Browse Source

Fix Error for W3C

master
tr4ck3ur des JM2L 9 years ago
parent
commit
240cdce43c
6 changed files with 52 additions and 21 deletions
  1. +13
    -0
      jm2l/static/css/jm2l.css
  2. BIN
      jm2l/static/img/Help.png
  3. +2
    -11
      jm2l/templates/NewIndex.mako
  4. +11
    -3
      jm2l/templates/helpers.mako
  5. +5
    -5
      jm2l/templates/layout.mako
  6. +21
    -2
      jm2l/views.py

+ 13
- 0
jm2l/static/css/jm2l.css View File

@@ -241,3 +241,16 @@ a {
.ws-popover-opener {
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;
}

BIN
jm2l/static/img/Help.png View File

Before After
Width: 12  |  Height: 12  |  Size: 648 B Width: 14  |  Height: 15  |  Size: 516 B

+ 2
- 11
jm2l/templates/NewIndex.mako View File

@@ -10,24 +10,15 @@
<%def name="cssAddOn()">
<!-- The default timeline stylesheet -->
<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>
<H2 style="text-align: center;" class="shadow">${edition | n} édition des JM2L en ${year}</H2>
<br>
<center>
<div class="center">
% if request.user and request.user.Staff:
<a href="/${year or 2015}/edit">Editer cette page</a> -
% endif
<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="span10 offset1">
${ content | n }


+ 11
- 3
jm2l/templates/helpers.mako View File

@@ -23,7 +23,7 @@ TabJs = {'select':[], 'desc':[]}
<a id="${Field.label.field_id}-help" data-toggle="popover"
data-original-title="${Field.label.text}"
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>
% endif
</label>
@@ -331,6 +331,7 @@ TabJs = {'select':[], 'desc':[]}
## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
<%def name="show_Interventions(ListEvent, HeadTitle=None, NotFoundTitle=None)"> \
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th style="width:6em;text-align:center;">Date</th>
% if HeadTitle:
@@ -339,6 +340,8 @@ TabJs = {'select':[], 'desc':[]}
<th style="text-align:center;">L'historique des interventions</th>
% endif
</tr>
</thead>
<tbody>
% if len(ListEvent)==0:
<tr>
<td style="text-align:center;" colspan="2">
@@ -398,6 +401,7 @@ TabJs = {'select':[], 'desc':[]}
</tr>
% endfor
% endif
</tbody>
</table>
</%def>
## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -647,7 +651,9 @@ TabJs = {'select':[], 'desc':[]}
<div id='right_panel'>
<table class="ShowEntities table">
<thead>
<th colspan="3">Sponsors ${Year}</th>
<tr>
<th colspan="3">Sponsors ${Year}</th>
</tr>
</thead>
<tr>
<% num = -1 %>
@@ -669,7 +675,9 @@ TabJs = {'select':[], 'desc':[]}
<br />
<table class="ShowEntities table">
<thead>
<th colspan="3">Exposants ${Year}</th>
<tr>
<th colspan="3">Exposants ${Year}</th>
</tr>
</thead>
<tr>
<% num = -1 %>


+ 5
- 5
jm2l/templates/layout.mako View File

@@ -51,17 +51,17 @@ ${helpers.uploader_js()}
<div class="carousel-inner" role="listbox">
<div class="item ${["","active"][request.user and request.user.vote_logo==1 or request.user is None]}">
<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>
</div>
<div class="item ${["","active"][request.user and request.user.vote_logo==2 or 0]}">
<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>
</div>
<div class="item ${["","active"][request.user and request.user.vote_logo==3 or 0]}">
<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>
</div>
% if request.user and request.user.vote_logo not in [1,2,3]:
@@ -77,10 +77,10 @@ ${helpers.uploader_js()}
% endif
</div>
<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 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>
<div class="carousel-vote">
% if request.user:


+ 21
- 2
jm2l/views.py View File

@@ -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":"<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:
@@ -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.")


Loading…
Cancel
Save