sibu 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f546bd4008bbe0847d6328ae30fd34f0feb06f8
-  data.tar.gz: 9734a6b7db39f25dd1a9de72feeafe551d49d302
+  metadata.gz: 55c6e2a83ee5222226abadce0270913620fc0be7
+  data.tar.gz: 838423c80a797ef3c8a5f4022d94f23b6c8e880a
 SHA512:
-  metadata.gz: d3b58626ea0c86f6384d4cd7207733333077bf3bde3fc46c1729718658745c34ac0cf4497e5396f681e33df754195c7141048ff1248db26309e7da9b37e31563
-  data.tar.gz: 84cac6c6ffe0dd30976f762d3d14c05fc3862eea70c51da8edce32e744bedfd989667fb676aa8f5905419616be61c215d3bc668b9be30e238ac73209922fc7b4
+  metadata.gz: 8e638a83f6b58bafa9bf0cd6a17850586f538f1dd3b4909849924ba47687bc6970bb29982768f4f2d20d5468c32094953a4562fea2a132f86c2c075c3e2c48e0
+  data.tar.gz: a596fe89724f5f320f239ba844538d6e9556e14a67059b18af7de73c13c1c4fa1a335399721a9b97ec252650d36f97aa985a88d938a66ef8006e2377ab259a5a

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

@@ -9,6 +9,8 @@
 
 sb-edit {
     position: relative;
+    display: inherit;
+    width: 100%;
 }
 
 sb-edit div.sb-overlay {

data/app/controllers/sibu/images_controller.rb

@@ -2,7 +2,7 @@ require_dependency "sibu/application_controller"
 
 module Sibu
   class ImagesController < ApplicationController
-    before_action :set_site, only: [:index, :new]
+    before_action :set_site, only: [:index, :new, :create, :edit]
 
     def index
       @images = Sibu::Image.where(site_id: params[:site_id])
@@ -10,12 +10,13 @@ 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 site_images_url(@image.site_id), notice: "L'image a bien été téléchargée."
+        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."
       else
         flash.now[:alert] = "Une erreur s'est produite lors du téléchargement de l'image."
         render :new
@@ -28,7 +29,7 @@ module Sibu
     def edit
     end
 
-    def updateé
+    def update
     end
 
     def destroy

data/app/controllers/sibu/pages_controller.rb

@@ -2,10 +2,11 @@ require_dependency "sibu/application_controller"
 
 module Sibu
   class PagesController < ApplicationController
-    before_action :set_page, only: [:edit, :update, :destroy, :edit_element, :update_element, :edit_section,
-                                    :clone_section, :delete_section]
+    before_action :set_page, only: [:edit, :update, :destroy, :edit_element, :update_element, :clone_element,
+                                    :delete_element, :edit_section, :clone_section, :delete_section]
     before_action :set_site, only: [:index, :new]
-    before_action :set_edit_context, only: [:edit_element, :update_element, :clone_section, :delete_section]
+    before_action :set_edit_context, only: [:edit_element, :update_element, :clone_element, :delete_element,
+                                            :clone_section, :delete_section]
     skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
 
     def index
@@ -78,6 +79,14 @@ module Sibu
       @updated = @entity.update_element(*@section_id.split('|'), element_params)
     end
 
+    def clone_element
+      @cloned = @entity.clone_element(*@section_id.split('|'), @element_id)
+    end
+
+    def delete_element
+      @deleted = @entity.delete_element(*@section_id.split('|'), @element_id)
+    end
+
     def edit_section
     end
 
@@ -85,12 +94,10 @@ module Sibu
     end
 
     def clone_section
-      @section_id = params[:section_id]
       @cloned = @entity.clone_section(*@section_id.split('|'))
     end
 
     def delete_section
-      @section_id = params[:section_id]
       @deleted = @entity.delete_section(*@section_id.split('|'))
     end
 

data/app/helpers/sibu/pages_helper.rb

@@ -19,7 +19,7 @@ module Sibu
 
     [:h1, :h2, :h3, :h4, :h5, :h6, :p, :span, :div].each do |t|
       define_method(t) do |elt, html_opts = {}|
-        defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt,"text" => "Texte à modifier"}
+        defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => "Texte à modifier"}
         content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
         html_opts.merge!({class: "sb-#{t} #{html_opts[:class]}", data: {id:  elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
         content_tag(t, raw(content["text"]).html_safe, html_opts)
@@ -38,7 +38,11 @@ module Sibu
       @sb_entity = @site
       @sb_section = sub_id ? [id, sub_id] : [id]
       if block_given?
-        "<sb-edit data-id='#{@sb_section.join('|')}' data-entity='site'>#{capture(self, &block)}</sb-edit>".html_safe
+        if action_name != 'show'
+          "<sb-edit data-id='#{@sb_section.join('|')}' data-entity='site'>#{capture(self, &block)}</sb-edit>".html_safe
+        else
+          capture(self, &block)
+        end
       else
         self
       end
@@ -47,7 +51,11 @@ module Sibu
     def section(id, sub_id = nil, &block)
       @sb_entity = @page
       @sb_section = sub_id ? [id, sub_id] : [id]
-      "<sb-edit data-id='#{@sb_section.join('|')}' data-entity='page' data-duplicate='#{!sub_id.nil?}'>#{capture(self, &block)}</sb-edit>".html_safe
+      if action_name != 'show'
+        "<sb-edit data-id='#{@sb_section.join('|')}' data-entity='page' data-duplicate='#{!sub_id.nil?}'>#{capture(self, &block)}</sb-edit>".html_safe
+      else
+        capture(self, &block)
+      end
     end
 
     # def site_sections(id, &block)
@@ -88,20 +96,61 @@ module Sibu
       end
     end
 
-    def img(elt, html_opts = {})
+    def img(elt, opts = {})
+      wrapper = opts.delete(:wrapper)
       defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => "/default.jpg"}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      html_opts.merge!({class: "sb-img #{html_opts[:class]}", data: {id: elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
-      content_tag(:img, nil, content.except("id").merge(html_opts))
+      opts.merge!({class: "sb-img #{opts[:class]}", data: {id: elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
+      wrapper ? content_tag(wrapper, content_tag(:img, nil, content.except("id")), opts) : content_tag(:img, nil, content.except("id").merge(opts))
     end
 
-    def bg_img(elt, html_opts = {})
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => "/default.jpg"}
-      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      html_opts.merge!({class: "sb-img #{html_opts[:class]}", data: {id: elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
-      content_tag(:div, content_tag(:img, nil, content.except("id")), html_opts)
+    # Note : see ActionView::OutputBuffer
+    def sb_page
+      @sb_entity = @page
+      self
+    end
+    alias page sb_page
+
+    def sb_site
+      @sb_entity = @site
+      self
+    end
+    alias site sb_site
+
+    def repeat(&block)
+      ((action_name != 'show' ? "<sb-edit data-id='#{@sb_section}' data-entity='#{@sb_entity == @site ? 'site' : 'page'}'>" : '') +
+          @sb_entity.section(@sb_section).map {|elt| capture(elt, &block)}.join('') +
+        (action_name != 'show' ? "</sb-edit>" : '')).html_safe
+    end
+
+    def secsion(id)
+      @sb_section = id
+      if block_given?
+        if current_action != 'show'
+          "<sb-edit data-id='#{@sb_section}' data-entity='#{@sb_entity == @site ? 'site' : 'page'}'>#{capture(self, &block)}</sb-edit>".html_safe
+        else
+          capture(self, &block)
+        end
+      else
+        self
+      end
     end
 
+    def secsions(id)
+
+    end
+
+    def elts
+
+    end
+
+    # def bg_img(elt, html_opts = {})
+    #   defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => "/default.jpg"}
+    #   content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+    #   html_opts.merge!({class: "sb-img #{html_opts[:class]}", data: {id: elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
+    #   content_tag(:div, content_tag(:img, nil, content.except("id")), html_opts)
+    # end
+
     def link(elt, html_opts = {}, &block)
       defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "value" => "", "text" => "Nouveau lien"}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))

data/app/helpers/sibu/sites_helper.rb

@@ -1,4 +1,19 @@
 module Sibu
   module SitesHelper
+    def primary_colors
+      Rails.application.config.sibu[:primary_colors]
+    end
+
+    def secondary_colors
+      Rails.application.config.sibu[:secondary_colors]
+    end
+
+    def primary_fonts
+      Rails.application.config.sibu[:primary_fonts]
+    end
+
+    def secondary_fonts
+      Rails.application.config.sibu[:secondary_fonts]
+    end
   end
 end

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

@@ -60,6 +60,22 @@ module Sibu
       value if save
     end
 
+    def clone_element(*ids, element_id)
+      siblings = section(*ids)
+      ref_index = siblings.index {|s| s["id"] == element_id}
+      new_elt = siblings[ref_index].deep_dup
+      new_elt["id"] = element_id + '§'
+      siblings.insert(ref_index + 1, new_elt)
+      save ? new_elt : nil
+    end
+
+    def delete_element(*ids, element_id)
+      siblings = section(*ids)
+      ref_index = siblings.index {|s| s["id"] == element_id}
+      siblings.delete_at(ref_index)
+      save
+    end
+
     def clone_section(*ids)
       siblings = section(ids.first)
       ref_index = siblings.index {|s| s["id"] == ids.last}

data/app/models/sibu/site.rb

@@ -2,6 +2,8 @@ module Sibu
   class Site < ApplicationRecord
     include Sibu::SectionsConcern
 
+    store :custom_data, accessors: [:primary_font, :secondary_font, :primary_color, :secondary_color], coder: JSON
+
     belongs_to :site_template, :class_name => 'Sibu::SiteTemplate'
     has_many :pages, :class_name => 'Sibu::Page', dependent: :destroy
     has_many :images, :class_name => 'Sibu::Image', dependent: :destroy

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

@@ -14,5 +14,6 @@
     </div>
   <% end %>
 <% end %>
+<%= yield :scripts %>
 </body>
 </html>

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

@@ -11,6 +11,7 @@
     <%= javascript_include_tag "#{@site.site_template.path}-core" %>
   <% end %>
   <%= csrf_meta_tags %>
+  <%= yield :styles %>
 </head>
 <body>
 <% [:top_panel, :side_panel, :content_panel, :bottom_panel].each do |panel| %>

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

@@ -11,6 +11,7 @@
     <%= javascript_include_tag @site.site_template.path %>
   <% end %>
   <%= csrf_meta_tags %>
+  <%= yield :styles %>
 </head>
 <body>
 

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

@@ -4,6 +4,7 @@
     <%= f.file_field :file %>
   </div>
   <%= f.hidden_field :site_id %>
+  <%= hidden_field_tag :page_id, @page_id %>
   <div class="sibu_actions">
     <%= f.submit 'Valider' %>
     <%= link_to 'Annuler', :back %>

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

@@ -0,0 +1,23 @@
+<% content_for :styles do %>
+  <style>
+    <% unless @site.primary_color.blank? %>
+    :not(.sibu_panel) [class*='bg--primary'] {
+      background-color: <%= @site.primary_color %> !important;
+    }
+
+    :not(.sibu_panel) [class *='txt--primary'] {
+      color: <%= @site.primary_color %> !important;
+    }
+    <% end %>
+
+    <% unless @site.secondary_color.blank? %>
+    :not(.sibu_panel) [class*='bg--success'] {
+      background-color: <%= @site.secondary_color %> !important;
+    }
+
+    :not(.sibu_panel) [class *='txt--success'] {
+      color: <%= @site.secondary_color %> !important;
+    }
+    <% end %>
+  </style>
+<% end %>

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

@@ -1,9 +1,10 @@
 <h2>Modifier l'image</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_select_images sibu_field">
-      <p>Sélectionnez ou <%= link_to 'téléchargez', new_site_image_path(@site.id) %> une image</p>
+      <p>Sélectionnez ou <%= link_to 'téléchargez', new_site_image_path(@site.id, page_id: @page.id) %> une image</p>
       <% @site.images.each do |image| %>
       <div class="sibu_image">
         <%= image_tag image.file_url(:small) %>

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

@@ -0,0 +1,9 @@
+<% if @cloned.nil? %>
+$("#edit_panel #edit_msg").html("<p class='sibu_alert'>Une erreur s'est produite lors de l'enregistrement.</p>");
+<% else %>
+$("#edit_panel").slideUp();
+var clonedElt = $("sb-edit[data-id='<%= @section_id %>']").find("[data-id='<%= @element_id %>']").first();
+var newElt = clonedElt.clone();
+newElt.data("id", "<%= @cloned["id"] %>");
+clonedElt.after(newElt);
+<% end %>

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

@@ -1,3 +1,4 @@
+<%= render 'custom_styles' %>
 <div class="edit_content">
   <%= render "shared/#{@site.site_template.path}/site" %>
 </div>

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

@@ -4,7 +4,7 @@ editPanel.html("");
   <% text_value = @element["text"] || 'Texte à modifier' %>
   editPanel.html("<%= j(render 'text_edit_panel') %>");
   var editorElt = editPanel.find("trix-editor")[0];
-  editorElt.editor.loadHTML("<%= raw(text_value.gsub("\n", "<br/>")) %>");
+  editorElt.editor.loadHTML("<%= j(raw(text_value.gsub("\n", "<br/>"))) %>");
 <% elsif @content_type == 'media' %>
   editPanel.html("<%= j(render 'media_edit_panel') %>");
   editPanel.find(".sibu_image img").click(function() {
@@ -15,5 +15,4 @@ editPanel.html("");
   editPanel.html("<%= j(render 'link_edit_panel') %>");
 <% end %>
 
-
 editPanel.slideDown("fast");

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

@@ -17,7 +17,7 @@
     <% @pages.each do |p| %>
       <tr>
         <td><%= p.name %></td>
-        <td><%= p.template %></td>
+        <td><%= t "sibu.templates.#{p.template}" %></td>
         <td><%= p.path %></td>
         <td><%= l p.updated_at %></td>
         <td colspan="2">

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

@@ -1 +1,2 @@
+<%= render 'custom_styles' %>
 <%= render "shared/#{@site.site_template.path}/site" %>

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

@@ -3,13 +3,62 @@
     <%= f.label :name, 'Nom du site' %>
     <%= f.text_field :name, placeholder: "Ex : Site de l'Hôtel du Lac" %>
   </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>
   <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'}) %>
+    <%= f.collection_select(:site_template_id, Sibu::SiteTemplate.all, :id, :name, {prompt: 'Sélectionnez un modèle de site'}, disabled: @site.persisted?) %>
+  </div>
+  <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 %>
+    </div>
+    <%= f.hidden_field :primary_color %>
+  </div>
+  <div class="sibu_field sibu_colors">
+    <%= f.label :secondary_color, 'Couleur secondaire' %>
+    <div>
+      <% 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 %>
+    </div>
+    <%= f.hidden_field :secondary_color %>
+  </div>
+  <div class="sibu_field">
+    <%= f.label :name, 'Police de caractères (titres)' %>
+
+  </div>
+  <div class="sibu_field">
+    <%= f.label :name, 'Police de caractères (corps)' %>
+
   </div>
   <%= f.hidden_field :user_id %>
   <div class="sibu_actions">
     <%= f.submit 'Valider' %>
     <%= link_to 'Annuler', :back %>
   </div>
+<% end %>
+
+<% content_for :scripts do %>
+  <script>
+      $(".sibu_colors").each(function () {
+          var colors = $(this).find(".sibu_color");
+          var input = $(this).find("input");
+          colors.click(function () {
+              if($(this).hasClass('selected')) {
+                  $(this).removeClass("selected");
+                  input.val('');
+              } else {
+                  colors.removeClass("selected");
+                  $(this).addClass('selected');
+                  input.val($(this).data("color"));
+              }
+          });
+      });
+  </script>
 <% end %>

data/config/routes.rb

@@ -10,6 +10,8 @@ Sibu::Engine.routes.draw do
         get :edit_element, on: :member
         get :edit_section, on: :member
         patch 'update_element', on: :member
+        post 'clone_element', on: :member
+        delete 'delete_element', on: :member
         patch 'update_section', on: :member
         post 'clone_section', on: :member
         delete 'delete_section', on: :member

data/db/migrate/20180214134653_add_fields_to_sites.rb

@@ -0,0 +1,5 @@
+class AddFieldsToSites < ActiveRecord::Migration[5.1]
+  def change
+    add_column :sibu_sites, :custom_data, :text
+  end
+end

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,10 +147,12 @@ files:
 - app/views/sibu/images/index.html.erb
 - app/views/sibu/images/new.html.erb
 - app/views/sibu/images/show.html.erb
+- app/views/sibu/pages/_custom_styles.html.erb
 - app/views/sibu/pages/_form.html.erb
 - app/views/sibu/pages/_link_edit_panel.html.erb
 - app/views/sibu/pages/_media_edit_panel.html.erb
 - app/views/sibu/pages/_text_edit_panel.html.erb
+- app/views/sibu/pages/clone_element.js.erb
 - app/views/sibu/pages/clone_section.js.erb
 - app/views/sibu/pages/delete_section.js.erb
 - app/views/sibu/pages/destroy.html.erb
@@ -182,6 +184,7 @@ files:
 - db/migrate/20180208082317_rename_images_user_id_to_site_id.rb
 - 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
 - lib/sibu.rb
 - lib/sibu/engine.rb
 - lib/sibu/version.rb