From 12d69abf83685d70030f06a203983f1298ae534a Mon Sep 17 00:00:00 2001
From: tr4ck3ur <tr4ck3ur@style-python.fr>
Date: Sat, 14 Feb 2015 12:01:04 +0100
Subject: Fix all last changes for pre-production test

---
 jm2l/templates/edit_event.mako | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'jm2l/templates/edit_event.mako')

diff --git a/jm2l/templates/edit_event.mako b/jm2l/templates/edit_event.mako
index a957b48..fee9f33 100644
--- a/jm2l/templates/edit_event.mako
+++ b/jm2l/templates/edit_event.mako
@@ -3,7 +3,8 @@
 <%namespace name="helpers" file="jm2l:templates/helpers.mako"/>
 <%def name="jsAddOn()">
   <script src="/vendor/ckeditor/ckeditor.js"></script>
-  <script src="/vendor/select2/js/select2.js"></script>  
+  <script src="/vendor/select2/js/select2.js"></script>
+  <script src="/vendor/fileupload/js/jquery-uploader.min.js"></script>
 </%def>
 <%def name="cssAddOn()">
   <link rel="stylesheet" href="/vendor/select2/css/select2.css" type="text/css" media="screen" />
@@ -92,13 +93,12 @@ DicForm = {
     '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;" },
+    'description': {'PlaceHolder':u"Description", 'ContainerStyle':"padding-right:5px;",             "FieldStyle":"width:90%;height:500px;", "ckeditor":1 },
     } 
 %>
 
     ${helpers.DisplayForm(form, DicForm)}
-
-    <button type="submit">Proposer</button>
+        <button type="submit">Proposer</button>
     </form>
     
 </fieldset>
@@ -116,8 +116,9 @@ DicForm = {
         ${helpers.uploader("event", form.uid.data, u"un support de présentation" )}
 </fieldset>
     %else:
-        <br>NB: Vous devez proposer votre conférence avant de pouvoir
+        <p>NB: Vous devez proposer votre conférence avant de pouvoir
         téléverser votre support de présentation.
+        </p>
     % endif
 
 % if 'uid' in form._fields:
@@ -174,7 +175,8 @@ TabFields = [
         ## Then the submit for this form
         ${formAdd.add}
     </form>
-</fieldset>    
+</fieldset>
+<div class="clearfix">&nbsp;</div>
     <p style="float:right;">Créé le ${event.created.strftime('%d %b %Y').decode('utf-8')}</p>
 %else:
     <p style="float:right;">Créé le  
@@ -205,13 +207,14 @@ TabFields = [
     var editor = CKEDITOR.replace('description', { autoGrow_onStartup: true, language: 'fr' } );
     </script>
 % else:
-    <%
-    for jsitem in form._fields.keys():
+<%
+for jsitem in form._fields.keys():
+    context._kwargs['postpone_js'].append( "$('#%s-help').popover();" % jsitem )
+    if form._fields[jsitem].type=='SelectField':
+        context._kwargs['postpone_js'].append( "$('#%s').select2({width:'resolve'});" % jsitem )
+if formAdd:
+    for jsitem in formAdd._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():
-        
-    %>
+%>
+${helpers.uploader_js()}
 % endif
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf