| @@ -241,3 +241,16 @@ a { | |||||
| .ws-popover-opener { | .ws-popover-opener { | ||||
| background: none; | 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; | |||||
| } | |||||
| @@ -10,24 +10,15 @@ | |||||
| <%def name="cssAddOn()"> | <%def name="cssAddOn()"> | ||||
| <!-- The default timeline stylesheet --> | <!-- The default timeline stylesheet --> | ||||
| <link rel="stylesheet" href="/vendor/timeline/css/timeline.css" /> | <link rel="stylesheet" href="/vendor/timeline/css/timeline.css" /> | ||||
| <style> | |||||
| .enum li { | |||||
| list-style-type: none; | |||||
| background-image: url(/img/puce.png); | |||||
| background-repeat: no-repeat; | |||||
| background-position: 0 6px; | |||||
| padding-left: 16px; | |||||
| } | |||||
| </style> | |||||
| </%def> | </%def> | ||||
| <H2 style="text-align: center;" class="shadow">${edition | n} édition des JM2L en ${year}</H2> | <H2 style="text-align: center;" class="shadow">${edition | n} édition des JM2L en ${year}</H2> | ||||
| <br> | <br> | ||||
| <center> | |||||
| <div class="center"> | |||||
| % if request.user and request.user.Staff: | % if request.user and request.user.Staff: | ||||
| <a href="/${year or 2015}/edit">Editer cette page</a> - | <a href="/${year or 2015}/edit">Editer cette page</a> - | ||||
| % endif | % endif | ||||
| <h4><a href="/${year or 2015}/le-programme">Le programme des événements ${year or 2015 }</a></h4> | <h4><a href="/${year or 2015}/le-programme">Le programme des événements ${year or 2015 }</a></h4> | ||||
| </center> | |||||
| </div> | |||||
| <div class="row-fluid"> | <div class="row-fluid"> | ||||
| <div class="span10 offset1"> | <div class="span10 offset1"> | ||||
| ${ content | n } | ${ content | n } | ||||
| @@ -23,7 +23,7 @@ TabJs = {'select':[], 'desc':[]} | |||||
| <a id="${Field.label.field_id}-help" data-toggle="popover" | <a id="${Field.label.field_id}-help" data-toggle="popover" | ||||
| data-original-title="${Field.label.text}" | data-original-title="${Field.label.text}" | ||||
| data-content="${Field.description}"> | data-content="${Field.description}"> | ||||
| <i class="icon-me" style="background-image: url('/img/Help.png');background-position:1px 2px;"></i> | |||||
| <i class="icon-me" style="background-image: url('/img/Help.png');background-position:0 0;"></i> | |||||
| </a> | </a> | ||||
| % endif | % endif | ||||
| </label> | </label> | ||||
| @@ -331,6 +331,7 @@ TabJs = {'select':[], 'desc':[]} | |||||
| ## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= | ## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= | ||||
| <%def name="show_Interventions(ListEvent, HeadTitle=None, NotFoundTitle=None)"> \ | <%def name="show_Interventions(ListEvent, HeadTitle=None, NotFoundTitle=None)"> \ | ||||
| <table class="table table-striped table-bordered table-hover"> | <table class="table table-striped table-bordered table-hover"> | ||||
| <thead> | |||||
| <tr> | <tr> | ||||
| <th style="width:6em;text-align:center;">Date</th> | <th style="width:6em;text-align:center;">Date</th> | ||||
| % if HeadTitle: | % if HeadTitle: | ||||
| @@ -339,6 +340,8 @@ TabJs = {'select':[], 'desc':[]} | |||||
| <th style="text-align:center;">L'historique des interventions</th> | <th style="text-align:center;">L'historique des interventions</th> | ||||
| % endif | % endif | ||||
| </tr> | </tr> | ||||
| </thead> | |||||
| <tbody> | |||||
| % if len(ListEvent)==0: | % if len(ListEvent)==0: | ||||
| <tr> | <tr> | ||||
| <td style="text-align:center;" colspan="2"> | <td style="text-align:center;" colspan="2"> | ||||
| @@ -398,6 +401,7 @@ TabJs = {'select':[], 'desc':[]} | |||||
| </tr> | </tr> | ||||
| % endfor | % endfor | ||||
| % endif | % endif | ||||
| </tbody> | |||||
| </table> | </table> | ||||
| </%def> | </%def> | ||||
| ## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= | ## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= | ||||
| @@ -647,7 +651,9 @@ TabJs = {'select':[], 'desc':[]} | |||||
| <div id='right_panel'> | <div id='right_panel'> | ||||
| <table class="ShowEntities table"> | <table class="ShowEntities table"> | ||||
| <thead> | <thead> | ||||
| <th colspan="3">Sponsors ${Year}</th> | |||||
| <tr> | |||||
| <th colspan="3">Sponsors ${Year}</th> | |||||
| </tr> | |||||
| </thead> | </thead> | ||||
| <tr> | <tr> | ||||
| <% num = -1 %> | <% num = -1 %> | ||||
| @@ -669,7 +675,9 @@ TabJs = {'select':[], 'desc':[]} | |||||
| <br /> | <br /> | ||||
| <table class="ShowEntities table"> | <table class="ShowEntities table"> | ||||
| <thead> | <thead> | ||||
| <th colspan="3">Exposants ${Year}</th> | |||||
| <tr> | |||||
| <th colspan="3">Exposants ${Year}</th> | |||||
| </tr> | |||||
| </thead> | </thead> | ||||
| <tr> | <tr> | ||||
| <% num = -1 %> | <% num = -1 %> | ||||
| @@ -51,17 +51,17 @@ ${helpers.uploader_js()} | |||||
| <div class="carousel-inner" role="listbox"> | <div class="carousel-inner" role="listbox"> | ||||
| <div class="item ${["","active"][request.user and request.user.vote_logo==1 or request.user is None]}"> | <div class="item ${["","active"][request.user and request.user.vote_logo==1 or request.user is None]}"> | ||||
| <a href="/"> | <a href="/"> | ||||
| <div style="height:215px;background: url(/img/2015/logo.png) no-repeat scroll center center transparent"></div> | |||||
| <div style="height:215px;background: url(/img/2015/logo.png) no-repeat scroll center transparent"></div> | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| <div class="item ${["","active"][request.user and request.user.vote_logo==2 or 0]}"> | <div class="item ${["","active"][request.user and request.user.vote_logo==2 or 0]}"> | ||||
| <a href="/"> | <a href="/"> | ||||
| <div style="height:215px;background: url(/img/2015/logo_1.png) no-repeat scroll center center transparent"></div> | |||||
| <div style="height:215px;background: url(/img/2015/logo_1.png) no-repeat scroll center transparent"></div> | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| <div class="item ${["","active"][request.user and request.user.vote_logo==3 or 0]}"> | <div class="item ${["","active"][request.user and request.user.vote_logo==3 or 0]}"> | ||||
| <a href="/"> | <a href="/"> | ||||
| <div style="height:215px;background: url(/img/2015/logo_2.png) no-repeat scroll center center transparent"></div> | |||||
| <div style="height:215px;background: url(/img/2015/logo_2.png) no-repeat scroll center transparent"></div> | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| % if request.user and request.user.vote_logo not in [1,2,3]: | % if request.user and request.user.vote_logo not in [1,2,3]: | ||||
| @@ -77,10 +77,10 @@ ${helpers.uploader_js()} | |||||
| % endif | % endif | ||||
| </div> | </div> | ||||
| <a class="left Tcarousel-control" href="#TitleCarousel" role="button" data-slide="prev"> | <a class="left Tcarousel-control" href="#TitleCarousel" role="button" data-slide="prev"> | ||||
| <img src="/img/chev-left.png"> | |||||
| <img src="/img/chev-left.png" alt="go left"> | |||||
| </a> | </a> | ||||
| <a class="right Tcarousel-control" href="#TitleCarousel" role="button" data-slide="next"> | <a class="right Tcarousel-control" href="#TitleCarousel" role="button" data-slide="next"> | ||||
| <img src="/img/chev-right.png"> | |||||
| <img src="/img/chev-right.png" alt="go right"> | |||||
| </a> | </a> | ||||
| <div class="carousel-vote"> | <div class="carousel-vote"> | ||||
| % if request.user: | % if request.user: | ||||
| @@ -244,8 +244,21 @@ def JSON_TimeLine_Request(request): | |||||
| "asset": | "asset": | ||||
| { | { | ||||
| "media":embeed_video("video/ogg","http://jm2l.linux-azur.org/resources/2010/Video/reportages/JM2L2010-PleinSudTV.ogv"), | "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":"<a href='http://pleinsudtv.com/index.php/casa/affichage-en-vignettes/93-casa-culture/582-les-jm-du-logiciel-libre-2010'>Le reportage Plein-sud TV</a>", | |||||
| "caption":"JM2L", | |||||
| } | |||||
| } | |||||
| elif year==2007: | |||||
| DicResult = { | |||||
| "lang":"fr", | |||||
| "headline":"JM2L 2007", | |||||
| "type":"default", | |||||
| "text":"<i><span class='c1'>2ème Édition</span></i>", | |||||
| "asset": | |||||
| { | |||||
| "media":embeed_video("video/ogg","http://jm2l.linux-azur.org/resources/2007/Video/20071110-linux.ogv"), | |||||
| "credit":"<a href='http://pleinsudtv.com/index.php/casa/affichage-en-vignettes/93-casa-culture/245-logiciel-libre-linux-jm2l'>Le reportage Plein-sud TV</a>", | |||||
| "caption":"JM2L 2007", | |||||
| } | } | ||||
| } | } | ||||
| else: | else: | ||||
| @@ -1151,6 +1164,12 @@ def edit_event(request): | |||||
| if not duration in map(lambda (d,y): d, form.duration.choices): | 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) ) ) | form.duration.choices.append( (duration,u'Table ronde (%dh%.2d)' % (duration/60, duration%60) ) ) | ||||
| SalleDispo = SalleDispo.filter(Salles.place_type=='Conference') | 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: | else: | ||||
| raise HTTPForbidden(u"Pas encore disponible.") | raise HTTPForbidden(u"Pas encore disponible.") | ||||