From 4220a2df1d78b7e04d8bc4d3e6d6d0f01577baf2 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Wed, 21 Nov 2012 17:50:27 +0100
Subject: [PATCH] Update to follow django-chickpea changes

---
 README.rst                              |  7 +++++++
 youmap/templates/base.html              | 22 ++++++++++++----------
 youmap/templates/chickpea/map_form.html |  2 ++
 youmap/templates/youmap/home.html       | 15 +--------------
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/README.rst b/README.rst
index 80153bf8..650c1592 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,13 @@
 YouMap project
 ==============
 
+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
+
+
 Quickstart
 ----------
 
diff --git a/youmap/templates/base.html b/youmap/templates/base.html
index cffc9e80..c8aeeb6b 100644
--- a/youmap/templates/base.html
+++ b/youmap/templates/base.html
@@ -28,7 +28,7 @@
     <script src="{{ STATIC_URL }}foundation/javascripts/jquery.js"></script>
     <script src="{{ STATIC_URL }}foundation/javascripts/jquery.foundation.mediaQueryToggle.js"></script>
     <script src="{{ STATIC_URL }}foundation/javascripts/jquery.foundation.reveal.js"></script>
-    <script src="{{ STATIC_URL }}foundation/javascripts/jquery.foundation.orbit.js"></script>
+    <!--script src="{{ STATIC_URL }}foundation/javascripts/jquery.foundation.orbit.js"></script-->
     <script src="{{ STATIC_URL }}foundation/javascripts/jquery.foundation.navigation.js"></script>
     <script src="{{ STATIC_URL }}foundation/javascripts/jquery.foundation.buttons.js"></script>
     <script src="{{ STATIC_URL }}foundation/javascripts/jquery.foundation.tabs.js"></script>
@@ -40,22 +40,24 @@
     {% block bottom_js %}
     <script type="text/javascript">
         $(document).foundationAlerts();
-        L.Util.chickpea_modal = function (content, context) {
+        L.Chickpea.on('modal_ready', function (e) {
             var $div = $('#reveal-container');
             // reset class
             $div.attr("class", "");
             $div.addClass("reveal-modal");
-            if (context && context.class) {
-                $div.addClass(context.class);
+            if (e.cssClass) {
+                $div.addClass(e.cssClass);
             }
-            return $div.empty().html(content).append('<a class="close-reveal-modal">&#215;</a>').reveal();
-        };
-        L.Util.chickpea_alert = function (content, level, context) {
-            console.log("alert", content);
-            $div = $('<div>').addClass('alert-box success global').html(content);
+            return $div.empty().html(e.data.html).append('<a class="close-reveal-modal">&#215;</a>').reveal();
+        });
+        L.Chickpea.on('modal_close', function (e) {
+            var $div = $('#reveal-container').trigger('reveal:close');
+        });
+        L.Chickpea.on('alert', function (e) {
+            $div = $('<div>').addClass('alert-box success global').html(e.content);
             $div.append('<a href="#" class="close">&times;</a>');
             $("body").prepend($div);
-        };
+        });
         $('a.reveal').click(function(e) {
           e.preventDefault();
           var $this = $(this);
diff --git a/youmap/templates/chickpea/map_form.html b/youmap/templates/chickpea/map_form.html
index e6cb0c66..af988c2c 100644
--- a/youmap/templates/chickpea/map_form.html
+++ b/youmap/templates/chickpea/map_form.html
@@ -8,6 +8,8 @@
     {% endfor %}
     {{ form.description }}
     {{ form.description.errors }}
+    {{ form.licence }}
+    {{ form.licence.errors }}
     {{ form.zoom }}
     {{ form.center }}
     <input type="submit" class="button" />
diff --git a/youmap/templates/youmap/home.html b/youmap/templates/youmap/home.html
index a8a32659..e9840010 100644
--- a/youmap/templates/youmap/home.html
+++ b/youmap/templates/youmap/home.html
@@ -144,17 +144,4 @@
 
     <!-- End Footer -->
   <!-- Included JS Files -->
-{% endblock content %}
-
-
-{% block bottom_js %}
-    {{ block.super }}
-  <script type="text/javascript">
-    $(window).load(function() {
-      $('#featured').orbit({
-        fluid: '2x1',
-        timer: false
-      });
-    });
-  </script>
-{% endblock bottom_js %}
\ No newline at end of file
+{% endblock content %}
\ No newline at end of file