udongo 6.3.2 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cdf12054d6d8972e4bde7c95678ee6f9f741eca
-  data.tar.gz: 60853bda10fb1c8095eecae3b721bd5602a94fa3
+  metadata.gz: 3b5b3b1a404230641c9fca147994774185e156ad
+  data.tar.gz: af7318f3a5bf2061fcf1a815600d8ba127513571
 SHA512:
-  metadata.gz: c018dd10a9e3bb83cba4c09c3f5825ce63b5a5ee78aed48ec0f9d1543caf0378e4de6460e30a5759c5a78a891475bc33bce3702a4f551538a641e5d2fb9c5c6e
-  data.tar.gz: a9db01cda86bf9b309f3ff5a4220317292a9e34b37e080530d60253b331d2070e0320b97327d079c102cb6a531478d4ecc467bdeb86b3adb3aff389c8443804a
+  metadata.gz: 2eabef60a87981eae7cb4e62635d350b1977aaf47a3840dd960042b144f00235990eef0f74bc905980c08baf20e7a52d36b7d5074457aff571df2ce85debc25c
+  data.tar.gz: efb9507168f2d96cb4b1e547f489b66be1f2768d12edccf79afbe087e66a1d2c8984a06f74343e369891ba798e46c12cd5fca15d4d4397e67889da489c3c5cdf

data/app/assets/javascripts/backend/application.js

@@ -25,3 +25,4 @@
 //= require backend/bootstrap-datepicker.min
 //= require backend/datepickers
 //= require backend/select2.min
+//= require backend/lity

data/app/assets/javascripts/backend/general.js

@@ -2,6 +2,12 @@ var general = general || {
   init: function() {
     $('form:not(.no-focus) input:visible:not(.no-focus):first').focus();
     $('[data-toggle="tooltip"]').tooltip();
+    $('[href="#lity-close"]').on('click', this.lity_close_click_listener);
+  },
+
+  lity_close_click_listener: function(e) {
+    e.preventDefault();
+    $(parent.window.document).find('[data-lity-close=""]').trigger('click');
   }
 };
 

data/app/assets/stylesheets/backend/application.scss

@@ -18,5 +18,6 @@
 @import 'bootstrap';
 @import 'backend/bootstrap-datepicker';
 @import 'backend/select2.min';
+@import 'backend/lity';
 @import 'udongo';
 @import 'custom';

data/app/assets/stylesheets/backend/base/_general.scss

@@ -0,0 +1,7 @@
+.lightbox {
+  margin-top: 1rem;
+}
+
+.img-fluid {
+  margin-bottom: 1rem;
+}

data/app/assets/stylesheets/backend/pages/_flexible_content.scss

@@ -62,11 +62,3 @@
     padding: 25px;
   }
 }
-
-.lightbox {
-  margin-top: 35px;
-}
-
-.img-fluid {
-  margin-bottom: 1rem;
-}

data/app/assets/stylesheets/backend/udongo.scss

@@ -1,6 +1,8 @@
 @charset "utf-8";
 
 // Base
+@import 'base/general';
+
 // fonts
 @import 'font-awesome';
 

data/app/controllers/backend/content/rows/columns_controller.rb

@@ -7,7 +7,6 @@ class Backend::Content::Rows::ColumnsController < Backend::BaseController
 
   def new
     @column = @row.columns.new(@row.column_width_calculator.hashed_values)
-    cancel_url
   end
 
   def create
@@ -25,7 +24,7 @@ class Backend::Content::Rows::ColumnsController < Backend::BaseController
 
   def update
     if @column.update_attributes allowed_params
-      redirect_to cancel_url
+      render 'backend/lightbox_saved'
     else
       render :edit
     end
@@ -57,11 +56,4 @@ class Backend::Content::Rows::ColumnsController < Backend::BaseController
   def redirect_to_edit(column)
     redirect_to send("edit_backend_content_#{column.content.decorate.content_type}_path", column.content)
   end
-
-  def cancel_url
-    instance = @row.rowable
-    path = "edit_translation_backend_#{instance.class.to_s.downcase}_path"
-    send(path, instance, @row.locale, anchor: "content-row-#{@row.id}")
-  end
-  helper_method :cancel_url
 end

data/app/controllers/backend/content/rows/slideshows_controller.rb

@@ -0,0 +1,11 @@
+class Backend::Content::Rows::SlideshowsController < Backend::BaseController
+  include Concerns::Backend::ContentTypeController
+
+  model ContentSlideshow
+  allowed_params :image_collection_id, :autoplay, :slide_interval
+
+  def image_collections
+    ImageCollection.order(:description).map { |c| [c.description, c.id] }
+  end
+  helper_method :image_collections
+end

data/app/controllers/backend/content/rows_controller.rb

@@ -1,6 +1,7 @@
 class Backend::Content::RowsController < Backend::BaseController
   include Concerns::Backend::PositionableController
   before_action :find_model, except: [:new]
+  layout 'backend/lightbox'
 
   def new
     if params[:klass] && params[:id] && params[:locale]
@@ -13,6 +14,14 @@ class Backend::Content::RowsController < Backend::BaseController
     end
   end
 
+  def update
+    if @row.update_attributes allowed_params
+      render 'backend/lightbox_saved'
+    else
+      render :edit
+    end
+  end
+
   def horizontal_alignment
     align = params[:align].to_s
     align = 'left' unless %w(left center right).include?(align)
@@ -54,4 +63,11 @@ class Backend::Content::RowsController < Backend::BaseController
     anchor = "content-row-#{@row.id}" unless anchor.present?
     redirect_to content_path(@row.rowable, @row.locale, anchor)
   end
+
+  def allowed_params
+    params.require(:content_row).permit(
+      :background_color, :margin_top, :margin_bottom, :padding_top,
+      :padding_bottom
+    )
+  end
 end

data/app/controllers/backend/forms/fields_controller.rb

@@ -42,7 +42,9 @@ class Backend::Forms::FieldsController < Backend::Forms::BaseController
   private
 
   def allowed_params
-    params[:form_field].permit(:identifier, :field_type, :presence, :email)
+    params[:form_field].permit(
+      :identifier, :field_type, :presence, :email, :external_reference
+    )
   end
 
   def find_model

data/app/controllers/backend/image_collections/base_controller.rb

@@ -0,0 +1,11 @@
+class Backend::ImageCollections::BaseController < Backend::BaseController
+  before_action :find_image_collection
+  before_action do
+    breadcrumb.add t('b.image_collections'), backend_image_collections_path
+    breadcrumb.add @image_collection.description, edit_backend_image_collection_path(@image_collection)
+  end
+
+  def find_image_collection
+    @image_collection = ImageCollection.find params[:image_collection_id]
+  end
+end

data/app/controllers/backend/image_collections/images_controller.rb

@@ -0,0 +1,15 @@
+class Backend::ImageCollections::ImagesController < Backend::ImageCollections::BaseController
+  include Concerns::Backend::PositionableController
+
+  before_action { breadcrumb.add t('b.images') }
+
+  def index
+    @images = @image_collection.images
+  end
+
+  private
+
+  def find_model
+    @model = @image_collection.images.find params[:id]
+  end
+end

data/app/controllers/backend/image_collections_controller.rb

@@ -0,0 +1,50 @@
+class Backend::ImageCollectionsController < Backend::BaseController
+  before_action :find_model, only: [:show, :edit, :update, :destroy]
+  before_action -> { breadcrumb.add t('b.image_collections'), backend_image_collections_path }
+
+  def index
+    @image_collections = ImageCollection.order(:description)
+  end
+
+  def show
+    redirect_to edit_backend_image_collection_path(@model)
+  end
+
+  def new
+    @model = ImageCollection.new
+  end
+
+  def create
+    @model = ImageCollection.new(allowed_params)
+
+    if @model.save
+      redirect_to edit_backend_image_collection_path(@model),
+                  notice: translate_notice(:added, :image_collection)
+    else
+      render :new
+    end
+  end
+
+  def update
+    if @model.update_attributes allowed_params
+      redirect_to backend_image_collections_path, notice: translate_notice(:edited, :image_collection)
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @model.destroy
+    redirect_to backend_image_collections_path, notice: translate_notice(:deleted, :image_collection)
+  end
+
+  private
+
+  def find_model
+    @model = ImageCollection.find(params[:id])
+  end
+
+  def allowed_params
+    params[:image_collection].permit(:identifier, :description)
+  end
+end

data/app/controllers/concerns/backend/content_type_controller.rb

@@ -6,7 +6,6 @@ module Concerns
       included do
         layout 'backend/lightbox'
         before_action :find_model
-        helper_method :content_path
       end
 
       module ClassMethods
@@ -25,17 +24,9 @@ module Concerns
         @model = model.find(params[:id]).decorate
       end
 
-      def content_path
-        column = @model.column
-        path = "edit_translation_backend_#{column.row.rowable.class.to_s.downcase}_path"
-        # TODO this needs to be the locale that you were editing, not the interface locale.
-        # You can reproduce this by editing flexible content in NL when your interface is english.
-        send(path, column.row.rowable, @model.column.row.locale, anchor: "content-row-#{column.row.id}")
-      end
-
       def update
         if @model.update_attributes allowed_params
-          redirect_to content_path
+          render 'backend/lightbox_saved'
         else
           render :edit
         end

data/app/decorators/content_slideshow_decorator.rb

@@ -0,0 +1,3 @@
+class ContentSlideshowDecorator < ApplicationDecorator
+  delegate_all
+end

data/app/models/content_slideshow.rb

@@ -0,0 +1,9 @@
+class ContentSlideshow < ApplicationRecord
+  include Concerns::ContentType
+
+  belongs_to :image_collection
+
+  def content_type
+    :slideshow
+  end
+end

data/app/models/image_collection.rb

@@ -0,0 +1,9 @@
+class ImageCollection < ApplicationRecord
+  include Concerns::Imageable
+
+  include Concerns::Cacheable
+  cache_by :identifier
+
+  validates :description, presence: true
+  validates :identifier, uniqueness: { case_sensitive: false }, allow_blank: true
+end

data/app/views/backend/content/_form.html.erb

@@ -1,5 +1,5 @@
 <% if object.present? && object.form.present? %>
-  <%= t 'b.form' %> &gt; <%= object.form.description %>
+  <strong><%= t 'b.form' %></strong> &gt; <%= object.form.description %>
 <% else %>
   <%= t 'b.msg.flexible_content.no_form_present' %>
 <% end %>

data/app/views/backend/content/_rows.html.erb

@@ -18,7 +18,7 @@
     <% end %>
 
     <% rows.decorate.each do |row| %>
-      <div id="content-row-<%= row.id %>" class="card content-row" data-update-position="<%= update_position_backend_content_row_path(row) %>">
+      <div id="content-row-<%= row.id %>" class="card content-row" data-update-position="<%= update_position_backend_content_row_path(row) %>" style="background-color: <%= row.background_color %>">
         <div class="card-header handle">
           <div class="btn-group" role="group">
             <% klass = 'btn btn-secondary' %>
@@ -57,6 +57,10 @@
           <div class="btn-group" role="group">
             <%= link_to icon(:trash), backend_content_row_path(row), class: 'btn btn-secondary', title: t('b.delete'), method: :delete, data: { toggle: 'tooltip', placement: 'bottom', confirm: t('b.msg.confirm') } %>
           </div>
+
+          <div class="btn-group pull-right" role="group">
+            <%= link_to icon(:cog), edit_backend_content_row_path(row), class: 'btn btn-secondary', title: t('b.settings'), data: { toggle: 'tooltip', placement: 'bottom', lity: '' } %>
+          </div>
         </div>
 
         <div class="row content-columns card-block <%= row.classes.join(' ') %>">
@@ -74,9 +78,9 @@
                 <div class="card-footer">
                   <div class="btn-group" role="group">
                     <% edit_link = send("edit_backend_content_#{content.content_type}_path", content) %>
-                    <%= link_to icon(:pencil_square_o), edit_link, class: 'btn btn-secondary btn-sm' %>
-                    <%= link_to icon(:trash), backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm', method: :delete, data: { confirm: t('b.msg.confirm') } %>
-                    <%= link_to icon(:wrench), edit_backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm' %>
+                    <%= link_to icon(:pencil_square_o), edit_link, class: 'btn btn-secondary btn-sm', title: t('b.edit'), data: { toggle: 'tooltip', placement: 'bottom', lity: '' } %>
+                    <%= link_to icon(:trash), backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm', title: t('b.delete'), method: :delete, data: { toggle: 'tooltip', placement: 'bottom', confirm: t('b.msg.confirm') } %>
+                    <%= link_to icon(:wrench), edit_backend_content_row_column_path(row, column), class: 'btn btn-secondary btn-sm', title: t('b.settings'), data: { toggle: 'tooltip', placement: 'bottom', lity: '' } %>
                   </div>
                 </div>
               </div>
@@ -85,10 +89,10 @@
 
           <% unless row.column_limit_reached? %>
             <% if row.columns.blank? %>
-              <%= link_to icon(:plus, t('b.msg.flexible_content.add_column')), new_backend_content_row_column_path(row), class: 'btn btn-secondary btn-block' %>
+              <%= link_to icon(:plus, t('b.msg.flexible_content.add_column')), new_backend_content_row_column_path(row), class: 'btn btn-secondary btn-block', data: { lity: '' } %>
             <% else %>
-              <%= link_to icon(:plus, t('b.msg.flexible_content.add_column')), new_backend_content_row_column_path(row), class: 'btn btn-secondary hidden-xl-up full-width' %>
-              <%= link_to icon(:plus), new_backend_content_row_column_path(row), class: 'btn btn-secondary hidden-lg-down block' %>
+              <%= link_to icon(:plus, t('b.msg.flexible_content.add_column')), new_backend_content_row_column_path(row), class: 'btn btn-secondary hidden-xl-up full-width', data: { lity: '' } %>
+              <%= link_to icon(:plus), new_backend_content_row_column_path(row), class: 'btn btn-secondary hidden-lg-down block', title: t('b.msg.flexible_content.add_column'), data: { toggle: 'tooltip', placement: 'bottom', lity: '' } %>
             <% end %>
           <% end %>
         </div>

data/app/views/backend/content/_slideshow.html.erb

@@ -0,0 +1,6 @@
+<% if object.image_collection && object.slide_interval %>
+  <strong><%= t 'b.slideshow' %></strong> &gt; <%= object.image_collection.description %>
+
+<% else %>
+  <p><%= t 'b.msg.flexible_content.no_slideshow_present' %></p>
+<% end %>

data/app/views/backend/content/rows/columns/edit.html.erb

@@ -3,23 +3,15 @@
 <%= simple_form_for(@column, url: backend_content_row_column_path(@row, @column)) do |f| %>
   <%= render 'column_width_explanation' %>
 
-  <div class="card">
-    <div class="card-header">
-      <%= t 'b.msg.flexible_content.edit_column' %>
+  <div class="row mb-3">
+    <div class="col-md-6">
+      <%= render 'backend/content/rows/columns/dimension_fields', form: f %>
     </div>
 
-    <div class="card-block">
-      <div class="row">
-        <div class="col-md-6">
-          <%= render 'backend/content/rows/columns/dimension_fields', form: f %>
-        </div>
-
-        <div class="col-md-6">
-          <%= f.input :content_type, collection: options_for_content_types, disabled: true, include_blank: false %>
-        </div>
-      </div>
+    <div class="col-md-6">
+      <%= f.input :content_type, collection: options_for_content_types, disabled: true, include_blank: false %>
     </div>
   </div>
 
-  <%= render 'backend/form_actions', cancel_url: cancel_url %>
+  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
 <% end %>

data/app/views/backend/content/rows/columns/new.html.erb

@@ -3,23 +3,15 @@
 <%= simple_form_for(@column, url: backend_content_row_columns_path(@row)) do |f| %>
   <%= render 'column_width_explanation' %>
 
-  <div class="card">
-    <div class="card-header">
-      <%= t 'b.msg.flexible_content.add_column' %>
+  <div class="row mb-3">
+    <div class="col-md-6">
+      <%= render 'backend/content/rows/columns/dimension_fields', form: f %>
     </div>
 
-    <div class="card-block">
-      <div class="row">
-        <div class="col-md-6">
-          <%= render 'backend/content/rows/columns/dimension_fields', form: f %>
-        </div>
-
-        <div class="col-md-6">
-          <%= f.input :content_type, collection: options_for_content_types, include_blank: false %>
-        </div>
-      </div>
+    <div class="col-md-6">
+      <%= f.input :content_type, collection: options_for_content_types, include_blank: false %>
     </div>
   </div>
 
-  <%= render 'backend/form_actions', cancel_url: cancel_url %>
+  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
 <% end %>

data/app/views/backend/content/rows/edit.html.erb

@@ -0,0 +1,31 @@
+<%= simple_form_for [:backend, @row] do |f| %>
+  <div class="row">
+    <div class="col-md-4">
+      <%= f.input :background_color, placeholder: 'eg #336699' %>
+    </div>
+  </div>
+
+  <% pixels = (1..10).map { |i| ["#{i * 16}px", i] } %>
+
+  <div class="row">
+    <div class="col-md-6">
+      <div class="alert alert-info">
+        <%= t 'b.msg.flexible_content.margin_explanation' %>
+      </div>
+
+      <%= f.input :margin_top, collection: pixels %>
+      <%= f.input :margin_bottom, collection: pixels %>
+    </div>
+
+    <div class="col-md-6">
+      <div class="alert alert-info">
+        <%= t 'b.msg.flexible_content.padding_explanation' %>
+      </div>
+
+      <%= f.input :padding_top, collection: pixels %>
+      <%= f.input :padding_bottom, collection: pixels %>
+    </div>
+  </div>
+
+  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
+<% end %>