From 2c8bd43f56d7f50cf61184d59f6a274f95d13b55 Mon Sep 17 00:00:00 2001 From: tr4ck3ur Date: Mon, 6 Apr 2015 16:21:45 +0200 Subject: [PATCH] Set Home page for all years Added video on Home change navigation bar buttons --- jm2l/__init__.py | 2 +- jm2l/templates/NewIndex.mako | 26 +++---------- jm2l/templates/helpers.mako | 3 +- jm2l/templates/layout.mako | 29 +++++++-------- jm2l/views.py | 71 ++++++++++++++++++++++++++---------- 5 files changed, 74 insertions(+), 57 deletions(-) diff --git a/jm2l/__init__.py b/jm2l/__init__.py index 8cd4b31..b1c3ce3 100644 --- a/jm2l/__init__.py +++ b/jm2l/__init__.py @@ -69,7 +69,7 @@ def main(global_config, **settings): config.add_route('action_salle', '/Salles/{action:(\w+)}/{salle_id:(\d+)}') # HTML Routes - Public - config.add_route('home', '/') + config.add_route('home', '/{year:(\d+/)?}') config.add_route('presse', '/{year:\d+}/dossier-de-presse') config.add_route('edit_presse', '/{year:\d+}/dossier-de-presse/edit') config.add_route('programme', '/{year:\d+}/le-programme') diff --git a/jm2l/templates/NewIndex.mako b/jm2l/templates/NewIndex.mako index a16a83c..7cb1594 100644 --- a/jm2l/templates/NewIndex.mako +++ b/jm2l/templates/NewIndex.mako @@ -4,7 +4,7 @@ <%def name="cssAddOn()"> @@ -20,8 +20,9 @@ } -

9ème édition des JM2L

+

${edition | n} édition des JM2L


+% if year=='2015':
@@ -31,11 +32,8 @@ Le thème de cette année sera « Do It Yourself » ou « Faîtes le vous-même » :
  • Migration vers les logiciels libres
    • -##
  • Libres enfants du numérique : jeux et loisirs pour les juniors.
    • -##
  • Gérer ses données personnelles
  • Do It Yourself (jeux vidéos, fablabs…)
  • Culture libre
    • -##
  • Communautés du libre
@@ -50,21 +48,9 @@

- - -## Nous vous proposons plusieurs formats de contribution : -## -##

-## Il sera bien sûr possible de combiner plusieurs formats (par exemple, une démo ou une conférence suivie -## d’un atelier). -##

+% else: + La grille du programme +% endif
diff --git a/jm2l/templates/helpers.mako b/jm2l/templates/helpers.mako index 4f25331..30bfb83 100644 --- a/jm2l/templates/helpers.mako +++ b/jm2l/templates/helpers.mako @@ -603,7 +603,7 @@ TabJs = {'select':[], 'desc':[]} ## Wrapper pour les sponsors ## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= <%def name="participants(Year)"> \ - +
@@ -647,4 +647,5 @@ TabJs = {'select':[], 'desc':[]} % endfor
Sponsors ${Year}
+
\ diff --git a/jm2l/templates/layout.mako b/jm2l/templates/layout.mako index cc28373..94a7ead 100644 --- a/jm2l/templates/layout.mako +++ b/jm2l/templates/layout.mako @@ -37,9 +37,8 @@ ${helpers.uploader_js()}
% if DisplayYear!=2015: - ## style="background: url( ${"/img/%s/headerbg.png" % DisplayYear} ) repeat-x scroll 0 top #ffffff;"> -
- +
+
@@ -98,19 +97,18 @@ ${helpers.uploader_js()}
-
+ +
- JM2L - ${DisplayYear}  + Archives 
    - % for tmpyear in range(2015, 2005, -1): - % if tmpyear!=2014: + % for tmpyear in range(2013, 2005, -1):
  • ${tmpyear}
    • - % endif % endfor
+
% if request.user: @@ -138,18 +136,17 @@ ${helpers.uploader_js()} ##
-
- +
+
diff --git a/jm2l/views.py b/jm2l/views.py index 4331a0d..8f9b1fc 100644 --- a/jm2l/views.py +++ b/jm2l/views.py @@ -170,9 +170,17 @@ def JSON_TimeLine_Request(request): .filter("strftime('%d', start_time) = :dow").params(dow=Day.day)\ .order_by(Event.start_time) - ListEv = [] + #ListEv = [] for ev in Events: if ev.event_type: + CurMedia = ev.video.first() or "" + if CurMedia: + Container = """" + else: + Container = "" ListEv.append( { #"uid":"%d/%d" % ( year, ev.uid ), "headline":ev.name, @@ -182,32 +190,55 @@ def JSON_TimeLine_Request(request): "tags":ev.Salle and (ev.Salle.name or "unk") , #"status":ev.event_type, "asset": { - "media":"", #http://jm2l.linux-azur.org/sites/jm2l.linux-azur.org/files/videos/2012/2012_Introduction_aux_logiciels_libres__Frederic_Couchet.ogv", + "media": Container, "credit":"", "caption":"" } } ) - break - DicResult = { - "lang":"fr", - "headline":"JM2L 2015", - "type":"default", - "startDate":"2015,11,28,10", - "text":"9ème Édition", - "asset": - { - "media":"https://www.youtube.com/watch?v=DnfjrxVoLao", - "credit":"JM2L", - "caption":"" + if year=="2015": + DicResult = { + "lang":"fr", + "headline":"JM2L 2015", + "type":"default", + "startDate":"2015,11,28,10", + "text":"9ème Édition", + "asset": + { + "media":"https://www.youtube.com/watch?v=DnfjrxVoLao", + "credit":"JM2L", + "caption":"" + } + } + else: + DicResult = { + "lang":"fr", + "headline":"JM2L %d" % year, + "type":"default", + "asset": + { + "media":"", + "credit":"JM2L", + "caption":"" + } } - } DicResult["date"] = ListEv return { 'timeline':DicResult } ## =-=- Here, We handle HTTP requests - Public Part -=-= @view_config(route_name='home', renderer="jm2l:templates/NewIndex.mako") def index_page(request): - MainTab = {'accueil':'active', "logged_in":request.authenticated_userid } - return MainTab + year = request.matchdict.get('year') + if year: + year=int(year[:-1]) + if 2004ère" } + else: + edition = year - 2005 + return {'year': year, 'edition':u"%dème" % edition } + else: + raise HTTPNotFound() + return {'year': CurrentYear, 'edition':u"9ème"} + @view_config(route_name='programme', renderer="jm2l:templates/Public/Programme.mako") def programme(request): @@ -250,7 +281,9 @@ def edit_presse(request): return MainTab @view_config(route_name='plan', renderer="jm2l:templates/Public/Plan.mako") -def static_plan(request): +def static_plan(request): + session = request.session + session['year'] = 2015 MainTab = {'plan':'active', "logged_in":request.authenticated_userid } return MainTab @@ -850,7 +883,7 @@ def change_year(request): session = request.session if year>-1: session['year'] = year - return HTTPFound(location='/%s/le-programme' % year) + return HTTPFound(location='/%s/' % year) return HTTPFound(location=request.route_url('home')) @view_config(route_name='pict_user', renderer="jm2l:templates/Profil/pict_user.mako")