Réajustement des logos

3 files changed, 21 insertions, 10 deletions

diff --git a/chimere_example_static/chimere/css/extra-styles.css b/chimere_example_static/chimere/css/extra-styles.css
index 4317af7..aea52b1 100644
--- a/chimere_example_static/chimere/css/extra-styles.css
+++ b/chimere_example_static/chimere/css/extra-styles.css
@@ -123,6 +123,15 @@ a:hover, a:focus {
     z-index:12;
 }
 
+#greenmap-logo{
+    display: block;
+    bottom: 200px;
+    position: absolute;
+    width: 370px;
+    height: 200px;
+    opacity: 0;
+}
+
 #detail {
     position:static;
     border:0 transparent;
@@ -195,8 +204,8 @@ ul.share {
 }
 
 #footer .map-footer {
-    bottom: 111px;
-    left: 0;
+    bottom: 0;
+    left: 400px;
     margin:0;
     background-color:#fff;
     opacity:0.8;
@@ -410,7 +419,7 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
     position: absolute;
     z-index:5;
     left:0;
-    width:580px;
+    width:400px;
     padding:15px;
     border:0 transparent;
     border-right:1px solid #E7E7E7;
@@ -424,6 +433,7 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
 
 #assos-logos{
     bottom:0;
+    height:80px;
 }
 
 .carousel-control {
diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html
index 302c232..7b8ba5e 100644
--- a/templates/chimere/blocks/actions.html
+++ b/templates/chimere/blocks/actions.html
@@ -30,7 +30,6 @@
         <li id='news-lnk'>
         <a data-toggle='modal' data-target="#welcome" href='#' id='welcome_button'><span class='fa fa-chimere-action fa-newspaper-o'></span><span class='lbl'>{% trans "News"%}</span></a>
         </li>
-        <li id="simple_button-lnk"><a id='simple_button' href='{% url chimere:simple_index area_name_slash %}'><span class='fa fa-chimere-action fa-simplybuilt'></span><span class='lbl'> {% trans "Simple map" %}</span></a></li>
         {% endif %}
         <li class='selection-sep'> </li>
         <li id='categories-lnk'{% if not has_search %} class='active'{%endif%}><a href='#categories' data-toggle='panel'><span class='fa fa-chimere-action fa-check-circle-o'></span> {% trans "Categories "%}</a></li>
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 0d855c0..3158d2b 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -18,6 +18,7 @@
     <div id='panel' class='navbar-default'>
       <form id="frm_categories"><div id='categories'></div></form>
       <div id='search-box' class='ui-widget ui-corner-all'></div>
+      <a id='greenmap-logo' href='http://www.greenmap.org/' target='_blank'>Greenmap</a>
     </div>
     <div id='category_description'>
     </div>
@@ -39,9 +40,6 @@
 
     <div id='logos' class='logos'>
         <ul>
-            <li><a href='http://www.greenmap.org/'><img src='{{STATIC_URL}}carteouverte/img/green_map.png' alt='Green Map System'/></a></li>
-        </ul>
-        <ul>
             <li><a href='http://dechets.ca-change-tout.fr/'><img src='{{STATIC_URL}}carteouverte/img/rennes-metropole.png' alt='Prévention des déchets - Rennes Métropole'/></a></li>
         </ul>
         <ul>
@@ -53,21 +51,25 @@
 
       <div class="carousel-inner" role="listbox">
         <div class="item active">
+            <a href="http://www.espacepieton.org/EspaceP/index.html"><img src="{{STATIC_URL}}carteouverte/img/espace_pieton.jpg" alt="Espace piéton"></a></li>
+            <a href="http://www.mce-info.org/fr/associations-adherentes/fiche.php?id=60"><img src="{{STATIC_URL}}carteouverte/img/ivine.png" alt="IVINE"></a></li>
+        </div>
+        <div class="item">
             <a href="http://www.mce-info.org/fr/associations-adherentes/fiche.php?id=38"><img src="{{STATIC_URL}}carteouverte/img/bretagne-vivante.png" alt="Bretagne-Vivante"></a></li>
             <a href="http://www.mce-info.org/fr/associations-adherentes/fiche.php?id=62"><img src="{{STATIC_URL}}carteouverte/img/Vertlejardin.png" alt="Vert le jardin"></a></li>
             <a href="http://www.mce-info.org/fr/associations-adherentes/fiche.php?id=40"><img src="{{STATIC_URL}}carteouverte/img/CLCV.png" alt="CLCV"></a></li>
-            <a href="http://www.ale-rennes.org/"><img src="{{STATIC_URL}}carteouverte/img/cle.png" alt="CLÉ"></a></li>
         </div>
         <div class="item">
+            <a href="http://www.ale-rennes.org/"><img src="{{STATIC_URL}}carteouverte/img/cle.png" alt="CLÉ"></a></li>
             <a href="http://www.mce-info.org/fr/associations-adherentes/fiche.php?id=42"><img src="{{STATIC_URL}}carteouverte/img/greenpeace.png" alt="Greenpeace"></a></li>
+        </div>
+        <div class="item">
             <a href="http://www.mce-info.org/fr/associations-adherentes/fiche.php?id=43"><img src="{{STATIC_URL}}carteouverte/img/gulliver.png" alt="Gulliver"></a></li>
             <a href="http://www.mce-info.org/fr/associations-adherentes/fiche.php?id=44"><img src="{{STATIC_URL}}carteouverte/img/indecosa-cgt.jpeg" alt="Indecosa-CGT"></a></li>
-            <a href="http://www.espacepieton.org/EspaceP/index.html"><img src="{{STATIC_URL}}carteouverte/img/espace_pieton.jpg" alt="Espace piéton"></a></li>
         </div>
         <div class="item">
             <a href="http://www.mce-info.org/fr/associations-adherentes/fiche.php?id=46"><img src="{{STATIC_URL}}carteouverte/img/rayonsdaction.png" alt="Rayons d'action"></a></li>
             <a href="http://www.resosolidaire.fr/"><img src="{{STATIC_URL}}carteouverte/img/reso_solidaire.png" alt="Réso solidaire"></a></li>
-            <a href="http://www.mce-info.org/fr/associations-adherentes/fiche.php?id=60"><img src="{{STATIC_URL}}carteouverte/img/ivine.png" alt="IVINE"></a></li>
         </div>
 
       </div>