sibu 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c985f14f2cabfa806c0d6b71bf4789ec20c7895
-  data.tar.gz: 8718dd2ff6b222e587181d87cef123282228c372
+  metadata.gz: 916acca3e25a345d957ff420f7fa164992dedeb0
+  data.tar.gz: 8c5332f2f016ad73c8f864c8b9ae4804bf1e7c13
 SHA512:
-  metadata.gz: 8f1a9ce7fb68e9c4a9584add19e30e57f1a2f2eb4c3ca91b139e8e32085c118e230a5ec27791332edf63c8462fa6b6114fb2f9f7536351e640c27b016bdd20b4
-  data.tar.gz: 7697e85aba1baab0e67ab794dfa1d6f649d49479e37ee08de3be9068d8e7042b452c23e9a3444ea7ae428dfc79bc05013aefacf3f7daa67db15e936378d1fde2
+  metadata.gz: aad71cc6b158cf274e9058530b7f01db7ee842bbf172cf6847ae4279e0de1a09253417597120bd3a1ecba9652897e44b4656df7223498bed869ee4ae5e6feb69
+  data.tar.gz: 69febad581a88ab80a797d5cf9f1d6ff2b7ab0925fb9a3ef31ade3b88c57a53f4ea0df9144bbb20ef3cd4d251a35a7ef984fbe07eb32874a28043ecf7a1198b9

data/app/assets/stylesheets/sibu/sibu.css

@@ -9,10 +9,14 @@
 
 .sb-editable {
     cursor: pointer;
-    outline: dashed rgba(94, 219, 255, 0.8) 2px;
+    outline: dashed rgba(94, 219, 255, 0.8) 3px;
     outline-offset: -3px;
 }
 
+.sb-editable[data-type='map'] {
+    border: dashed rgba(94, 219, 255, 0.8) 3px;
+}
+
 #edit_mode_overlay {
     display: none;
 }

data/app/controllers/sibu/pages_controller.rb

@@ -81,6 +81,7 @@ module Sibu
     def update_element
       ids = (@section_id.split('|') + @element_id.split('|')).uniq[0...-1]
       @updated = @entity.update_element(*ids, element_params)
+      @refresh = params[:refresh]
     end
 
     def clone_element
@@ -95,13 +96,12 @@ module Sibu
       @added = @entity.child_element(*@section_id.split('|'), *@element_id.split('|'))
     end
 
-    # Todo - init available sections properly and fix dynamic sections creation (init needed)
     def new_section
       @after = params[:after]
       @links = @site.pages_path_by_id
       @page.sections << {"id" => "sibu_template_free_text", "elements" => [{"id" => "paragraph0"}]}
       @page.sections << {"id" => "sibu_template_gallery",
-                         "elements" => [{"id" => "slide0", "elements" => [{"id" => "slide0"}, {"id" => "slide1"}, {"id" => "slide2"}]}]}
+                         "elements" => [{"id" => "slide0"}, {"id" => "slide1"}, {"id" => "slide2"}]}
       @page.sections << {"id" => "sibu_template_table", "elements" => [
           {"id" => "col0", "elements" => [{"id" => "row1"}, {"id" => "row2"}]},
           {"id" => "col1", "elements" => [{"id" => "row1"}, {"id" => "row2"}]},

data/app/helpers/sibu/pages_helper.rb

@@ -143,9 +143,9 @@ module Sibu
       end
     end
 
-    def interactive_map(elt, html_opts = {}, &block)
+    def interactive_map(elt, html_opts = {})
       defaults = {"data-lat" => "45.68854", "data-lng" => "5.91587", "data-title" => DEFAULT_TEXT}
-      content = elt.is_a?(Hash) ? defaults.merge(elt) : (select_element(elt) || {"id" => elt}).merge(defaults)
+      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {"id" => elt}))
       html_opts.merge!({data: {id: elt_id(elt), type: "map"}}) if action_name != 'show'
       content_tag(:div, nil, content.merge(html_opts))
     end

data/app/views/layouts/sibu/edit_content.html.erb

@@ -157,11 +157,13 @@
 
     function cancelEdit() {
         $("#edit_panel").slideUp("fast");
+        $("#edit_panel").html("");
         document.body.style.overflow = "initial";
     }
 
     function cancelSectionsEdit() {
         $("#sections_panel").slideUp("fast");
+        $("#sections_panel").html("");
         document.body.style.overflow = "initial";
     }
 

data/app/views/sibu/pages/_map_edit_panel.html.erb

@@ -0,0 +1,27 @@
+<h2>Modifier la carte</h2>
+<div id="edit_msg"></div>
+<div class="sibu_edit_form">
+  <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
+    <div class="sibu_field">
+      <%= label_tag 'element[data-lat]', 'Latitude' %>
+      <%= text_field_tag 'element[data-lat]', @element["data-lat"] %>
+    </div>
+    <div class="sibu_field">
+      <%= label_tag 'element[data-lng]', 'Longitude' %>
+      <%= text_field_tag 'element[data-lng]', @element["data-lng"] %>
+    </div>
+    <div class="sibu_field">
+      <%= label_tag 'element[data-title]', 'Libellé' %>
+      <%= text_field_tag 'element[data-title]', @element["data-title"] %>
+    </div>
+    <%= hidden_field_tag 'element[id]', @element["id"] %>
+    <%= hidden_field_tag :element_id, @element_id %>
+    <%= hidden_field_tag :section_id, @section_id %>
+    <%= hidden_field_tag :entity, @entity_type %>
+    <%= hidden_field_tag :refresh, true %>
+    <div class="sibu_actions">
+      <%= submit_tag 'Valider' %>
+      <%= link_to 'Annuler', '#', onclick: 'cancelEdit(); return false;' %>
+    </div>
+  <% end %>
+</div>

data/app/views/sibu/pages/edit_element.js.erb

@@ -37,6 +37,8 @@ editPanel.html("");
   });
 <% when 'group' %>
   editPanel.html("<%= j(render 'group_edit_panel') %>");
+<% when 'map' %>
+  editPanel.html("<%= j(render 'map_edit_panel') %>");
 <% else %>
   editPanel.html("<%= j(render 'error_panel') %>");
 <% end %>

data/app/views/sibu/pages/update_element.js.erb

@@ -1,5 +1,8 @@
 <% if @updated.nil? %>
   $("#edit_panel #edit_msg").html("<p class='sibu_alert'>Une erreur s'est produite lors de l'enregistrement.</p>");
+<% elsif @refresh %>
+  $("#edit_panel").slideUp();
+  location.reload(true);
 <% else %>
   $("#edit_panel").slideUp();
   var updatedElt = $("[data-sb-id='<%= @section_id %>']").find("[data-id='<%= @element_id %>']");

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.24'
+  VERSION = '0.1.25'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
@@ -141,6 +141,7 @@ files:
 - app/views/sibu/pages/_form.html.erb
 - app/views/sibu/pages/_group_edit_panel.html.erb
 - app/views/sibu/pages/_link_edit_panel.html.erb
+- app/views/sibu/pages/_map_edit_panel.html.erb
 - app/views/sibu/pages/_media_edit_panel.html.erb
 - app/views/sibu/pages/_new_section_panel.html.erb
 - app/views/sibu/pages/_paragraph_edit_panel.html.erb