Many changes to reorganize third party javascript

1 files changed, 52 insertions, 63 deletions

diff --git a/jm2l/templates/edit_event.mako b/jm2l/templates/edit_event.mako
index 6c41e9e..a957b48 100644
--- a/jm2l/templates/edit_event.mako
+++ b/jm2l/templates/edit_event.mako
@@ -2,17 +2,17 @@
 <%inherit file="jm2l:templates/layout.mako"/>
 <%namespace name="helpers" file="jm2l:templates/helpers.mako"/>
 <%def name="jsAddOn()">
-  <script src="/static/third-party/ckeditor/ckeditor.js"></script>
-  <script src="/static/select2.js"></script>  
+  <script src="/vendor/ckeditor/ckeditor.js"></script>
+  <script src="/vendor/select2/js/select2.js"></script>  
 </%def>
 <%def name="cssAddOn()">
-  <link rel="stylesheet" href="/static/select2.css" type="text/css" media="screen" />
-  <link rel="stylesheet" href="/static/css/jquery.fileupload.css">
-  <link rel="stylesheet" href="/static/css/jquery.fileupload-ui.css">
-  <link rel="stylesheet" href="/static/leaflet.css" />  
+  <link rel="stylesheet" href="/vendor/select2/css/select2.css" type="text/css" media="screen" />
+  <link rel="stylesheet" href="/vendor/fileupload/css/jquery.fileupload.css">
+  <link rel="stylesheet" href="/vendor/fileupload/css/jquery.fileupload-ui.css">
+  <link rel="stylesheet" href="/vendor/leaflet/css/leaflet.css" />  
   <!-- CSS adjustments for browsers with JavaScript disabled -->
-  <noscript><link rel="stylesheet" href="/static/css/jquery.fileupload-noscript.css"></noscript>
-  <noscript><link rel="stylesheet" href="/static/css/jquery.fileupload-ui-noscript.css"></noscript>  
+  <noscript><link rel="stylesheet" href="/vendor/fileupload/css/jquery.fileupload-noscript.css"></noscript>
+  <noscript><link rel="stylesheet" href="/vendor/fileupload/css/jquery.fileupload-ui-noscript.css"></noscript>  
 </%def>
 <% from datetime import datetime %>
 <style>
@@ -81,47 +81,22 @@
         % if 'uid' in form._fields:
             ${form.uid}
         %endif
-<%
-TabFields = [
-    ( form._fields.get("for_year"),      u"Prénom",      "padding-right:5px;float:left;"  , "" ),
-    ( form._fields.get("event_type"),    u"Nom",         "padding-right:5px;"             , "" ),
-    ( form._fields.get("start_sel"),     u"Début",       "padding-right:15px;float:left;" , "width:15em;" ),
-    ( form._fields.get("duration"),      u"Durée",       "padding-right:15px;float:left;" , "width:15em;" ),
-    ( form._fields.get("salle_uid"),     u"Salle",       "padding-right:15px;",             "width:15em;" ),
-    ( form._fields.get("name"),          u"Nom",         "padding-right:5px;"             , "width:95%;" ),
-    ( form._fields.get("description"),   u"Description", "padding-right:5px;"             , "width:90%;height:500px;" ),
-]
-%>
         ${form.start_time}
         ${form.end_time}
-% for Field, PlaceHolder, DivClass, FieldClass in TabFields:
-    % if Field is None:
-        <% continue %>
-    % endif    
-    % if Field.type=='HiddenField':
-        ${Field()}    
-        <% continue %>
-    % endif
-    <div style="padding-right:5px;${DivClass}">
-        <label for="${Field.label.field_id}">${Field.label.text}
-            % if len(Field.description):
-                <a id="${Field.label.field_id}-help" data-toggle="popover"
-                    data-original-title="${Field.label.text}"
-                    data-content="${Field.description}">
-                    <i class="icon-me" style="background-image: url('/static/Help.png');background-position:1px 2px;"></i>
-                </a>
-            % endif
-        </label>
-        % for error in Field.errors:
-            <div class="alert alert-error">
-                <button type="button" class="close" data-dismiss="alert">&times;</button>
-                <h4>Erreur!</h4>
-                ${ error }
-            </div>
-        % endfor
-        ${Field(placeholder=PlaceHolder, style=FieldClass)}        
-    </div>
-% endfor
+
+<%
+DicForm = {
+    'for_year':    {'PlaceHolder':u"Année",       'ContainerStyle':"padding-right:5px;float:left;",  },
+    'event_type':  {'PlaceHolder':u"Nom",         'ContainerStyle':"padding-right:5px;",             },
+    'start_sel':   {'PlaceHolder':u"Début",       'ContainerStyle':"padding-right:15px;float:left;", "FieldStyle":"width:15em;"},
+    'duration':    {'PlaceHolder':u"Durée",       'ContainerStyle':"padding-right:15px;float:left;", "FieldStyle":"width:15em;"},
+    'salle_uid':   {'PlaceHolder':u"Salle",       'ContainerStyle':"padding-right:15px;",            "FieldStyle":"width:15em;"},
+    'name':        {'PlaceHolder':u"Nom",         'ContainerStyle':"padding-right:5px;",             "FieldStyle":"width:95%;"},
+    'description': {'PlaceHolder':u"Description", 'ContainerStyle':"padding-right:5px;",             "FieldStyle":"width:90%;height:500px;" },
+    } 
+%>
+
+    ${helpers.DisplayForm(form, DicForm)}
 
     <button type="submit">Proposer</button>
     </form>
@@ -182,7 +157,7 @@ TabFields = [
                 <a id="${Field.label.field_id}-help" data-toggle="popover"
                     data-original-title="${Field.label.text}"
                     data-content="${Field.description}">
-                    <i class="icon-me" style="background-image: url('/static/Help.png');background-position:1px 2px;"></i>
+                    <i class="icon-me" style="background-image: url('/img/Help.png');background-position:1px 2px;"></i>
                 </a>
             % endif
         </label>
@@ -208,21 +183,35 @@ TabFields = [
 % endif
 <br/>
 <hr/>
-% if 'uid' in form._fields:
-    ${helpers.uploader_js()}
-% endif
-<script type="text/javascript">
-## Handle Popover of this form
-% for field in form._fields.keys():
-    $('#${field}-help').popover();
-    % if form._fields[field].type=='SelectField':
-    $('#${field}').select2({width:'resolve'});
+
+% if 0:
+    % if 'uid' in form._fields:
+        ${helpers.uploader_js()}
     % endif
-%endfor
-% if formAdd:
-    % for field in formAdd._fields.keys():
+    <script type="text/javascript">
+    ## Handle Popover of this form
+    % for field in form._fields.keys():
+        
         $('#${field}-help').popover();
+        % if form._fields[field].type=='SelectField':
+        $('#${field}').select2({width:'resolve'});
+        % endif
     %endfor
-% endif
-var editor = CKEDITOR.replace('description', { autoGrow_onStartup: true, language: 'fr' } );
-</script>
+    % if formAdd:
+        % for field in formAdd._fields.keys():
+            $('#${field}-help').popover();
+        %endfor
+    % endif
+    var editor = CKEDITOR.replace('description', { autoGrow_onStartup: true, language: 'fr' } );
+    </script>
+% else:
+    <%
+    for jsitem in form._fields.keys():
+        context._kwargs['postpone_js'].append( "$('#%s-help').popover();" % jsitem )
+        if form._fields[field].type=='SelectField':
+            context._kwargs['postpone_js'].append( "$('#%s').select2({width:'resolve'});" % jsitem )
+    if formAdd:
+        for jsitem in formAdd._fields.keys():
+        
+    %>
+% endif
\ No newline at end of file