diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-04-10 11:13:05 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-04-10 11:13:05 +0000 |
| commit | 969cc127344c30d3ece99553d7ddde9ed7c338d9 (patch) | |
| tree | 2d447cef6ea0c8917fb4bc873825a44e086ab9f7 | |
| parent | ab44a5277de878a623ae00d7bc11f39b74d92fcb (diff) | |
| parent | 659dfce5152853c9115c1f45808788e153c1ac99 (diff) | |
| download | Chimère - projet Saclay-969cc127344c30d3ece99553d7ddde9ed7c338d9.tar.bz2 Chimère - projet Saclay-969cc127344c30d3ece99553d7ddde9ed7c338d9.zip | |
Merge branch 'saclay' of ssh://kubo.niadomo.net/home/etienne/git/chimere_saclay into saclay
| -rw-r--r-- | site_static/css/home.css | 4 | ||||
| -rw-r--r-- | static/saclay/css/styles.css | 4 | ||||
| -rw-r--r-- | templates/chimere/blocks/news.html | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/site_static/css/home.css b/site_static/css/home.css index 63ef79b..016c359 100644 --- a/site_static/css/home.css +++ b/site_static/css/home.css @@ -13,6 +13,10 @@ background-color: #fff; }
+select#id_categories{
+ max-width:240px;
+}
+
#frm-response{
display:none;
}
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index f99671b..111eba2 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -1662,6 +1662,10 @@ input#id_name{ width:250px; } +select#id_categories{ + max-width:240px; +} + #itinerary_field #id_transport_div, #itinerary_field #id_speed_div, #itinerary_field .extra-criteria diff --git a/templates/chimere/blocks/news.html b/templates/chimere/blocks/news.html index 84dfe04..3788b64 100644 --- a/templates/chimere/blocks/news.html +++ b/templates/chimere/blocks/news.html @@ -1,5 +1,4 @@ {% load i18n sanitize chimere_tags %} -{% if news_lst %} <script type='text/javascript'> <!-- $(function(){ @@ -14,6 +13,7 @@ $(function(){ <div id='news' style='display:none'> <h2>{% trans "News" %}</h2> <div class='news'> + {% if news_lst %} {% for news in news_lst %} <div class='info'> {% if news.title %} @@ -34,7 +34,11 @@ $(function(){ </p> </div> {%endfor%} + {% else %} + <div class='info'> + <em>{% trans "No news today."%}</em> + </div> + {% endif %} </div> </div> -{% endif %} |