From 40c7fdf0854f716201f871926599e24bbd0eb75f Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Sat, 22 Dec 2012 20:32:11 +0100 Subject: [PATCH] Follow django-chickpea rename to django-leaflet-storage --- README.rst | 2 +- requirements.pip | 2 +- youmap/sesql_config.py | 2 +- youmap/settings/base.py | 2 +- youmap/templates/auth/user_detail.html | 2 +- .../{chickpea => leaflet_storage}/category_form.html | 0 .../{chickpea => leaflet_storage}/feature_form.html | 0 .../{chickpea => leaflet_storage}/map_detail.html | 8 ++++---- .../templates/{chickpea => leaflet_storage}/map_form.html | 0 .../templates/{chickpea => leaflet_storage}/map_list.html | 2 +- .../map_update_tilelayers.html | 2 +- youmap/templates/youmap/home.html | 8 ++++---- youmap/templates/youmap/search.html | 2 +- youmap/urls.py | 2 +- youmap/views.py | 8 ++++---- 15 files changed, 21 insertions(+), 21 deletions(-) rename youmap/templates/{chickpea => leaflet_storage}/category_form.html (100%) rename youmap/templates/{chickpea => leaflet_storage}/feature_form.html (100%) rename youmap/templates/{chickpea => leaflet_storage}/map_detail.html (72%) rename youmap/templates/{chickpea => leaflet_storage}/map_form.html (100%) rename youmap/templates/{chickpea => leaflet_storage}/map_list.html (91%) rename youmap/templates/{chickpea => leaflet_storage}/map_update_tilelayers.html (95%) diff --git a/README.rst b/README.rst index 8dcf47eb..73218fad 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ About ----- YouMap let you create map with OpenStreetMap layers in a minute and embed them in your site. *Be cause we think that the more OSM will be used, the more OSM will be ''cured''.* -It uses `django-chickpea `_, built on top of Django and Leaflet. +It uses `django-leaflet-storage `_, built on top of Django and Leaflet. Quickstart diff --git a/requirements.pip b/requirements.pip index 3c22d407..dd40c4fb 100644 --- a/requirements.pip +++ b/requirements.pip @@ -7,7 +7,7 @@ django==1.4.2 #south==0.7.6 git+git://github.com/petry/django-foundation.git -git+git://github.com/yohanboniface/django-chickpea.git +git+git://github.com/yohanboniface/django-leaflet-storage.git git+git://github.com/frankban/django-endless-pagination.git hg+https://bitbucket.org/liberation/sesql django_compressor \ No newline at end of file diff --git a/youmap/sesql_config.py b/youmap/sesql_config.py index 3d898902..f0ff855f 100644 --- a/youmap/sesql_config.py +++ b/youmap/sesql_config.py @@ -34,7 +34,7 @@ CHARSET = "utf-8" from sesql.fields import * from sesql.sources import * from django.db.models import Q -from chickpea import models +from leaflet_storage import models # # Select the ORM to use diff --git a/youmap/settings/base.py b/youmap/settings/base.py index 67903ed8..701948ce 100644 --- a/youmap/settings/base.py +++ b/youmap/settings/base.py @@ -25,7 +25,7 @@ LANGUAGES = ( SECRET_KEY = 'j6fly6aomgo6!3_$v#9kvhw-%wgs1@1l6x+4nr73tmn40=&_@&' INSTALLED_APPS = ( - 'chickpea', + 'leaflet_storage', 'foundation', 'endless_pagination', 'youmap', diff --git a/youmap/templates/auth/user_detail.html b/youmap/templates/auth/user_detail.html index e3d1902c..d402a2ea 100644 --- a/youmap/templates/auth/user_detail.html +++ b/youmap/templates/auth/user_detail.html @@ -21,7 +21,7 @@
{% if maps %} - {% include "chickpea/map_list.html" %} + {% include "leaflet_storage/map_list.html" %} {% else %}
{{ current_user }} has not map yet. diff --git a/youmap/templates/chickpea/category_form.html b/youmap/templates/leaflet_storage/category_form.html similarity index 100% rename from youmap/templates/chickpea/category_form.html rename to youmap/templates/leaflet_storage/category_form.html diff --git a/youmap/templates/chickpea/feature_form.html b/youmap/templates/leaflet_storage/feature_form.html similarity index 100% rename from youmap/templates/chickpea/feature_form.html rename to youmap/templates/leaflet_storage/feature_form.html diff --git a/youmap/templates/chickpea/map_detail.html b/youmap/templates/leaflet_storage/map_detail.html similarity index 72% rename from youmap/templates/chickpea/map_detail.html rename to youmap/templates/leaflet_storage/map_detail.html index 02b66602..2eedada4 100644 --- a/youmap/templates/chickpea/map_detail.html +++ b/youmap/templates/leaflet_storage/map_detail.html @@ -1,20 +1,20 @@ {% extends "base.html" %} -{% load chickpea_tags compress %} +{% load leaflet_storage_tags compress %} {% block title %}{{ map.name }}{% endblock %} {% block body_class %}map_detail{% endblock %} {% block extra_head %} {% compress css %} - {% chickpea_css %} + {% leaflet_storage_css %} {% endcompress %} {% compress js %} - {% chickpea_js %} + {% leaflet_storage_js %} {% endcompress %} {% endblock %} {% block content %} {% block map_init %} - {% include "chickpea/map_init.html" %} + {% include "leaflet_storage/map_init.html" %} {% endblock %} {% endblock %} \ No newline at end of file diff --git a/youmap/templates/chickpea/map_form.html b/youmap/templates/leaflet_storage/map_form.html similarity index 100% rename from youmap/templates/chickpea/map_form.html rename to youmap/templates/leaflet_storage/map_form.html diff --git a/youmap/templates/chickpea/map_list.html b/youmap/templates/leaflet_storage/map_list.html similarity index 91% rename from youmap/templates/chickpea/map_list.html rename to youmap/templates/leaflet_storage/map_list.html index ff9f31de..1d742f65 100644 --- a/youmap/templates/chickpea/map_list.html +++ b/youmap/templates/leaflet_storage/map_list.html @@ -1,4 +1,4 @@ -{% load chickpea_tags endless %} +{% load leaflet_storage_tags endless %} {% paginate 5 maps %} diff --git a/youmap/templates/chickpea/map_update_tilelayers.html b/youmap/templates/leaflet_storage/map_update_tilelayers.html similarity index 95% rename from youmap/templates/chickpea/map_update_tilelayers.html rename to youmap/templates/leaflet_storage/map_update_tilelayers.html index 2a78ebf5..823380b5 100644 --- a/youmap/templates/chickpea/map_update_tilelayers.html +++ b/youmap/templates/leaflet_storage/map_update_tilelayers.html @@ -1,4 +1,4 @@ -{% load chickpea_tags %} +{% load leaflet_storage_tags %}

Choose your tilelayer

{% csrf_token %} diff --git a/youmap/templates/youmap/home.html b/youmap/templates/youmap/home.html index cc4a8ac6..480102a4 100644 --- a/youmap/templates/youmap/home.html +++ b/youmap/templates/youmap/home.html @@ -1,13 +1,13 @@ {% extends "base.html" %} -{% load chickpea_tags compress %} +{% load leaflet_storage_tags compress %} {% block extra_head %} {% compress css %} - {% chickpea_css %} + {% leaflet_storage_css %} {% endcompress css %} {% compress js %} - {% chickpea_js %} + {% leaflet_storage_js %} {% endcompress js %} {% endblock %} @@ -90,7 +90,7 @@
- {% include "chickpea/map_list.html" %} + {% include "leaflet_storage/map_list.html" %}
diff --git a/youmap/templates/youmap/search.html b/youmap/templates/youmap/search.html index b6ae472b..a51e2812 100644 --- a/youmap/templates/youmap/search.html +++ b/youmap/templates/youmap/search.html @@ -21,7 +21,7 @@
{% if maps %} - {% include "chickpea/map_list.html" %} + {% include "leaflet_storage/map_list.html" %} {% else %}
Not map found. diff --git a/youmap/urls.py b/youmap/urls.py index a05459ea..e42eb087 100644 --- a/youmap/urls.py +++ b/youmap/urls.py @@ -16,7 +16,7 @@ urlpatterns = patterns('', url(r'^$', views.home, name="home"), url(r'^search/$', views.search, name="search"), url(r'^user/(?P[-_\w]+)/$', views.user_maps, name='user_maps'), - (r'', include('chickpea.urls')), + (r'', include('leaflet_storage.urls')), ) if settings.DEBUG and settings.MEDIA_ROOT: diff --git a/youmap/views.py b/youmap/views.py index a04e53ef..020f0385 100644 --- a/youmap/views.py +++ b/youmap/views.py @@ -5,12 +5,12 @@ from django.db.models import Q from sesql.shortquery import shortquery -from chickpea.models import Map +from leaflet_storage.models import Map class Home(TemplateView): template_name = "youmap/home.html" - list_template_name = "chickpea/map_list.html" + list_template_name = "leaflet_storage/map_list.html" def get_context_data(self, **kwargs): maps = Map.objects.order_by('-modified_at')[:100] @@ -36,7 +36,7 @@ class UserMaps(DetailView): model = User slug_url_kwarg = 'username' slug_field = 'username' - list_template_name = "chickpea/map_list.html" + list_template_name = "leaflet_storage/map_list.html" context_object_name = "current_user" def get_context_data(self, **kwargs): @@ -60,7 +60,7 @@ user_maps = UserMaps.as_view() class Search(TemplateView): template_name = "youmap/search.html" - list_template_name = "chickpea/map_list.html" + list_template_name = "leaflet_storage/map_list.html" def get_context_data(self, **kwargs): q = self.request.GET['q']