sibu 0.2.5 → 0.2.6

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

@@ -1,17 +1,17 @@
 <div class="sibu_image_preview">
   <%= image_tag @image.file_url(:medium) %>
 </div>
-<%= form_for([@site, @image]) do |f| %>
+<%= form_for(@image) do |f| %>
   <div class="sibu_field">
     <%= f.label :alt, "Légende / texte alternatif" %>
     <div>
-      <%= f.text_field :alt %>
+      <%= f.text_field :alt %><br/>
       <small>Renseignez un texte décrivant l'image</small>
     </div>
   </div>
-  <%= f.hidden_field :site_id %>
+  <%= f.hidden_field :user_id %>
   <div class="sibu_actions">
     <%= f.submit 'Mettre à jour' %>
-    <%= link_to 'Supprimer', site_image_path(@image.site_id, @image.id), method: :delete, data: {confirm: "Supprimer l'image ?", disable_with: "Suppression en cours..."} %>
+    <%= link_to 'Supprimer', image_path(@image.id), method: :delete, data: {confirm: "Supprimer l'image ?", disable_with: "Suppression en cours..."} %>
   </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= form_for([@site, @image]) do |f| %>
+<%= form_for(@image) do |f| %>
   <div class="sibu_field">
     <%= f.label :file, "Sélection de l'image" %>
     <div>
@@ -14,7 +14,7 @@
       <small>Renseignez un texte décrivant l'image</small>
     </div>
   </div>
-  <%= f.hidden_field :site_id %>
+  <%= f.hidden_field :user_id %>
   <%= hidden_field_tag :page_id, @page_id %>
   <%= hidden_field_tag :entity_type, @entity_type %>
   <%= hidden_field_tag :element_id, @element_id %>

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

@@ -1,11 +1,11 @@
 <div id="pages" class="sibu_view">
   <div class="actions">
-    <%= link_to 'Télécharger une image', new_site_image_path(@site.id) %> <%= link_to 'Retour', :back %>
+    <%= link_to 'Télécharger une image', new_image_path %> <%= link_to 'Retour', :back %>
   </div>
-  <h2>Images du site "<%= @site.name %>"</h2>
+  <h2>Images téléchargées</h2>
   <div class="sibu_images">
     <% @images.each do |image| %>
-      <%= link_to image_tag(image.file_url(:small)), edit_site_image_path(@site.id, image.id), class: 'sibu_image', id: "sibu_image_#{image.id}", remote: true %>
+      <%= link_to image_tag(image.file_url(:small)), edit_image_path(image.id), class: 'sibu_image', id: "sibu_image_#{image.id}", remote: true %>
     <% end %>
   </div>
   <div class="sibu_edit_image">Sélectionnez une image pour voir ses informations.</div>

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

@@ -3,6 +3,10 @@
     <%= link_to 'Retour', :back %>
   </div>
   <h2>Télécharger une image</h2>
+  <p>
+    Pour un rendu optimal, nous vous conseillons d'utiliser des images ayant une résolution élevée (au moins 1600 pixels sur le bord le plus large).
+    Veillez également à ne télécharger que des visuels pour lesquels vous disposez des droits d'utilisation.
+  </p>
   <div class="sibu_form">
     <%= render 'form' %>
   </div>

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

@@ -13,13 +13,6 @@
       <small>L'adresse (ou URL) de la page, utilisée par les navigateurs web pour y accéder</small>
     </div>
   </div>
-  <div class="sibu_field">
-    <%= f.label :language, "Langue" %>
-    <div>
-      <%= f.select(:language, page_languages) %>
-      <small>La langue d'affichage de la page</small>
-    </div>
-  </div>
   <div class="sibu_field">
     <%= f.label :title, 'Titre' %>
     <div>

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

@@ -3,22 +3,34 @@
 <%= render 'element_actions' %>
 <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, section_id: @section_id, entity_type: @entity_type,
-                                                                        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), alt: image.alt} %>
+    <div class="sibu_image_selection">
+      <div class="sibu_select_images sibu_field">
+        <p>Sélectionnez ou <%= link_to 'téléchargez', new_image_path(page_id: @page.id, section_id: @section_id, entity_type: @entity_type,
+                                                                     element_id: @element_id, img_id: @element["id"], size: @size) %> une image</p>
+        <% site_images.each_with_index do |image, i| %>
+          <div class="sibu_image" data-img-id="<%= image.id %>">
+            <% if i == 0 %><span>Aucune image</span><% end %>
+            <%= 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>
+      <div class="sibu_selected_image">
+        <% if @element["src"] == DEFAULT_IMG || @element["src"].blank? %>
+          <p>Veuillez sélectionner une image.</p>
+        <% end %>
+        <div class="sibu_crop">
+          <%= image_tag(@element["src"]) unless @element["src"] == DEFAULT_IMG || @element["src"].blank? %>
+        </div>
+        <div class="sibu_field">
+          <%= label_tag 'element[alt]', 'Légende / texte alternatif' %>
+          <%= text_field_tag 'element[alt]', @element["alt"] %>
+        </div>
       </div>
-      <% end %>
-    </div>
-    <div class="sibu_field">
-      <%= label_tag 'element[alt]', 'Légende / texte alternatif' %>
-      <%= text_field_tag 'element[alt]', @element["alt"] %>
     </div>
     <%= hidden_field_tag 'element[id]', @element["id"] %>
     <%= hidden_field_tag 'element[src]', @element["src"] %>
+    <%= hidden_field_tag 'element[style]', @element["style"] %>
     <%= hidden_field_tag :element_id, @element_id %>
     <%= hidden_field_tag :section_id, @section_id %>
     <%= hidden_field_tag :entity, @entity_type %>

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

@@ -5,37 +5,10 @@ editPanel.html("");
   editPanel.html("<%= j(render 'text_edit_panel') %>");
 <% when 'paragraph' %>
   editPanel.html("<%= j(render 'paragraph_edit_panel') %>");
-  var quill = initQuillEditor('#editor-container');
-  quill.root.innerHTML = "<%= j(raw(@element["text"] || 'Texte à modifier')) %>";
-  quill.on('text-change', function() {
-    $("#element_text").val(quill.root.innerHTML);
-  });
-  var wrapper = $("[data-sb-id='<%= @section_id %>']").find("[data-id='<%= @element_id %>']");
-  editPanel.find(".ql-editor").css({
-      "font-family": wrapper.css("font-family"),
-      "font-size": wrapper.css("font-size"),
-      "color": wrapper.css("color"),
-      "text-align": wrapper.css("text-align")
-  });
 <% when 'media' %>
   editPanel.html("<%= j(render 'media_edit_panel') %>");
-  var images = editPanel.find(".sibu_image img");
-  images.click(function() {
-    if(!$(this).hasClass('selected')) {
-      images.removeClass('selected');
-      $(this).addClass('selected');
-      $("#element_src").val($(this).data("src"));
-      $("#element_alt").val($(this).data("alt"));
-    }
-  });
 <% when 'link' %>
   editPanel.html("<%= j(render 'link_edit_panel') %>");
-  $("input[name='mode']").change(function() {
-    var selected = $(this).val();
-    var other = selected === 'internal' ? 'external' : 'internal';
-    $("#link_" + selected).find("#element_value, #element_target").removeAttr("disabled");
-    $("#link_" + other).find("#element_value, #element_target").attr("disabled", "disabled");
-  });
 <% when 'group' %>
   editPanel.html("<%= j(render 'group_edit_panel') %>");
 <% when 'map' %>
@@ -46,17 +19,59 @@ editPanel.html("");
   editPanel.html("<%= j(render 'error_panel') %>");
 <% end %>
 
-<% if @repeat %>
-$("#clone_elt, #duplicate_elt").show();
-<% else %>
-$("#clone_elt, #duplicate_elt").remove();
-<% end %>
 
-<% if @children %>
-$("#child_elt").show();
-<% else %>
-$("#child_elt").remove();
-<% end %>
-editPanel.slideDown("fast");
+editPanel.slideDown("fast", function() {
+    <% case @content_type %>
+    <% when 'paragraph' %>
+        var quill = initQuillEditor('#editor-container');
+        quill.root.innerHTML = "<%= j(raw(@element["text"] || 'Texte à modifier')) %>";
+        quill.on('text-change', function() {
+            $("#element_text").val(quill.root.innerHTML);
+        });
+        var wrapper = $("[data-sb-id='<%= @section_id %>']").find("[data-id='<%= @element_id %>']");
+        editPanel.find(".ql-editor").css({
+            "font-family": wrapper.css("font-family"),
+            "font-size": wrapper.css("font-size"),
+            "color": wrapper.css("color"),
+            "text-align": wrapper.css("text-align")
+        });
+    <% when 'media' %>
+        var images = editPanel.find(".sibu_image img");
+        images.click(function() {
+            if(!$(this).hasClass('selected')) {
+                images.removeClass('selected');
+                $(this).addClass('selected');
+                $("#element_src").val($(this).data("src"));
+                $("#element_alt").val($(this).data("alt"));
+                editPanel.find(".sibu_crop").html('<img src="' + $("#element_src").val() + '"/>');
+                editPanel.find(".sibu_selected_image > p:first-child").hide();
+                initCropper("<%= @element_id %>");
+            }
+        });
+        if(editPanel.find(".sibu_crop img").size() > 0) {
+          initCropper("<%= @element_id %>");
+        }
+    <% when 'link' %>
+        $("input[name='mode']").change(function() {
+            var selected = $(this).val();
+            var other = selected === 'internal' ? 'external' : 'internal';
+            $("#link_" + selected).find("#element_value, #element_target").removeAttr("disabled");
+            $("#link_" + other).find("#element_value, #element_target").attr("disabled", "disabled");
+        });
+    <% else %>
+    <% end %>
+
+    <% if @repeat %>
+        $("#clone_elt, #duplicate_elt").show();
+    <% else %>
+        $("#clone_elt, #duplicate_elt").remove();
+    <% end %>
+
+    <% if @children %>
+        $("#child_elt").show();
+    <% else %>
+        $("#child_elt").remove();
+    <% end %>
+    sibuCallback("editElement", "<%= @content_type %>");
+});
 document.body.style.overflow = "hidden";
-sibuCallback("editElement", "<%= @content_type %>");

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

@@ -21,6 +21,7 @@
         <td colspan="2">
           <%= link_to 'Voir', site_page_path(@site.id, p), target: '_blank' %> |
           <%= link_to 'Modifier', site_page_edit_content_path(site_id: @site.id, page_id: p.id) %> |
+          <%= link_to 'Copier', duplicate_site_page_path(@site.id, p), method: :post, data: {confirm: "Copier la page \"#{p.name}\" ?"} %> |
           <%= link_to 'Paramétrer', edit_site_page_path(@site.id, p) %> |
           <%= link_to 'Supprimer', site_page_path(@site.id, p), method: :delete, data: {confirm: "Supprimer la page \"#{p.name}\" ?"} %>
         </td>

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

@@ -12,7 +12,7 @@
   <% unless @updated.except("id", "text", "value").blank? %>
     var tag = updatedElt.prop("tagName").toLowerCase();
     <% @updated.except("id", "text", "value").each_pair do |attr, val| %>
-      if(("<%= attr %>" === 'src' || "<%= attr %>" === 'alt') && tag !== 'img') {
+      if(("<%= attr %>" === 'src' || "<%= attr %>" === 'alt' || "<%= attr %>" === 'style') && tag !== 'img') {
         updatedElt.find("img").attr("<%= attr %>", "<%= val %>");
       } else {
         updatedElt.attr("<%= attr %>", "<%= val %>");

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

@@ -20,6 +20,13 @@
       <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 :version, 'Version' %>
+    <div>
+      <%= f.select :version, site_versions %>
+      <small>Langue du site</small>
+    </div>
+  </div>
   <div class="sibu_field">
     <%= f.label :analytics_id, "Statistiques d'audience" %>
     <div>
@@ -27,7 +34,7 @@
       <small>Renseignez l'identifiant Google Analytics pour suivre les statistiques d'audience du site</small>
     </div>
   </div>
-  <% if @next_page %>
+  <% if @site.persisted? && @next_page %>
   <div class="sibu_field sibu_colors">
     <%= f.label :primary_color, 'Couleur principale' %>
     <div>
@@ -48,17 +55,17 @@
     </div>
     <%= f.hidden_field :secondary_color %>
   </div>
-  <div class="sibu_field">
+  <div class="sibu_field sibu_fonts">
     <%= f.label :name, 'Police de caractères (titres)' %>
     <div>
-      <%= f.select :primary_font, primary_fonts, {prompt: 'Police par défaut'} %>
+      <%= f.select :primary_font, primary_fonts %>
       <small>Police de caractère utilisée pour les titres du modèle choisi</small>
     </div>
   </div>
-  <div class="sibu_field">
+  <div class="sibu_field sibu_fonts">
     <%= f.label :name, 'Police de caractères (corps)' %>
     <div>
-      <%= f.select :secondary_font, secondary_fonts, {prompt: 'Police par défaut'} %>
+      <%= f.select :secondary_font, secondary_fonts %>
       <small>Police de caractère utilisée pour les corps de texte du modèle choisi</small>
     </div>
   </div>
@@ -77,15 +84,30 @@
           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"));
-              }
+              selectColor($(this), colors, input);
           });
       });
+
+      function selectColor(color, colors, input) {
+          if(!color.hasClass('selected')) {
+              colors.removeClass("selected");
+              color.addClass('selected');
+              input.val(color.data("color"));
+          }
+      }
+
+      function resetValues() {
+          $(".sibu_colors").each(function () {
+              var colors = $(this).find(".sibu_color");
+              var defaultColor = colors.first();
+              var input = $(this).find("input");
+              selectColor(defaultColor, colors, input);
+          });
+          $(".sibu_fonts").each(function() {
+              var fonts = $(this).find("select");
+              var defaultValue = fonts.find("option").first().attr("value");
+              fonts.val(defaultValue).change();
+          });
+      }
   </script>
 <% end %>

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

@@ -1,5 +1,6 @@
 <div class="sibu_view">
   <div class="actions">
+    <% if @site.persisted? && @next_page %><%= link_to 'Rétablir les paramètres par défaut', '#', onclick: 'resetValues()' %><% end %>
     <%= link_to 'Retour', :back %>
   </div>
   <h2>Modifier un site</h2>

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

@@ -1,5 +1,6 @@
 <div class="sibu_view">
   <div class="actions">
+    <%= link_to "Bibliothèque d'images", images_path %>
     <%= link_to 'Créer un site', new_site_path %>
   </div>
   <h2>Liste des sites</h2>
@@ -8,6 +9,7 @@
       <tr>
         <th>Nom</th>
         <th>Modèle</th>
+        <th>Version</th>
         <th>Mise à jour</th>
         <th colspan="2"></th>
       </tr>
@@ -17,11 +19,12 @@
       <tr>
         <td><%= s.name %></td>
         <td><%= s.site_template.name if s.site_template %></td>
+        <td><%= s.version.upcase unless s.version.blank? %></td>
         <td><%= l s.updated_at %></td>
         <td colspan="2">
           <%= link_to 'Pages', site_pages_path(s) %> |
-          <%= link_to 'Images', site_images_path(s) %> |
           <%= link_to 'Modifier', edit_site_path(s) %> |
+          <%= link_to 'Copier', duplicate_site_path(s), method: :post, data: {confirm: "Copier le site \"#{s.name}\" ?"} %> |
           <%= link_to 'Supprimer', site_path(s), method: :delete, data: {confirm: "Supprimer le site \"#{s.name}\" ?"} %>
         </td>
       </tr>

data/config/routes.rb

@@ -5,7 +5,9 @@ Sibu::Engine.routes.draw do
 
   scope path_names: {new: 'creer', edit: 'modifier'} do
     resources :sites do
+      post 'duplicate', on: :member
       resources :pages do
+        post 'duplicate', on: :member
         get :edit_content, to: 'pages#edit_content', path: 'editer'
         get :edit_element, on: :member
         get :edit_section, on: :member
@@ -17,8 +19,8 @@ Sibu::Engine.routes.draw do
         post 'create_section', on: :member
         delete 'delete_section', on: :member
       end
-
-      resources :images
     end
+
+    resources :images
   end
 end

data/db/migrate/20180321144021_move_images_to_user_level.rb

@@ -0,0 +1,7 @@
+class MoveImagesToUserLevel < ActiveRecord::Migration[5.1]
+  def change
+    add_column :sibu_images, :user_id, :integer
+    Sibu::Image.where("site_id IS NOT NULL").each {|img| img.update(user_id: img.site.user_id)}
+    remove_column :sibu_images, :site_id
+  end
+end

data/db/migrate/20180321170310_add_version_to_sibu_sites.rb

@@ -0,0 +1,7 @@
+class AddVersionToSibuSites < ActiveRecord::Migration[5.1]
+  def change
+    add_column :sibu_sites, :version, :string
+    Sibu::Site.update_all(version: 'fr')
+    remove_column :sibu_pages, :language
+  end
+end

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,9 +124,12 @@ files:
 - app/assets/fonts/sibu/Sibu.svg
 - app/assets/fonts/sibu/Sibu.ttf
 - app/assets/fonts/sibu/Sibu.woff
+- app/assets/images/sibu/empty.png
+- app/assets/javascripts/cropper/cropper.js
 - app/assets/javascripts/quill/quill.js
 - app/assets/javascripts/sibu/common.js
 - app/assets/javascripts/sibu/sibu.js.erb
+- app/assets/stylesheets/cropper/cropper.css
 - app/assets/stylesheets/quill/quill.snow.css
 - app/assets/stylesheets/sibu/icons.scss
 - app/assets/stylesheets/sibu/sibu.css
@@ -143,6 +146,7 @@ files:
 - app/models/concerns/sibu/image_uploader.rb
 - app/models/concerns/sibu/sections_concern.rb
 - app/models/concerns/sibu/style_uploader.rb
+- app/models/concerns/sibu/user_concern.rb
 - app/models/sibu/application_record.rb
 - app/models/sibu/dynamic_style.rb
 - app/models/sibu/image.rb
@@ -158,7 +162,6 @@ 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/_element_actions.html.erb
 - app/views/sibu/pages/_error_panel.html.erb
 - app/views/sibu/pages/_form.html.erb
@@ -210,6 +213,8 @@ files:
 - db/migrate/20180227151519_add_default_templates_to_site_templates.rb
 - db/migrate/20180301121902_add_style_data_to_sites.rb
 - db/migrate/20180301152101_add_default_styles_to_templates.rb
+- db/migrate/20180321144021_move_images_to_user_level.rb
+- db/migrate/20180321170310_add_version_to_sibu_sites.rb
 - lib/sibu.rb
 - lib/sibu/engine.rb
 - lib/sibu/utils.rb

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

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