tr4ck3ur/jm2l
3
0
Fork 1
Code Issues 3 Pull Requests Releases Wiki Activity

Fix index page

Browse Source
This commit is contained in:
tr4ck3ur des JM2L
2015-02-14 12:12:47 +01:00
parent 12d69abf83
commit 0f4c8a2994
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jm2l/templates/NewIndex.mako
+6 -6
View File
@@ -1,14 +1,14 @@
<%inherit file="jm2l:templates/layout.mako"/>
<%def name="jsAddOn()">
<script src="/vendor/timeline/js/timeline-src.js"></script>
<script src="/vendor/timeline/js/timeline-src.js"></script>
<script>
var timeline = new VMM.Timeline("timeline", '850px', '500px');
var c = {language:{ lang:"fr",api:{wikipedia:"fr"},date:{month:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],month_abbr:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","dec."],day:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],day_abbr:["Dim.","Lu.","Ma.","Me.","Jeu.","Vend.","Sam."]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",time_short:"HH:MM:SS",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'<br/><small>'d mmmm yyyy'</small>'",full_long:"dddd',' d mmm yyyy 'à' HH:MM",full_long_small_date:"HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'"},messages:{loading_timeline:"Chargement de la frise en cours... ",return_to_title:"Retour à la page d'accueil",expand_timeline:"Elargir la frise",contract_timeline:"Réduire la frise",wikipedia:"Extrait de Wikipedia, l'encyclopédie libre",loading_content:"Chargement",loading:"Chargement",swipe_nav:"Swipe to Navigate"}}};
timeline.init(c, "/2015/timeline-json");
</script>
</%def>
<%def name="cssAddOn()">
<!-- The default timeline stylesheet -->
<link rel="stylesheet" href="/vendor/timeline/css/timeline.css" />
</%def>
<div id="timeline" style="margin-left: -50px;"></div>
<script>
var timeline = new VMM.Timeline("timeline", '850px', '500px');
var c = {language:{ lang:"fr",api:{wikipedia:"fr"},date:{month:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],month_abbr:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","dec."],day:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],day_abbr:["Dim.","Lu.","Ma.","Me.","Jeu.","Vend.","Sam."]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",time_short:"HH:MM:SS",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'<br/><small>'d mmmm yyyy'</small>'",full_long:"dddd',' d mmm yyyy 'à' HH:MM",full_long_small_date:"HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'"},messages:{loading_timeline:"Chargement de la frise en cours... ",return_to_title:"Retour à la page d'accueil",expand_timeline:"Elargir la frise",contract_timeline:"Réduire la frise",wikipedia:"Extrait de Wikipedia, l'encyclopédie libre",loading_content:"Chargement",loading:"Chargement",swipe_nav:"Swipe to Navigate"}}};
timeline.init(c, "/2013/timeline-json");
</script>
jm2l/views.py
+4 -4
View File
@@ -166,7 +166,7 @@ def JSON_TimeLine_Request(request):
.filter(Event.event_type != None)\
.group_by(func.strftime('%d', Event.start_time)).all()
for Day in Days[2:]:
for Day in Days:
Events = DBSession.query(Event)\
.filter(Event.for_year == year)\
.filter(Event.event_type != 'Stand')\
@@ -192,10 +192,10 @@ def JSON_TimeLine_Request(request):
break
DicResult = {
"lang":"fr",
"headline":"JM2L 2013",
"headline":"JM2L 2015",
"type":"default",
"startDate":"2013,11,30,10",
"text":"<i><span class='c1'>8ème Édition</span></i>",
"startDate":"2015,11,28,10",
"text":"<i><span class='c1'>9ème Édition</span></i>",
"asset":
{
"media":"",