decidim-gallery 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beffc2c9624a4d717bfda4dcb010d17a62d5ef7436ad2b48e69ba9c13c89d0eb
-  data.tar.gz: 73dc85ff4550e80facc8371169529bb9fe0ed33b3d2ad322776f8fea26d3a77e
+  metadata.gz: 47165db0debd2a2b436f6276367445245aa4876279ce35d5c81b908be8d6f6ce
+  data.tar.gz: fecfea411a887a033a9aac7e2e492834d86bef29dfd5fc503807f4da270826fc
 SHA512:
-  metadata.gz: 7c522fcd138ebff77b08fa40fb0c133fbf98695bebdbdc9998da05af0c73e6e5b00e1a1eb9920cf634a9a8f4a63635e55d8cc80feef76cfe4432240fb592df3a
-  data.tar.gz: 4aa1c108eb5c5af4d3732638c4070a2d517efa20e93603976cb36744e751e875b68bda5e1fe4a10e4eb1ceea25417237430a2dd473a73090976eb3425bf5d55f
+  metadata.gz: 975fd9d8a7d4f86ff36668cfed341808e2f3fc232556f2f79eaf0e540aa78ad85bf208f8efc23915c0d683f920697a173250681b496f0e94e54352e3cf5b8019
+  data.tar.gz: ba78279cf7da7c6c0411ec3670276b1ec8009d3d4842c079bab89bcd0f643fc1ad2291e9459b1db06a493f3bf19e1c95d89df85adee5edad390464a998665266

data/app/cells/decidim/gallery/main/gallery_structure.erb

@@ -0,0 +1,29 @@
+<% if gallery_component.settings.show_title? %>
+  <h3 class="section-heading gallery-heading"><%= title %> (<%= t(gallery_component.settings.gallery_type, scope: "decidim.gallery.main", count: items.total_count) %>)</h3>
+<% end %>
+
+<% if gallery_component.settings.show_announcement? %>
+  <div class="row">
+    <div class="column"><%= translated_attribute(gallery_component.settings.announcement) %></div>
+  </div>
+<% end %>
+
+<% if items.total_count.zero? %>
+  <div class="row">
+    <div class="column">
+      <%= cell("decidim/announcement", t("decidim.gallery.main.no_results"), callout_class: "warning") %>
+    </div>
+  </div>
+<% else %>
+  <div class="row small-up <%= model.css %> medium-up-3 mb-l gallery <%= gallery_component.settings.gallery_type %>" id="gallery_<%=model.gallery_id %>">
+    <%= cell("decidim/gallery/main", model).collection %>
+  </div>
+<% end %>
+
+<% unless items.total_count.zero? || items.last_page? %>
+  <div class="row">
+    <div class="column">
+      <%= link_to t("decidim.gallery.main.load_more"), gallery_path(format: 'js', page: items.next_page), class: "button small hollow", id: "link_gallery_#{model.gallery_id}", remote: true %>
+    </div>
+  </div>
+<% end %>

data/app/cells/decidim/gallery/main/image.erb

@@ -1,25 +1,6 @@
-<% if gallery_component.settings.show_title? %>
-  <h3 class="section-heading gallery-heading"><%= title %> (<%= t( ".#{gallery_component.settings.gallery_type}", count: items.total_count) %>)</h3>
-<% end %>
+<%= render :gallery_structure %>
 
-<% if gallery_component.settings.show_announcement? %>
-  <div class="row">
-    <div class="column"><%= translated_attribute(gallery_component.settings.announcement) %></div>
-  </div>
-<% end %>
-
-<div class="row small-up <%= model.css %> medium-up-3 mb-l gallery image" id="gallery_<%= model.section %>_<%=model.gallery_id %>">
-  <%= cell("decidim/gallery/main", model).collection %>
-</div>
-<% unless items.total_count.zero? || items.last_page? %>
-  <div class="row">
-    <div class="column">
-      <%= link_to t("decidim.gallery.main.load_more"), gallery_path(format: 'js', page: items.next_page,section: model.section, cb: model.id), class: "button small hollow", id: "link_gallery_#{model.section}_#{model.id}" , remote: true %>
-    </div>
-  </div>
-<% end %>
-
-<div class="small gallery-pop-up reveal" id="galleryModal_<%= model.section %>_<%=model.id %>" <% unless browser.mobile? %> data-reveal<% end %> >
+<div class="small gallery-pop-up reveal" id="galleryModal" <% unless browser.mobile? %> data-reveal<% end %> >
   <button class="close-button" data-close aria-label="<%= t("decidim.gallery.main.close_modal") %>"
           type="button">
     <span aria-hidden="true">&times;</span>

data/app/cells/decidim/gallery/main/image_collection.erb

@@ -4,7 +4,7 @@
     <% if browser.mobile? %>
       <%= image_tag item.attached_uploader(:photo).path(variant: :big), alt: translated_attribute(item.title), class: "speaker-image" %>
     <% else %>
-      <a href="#" title="<%= translated_attribute(item.title) %>" data-open="galleryModal_<%= model.section %>_<%=model.id %>" data-id="link<%= item.id %>">
+      <a href="#" title="<%= translated_attribute(item.title) %>" data-open="galleryModal" data-id="link<%= item.id %>">
         <%= image_tag item.attached_uploader(:photo).path(variant: :big), alt: translated_attribute(item.title), class: "speaker-image" %>
       </a>
     <% end %>

data/app/cells/decidim/gallery/main/video.erb

@@ -1,20 +1 @@
-<% if gallery_component.settings.show_title? %>
-  <h3 class="section-heading gallery-heading"><%= title %> (<%= t( ".#{gallery_component.settings.gallery_type}", count: items.total_count) %>)</h3>
-<% end %>
-
-<% if gallery_component.settings.show_announcement? %>
-  <div class="row">
-    <div class="column"><%= translated_attribute(gallery_component.settings.announcement) %></div>
-  </div>
-<% end %>
-
-<div class="row small-up <%= model.css %> mb-l medium-up-3 gallery video" id="gallery_<%= model.section %>_<%=model.id %>">
-  <%= cell("decidim/gallery/main", model).collection %>
-</div>
-<% unless items.total_count.zero? || items.last_page? %>
-  <div class="row">
-    <div class="column">
-      <%= link_to t("decidim.gallery.main.load_more"), gallery_path(format: 'js', page: items.next_page, section: model.section, cb: model.id), class: "button small hollow", id: "link_gallery_#{model.section}_#{model.id}", remote: true %>
-    </div>
-  </div>
-<% end %>
+<%= render :gallery_structure %>

data/app/cells/decidim/gallery/main_cell.rb

@@ -24,7 +24,7 @@ module Decidim
         @items ||= Decidim::Gallery::GalleryItem
                    .published
                    .where(decidim_component_id: gallery_component.id)
-                   .order(weight: :desc, published_at: :desc)
+                   .order(weight: :asc, published_at: :asc)
                    .page(options[:page])
                    .per(per_page)
       end

data/app/packs/src/decidim/gallery/gallery.js

@@ -1,6 +1,6 @@
 import Masonry from "./masonry/masonry";
 
-function addGalleryHandlers() {
+window.addGalleryHandlers = function () {
   $(".gallery-item > a").on("click", function(event){
     event.preventDefault();
     $(".gallery-item > a.gallery-item-active").removeClass("gallery-item-active");

data/app/views/decidim/gallery/gallery/index.js.erb

@@ -0,0 +1,30 @@
+<% cell_block = cell("decidim/gallery/main", OpenStruct.new(gallery_id: current_component.id), context: { view_context: self }, page: params[:page] || 1) %>
+
+var $gallery = $("#gallery_<%= current_component.id %>");
+
+var content = $( '<%= j(cell_block.collection).strip.html_safe %>' );
+$gallery.append( content ).masonry( 'appended', content).masonry();
+
+var list_content = $( '<%= j(cell_block.list_items).strip.html_safe %>' );
+
+var $list = $(".orbit-container");
+$list.append(list_content);
+
+Foundation.reInit($('#galleryModal > .orbit'));
+
+content
+    .find("img")
+    .one("load", function() { $gallery.masonry(); })
+    .each(function() {
+        if(this.complete) { $(this).trigger('load'); }
+    });
+
+var $linkGallery = $("#link_gallery_<%= current_component.id %>");
+
+$linkGallery.attr("href","<%= root_path(format: 'js', page: cell_block.items.next_page) %>")
+
+<% if cell_block.items.last_page? %>
+  $linkGallery.hide();
+<% end %>
+
+addGalleryHandlers();

data/config/locales/en.yml

@@ -62,13 +62,16 @@ en:
           few: "%{count} Photos"
           one: 1 Photo
           other: "%{count} Photos"
+          zero: No photos
         load_more: View more
         next_slide: Next
+        no_results: There are no gallery items
         previous_slide: Previous
         video:
           few: "%{count} Videos"
           one: 1 Video
           other: "%{count} Videos"
+          zero: No Videos
       models:
         gallery_item:
           fields:

data/config/locales/fr.yml

@@ -17,7 +17,7 @@ fr:
               '12': '12'
               '15': '15'
               '18': '18'
-            show_announcement: Montrer l'annonce
+            show_announcement: Afficher l'annonce
             show_title: Afficher le titre
     gallery:
       actions:
@@ -25,10 +25,10 @@ fr:
         confirm_unpublish: Êtes-vous sûr de vouloir dépublier ?
         destroy: Supprimer
         edit: Modifier
-        new: Nouvel élément de la galerie
+        new: Nouvel élément de galerie
         publish: Publier
         title: Actions
-        unpublish: Dé-publier
+        unpublish: Dépublier
       admin:
         formatted_text: Galerie %{component_name} dans %{space_name}
         gallery_item:
@@ -46,29 +46,32 @@ fr:
             image:
               title: Nouvelle image de galerie
             video:
-              title: Nouvel vidéo de la galerie
+              title: Nouvel vidéo de galerie
           publish:
             invalid: Une erreur s'est produite lors de la publication de votre fichier
             success: Publié avec succès
           unpublish:
-            invalid: Une erreur s'est produite lors de la dé-publication de votre fichier
-            success: Dé-publié avec succès
+            invalid: Une erreur s'est produite lors de la dépublication de votre fichier
+            success: Dépublié avec succès
           update:
             invalid: Une erreur est survenue lors de la mise à jour du fichier
             success: Mis à jour avec succès
       main:
         close_modal: Fermer
         image:
-          few: "%{count} photos"
-          one: 1 Photo
-          other: "%{count} photos"
+          few: "%{count} images"
+          one: 1 image
+          other: "%{count} images"
+          zero: 0 images
         load_more: Afficher plus
         next_slide: Suivant
+        no_results: Il n'y a pas d'images ou de vidéos dans cette galerie
         previous_slide: Précédent
         video:
           few: "%{count} vidéos"
           one: 1 vidéo
           other: "%{count} vidéos"
+          zero: 0 vidéos
       models:
         gallery_item:
           fields:

data/config/locales/ro.yml

@@ -7,7 +7,7 @@ ro:
         settings:
           global:
             additional_css: CSS suplimentar
-            announcement: Announcement
+            announcement: Anunț
             gallery_type: Tipul galeriei
             gallery_type_choices:
               image: Imagine
@@ -17,7 +17,7 @@ ro:
               '12': '12'
               '15': '15'
               '18': '18'
-            show_announcement: Display announcement
+            show_announcement: Afișează anunț
             show_title: Arată titlul
     gallery:
       actions:
@@ -59,13 +59,16 @@ ro:
       main:
         close_modal: Închide
         image:
+          zero: 0 imagini
           few: "%{count} Imagini"
           one: 1 imagine
           other: "%{count} Imagini"
         load_more: Vezi mai multe
         next_slide: Următorul
+        no_results: Nu există înregistrări
         previous_slide: Anteriorul
         video:
+          zero: 0 videoclipuri
           few: "%{count} videoclipuri"
           one: 1 videoclip
           other: "%{count} videoclipuri"

data/lib/decidim/gallery/test/factories.rb

@@ -18,7 +18,8 @@ FactoryBot.define do
     trait :video do
       settings do
         {
-          gallery_type: :video
+          gallery_type: :video,
+          items_per_page: 12
         }
       end
     end
@@ -26,14 +27,15 @@ FactoryBot.define do
     trait :image do
       settings do
         {
-          gallery_type: :image
+          gallery_type: :image,
+          items_per_page: 12
         }
       end
     end
 
     trait :with_items do
       after(:create) do |gallery, _evaluator|
-        create_list("#{gallery.settings.gallery_type}_gallery_item".to_sym, 6, :published, component: gallery)
+        create_list("#{gallery.settings.gallery_type}_gallery_item".to_sym, 16, :published, component: gallery)
       end
     end
   end

data/lib/decidim/gallery/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-gallery version.
   module Gallery
     def self.version
-      "0.0.1"
+      "0.0.3"
     end
 
     def self.decidim_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-gallery
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Alexandru-Emil Lupu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -76,6 +76,7 @@ files:
 - LICENSE-AGPLv3.txt
 - README.md
 - Rakefile
+- app/cells/decidim/gallery/main/gallery_structure.erb
 - app/cells/decidim/gallery/main/image.erb
 - app/cells/decidim/gallery/main/image_collection.erb
 - app/cells/decidim/gallery/main/image_list.erb
@@ -121,6 +122,7 @@ files:
 - app/views/decidim/gallery/admin/gallery_item/index.html.erb
 - app/views/decidim/gallery/admin/gallery_item/new.html.erb
 - app/views/decidim/gallery/gallery/index.html.erb
+- app/views/decidim/gallery/gallery/index.js.erb
 - config/assets.rb
 - config/i18n-tasks.yml
 - config/locales/en.yml