Browse Source

Added 2015 link

master
tr4ck3ur des JM2L 9 years ago
parent
commit
64556ecf47
3 changed files with 11 additions and 6 deletions
  1. +3
    -3
      jm2l/templates/NewIndex.mako
  2. +3
    -1
      jm2l/templates/layout.mako
  3. +5
    -2
      jm2l/views.py

+ 3
- 3
jm2l/templates/NewIndex.mako View File

@@ -20,9 +20,9 @@
}
</style>
</%def>
<H2 style="text-align: center;" class="shadow">${edition | n} édition des JM2L</H2>
<H2 style="text-align: center;" class="shadow">${edition | n} édition des JM2L en ${year}</H2>
<br>
% if year=='2015':
% if year==2015:
<div class="row-fluid">
<div class="span4 offset1">
<blockquote>
@@ -49,7 +49,7 @@
</div>
</div>
% else:
<a href="/${year}/le-programme">La grille du programme</a>
<a href="/${year}/le-programme">Le programme des évenements ${year}</a>
% endif

<div class="row-fluid">


+ 3
- 1
jm2l/templates/layout.mako View File

@@ -103,8 +103,10 @@ ${helpers.uploader_js()}
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
Archives&nbsp;<span class="caret"></span></a>
<ul class="dropdown-menu">
% for tmpyear in range(2013, 2005, -1):
% for tmpyear in range(2015, 2005, -1):
% if tmpyear!=2014:
<li><a href="/year/${tmpyear}">${tmpyear}</a></li>
% endif
% endfor
</ul>
</div>


+ 5
- 2
jm2l/views.py View File

@@ -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<year<=CurrentYear:
if year==2006:
return {'year': year, 'edition':u"1<sup>ère</sup>" }
elif year==2015:
return {'year': year, 'edition':u"9<sup>ème</sup>" }
else:
edition = year - 2005
return {'year': year, 'edition':u"%d<sup>ème</sup>" % edition }


Loading…
Cancel
Save