diff --git a/jm2l/templates/NewIndex.mako b/jm2l/templates/NewIndex.mako index 7cb1594..6385003 100644 --- a/jm2l/templates/NewIndex.mako +++ b/jm2l/templates/NewIndex.mako @@ -20,9 +20,9 @@ } -

${edition | n} édition des JM2L

+

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


-% if year=='2015': +% if year==2015:
@@ -49,7 +49,7 @@
% else: - La grille du programme + Le programme des évenements ${year} % endif
diff --git a/jm2l/templates/layout.mako b/jm2l/templates/layout.mako index 94a7ead..13d8175 100644 --- a/jm2l/templates/layout.mako +++ b/jm2l/templates/layout.mako @@ -103,8 +103,10 @@ ${helpers.uploader_js()} Archives 
diff --git a/jm2l/views.py b/jm2l/views.py index aaa9a08..b7d8fe3 100644 --- a/jm2l/views.py +++ b/jm2l/views.py @@ -187,11 +187,12 @@ def JSON_TimeLine_Request(request): "startDate":ev.start_time.strftime('%Y,%m,%d,%H,%M'), "endDate":ev.end_time.strftime('%Y,%m,%d,%H,%M'), "text":ev.Salle and (ev.Salle.name or "unk"), - "tags":ev.Salle and (ev.Salle.name or "unk") , + #"text":ev.description[:100], + "tags":ev.Salle and (ev.Salle.salle_id or "unk") , #"status":ev.event_type, "asset": { "media": Container, - "credit":"", + "credit": ",".join(["%s %s" % (i.prenom, i.nom) for i in ev.intervenants]), "caption":"" } } ) if year=="2015": @@ -232,6 +233,8 @@ def index_page(request): if 2004ère" } + elif year==2015: + return {'year': year, 'edition':u"9ème" } else: edition = year - 2005 return {'year': year, 'edition':u"%dème" % edition }