From 8ec63b69a9c4f029d684625636cf4efe53198be7 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Mon, 11 Nov 2013 12:57:34 +0100
Subject: [PATCH] Geojsonize (cf yohanboniface/Leaflet.Storage#62)

---
 umap/settings/base.py                  |  5 ++-
 umap/static/umap/umap.css              | 43 ++++++++++++++++++++++++--
 umap/templates/base.html               |  1 -
 umap/templates/umap/about_summary.html |  7 +++--
 umap/templates/umap/navigation.html    |  2 +-
 umap/urls.py                           |  2 +-
 6 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/umap/settings/base.py b/umap/settings/base.py
index f0b4b2b8..c7056b58 100644
--- a/umap/settings/base.py
+++ b/umap/settings/base.py
@@ -45,8 +45,7 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'django.contrib.gis',
-    'django.contrib.markup',
+    'django.contrib.gis'
 )
 
 #==============================================================================
@@ -160,4 +159,4 @@ SOCIAL_AUTH_PIPELINE = (
     'social_auth.backends.pipeline.social.associate_user',
     'social_auth.backends.pipeline.social.load_extra_data',
     'social_auth.backends.pipeline.user.update_user_details'
-)
+)
\ No newline at end of file
diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css
index f51c4836..5fb3f0d4 100644
--- a/umap/static/umap/umap.css
+++ b/umap/static/umap/umap.css
@@ -165,7 +165,7 @@ nav a {
 }
 
 nav a:hover {
-    background-color: SeaGreen;
+    background-color: #79c1c0;
 }
 
 nav h1 a {
@@ -194,6 +194,44 @@ nav .branding {
     margin-bottom: 7px;
 }
 
+/* **************************** */
+/*            colors            */
+/* **************************** */
+a {
+    color: #689191;
+}
+.button, input[type="submit"] {
+    background-color: #79c1c0;
+}
+.button:hover, input[type="submit"]:hover {
+    background-color: #689191;
+}
+.warning {
+    color: #cc0000;
+}
+.tintbox {
+    background-color: #28353D;
+}
+.tintbox,
+.tintbox p,
+.tintbox a {
+    color: #f8f8f8;
+    font-family: sans-serif;
+}
+.tintbox a {
+    text-decoration: underline;
+}
+.tintbox.warning {
+    background-color: #cc0000;
+    color: #fff;
+}
+.tintbox .note, .tintbox .note a {
+    line-height: 1.2em;
+    font-size: 11px;
+    font-style: italic;
+}
+
+
 /* **************************** */
 /*   Override Leaflet.Storage   */
 /* **************************** */
@@ -209,8 +247,9 @@ body.content #storage-ui-container {
 #id_editors + br + span.helptext {
     display: none;
 }
+.storage-loader,
 .leaflet-popup-content .storage-popup-footer,
 .leaflet-control-browse .storage-browse-actions a.add-datalayer,
 .leaflet-control-browse .storage-browse-actions a.storage-browse-link {
-    background-color: SeaGreen;
+    background-color: #79c1c0 !important;
 }
diff --git a/umap/templates/base.html b/umap/templates/base.html
index 2877ef2d..2b697fbb 100644
--- a/umap/templates/base.html
+++ b/umap/templates/base.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/core.css">
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/grid.css">
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/form.css">
-    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/color/seagreen.css">
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/debug.css">
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/autocomplete.css">
     <link rel="stylesheet" href="{{ STATIC_URL }}storage/contrib/css/storage.ui.default.css">
diff --git a/umap/templates/umap/about_summary.html b/umap/templates/umap/about_summary.html
index 1111648a..bcc31084 100644
--- a/umap/templates/umap/about_summary.html
+++ b/umap/templates/umap/about_summary.html
@@ -2,11 +2,12 @@
 <div class="col _35">
   <div class="col _11 c20_20 tintbox">
     <h5>{% trans "What is uMap" %}</h5>
-    <p>{% blocktrans with osm_url="http://osm.org" %}uMap let you create maps with <a href="{{ osm_url }}" />OpenStreetMap</a> layers in a minute and embed them in your site.{% endblocktrans %}
+    <p>{% blocktrans with osm_url="http://osm.org" %}uMap let you create maps with <a href="{{ osm_url }}" />OpenStreetMap</a> layers in a minute and embed them in your site.{% endblocktrans %}</p>
+    <p class="note">
     {% if DEMO_SITE %}
-    <br /> {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" %}This is a demo instance, you can host your own, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
+      {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" stable_url="http://umap.openstreetmap.fr" %}This is a demo instance, used for tests and pre-rolling releases. If you need a stable instance, please use <a href="{{ stable_url }}">{{ stable_url }}</a>. You can also host your own instance, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
     {% else %}
-      <br /> {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" %}And it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
+      {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" %}And it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
     {% endif %}
     </p>
   </div>
diff --git a/umap/templates/umap/navigation.html b/umap/templates/umap/navigation.html
index 7412bf78..fcd7e3ba 100644
--- a/umap/templates/umap/navigation.html
+++ b/umap/templates/umap/navigation.html
@@ -24,7 +24,7 @@
   <section class="right">
     <ul>
       <li class="has-button _5 c20_wide">
-        <a href="{% url 'map_add' %}" data-listen-form="map_edit" class="button create-map">
+        <a href="{% url 'map_new' %}" class="button">
           {% trans "Create a map" %}
         </a>
       </li>
diff --git a/umap/urls.py b/umap/urls.py
index a01ad2a7..52c7dc5c 100644
--- a/umap/urls.py
+++ b/umap/urls.py
@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.conf.urls.i18n import i18n_patterns
-from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls import patterns, url, include
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.contrib import admin