From 240cdce43ce54c43839ffa793c72f5cc5fefae1a Mon Sep 17 00:00:00 2001 From: tr4ck3ur Date: Sun, 12 Apr 2015 15:18:04 +0200 Subject: [PATCH] Fix Error for W3C --- jm2l/static/css/jm2l.css | 13 +++++++++++++ jm2l/static/img/Help.png | Bin 648 -> 516 bytes jm2l/templates/NewIndex.mako | 13 ++----------- jm2l/templates/helpers.mako | 14 +++++++++++--- jm2l/templates/layout.mako | 10 +++++----- jm2l/views.py | 23 +++++++++++++++++++++-- 6 files changed, 52 insertions(+), 21 deletions(-) diff --git a/jm2l/static/css/jm2l.css b/jm2l/static/css/jm2l.css index bcdde76..27d9de8 100644 --- a/jm2l/static/css/jm2l.css +++ b/jm2l/static/css/jm2l.css @@ -241,3 +241,16 @@ a { .ws-popover-opener { background: none; } + +.enum li { + list-style-type: none; + background-image: url(/img/puce.png); + background-repeat: no-repeat; + background-position: 0 6px; + padding-left: 16px; +} + +.center +{ + text-align: center; +} \ No newline at end of file diff --git a/jm2l/static/img/Help.png b/jm2l/static/img/Help.png index 6402e9bf7e855cf4991ddf616ed9e667394d3eb7..ad6d331518c77792f51c06522e63dcde7af201f4 100644 GIT binary patch delta 487 zcmV1%w14iBL{Q4GJ0x0000DNk~Le0000E0000F2nGNE0Mr!zbdez`e*vUP zL_t(2&z+M!Xj5SnhM#l)@&n#B)nY7CwCErf2ce6tPy{Cj1&0#1LTACHn^16a>f&k; z2bW5Rf`b$)*x+c$6o@z|+)8Q&uXukn`M%?lf>eXmcRRy#eqP=Kqvh})x(U1nZu|>0 z4n%>7o^su9z`3J>4*|Visp$IRf1(~2+4{u-P0zlGDyXO`&p(hmY4OI$n#ii6s`mT+HCTEX^AAy5yyd6i)+4r8@P2CtN<$xaCK~qwA0~>@3XMEf60f{Rlc^{ zT=G0lI?f|t;#Y75s7!kvr9y!`NpSNVlVx=4b-s)61GpFjQw}^haMcH%0^^s9MXIh# zX)s_AMP$aX*J#icp$qg>*)wKl0P7ww2b?L0;HlC}Q_7Bm^?hb0CwXNpO>5~`%V%SH z79InA0cyarq6im!pE8iCJ<>IXPu9j38pHVQ04<<@U{DCW1QdvYZQwpI4;1-J*abK- dy!S|7@e^-Bl^!%Fe{s_T00MyNC(h_ds^|IekU2Hd z3nVNcWS}Ai3V$RDd(L8EJNNM0%jpCC+Wn%PPTNbTGv?H2lKJvUMy8kP)ByN&Qilhf zx?1#-+me3E2XDduFqiBvj$e;0mxLRglV z8y*yBxdE~zom%;jcO69+2D{vE+0^JLZnhPl$fQU&`({Nf!js(q2tq=|1JZ29V9)8(PabTu@#IR@|UK z0a5sT^&HXl^MYI%GHF1(&!$FclVx>#S(EkLYPnQg)Y*d-GYCT9NJe -

${edition | n} édition des JM2L en ${year}


-
+
% if request.user and request.user.Staff: Editer cette page - % endif

Le programme des événements ${year or 2015 }

-
+
${ content | n } diff --git a/jm2l/templates/helpers.mako b/jm2l/templates/helpers.mako index 3853aa8..cbe348d 100644 --- a/jm2l/templates/helpers.mako +++ b/jm2l/templates/helpers.mako @@ -23,7 +23,7 @@ TabJs = {'select':[], 'desc':[]} - + % endif @@ -331,6 +331,7 @@ TabJs = {'select':[], 'desc':[]} ## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= <%def name="show_Interventions(ListEvent, HeadTitle=None, NotFoundTitle=None)"> \ + % if HeadTitle: @@ -339,6 +340,8 @@ TabJs = {'select':[], 'desc':[]} % endif + + % if len(ListEvent)==0: % endfor % endif +
DateL'historique des interventions
@@ -398,6 +401,7 @@ TabJs = {'select':[], 'desc':[]}
## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -647,7 +651,9 @@ TabJs = {'select':[], 'desc':[]}
- + + + <% num = -1 %> @@ -669,7 +675,9 @@ TabJs = {'select':[], 'desc':[]}
Sponsors ${Year}
Sponsors ${Year}
- + + + <% num = -1 %> diff --git a/jm2l/templates/layout.mako b/jm2l/templates/layout.mako index ad6d66f..79d82a9 100644 --- a/jm2l/templates/layout.mako +++ b/jm2l/templates/layout.mako @@ -51,17 +51,17 @@ ${helpers.uploader_js()}
-
+
-
+
-
+
% if request.user and request.user.vote_logo not in [1,2,3]: @@ -77,10 +77,10 @@ ${helpers.uploader_js()} % endif
- + go left - + go right
% if request.user: diff --git a/jm2l/views.py b/jm2l/views.py index 69b2c37..b982024 100644 --- a/jm2l/views.py +++ b/jm2l/views.py @@ -244,8 +244,21 @@ def JSON_TimeLine_Request(request): "asset": { "media":embeed_video("video/ogg","http://jm2l.linux-azur.org/resources/2010/Video/reportages/JM2L2010-PleinSudTV.ogv"), - "credit":"JM2L", - "caption":"reportage Plein-sud TV" + "credit":"Le reportage Plein-sud TV", + "caption":"JM2L", + } + } + elif year==2007: + DicResult = { + "lang":"fr", + "headline":"JM2L 2007", + "type":"default", + "text":"2ème Édition", + "asset": + { + "media":embeed_video("video/ogg","http://jm2l.linux-azur.org/resources/2007/Video/20071110-linux.ogv"), + "credit":"Le reportage Plein-sud TV", + "caption":"JM2L 2007", } } else: @@ -1151,6 +1164,12 @@ def edit_event(request): if not duration in map(lambda (d,y): d, form.duration.choices): form.duration.choices.append( (duration,u'Table ronde (%dh%.2d)' % (duration/60, duration%60) ) ) SalleDispo = SalleDispo.filter(Salles.place_type=='Conference') + elif intervention=="Concert": + form.duration.choices = map( lambda d:(d, u'Concert (%dh%.2d)' % (d/60, d%60) ), \ + [60, 90, 120, 150, 180, 210, 240] ) + if not duration in map(lambda (d,y): d, form.duration.choices): + form.duration.choices.append( (duration,u'Concert (%dh%.2d)' % (duration/60, duration%60) ) ) + SalleDispo = SalleDispo.filter(Salles.place_type=='Stand') else: raise HTTPForbidden(u"Pas encore disponible.")
Exposants ${Year}
Exposants ${Year}