diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-04-10 13:09:55 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-04-10 13:09:55 +0200 |
| commit | c35a63caedec50f77fc66a428e8de70ff06cbb12 (patch) | |
| tree | 219691709610c1e51c79606726f0f40f8882a61d | |
| parent | 497743cb22c324c0286ede71fd198c07336594fc (diff) | |
| parent | c22d23a4860a0e299d8e5b85d698edf52f2fd861 (diff) | |
| download | Chimère - projet Saclay-c35a63caedec50f77fc66a428e8de70ff06cbb12.tar.bz2 Chimère - projet Saclay-c35a63caedec50f77fc66a428e8de70ff06cbb12.zip | |
Merge branch 'master' into ecopole
| -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 e132e41..01e5ed5 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 %} |