From d261e8fc5aa32260c2da9041a879e77fadf6854d Mon Sep 17 00:00:00 2001 From: tr4ck3ur Date: Sun, 12 Apr 2015 17:35:16 +0200 Subject: [PATCH] Replace
by css (as suggested by W3C) Fix Url link for space --- jm2l/templates/Logistique/Dialog_Covoit.mako | 4 ++-- jm2l/templates/Profil/Sejour.mako | 4 ++-- jm2l/templates/Salles/salle.mako | 4 ++-- jm2l/templates/Salles/salle_phy.mako | 8 ++++---- jm2l/templates/Staff/EditIndex.mako | 4 ++-- jm2l/templates/Staff/EditPresse.mako | 8 ++++---- jm2l/templates/Staff/pole.mako | 8 ++++---- jm2l/templates/Staff/tasks.mako | 8 ++++---- jm2l/templates/login.mako | 4 +++- jm2l/templates/view_event.mako | 8 ++++---- jm2l/upload.py | 4 ++-- 11 files changed, 33 insertions(+), 31 deletions(-) diff --git a/jm2l/templates/Logistique/Dialog_Covoit.mako b/jm2l/templates/Logistique/Dialog_Covoit.mako index 7e2bf9b..e953afb 100644 --- a/jm2l/templates/Logistique/Dialog_Covoit.mako +++ b/jm2l/templates/Logistique/Dialog_Covoit.mako @@ -29,10 +29,10 @@ -
+
Pour un co-voiturage le ${Exch.start_time.strftime("%a %d %b").decode('utf-8')} vers ${Exch.start_time.strftime("%H:%M")} -
+ Temps de voyage estimé à
diff --git a/jm2l/templates/Profil/Sejour.mako b/jm2l/templates/Profil/Sejour.mako index 91eaaf7..5c784a9 100644 --- a/jm2l/templates/Profil/Sejour.mako +++ b/jm2l/templates/Profil/Sejour.mako @@ -155,7 +155,7 @@ fieldset:disabled {

-
+
% if 1: % endif -
+ diff --git a/jm2l/templates/Salles/salle.mako b/jm2l/templates/Salles/salle.mako index d033aec..73e8ac8 100644 --- a/jm2l/templates/Salles/salle.mako +++ b/jm2l/templates/Salles/salle.mako @@ -46,11 +46,11 @@ DicForm = { ${helpers.DisplayForm(form, DicForm)}
-
+
-
+ diff --git a/jm2l/templates/Salles/salle_phy.mako b/jm2l/templates/Salles/salle_phy.mako index a7c1f47..8f522d7 100644 --- a/jm2l/templates/Salles/salle_phy.mako +++ b/jm2l/templates/Salles/salle_phy.mako @@ -44,17 +44,17 @@ DicForm = { ${helpers.DisplayForm(form, DicForm)}
-
+
-
+ % if 'uid' in form._fields.keys(): -
+
${helpers.uploader("salle", form.uid.data, u"Attachement" )} -
+ %endif diff --git a/jm2l/templates/Staff/EditIndex.mako b/jm2l/templates/Staff/EditIndex.mako index c062be8..d540b4a 100644 --- a/jm2l/templates/Staff/EditIndex.mako +++ b/jm2l/templates/Staff/EditIndex.mako @@ -19,11 +19,11 @@ DicForm = {
${helpers.DisplayForm(form, DicForm)}
-
+
-
+
diff --git a/jm2l/templates/Staff/EditPresse.mako b/jm2l/templates/Staff/EditPresse.mako index 2af70de..5db4a9c 100644 --- a/jm2l/templates/Staff/EditPresse.mako +++ b/jm2l/templates/Staff/EditPresse.mako @@ -23,14 +23,14 @@ DicForm = {
${helpers.DisplayForm(form, DicForm)}
-
+
-
+
-
+
${helpers.uploader("presse", form.year_uid.data, u"Fichier" )} -
+ diff --git a/jm2l/templates/Staff/pole.mako b/jm2l/templates/Staff/pole.mako index 2eecc61..9a00cde 100644 --- a/jm2l/templates/Staff/pole.mako +++ b/jm2l/templates/Staff/pole.mako @@ -46,17 +46,17 @@ DicForm = { ${helpers.DisplayForm(form, DicForm)}
-
+
-
+ % if 'uid' in form._fields.keys(): -
+
${helpers.uploader("poles", form.uid.data, u"Attachement" )} -
+ %endif diff --git a/jm2l/templates/Staff/tasks.mako b/jm2l/templates/Staff/tasks.mako index b49f9f7..ccf6c94 100644 --- a/jm2l/templates/Staff/tasks.mako +++ b/jm2l/templates/Staff/tasks.mako @@ -64,17 +64,17 @@ DicForm = { ${helpers.DisplayForm(form, DicForm)}
-
+
-
+ % if 'uid' in form._fields.keys(): -
+
${helpers.uploader("tasks", form.uid.data, u"une pièce jointe" )} -
+ %endif diff --git a/jm2l/templates/login.mako b/jm2l/templates/login.mako index df91eb6..c989092 100644 --- a/jm2l/templates/login.mako +++ b/jm2l/templates/login.mako @@ -49,7 +49,9 @@
-
+
+ +

Je ne me souviens plus de mon mot de passe diff --git a/jm2l/templates/view_event.mako b/jm2l/templates/view_event.mako index 32776b8..bee6f6b 100644 --- a/jm2l/templates/view_event.mako +++ b/jm2l/templates/view_event.mako @@ -46,9 +46,9 @@ ${event.start_time.strftime('%H:%M')} à ${event.end_time.strftime('%H:%M')}
Présentation
-
+
Télécharger la présentation (${media.mime_type}) -
+ % endfor
@@ -59,9 +59,9 @@ ${event.start_time.strftime('%H:%M')} à ${event.end_time.strftime('%H:%M')} src="${media.get_path}" />
-
+
Télécharger la vidéo (${media.mime_type}) -
+ % endfor diff --git a/jm2l/upload.py b/jm2l/upload.py index 9bf9144..9c4c7e9 100644 --- a/jm2l/upload.py +++ b/jm2l/upload.py @@ -57,7 +57,7 @@ class MediaPath(): continue if f: filename, ext = os.path.splitext( f ) - tmpurl = '/image/%s/%d/%s' % (media_table, linked_id, f) + tmpurl = '/image/%s/%d/%s' % (media_table, linked_id, f.replace(" ","%20")) if MediaType is None: filelist.append(tmpurl) elif MediaType=='Image' and ext.lower() in ['.gif','.jpg','.png','.svg','.jpeg']: @@ -79,7 +79,7 @@ class MediaPath(): if f.endswith('.type'): continue if f: - tmpurl = '/image/%s/%d/thumbnails/%s' % (media_table, linked_id, f) + tmpurl = '/image/%s/%d/thumbnails/%s' % (media_table, linked_id, f.replace(" ","%20")) if MediaType is None: filelist.append(tmpurl) elif MediaType=='Image' and len( os.path.splitext(filename)[1] )==0: