diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-18 15:28:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-18 15:28:28 +0100 |
| commit | 4546123743efd195d987f7d0b0ccfeb806f5e05a (patch) | |
| tree | f9aad83b51a164f8a44455405b848bdca6122a5f | |
| parent | fa9f685b75d69a9e7a2706321b2971a383c8a164 (diff) | |
| download | Chimère - projet Saclay-4546123743efd195d987f7d0b0ccfeb806f5e05a.tar.bz2 Chimère - projet Saclay-4546123743efd195d987f7d0b0ccfeb806f5e05a.zip | |
Simplify welcome message
| -rw-r--r-- | static/saclay/css/styles-saclay.css | 12 | ||||
| -rw-r--r-- | templates/chimere/blocks/welcome.html | 8 |
2 files changed, 13 insertions, 7 deletions
diff --git a/static/saclay/css/styles-saclay.css b/static/saclay/css/styles-saclay.css index 6d62cf8..a270636 100644 --- a/static/saclay/css/styles-saclay.css +++ b/static/saclay/css/styles-saclay.css @@ -440,15 +440,21 @@ a#ui-active-menuitem.ui-state-hover{ background-image:none; } +#logos{ + width:340px; + margin-left:auto; + margin-right:auto; +} + #welcome_message{ padding:1em; margin:0; - float:left; - width:334px; + /* float:left; + width:334px; */ } #welcome_content{ - height:200px; + height:145px; overflow:auto; margin-bottom:1em; } diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html index f09710a..b811257 100644 --- a/templates/chimere/blocks/welcome.html +++ b/templates/chimere/blocks/welcome.html @@ -6,7 +6,7 @@ $(function(){ $('#welcome div.media-player').jmeEmbedControls(); $('#welcome video').each(function(index){$(this).pause()}); $('#welcome audio').each(function(index){$(this).pause()}); - $("#welcome").dialog({width:826, height:490, dialogClass:'welcome-dialog' + $("#welcome").dialog({width:826, height:410, dialogClass:'welcome-dialog' {% if not display %}, autoOpen:false{% endif %}}); }); // --> @@ -15,7 +15,7 @@ $(function(){ <div class='title'> <h2>{{title}}</h2> </div> - <img src='{{STATIC_URL}}saclay/images/popup/welcome_header.png' alt='Welcome header'/> + {% comment %} <img src='{{STATIC_URL}}saclay/images/popup/welcome_header.png' alt='Welcome header'/> {% endcomment %} <div id='welcome_message'> <div id='welcome_content'> {{welcome_message|safe}} @@ -24,7 +24,7 @@ $(function(){ <a href='http://www.paris-malaquais.archi.fr/'><img alt='Paris Malaquais link' src='{{STATIC_URL}}saclay/images/popup/welcome_logo-paris-malaquais.png'/></a><a href='http://www.terreetcite.org/'><img alt='Terre et cité link' src='{{STATIC_URL}}saclay/images/popup/welcome_logo-terre-et-cite.png'/></a><a href='http://www.groupechronos.org/'><img alt='Chronos link' src='{{STATIC_URL}}saclay/images/popup/welcome_logo-chronos.png'/></a> </div> </div> - <div class='welcome-col'> + {% comment %} <div class='welcome-col'> <div class='news'> {% if news_lst %} {% for news in news_lst %} @@ -52,7 +52,7 @@ $(function(){ {% endif %} </div> <div class='footer'><a href='#' class='get_more_information'>{% trans "See all news" %}</a></div> - </div> + </div>{% endcomment %} </div> <script type='text/javascript'> <!-- |