Desactivation du welcome

4 files changed, 19 insertions, 7 deletions

diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 41e09b4..4abae53 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -1117,17 +1117,16 @@ div#panel{
     z-index:10;
     max-height:none;
     padding:0;
-    padding-top: 170px;
+    padding-top: 95px;
     right:auto;
     bottom:26px;
     top: 0;
     border-width:0 1px;
     background-image:url('../images/logo.png');
-    background-repeat:repeat-x;
-    background-position:left top;
     background-color: transparent;
+    background-repeat: no-repeat;
+    background-position: center 40px;
     overflow-x:hidden;
-    background-color: #fff;
 }
 
 #footer-panel{
@@ -1615,6 +1614,7 @@ ul#roadmap_toolbar, ul#roadmap_toolbar ul, ul#roadmap_toolbar li{
 
 #search-box{
     display: block;
+    border-top: 0 solid transparent;
 }
 
 #search-box,
@@ -2262,3 +2262,9 @@ a#page-feedback{
 #layerSwitcher{
     display: none;
 }
+
+/* to be fixed */
+a#page-feedback,
+.map-footer{
+    display: none;
+}
diff --git a/static/saclay/images/logo.png b/static/saclay/images/logo.png
index 7a14e3c..98fe5e3 100644
--- a/static/saclay/images/logo.png
+++ b/static/saclay/images/logo.png
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index 0aadafd..ddc4606 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -2,6 +2,7 @@ var msg_edit_route = "Cliquez sur la carte pour tracer le trajet. Chaque nouveau
 var msg_edit = "Cliquez sur la carte pour placer le lieu. Pour modifier ce lieu sélectionnez-le puis glissez-déposez pour le déplacer.";
 
 var init_default_message_diag = function(){
+    /* TODO : to be removed */
     $('#default-message').dialog({
           'autoOpen':false,
           'resizable':false,
@@ -192,7 +193,8 @@ var connectWebViewJavascriptBridge = function(callback) {
 };
 
 $(function(){
-    init_default_message_diag();
+    /* TODO */
+    // init_default_message_diag();
 
     $('#action-routing').click(routing_panel_open);
     $('#routing-button').click(routing_panel_open);
diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html
index e06361a..ea20b9f 100644
--- a/templates/chimere/blocks/welcome.html
+++ b/templates/chimere/blocks/welcome.html
@@ -1,12 +1,15 @@
 {% load i18n sanitize chimere_tags %}
+{% comment %}
+
+{# TODO remove? #}
+
 {% if news_lst or welcome_message %}
 <script type='text/javascript'>
 <!--
 $(function(){
-    /*
     $('#welcome div.media-player').jmeEmbedControls();
     $('#welcome video').each(function(index){$(this).pause()});
-    $('#welcome audio').each(function(index){$(this).pause()});*/
+    $('#welcome audio').each(function(index){$(this).pause()});
     $("#welcome").dialog({width:550, height:300, dialogClass:'welcome-dialog'
                           {% if not display %}, autoOpen:false{% endif %},
                       open: function () { $("#welcome_content").scrollTop(0); }
@@ -50,3 +53,4 @@ $(function(){
 // -->
 </script>
 {% endif %}
+{% endcomment %}