% if request.user and request.user.vote_logo not in [1,2,3]:
@@ -77,10 +77,10 @@ ${helpers.uploader_js()}
% endif
% 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.")