From e3a5263c62af779ea1d2e762ff3025aa91762473 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Sat, 8 Jun 2013 15:40:53 +0200
Subject: [PATCH] Rename category in datalayer

cf yohanboniface/django-leaflet-storage#82
---
 umap/static/umap/umap.css                                    | 2 +-
 .../{category_form.html => datalayer_form.html}              | 4 ++--
 umap/templates/leaflet_storage/feature_form.html             | 2 +-
 umap/urls.py                                                 | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename umap/templates/leaflet_storage/{category_form.html => datalayer_form.html} (79%)

diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css
index ff2d98e4..c78ea339 100644
--- a/umap/static/umap/umap.css
+++ b/umap/static/umap/umap.css
@@ -91,7 +91,7 @@ fieldset.toggle.on .more_style_options {
 }
 
 /* Map infos */
-.category_color {
+.datalayer_color {
     display: inline-block;
     width: 16px;
     height: 16px;
diff --git a/umap/templates/leaflet_storage/category_form.html b/umap/templates/leaflet_storage/datalayer_form.html
similarity index 79%
rename from umap/templates/leaflet_storage/category_form.html
rename to umap/templates/leaflet_storage/datalayer_form.html
index 5a7f295c..5db0c661 100644
--- a/umap/templates/leaflet_storage/category_form.html
+++ b/umap/templates/leaflet_storage/datalayer_form.html
@@ -1,5 +1,5 @@
 {% load umap_tags i18n %}
-<form action="{{ action_url }}" method="post" id="category_edit">
+<form action="{{ action_url }}" method="post" id="datalayer_edit">
     {% csrf_token %}
     {% for error in form.errors %}
         <small class="error">{{ error }}</small>
@@ -15,6 +15,6 @@
     {% include "umap/styles_fieldset.html" %}
     <input type="submit" class="button" />
     {% if delete_url %}
-        <a href="{{ delete_url }}" id="delete_category_button" >{% trans "Delete" %}</a>
+        <a href="{{ delete_url }}" id="delete_datalayer_button" >{% trans "Delete" %}</a>
     {% endif %}
 </form>
\ No newline at end of file
diff --git a/umap/templates/leaflet_storage/feature_form.html b/umap/templates/leaflet_storage/feature_form.html
index 5fafacda..514b250f 100644
--- a/umap/templates/leaflet_storage/feature_form.html
+++ b/umap/templates/leaflet_storage/feature_form.html
@@ -4,7 +4,7 @@
     {{ form.no_field_errors }}
     {% foundation_field form.name %}
     {% foundation_field form.description %}
-    {% foundation_field form.category %}
+    {% foundation_field form.datalayer %}
     {% include "umap/styles_fieldset.html" %}
     {{ form.latlng }}
     <input type="submit" class="button" />
diff --git a/umap/urls.py b/umap/urls.py
index ceb6a735..688e7d90 100644
--- a/umap/urls.py
+++ b/umap/urls.py
@@ -3,9 +3,10 @@ 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.contrib.staticfiles.urls import staticfiles_urlpatterns
-
 from django.contrib import admin
 
+from leaflet_storage.views import MapShortUrl
+
 from . import views
 
 admin.autodiscover()
@@ -13,6 +14,8 @@ admin.autodiscover()
 urlpatterns = patterns('',
     (r'^admin/', include(admin.site.urls)),
     url(r'', include('social_auth.urls')),
+    # We don't want it to be localized
+    url(r'^m/(?P<pk>\d+)/$', MapShortUrl.as_view(), name='map_short_url'),
 )
 urlpatterns += i18n_patterns('',
     url(r'^$', views.home, name="home"),