sibu 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 916acca3e25a345d957ff420f7fa164992dedeb0
-  data.tar.gz: 8c5332f2f016ad73c8f864c8b9ae4804bf1e7c13
+  metadata.gz: ae660a877d92fc982f3f013404a4afd4d79e46de
+  data.tar.gz: 5b4221c6178eb1b5cb4b497bfef8801e989c77a3
 SHA512:
-  metadata.gz: aad71cc6b158cf274e9058530b7f01db7ee842bbf172cf6847ae4279e0de1a09253417597120bd3a1ecba9652897e44b4656df7223498bed869ee4ae5e6feb69
-  data.tar.gz: 69febad581a88ab80a797d5cf9f1d6ff2b7ab0925fb9a3ef31ade3b88c57a53f4ea0df9144bbb20ef3cd4d251a35a7ef984fbe07eb32874a28043ecf7a1198b9
+  metadata.gz: b954bf098086c3b9ac081be9538a5e565f93908ade83b99dd6dfb72f01e2efdb3a8f806d2bd8be10176a558723be7fbb3f3afc17893dcaa980e8d1ca414017cf
+  data.tar.gz: 2a9d4af45641c0db7453ae2439c944df92a577cb401c3ed588ac8bf523801102b4ca190ee5cc0a8f278ac40ba0e50c6d6b58f2ed0c70016e9592ead171414b2c

data/app/controllers/sibu/images_controller.rb

@@ -3,6 +3,7 @@ require_dependency "sibu/application_controller"
 module Sibu
   class ImagesController < ApplicationController
     before_action :set_site, only: [:index, :new, :create, :edit]
+    before_action :set_edition_context, only: [:new, :create]
 
     def index
       @images = Sibu::Image.where(site_id: params[:site_id])
@@ -10,13 +11,24 @@ module Sibu
 
     def new
       @image = Sibu::Image.new(site_id: @site.id)
-      @page_id = params[:page_id]
     end
 
     def create
       @image = Sibu::Image.new(image_params)
       if @image.save
-        redirect_to (params[:page_id].blank? ? site_images_url(@image.site_id) : site_page_edit_content_path(@site.id, params[:page_id])), notice: "L'image a bien été téléchargée."
+        if @page_id && @section_id && @element_id && @size
+          page = Sibu::Page.find(@page_id)
+          ids = (@section_id.split('|') + @element_id.split('|')).uniq[0...-1]
+          elt = page.update_element(*ids, {"id" => @img_id, "src" => @image.file_url(@size.to_sym), "alt" => @image.alt})
+          if elt.nil?
+            msg = {alert: "Une erreur s'est produite lors de la mise à jour de l'image."}
+          else
+            msg = {notice: "L'image a bien été mise à jour."}
+          end
+          redirect_to site_page_edit_content_path(@site.id, page.id), msg
+        else
+          redirect_to site_images_url(@image.site_id), notice: "L'image a bien été téléchargée."
+        end
       else
         flash.now[:alert] = "Une erreur s'est produite lors du téléchargement de l'image."
         render :new
@@ -41,6 +53,14 @@ module Sibu
       @site = Sibu::Site.find(params[:site_id])
     end
 
+    def set_edition_context
+      @page_id = params[:page_id]
+      @section_id = params[:section_id]
+      @element_id = params[:element_id]
+      @img_id = params[:img_id]
+      @size = params[:size]
+    end
+
     def image_params
       params.require(:image).permit!
     end

data/app/controllers/sibu/pages_controller.rb

@@ -97,15 +97,16 @@ module Sibu
     end
 
     def new_section
+      page = Sibu::Page.find(params[:id])
+      @page = Page.new(id: page.id, sections: [])
+      @site = Sibu::Site.includes(:pages).find(page.site_id)
       @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"}, {"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"}]},
-      ]}
+
+      @site.site_template.available_templates.each do |t|
+        template_defaults = @site.site_template.templates ? (@site.site_template.templates[t["template"]] || {}) : {}
+        @page.sections << template_defaults.merge(t).to_h
+      end
     end
 
     def create_section

data/app/helpers/sibu/pages_helper.rb

@@ -12,8 +12,7 @@ module Sibu
     end
 
     def sections_templates
-      Dir.glob(File.join(Rails.root, "app/views/shared/#{@site.site_template.path}/*.erb")).map {|f| f.split('/').last}
-          .map {|f| f[1..-1].gsub('.html.erb', '')}.select {|f| f != 'site'}.map {|f| {"id" => "sibu_template_#{f}", "template" => f}}
+      @site.site_template.available_templates
     end
 
     def page_languages
@@ -21,7 +20,7 @@ module Sibu
     end
 
     def site_images
-      @site.images + Sibu::Image.shared
+      Sibu::Image.shared + @site.images
     end
 
     def available_links
@@ -59,7 +58,7 @@ module Sibu
 
     def elements(id = nil)
       items = id ? select_element(id)["elements"] : @sb_entity.find_or_init(*@sb_section)["elements"]
-      items.blank? ? [{"id" => "#{@sb_section.last}*"}] : items
+      items.blank? ? [{"id" => "el#{Time.current.to_i}"}] : items
     end
 
     def img(elt, opts = {})

data/app/models/concerns/sibu/sections_concern.rb

@@ -52,7 +52,7 @@ module Sibu
       siblings = find_or_init(*ids)["elements"]
       ref_index = siblings.index {|s| s["id"] == element_id}
       new_elt = siblings[ref_index].deep_dup
-      new_elt["id"] = element_id + '§'
+      new_elt["id"] = "cl#{Time.current.to_i}"
       siblings.insert(ref_index + 1, new_elt)
       save ? new_elt : nil
     end
@@ -73,23 +73,29 @@ module Sibu
       siblings = elements(*ids)
       parent_elt = siblings[siblings.index {|s| s["id"] == element_id}]
       if parent_elt["elements"].blank?
-        parent_elt["elements"] = [{"id" => "#{element_id}*"}]
+        parent_elt["elements"] = [{"id" => "cl#{Time.current.to_i}"}]
       else
-        parent_elt["elements"] << [{"id" => "#{parent_elt["elements"].last["id"]}§"}]
+        parent_elt["elements"] << [{"id" => "cl#{Time.current.to_i}"}]
       end
       save
     end
 
     def create_section(*ids, after, new_section)
-      new_section["id"] = "#{new_section["template"]}-#{Time.current.to_i}"
+      new_section["id"] = "cs#{Time.current.to_i}"
       if ids.length == 1
         parent = sections
       else
         parent = find_or_init(*ids[0..-2])["elements"]
       end
-      ref_pos = parent.index {|s| s["id"] == ids.last}
-      parent.insert(after.to_s == 'true' ? ref_pos + 1 : ref_pos, new_section)
-      save ? new_section : nil
+      if new_section["template"].blank?
+        nil
+      else
+        template_defaults = site_template.templates ? site_template.templates[new_section["template"]] : {}
+        sec = template_defaults.merge(new_section)
+        ref_pos = parent.index {|s| s["id"] == ids.last}
+        parent.insert(after.to_s == 'true' ? ref_pos + 1 : ref_pos, sec)
+        sec if save
+      end
     end
 
     def delete_section(*ids)

data/app/models/sibu/image.rb

@@ -4,6 +4,10 @@ module Sibu
 
     belongs_to :site, :class_name => 'Sibu::Site', optional: true
 
+    store :metadata, accessors: [:alt], coder: JSON
+
+    validates_presence_of :file_data
+
     def self.shared
       where(site_id: nil)
     end

data/app/models/sibu/page.rb

@@ -21,5 +21,9 @@ module Sibu
     def update_path
       self.path = name.parameterize if self.path.blank? && name != 'Accueil'
     end
+
+    def site_template
+      site.site_template
+    end
   end
 end

data/app/models/sibu/site.rb

@@ -3,6 +3,7 @@ module Sibu
     include Sibu::SectionsConcern
 
     store :custom_data, accessors: [:primary_font, :secondary_font, :primary_color, :secondary_color], coder: JSON
+    store :metadata, accessors: [:analytics_id]
 
     belongs_to :site_template, :class_name => 'Sibu::SiteTemplate'
     has_many :pages, :class_name => 'Sibu::Page', dependent: :destroy

data/app/models/sibu/site_template.rb

@@ -2,9 +2,15 @@ module Sibu
   class SiteTemplate < ApplicationRecord
     store :default_sections, accessors: [:sections], coder: JSON
     store :default_pages, accessors: [:pages], coder: JSON
+    store :default_templates, accessors: [:templates], coder: JSON
 
     def reference
       name.parameterize.gsub('-', '_')
     end
+
+    def available_templates
+      Dir.glob(File.join(Rails.root, "app/views/shared/#{path}/*.erb")).map {|f| f.split('/').last}
+          .map {|f| f[1..-1].gsub('.html.erb', '')}.select {|f| f != 'site'}.map {|f| {"id" => "sibu_template_#{f}", "template" => f}}
+    end
   end
 end

data/app/views/sibu/images/_form.html.erb

@@ -1,10 +1,25 @@
 <%= form_for([@site, @image]) do |f| %>
   <div class="sibu_field">
-    <%= f.hidden_field :file, value: @image.cached_file_data %>
-    <%= f.file_field :file %>
+    <%= f.label :file, "Sélection de l'image" %>
+    <div>
+      <%= f.hidden_field :file, value: @image.cached_file_data %>
+      <%= f.file_field :file %>
+      <small>Sélectionnez une image à télécharger depuis votre ordinateur</small>
+    </div>
+  </div>
+  <div class="sibu_field">
+    <%= f.label :alt, "Légende / texte alternatif" %>
+    <div>
+      <%= f.text_field :alt %>
+      <small>Renseignez un texte décrivant l'image</small>
+    </div>
   </div>
   <%= f.hidden_field :site_id %>
   <%= hidden_field_tag :page_id, @page_id %>
+  <%= hidden_field_tag :element_id, @element_id %>
+  <%= hidden_field_tag :section_id, @section_id %>
+  <%= hidden_field_tag :img_id, @img_id %>
+  <%= hidden_field_tag :size, @size %>
   <div class="sibu_actions">
     <%= f.submit 'Valider' %>
     <%= link_to 'Annuler', :back %>

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

@@ -16,7 +16,7 @@
   <div class="sibu_field">
     <%= f.label :language, "Langue" %>
     <div>
-      <%= f.select(:language, page_languages, {prompt: 'Sélectionnez une langue'}) %>
+      <%= f.select(:language, page_languages) %>
       <small>La langue d'affichage de la page</small>
     </div>
   </div>

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

@@ -4,10 +4,12 @@
 <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_select_images sibu_field">
-      <p>Sélectionnez ou <%= link_to 'téléchargez', new_site_image_path(@site.id, page_id: @page.id) %> une image</p>
+      <p>Sélectionnez ou <%= link_to 'téléchargez', new_site_image_path(@site.id, page_id: @page.id, section_id: @section_id,
+                                                                        element_id: @element_id, img_id: @element["id"], size: @size) %> une image</p>
       <% site_images.each do |image| %>
       <div class="sibu_image" data-img-id="<%= image.id %>">
-        <%= image_tag image.file_url(:small), class: (@element["src"] == image.file_url(@size) ? 'selected' : ''), data: {src: image.file_url(@size)} %>
+        <%= image_tag image.file_url(:small), class: (@element["src"] == image.file_url(@size) ? 'selected' : ''),
+                      data: {src: image.file_url(@size), alt: image.alt} %>
       </div>
       <% end %>
     </div>

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

@@ -3,12 +3,14 @@
   <div id="edit_msg"></div>
 </div>
 <div>
-  <div id="<%= "#{@site.site_template.reference}_sections" %>" class="sibu_sections sibu_site_content">
-    <% sections_templates.each do |st| %>
-      <div data-sb-template="<%= st["template"] %>">
-        <%= render "shared/#{@site.section_template(st)}", sec: st %>
-      </div>
-    <% end %>
+  <div class="sibu_sections sibu_site_content">
+    <div id="<%= "#{@site.site_template.reference}_sections" %>">
+      <% sections_templates.each do |st| %>
+        <div data-sb-template="<%= st["template"] %>">
+          <%= render "shared/#{@site.section_template(st)}", sec: st %>
+        </div>
+      <% end %>
+    </div>
   </div>
   <%= form_tag(create_section_site_page_path(@site.id, @page.id), method: :post, remote: true) do |f| %>
     <%= hidden_field_tag 'section[template]', '' %>

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

@@ -25,6 +25,7 @@ editPanel.html("");
       images.removeClass('selected');
       $(this).addClass('selected');
       $("#element_src").val($(this).data("src"));
+      $("#element_alt").val($(this).data("alt"));
     }
   });
 <% when 'link' %>

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

@@ -1,7 +1,7 @@
 var sectionsPanel = $("#sections_panel");
 sectionsPanel.html("");
 sectionsPanel.html("<%= j(render 'new_section_panel') %>");
-var sections = sectionsPanel.find(".sibu_sections > *");
+var sections = sectionsPanel.find(".sibu_sections [data-sb-template]");
 sections.click(function() {
     if(!$(this).hasClass('selected')) {
         sections.removeClass('selected');

data/app/views/sibu/sites/_form.html.erb

@@ -1,22 +1,40 @@
 <%= form_for @site do |f| %>
   <div class="sibu_field">
     <%= f.label :name, 'Nom du site' %>
-    <%= f.text_field :name, placeholder: "Ex : Site de l'Hôtel du Lac" %>
+    <div>
+      <%= f.text_field :name, placeholder: "Ex : Site de l'Hôtel du Lac" %>
+      <small>Libellé utilisé dans l'outil d'administration (non utilisé dans le site)</small>
+    </div>
   </div>
   <div class="sibu_field">
     <%= f.label :name, 'Nom de domaine' %>
-    <%= f.text_field :domain, placeholder: "Ex : www.monsite.com (utilisé lors de la mise en ligne du site)" %>
+    <div>
+      <%= f.text_field :domain, placeholder: "Ex : www.monsite.com (utilisé lors de la mise en ligne du site)" %>
+      <small>Renseignez le nom de domaine de votre site (utile uniquement lors de la publication)</small>
+    </div>
   </div>
   <div class="sibu_field">
     <%= f.label :site_template_id, 'Modèle' %>
-    <%= f.collection_select(:site_template_id, Sibu::SiteTemplate.all, :id, :name, {prompt: 'Sélectionnez un modèle de site'}, disabled: @site.persisted?) %>
+    <div>
+      <%= f.collection_select(:site_template_id, Sibu::SiteTemplate.all, :id, :name, {prompt: 'Sélectionnez un modèle de site'}, disabled: @site.persisted?) %>
+      <small>Choisissez le gabarit qui servira de modèle pour votre site (non modifiable après création)</small>
+    </div>
+  </div>
+  <div class="sibu_field">
+    <%= f.label :analytics_id, "Statistiques d'audience" %>
+    <div>
+      <%= f.text_field :analytics_id, placeholder: "UA-XXXXXX" %>
+      <small>Renseignez l'identifiant Google Analytics pour suivre les statistiques d'audience du site</small>
+    </div>
   </div>
+  <% if @next_page %>
   <div class="sibu_field sibu_colors">
     <%= f.label :primary_color, 'Couleur principale' %>
     <div>
       <% primary_colors.each do |c| %>
         <span class="sibu_color <%= 'selected' if f.object.primary_color == c %>" data-color="<%= c %>" style="background-color: <%= c %>;"></span>
       <% end %>
+      <small>Couleur principale appliquée au modèle choisi</small>
     </div>
     <%= f.hidden_field :primary_color %>
   </div>
@@ -26,17 +44,25 @@
       <% secondary_colors.each do |c| %>
         <span class="sibu_color <%= 'selected' if f.object.secondary_color == c %>" data-color="<%= c %>" style="background-color: <%= c %>;"></span>
       <% end %>
+      <small>Couleur secondaire appliquée au modèle choisi</small>
     </div>
     <%= f.hidden_field :secondary_color %>
   </div>
   <div class="sibu_field">
     <%= f.label :name, 'Police de caractères (titres)' %>
-    <%= f.select :primary_font, primary_fonts, {prompt: 'Police par défaut'} %>
+    <div>
+      <%= f.select :primary_font, primary_fonts, {prompt: 'Police par défaut'} %>
+      <small>Police de caractère utilisée pour les titres du modèle choisi</small>
+    </div>
   </div>
   <div class="sibu_field">
     <%= f.label :name, 'Police de caractères (corps)' %>
-    <%= f.select :secondary_font, secondary_fonts, {prompt: 'Police par défaut'} %>
+    <div>
+      <%= f.select :secondary_font, secondary_fonts, {prompt: 'Police par défaut'} %>
+      <small>Police de caractère utilisée pour les corps de texte du modèle choisi</small>
+    </div>
   </div>
+  <% end %>
   <%= hidden_field_tag :next_page, @next_page %>
   <%= f.hidden_field :user_id %>
   <div class="sibu_actions">

data/db/migrate/20180227151519_add_default_templates_to_site_templates.rb

@@ -0,0 +1,5 @@
+class AddDefaultTemplatesToSiteTemplates < ActiveRecord::Migration[5.1]
+  def change
+    add_column :sibu_site_templates, :default_templates, :text
+  end
+end

data/lib/sibu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,6 +184,7 @@ files:
 - db/migrate/20180208125024_rename_image_data_column.rb
 - db/migrate/20180210181644_add_defaults_to_site_templates.rb
 - db/migrate/20180214134653_add_fields_to_sites.rb
+- db/migrate/20180227151519_add_default_templates_to_site_templates.rb
 - lib/sibu.rb
 - lib/sibu/engine.rb
 - lib/sibu/utils.rb