sibu 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e386778852e44a0751ec065d259a3d02423e04
-  data.tar.gz: 63734db5d138f1a863428a8990c8abc901c6dbce
+  metadata.gz: 581dc6f007ee79baca625913bb3d2435cd4d6670
+  data.tar.gz: de20141f770bb6ff3143b4bc7e0610f108d8c6d1
 SHA512:
-  metadata.gz: e82342f402b119115ed0fa6e76c2c1ba819847022ccb0ab45e890d8ddcc171b792b95287b99004b4b2c02122f152e1210f85677dff984e922beb4144b8c5a8cc
-  data.tar.gz: 168e70cca77e87181e289a5e624bfe60eadca752d35d95c80f31b66b4d68af3ba89409822fe1caadf1182e7af1ac3f767491051b27de47fada7ae950a08af645
+  metadata.gz: 98dd538ee917b5e7a8aebc3c41c61b0698952b8a79d4f824032c2faab88f87497991bb37738e6be959cc1a6de0644974de52c1fc9662061ace4f971365ef8967
+  data.tar.gz: 7c025d653c4d53144abda8dafb419075941b216318dc19f0ab63aa7cb8c40916dc566c0b2e7c6f1948188d574aafdf61d0d453913e72895987dbb4599de6fd6e

data/app/assets/javascripts/sibu/sibu.js.erb

@@ -113,6 +113,7 @@ function initQuillEditor(container) {
 function initCustomCenter() {
     var wrapper = $(".sibu_center > img"), centerPos = $(".sibu_center > #sibu_center_pos");
     displayCurrentCenter(wrapper[0], centerPos);
+    $(".sibu_center > #sibu_center_desc").show();
     wrapper.click(function(e) {
         var rect = e.target.getBoundingClientRect();
         var x = e.clientX - rect.left;

data/app/assets/stylesheets/sibu/defaults.scss

@@ -58,6 +58,10 @@ $sibu-color3 : #333 !default;
     &.selected {
       background-color: $sibu-color3;
     }
+
+    &:hover {
+      cursor: pointer;
+    }
   }
 
   .sibu_form {
@@ -163,35 +167,6 @@ $sibu-color3 : #333 !default;
       width: 70%;
       max-height: calc(100vh - 300px);
       overflow: auto;
-
-      .sibu_image {
-        position: relative;
-        span {
-          position: absolute;
-          z-index: -1;
-          line-height: 1;
-          width: 100%;
-          text-align: center;
-          top: 30px;
-
-          & + .selected {
-            background-color: transparentize($sibu-color3, 0.5);
-          }
-        }
-      }
-
-      img {
-        padding: 5px;
-        border: 1px solid $sibu-color3;
-
-        &.selected {
-          background-color: $sibu-color3;
-        }
-
-        &:hover {
-          cursor: pointer;
-        }
-      }
     }
 
     .sibu_selected_image {
@@ -219,6 +194,12 @@ $sibu-color3 : #333 !default;
           color: white;
           text-shadow: 0 2px grey;
         }
+
+        #sibu_center_desc {
+          font-size: 10px;
+          line-height: 1.2;
+          margin-top: 5px;
+        }
       }
     }
 
@@ -258,34 +239,14 @@ $sibu-color3 : #333 !default;
     max-height: 60vh;
     overflow-y: scroll;
 
-    > div {
-      > * {
-        padding: 2rem;
-        border-bottom: 2px solid $sibu-color1;
-        &:hover {
-          cursor: pointer;
-          outline: dashed $sibu-color2 4px;
-          outline-offset: -5px;
-        }
-
-        &.selected {
-          outline: solid $sibu-color2 5px;
-          outline-offset: -5px;
-        }
-
-        > * {
-          margin-top: 0 !important;
-          margin-bottom: 0 !important;
-        }
-      }
-    }
-
     .tabs__list {
       margin: 0;
       padding: 0;
+      display: table;
+      width: 100%;
     }
     .tabs__item {
-      display: inline-block;
+      display: table-cell;
       > a {
         text-decoration: none;
       }
@@ -317,8 +278,33 @@ $sibu-color3 : #333 !default;
     }
 
     .tabs__content {
-      padding: 3rem 2rem;
+      padding: 2rem 0;
       background-color: white;
+      max-height: calc(100% - 40px);
+      overflow-y: scroll;
+
+      > * {
+        padding: 4px 0;
+        margin: 0 1rem 2rem 1rem;
+        min-height: auto;
+        box-shadow: 0 0 5px #cdcdcd;
+
+        &:hover {
+          cursor: pointer;
+          outline: dashed $sibu-color2 4px;
+          outline-offset: -5px;
+        }
+
+        &.selected {
+          outline: solid $sibu-color1 5px;
+          outline-offset: -5px;
+        }
+
+        > * {
+          margin-top: 0 !important;
+          margin-bottom: 0 !important;
+        }
+      }
     }
 
     [aria-hidden="true"].tabs__content {

data/app/helpers/sibu/pages_helper.rb

@@ -12,7 +12,7 @@ module Sibu
     end
 
     def site_images
-      ([Sibu::Image.empty] + Sibu::Image.for_user(sibu_user)).uniq
+      Sibu::Image.for_user(sibu_user).uniq
     end
 
     def available_links

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

@@ -3,7 +3,8 @@ module Sibu
     include ActiveSupport::Concern
 
     def for_user(usr)
-      Rails.application.config.sibu[:multi_user] ? where(user_id: [nil, usr.id]) : all
+      entities = (Rails.application.config.sibu[:multi_user] ? where(user_id: [nil, usr.id]) : all)
+      entities.order(updated_at: :desc)
     end
   end
 end

data/app/models/sibu/image.rb

@@ -6,14 +6,5 @@ module Sibu
     store :metadata, accessors: [:alt, :reference, :credits], coder: JSON
 
     validates_presence_of :file_data
-
-    def self.empty
-      empty_img = where("metadata ILIKE '%default_empty_image%'").first
-      if empty_img.nil?
-        empty_img = new(reference: 'default_empty_image', file: File.new('app/assets/images/empty.png'))
-        empty_img.save
-      end
-      empty_img
-    end
   end
 end

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

@@ -1,4 +1,4 @@
-<div class="sibu_view">
+<div id="documents" class="sibu_view">
   <div class="actions">
     <%= link_to 'Télécharger un document', new_document_path %> <%= link_to 'Retour', :back %>
   </div>

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

@@ -1,13 +1,31 @@
-<div class="sibu_view">
+<div id="images" class="sibu_view">
   <div class="actions">
     <%= link_to 'Télécharger une image', new_image_path %> <%= link_to 'Retour', :back %>
   </div>
   <h2>Images téléchargées</h2>
-  <div class="sibu_images">
+  <table class="sibu_images">
+    <thead>
+    <tr>
+      <th>Aperçu</th>
+      <th>Descriptif</th>
+      <th>Crédits</th>
+    </tr>
+    </thead>
+    <tbody>
     <% @images.each do |image| %>
-      <%= link_to image_tag(image.file_url(:small)), edit_image_path(image.id), class: 'sibu_image', id: "sibu_image_#{image.id}", remote: true %>
+      <tr>
+        <td><%= link_to image_tag(image.file_url(:small)), edit_image_path(image.id), class: 'sibu_image', id: "sibu_image_#{image.id}", remote: true %></td>
+        <td><%= image.alt %></td>
+        <td><%= image.credits %></td>
+      </tr>
     <% end %>
-  </div>
+    <% if @images.empty? %>
+      <tr>
+        <td colspan="3">Aucune image téléchargée pour le moment.</td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
   <div class="sibu_edit_image">Sélectionnez une image pour voir ses informations.</div>
 </div>
 

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

@@ -7,13 +7,29 @@
       <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 %>
+        <table class="sibu_images">
+          <thead>
+          <tr>
+            <th>Aperçu</th>
+            <th>Descriptif</th>
+            <th>Crédits</th>
+          </tr>
+          </thead>
+          <tbody>
+            <% site_images.each do |image| %>
+              <tr>
+                <td>
+                  <span 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} %>
+                  </span>
+                </td>
+                <td><%= image.alt %></td>
+                <td><%= image.credits %></td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
       </div>
       <div class="sibu_selected_image">
         <% if @element["src"] == DEFAULT_IMG || @element["src"].blank? %>
@@ -26,6 +42,7 @@
         <div class="sibu_center">
           <%= image_tag(@element["src"]) unless @element["src"] == DEFAULT_IMG || @element["src"].blank? %>
           <div id="sibu_center_pos" style="display: none;">✕</div>
+          <div id="sibu_center_desc" style="display: none;"><em>Cliquez sur l'image pour la recentrer sur un point donné (à utiliser lorsque l'image est tronquée car la zone d'affichage est trop petite).</em></div>
         </div>
         <div class="sibu_field" style="display: <%= (@element["src"] == DEFAULT_IMG || @element["src"].blank?) ? 'none' : 'block' %>">
           <%= label_tag 'element[alt]', 'Légende / texte alternatif' %>

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

@@ -38,15 +38,19 @@ editPanel.slideDown("fast", function() {
             "text-align": wrapper.css("text-align")
         });
     <% when 'media' %>
-        var images = editPanel.find(".sibu_image img");
-        var customCenter = $("#custom_center"), customCtr;
+        var images = editPanel.find(".sibu_image");
+        var customCenter = $("#custom_center");
         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_center").html('<img src="' + $("#element_src").val() + '"/><div id="sibu_center_pos" style="display: none;">✕</div>');
+                var imgElt = $(this).find("img");
+                $("#element_src").val(imgElt.data("src"));
+                $("#element_alt").val(imgElt.data("alt"));
+                editPanel.find(".sibu_center").html(
+                    '<img src="' + $("#element_src").val() + '"/>' +
+                    '<div id="sibu_center_pos" style="display: none;">✕</div>' +
+                    '<div id="sibu_center_desc" style="display: none;"><em>Cliquez sur l\'image pour la recentrer sur un point donné (à utiliser lorsque l\'image est tronquée car la zone d\'affichage est trop petite)</em></div>');
                 editPanel.find(".sibu_selected_image > p:first-child").hide();
                 editPanel.find(".sibu_selected_image").find(".sibu_custom_center").show();
                 editPanel.find(".sibu_selected_image").find(".sibu_field").show();
@@ -69,6 +73,7 @@ editPanel.slideDown("fast", function() {
               $("#element_class").val("");
               $(".sibu_center").attr("style", "");
               $(".sibu_center > #sibu_center_pos").hide();
+              $(".sibu_center > #sibu_center_desc").hide();
           }
         });
     <% when 'link' %>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shrine
   requirement: !ruby/object:Gem::Requirement