Many changes for templates

jm2l/templates/Public/Programme.mako

@@ -1,4 +1,5 @@
 <%inherit file="jm2l:templates/layout.mako"/>
+<%namespace name="helpers" file="jm2l:templates/helpers.mako"/>
 <%
 TabDisplay = [
     (u'Tables rondes', 'Table ronde'),
@@ -7,6 +8,11 @@ TabDisplay = [
     (u'Stands', 'Stand'),    
 ]
 %>
+<%def name="jsAddOn()">
+    <script type="text/javascript" src="/vendor/d3js/d3.v3.min.js"></script>
+    <script type="text/javascript" src="/js/programme.js"></script>
+</%def>
+<%def name="cssAddOn()">
 <style>
 .myblock {
     background-color:#EEE;
@@ -31,11 +37,9 @@ TabDisplay = [
 }
 .Atelier {
     fill: #faebeb;
-    stroke: #dc7070;
 }
 .Table-ronde {
     fill: #fff4e5;
-    stroke: #ff9912;
 }
 .Repas {
     fill: #2EE;
@@ -54,26 +58,38 @@ rect {
   fill: none;
   stroke: #222;
 }
-
 </style>
-<h2>Le Programme ${DisplayYear}</h2>
-
-<div class="tabbable" id="main_tab">
-    <ul class="nav nav-tabs" style="margin-bottom: 5px;">
-    % for Num, (Day, IdDay) in enumerate(Days):
-        <li class="${['','active'][Num==0]}"><a href="#Day${Num}" id="Schedule_${Num}" data-toggle="tab">${Day}</a></li>
-    % endfor
-    </ul>
-    <div class="tab-content" style="padding:0">
-    % for Num, (Day, IdDay) in enumerate(Days):        
-        <div class="tab-pane fade ${['','active '][Num==0]}in" id="Day${Num}">
-            ## Container for SVG version of Programme
-            <div id="Schedule_SVG_${IdDay}">
+</%def>
+<div class="row-fluid">
+  <div class="span9">
+    
+    <h2>Le Programme ${DisplayYear}</h2>
+    
+    <div class="tabbable" id="main_tab">
+        <ul class="nav nav-tabs" style="margin-bottom: 5px;">
+        % for Num, (Day, IdDay) in enumerate(Days):
+            <li class="${['','active'][Num==0]}"><a href="#Day${Num}" id="Schedule_${Num}" data-toggle="tab">${Day}</a></li>
+        % endfor
+        </ul>
+        <div class="tab-content" style="padding:0">
+        % for Num, (Day, IdDay) in enumerate(Days):        
+            <div class="tab-pane fade ${['','active '][Num==0]}in" id="Day${Num}">
+                ## Container for SVG version of Programme
+                <div id="Schedule_SVG_${IdDay}">
+                </div>
             </div>
+        % endfor
         </div>
-    % endfor
     </div>
+
+  </div>
+  <div class="span3">
+    <!--Sidebar content-->
+    ${helpers.participants(DisplayYear)}
+  </div>
 </div>
+<div class="row-fluid">
+  <div class="span10 offset1">
 
 <div id="DivProg" style="border: 1px solid black;"></div>
 
@@ -99,7 +115,7 @@ if Counter==0:
       <thead>
         <tr>
             <th style="width:7em;text-align:center;">Date</th>
-            <th style="text-align:center;">Sujet - ${Counter} ${Title}</th>
+            <th style="text-align:center;">${Counter} ${Title}</th>
         </tr>
       </thead>
       <tbody>
@@ -154,6 +170,6 @@ if Counter==0:
     
 % endfor
 ##</div>
-<br/><br/>
-<script type="text/javascript" src="/vendor/d3js/d3.v3.min.js"></script>
-<script type="text/javascript" src="/js/programme.js"></script>
+
+  </div>
+</div>