From 72202b0d3de56e3815ad68e8074566a10d73109d Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Tue, 17 May 2016 22:37:20 +0200
Subject: [PATCH] Small CSS/HTML tricks to follow changes in Leaflet.Storage

---
 umap/settings/base.py                         |  2 -
 umap/static/umap/umap.css                     | 42 +++++++++++--------
 umap/templates/base.html                      | 12 ------
 .../templates/leaflet_storage/map_detail.html | 12 +++++-
 umap/templates/umap/about_summary.html        |  2 +-
 5 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/umap/settings/base.py b/umap/settings/base.py
index 261569fb..c0e8c644 100644
--- a/umap/settings/base.py
+++ b/umap/settings/base.py
@@ -136,7 +136,6 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.http.ConditionalGetMiddleware',
 )
 
 # =============================================================================
@@ -163,7 +162,6 @@ MAP_SHORT_URL_NAME = "umap_short_url"
 UMAP_USE_UNACCENT = False
 UMAP_FEEDBACK_LINK = "http://wiki.openstreetmap.org/wiki/UMap#Feedback_and_help"  # noqa
 USER_MAPS_URL = 'user_maps'
-MAPQUEST_KEY = 'set me'
 
 # =============================================================================
 # Third party app settings
diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css
index da9d9f80..b7c712b6 100644
--- a/umap/static/umap/umap.css
+++ b/umap/static/umap/umap.css
@@ -443,6 +443,9 @@ h2.section {
 .button-bar .button.half {
     width: calc(50% - 7px);
 }
+.button-bar .button.third {
+    width: calc(100% / 3 - 10px);
+}
 .demo-instance-warning {
     background-color: #c0392b;
     color: #efefef;
@@ -461,19 +464,9 @@ h2.section {
 /* **************************** */
 /*            colors            */
 /* **************************** */
-a {
+/*a {
     color: #689191;
 }
-.button, input[type="submit"] {
-    background-color: #79c1c0;
-}
-.neutral, input[type="submit"].neutral {
-    background-color: #ddd;
-    color: #666;
-}
-.button:hover, input[type="submit"]:hover {
-    background-color: #689191;
-}
 .warning {
     color: #cc0000;
 }
@@ -498,19 +491,33 @@ a {
     font-size: 11px;
     font-style: italic;
 }
-.darline-autocomplete li.on {
+*/
+.wrapper input[type="submit"],
+.wrapper .button {
     background-color: #79c1c0;
+    color: #eeeeec;
 }
-.dark {
+.neutral, input[type="submit"].neutral {
+    background-color: #ddd;
+    color: #666;
+}
+.wrapper input[type="submit"]:hover {
+    background-color: #689191;
+}
+.wrapper.somber {
     background-color: #2E3641;
     color: #efefef;
     padding-top: 20px;
     margin-top: 20px;
 }
-.dark .row {
+.wrapper.somber .row {
     margin-top: 0;
 }
-
+.wrapper .button,
+.wrapper input {
+    height: 56px;
+    line-height: 43px;
+}
 
 /* **************************** */
 /*             404              */
@@ -564,10 +571,11 @@ ul.umap-autocomplete {
 .umap-singleresult div,
 .umap-multiresult li {
     width: 100%;
-    background-color: #e5e5e5;
+    background-color: #2e3436;
     border-radius: 2px;
+    border: 1px solid #202425;
     padding: 7px;
-    color: #464646;
+    color: #eeeeec;
 }
 .umap-multiresult li + li {
     margin-top: 7px;
diff --git a/umap/templates/base.html b/umap/templates/base.html
index 560ed26c..65938cbc 100644
--- a/umap/templates/base.html
+++ b/umap/templates/base.html
@@ -29,18 +29,6 @@
     {% block content %}
     {% endblock %}
 
-    {% block bottom_js %}
-        <script type="text/javascript">
-            L.S.on('ui:ready', function () {
-                L.S.AutoComplete.multiSelect('id_editors', {
-                    placeholder: "{% trans 'Type editors nick to add…' %}"
-                });
-                L.S.AutoComplete.select('id_owner', {
-                    placeholder: "{% trans 'Type new owner nick…' %}"
-                });
-            });
-        </script>
-    {% endblock %}
     {% block footer %}
         {% include "umap/footer.html" %}
     {% endblock footer %}
diff --git a/umap/templates/leaflet_storage/map_detail.html b/umap/templates/leaflet_storage/map_detail.html
index 6023676f..261540ff 100644
--- a/umap/templates/leaflet_storage/map_detail.html
+++ b/umap/templates/leaflet_storage/map_detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load leaflet_storage_tags compress %}
+{% load leaflet_storage_tags compress i18n %}
 {% block head_title %}{{ map.name }} - uMap{% endblock %}
 {% block body_class %}map_detail{% endblock %}
 
@@ -18,4 +18,14 @@
         {% include "leaflet_storage/map_init.html" %}
     {% endblock %}
     {% include "leaflet_storage/map_messages.html" %}
+    <script type="text/javascript">
+        MAP.ui.on('panel:ready', function () {
+            L.S.AutoComplete.multiSelect('id_editors', {
+                placeholder: "{% trans 'Type editors nick to add…' %}"
+            });
+            L.S.AutoComplete.select('id_owner', {
+                placeholder: "{% trans 'Type new owner nick…' %}"
+            });
+        });
+    </script>
 {% endblock %}
diff --git a/umap/templates/umap/about_summary.html b/umap/templates/umap/about_summary.html
index 65a9d801..20bc8d8e 100644
--- a/umap/templates/umap/about_summary.html
+++ b/umap/templates/umap/about_summary.html
@@ -25,7 +25,7 @@
     </div>
   </div>
 </div>
-<div class="wrapper dark button-bar">
+<div class="wrapper somber button-bar">
   <div class="row">
     <div class="col half center mwide">
     {% spaceless %}