udongo 6.3.2 → 6.4.0

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

@@ -1,17 +1,9 @@
 <%= simple_form_for [:backend, @model] do |f| %>
-  <div class="card">
-    <div class="card-header">
-      <%= t 'b.msg.flexible_content.edit_form' %>
-    </div>
-
-    <div class="card-block">
-      <div class="row">
-        <div class="col-6">
-          <%= f.input :form_id, collection: forms_collection %>
-        </div>
-      </div>
+  <div class="row">
+    <div class="col-6">
+      <%= f.input :form_id, collection: forms_collection %>
     </div>
   </div>
 
-  <%= render 'backend/form_actions', cancel_url: content_path %>
+  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
 <% end %>

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

@@ -1,24 +1,16 @@
 <%= render 'backend/general_form_error', object: @model %>
 
-<div class="card">
-  <div class="card-header">
-    <%= t 'b.msg.flexible_content.edit_image' %>
+<% if @model.file.present? %>
+  <div class="row">
+    <div class="col-lg-8 col-lg-offset-2">
+      <%= image_tag(@model.file.url, alt: '', class: 'img-fluid') %>
+    </div>
   </div>
+<% end %>
 
-  <div class="card-block">
-    <% if @model.file.present? %>
-      <div class="row">
-        <div class="col-lg-8 col-lg-offset-2">
-          <%= image_tag(@model.file.url, alt: '', class: 'img-fluid') %>
-        </div>
-      </div>
-    <% end %>
-
-    <%= simple_form_for [:backend, @model] do |f| %>
-      <%= f.input :file, as: :file %>
-      <%= f.input :url, as: :string %>
-      <%= f.input :caption, as: :text %>
-      <%= render 'backend/form_actions', cancel_url: content_path %>
-    <% end %>
-  </div>
-</div>
+<%= simple_form_for [:backend, @model] do |f| %>
+  <%= f.input :file, as: :file %>
+  <%= f.input :url, as: :string %>
+  <%= f.input :caption, as: :text %>
+  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
+<% end %>

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

@@ -1,20 +1,12 @@
 <%= render 'backend/general_form_error', object: @model %>
 
-<div class="card">
-  <div class="card-header">
-    <%= t 'b.msg.flexible_content.edit_picture' %>
-  </div>
+<%= image_tag @model.asset.image.url(900, 900, quality: 65), alt: '', class: 'img-fluid' %>
 
-  <div class="card-block">
-    <%= image_tag @model.asset.image.url(1700, 1700, quality: 65), alt: '', class: 'img-fluid' %>
+<%= simple_form_for [:backend, @model] do |f| %>
+  <%= f.input :url, as: :string %>
 
-    <%= simple_form_for [:backend, @model] do |f| %>
-      <%= f.input :url, as: :string %>
+  <% content_type = Udongo.config.flexible_content.picture_caption_editor? ? :ckeditor : :text %>
+  <%= f.input :caption, as: content_type %>
 
-      <% content_type = Udongo.config.flexible_content.picture_caption_editor? ? :ckeditor : :text %>
-      <%= f.input :caption, as: content_type %>
-
-      <%= render 'backend/form_actions', cancel_url: content_path %>
-    <% end %>
-  </div>
-</div>
+  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
+<% end %>

data/app/views/backend/content/rows/pictures/link_or_upload.html.erb

@@ -1,34 +1,26 @@
 <%= simple_form_for @asset, url: upload_backend_content_picture_path(@model) do |f| %>
-  <div class="card">
-    <div class="card-header">
-      <%= t 'b.upload_a_new_image' %>
-    </div>
+  <div class="row mb-5">
+    <div class="col-12">
+      <h4><%= t 'b.upload_a_new_image' %></h4>
 
-    <div class="card-block">
       <%= f.input :filename, as: :file, label: false, required: false %>
       <%= f.input :description, as: :text, required: false %>
 
-      <%= render 'backend/form_actions', cancel_url: content_path %>
+      <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
     </div>
   </div>
 <% end %>
 
-<div class="card">
-  <div class="card-header">
-    <%= t 'b.choose_an_existing_image' %>
-  </div>
 
-  <div class="card-block">
-    <%= render 'filter' %>
+<h4><%= t 'b.choose_an_existing_image' %></h4>
+<%= render 'filter' %>
 
-    <div class="row">
-      <% @assets.each do |a| %>
-        <div class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
-          <%= link_to link_backend_content_picture_path(@model, asset_id: a.id), style: '' do %>
-            <%= image_tag a.image.url(550, 550, action: :resize_and_pad, background: :white), alt: '', class: 'img-fluid' %>
-          <% end %>
-        </div>
+<div class="row">
+  <% @assets.each do |a| %>
+    <div class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
+      <%= link_to link_backend_content_picture_path(@model, asset_id: a.id), style: '' do %>
+        <%= image_tag a.image.url(550, 550, action: :resize_and_pad, background: :white), alt: '', class: 'img-fluid' %>
       <% end %>
     </div>
-  </div>
+  <% end %>
 </div>

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

@@ -0,0 +1,17 @@
+<%= simple_form_for [:backend, @model] do |f| %>
+  <div class="row">
+    <div class="col-md-4">
+      <%= f.input :image_collection_id, collection: image_collections %>
+    </div>
+
+    <div class="col-md-4">
+      <%= f.input :slide_interval, as: :integer %>
+    </div>
+
+    <div class="col-md-4">
+      <%= f.input :autoplay, as: :boolean %>
+    </div>
+  </div>
+
+  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
+<% end %>

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

@@ -1,13 +1,5 @@
 <%= simple_form_for [:backend, @model] do |f| %>
-  <div class="card">
-    <div class="card-header">
-      <%= t 'b.msg.flexible_content.edit_text' %>
-    </div>
+  <%= f.input :content, as: :ckeditor, label: false %>
 
-    <div class="card-block">
-      <%= f.input :content, as: :ckeditor, label: false %>
-    </div>
-  </div>
-
-  <%= render 'backend/form_actions', cancel_url: content_path %>
+  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
 <% end %>

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

@@ -1,14 +1,13 @@
 <%= simple_form_for [:backend, @model] do |f| %>
-  <div class="card">
-    <div class="card-header">
-      <%= t 'b.msg.flexible_content.edit_video' %>
+  <div class="row">
+    <div class="col-md-8">
+      <%= f.input :url, as: :string %>
     </div>
 
-    <div class="card-block">
-      <%= f.input :url, as: :string %>
+    <div class="col-md-4">
       <%= f.input :aspect_ratio, collection: ContentVideo::ASPECT_RATIOS, include_blank: false %>
     </div>
   </div>
 
-  <%= render 'backend/form_actions', cancel_url: content_path %>
+  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
 <% end %>

data/app/views/backend/forms/fields/_form.html.erb

@@ -11,6 +11,7 @@
         <div class="card-block">
           <%= f.input :identifier %>
           <%= f.input :field_type, collection: options_for_collection(:form_field_type, FormField::FIELD_TYPES) %>
+          <%= f.input :external_reference %>
         </div>
       </div>
     </div>

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

@@ -0,0 +1,19 @@
+<%= render 'backend/general_form_error', object: @model %>
+
+<%= simple_form_for [:backend, @model] do |f| %>
+  <div class="row">
+    <div class="col-md-6">
+      <div class="card">
+        <div class="card-header">
+          <%= t 'b.general' %>
+        </div>
+
+        <div class="card-block">
+          <%= f.input :description, as: :string %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <%= render 'backend/form_actions', cancel_url: backend_image_collections_path %>
+<% end %>

data/app/views/backend/image_collections/_tabs.html.erb

@@ -0,0 +1,18 @@
+<div class="row subnav">
+  <div class="col-md-12">
+    <ul class="nav nav-pills">
+      <li class="nav-item">
+        <% klass = %w(nav-link) %>
+        <% klass << 'active' if active == :general %>
+
+        <%= link_to t('b.general'), edit_backend_image_collection_path(model), class: klass %>
+      </li>
+
+      <li class="nav-item">
+        <% klass = %w(nav-link) %>
+        <% klass << 'active' if active == :images %>
+        <%= link_to icon(:image, t('b.images')), backend_image_collection_images_path(model), class: klass %>
+      </li>
+    </ul>
+  </div>
+</div>

data/app/views/backend/image_collections/edit.html.erb

@@ -0,0 +1,6 @@
+<% breadcrumb.add @model.description, edit_backend_image_collection_path(@model) %>
+<% breadcrumb.add t('b.edit') %>
+<%= render 'backend/breadcrumbs' %>
+
+<%= render 'tabs', model: @model, active: :general %>
+<%= render 'form', model: @model %>

data/app/views/backend/image_collections/images/index.html.erb

@@ -0,0 +1,43 @@
+<% javascript 'backend/sortable' %>
+<%= render 'backend/breadcrumbs' %>
+<%= render 'backend/image_collections/tabs', model: @image_collection, active: :images %>
+
+<p class="text-right">
+  <%= link_to icon(:plus, t('b.add')), backend_images_path(klass: @image_collection.class.name, id: @image_collection.id), class: 'btn btn-primary btn-sm' %>
+</p>
+
+<% if @images.any? %>
+  <table class="table table-striped table-hover">
+    <thead class="thead-inverse">
+      <tr>
+        <th><%= t 'b.file' %></th>
+        <th><%= t 'b.type' %></th>
+        <th><%= t 'b.size' %></th>
+        <th><%= t 'b.description' %></th>
+        <th><%= t 'b.last_changed_at' %></th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @images.each do |img| %>
+        <% a = img.asset %>
+        <tr data-update-position="<%= update_position_backend_image_collection_image_path(@image_collection, img) %>">
+          <td>
+            <%= image_tag a.image.url(150, 150), alt: '', class: 'img-fluid' %>
+          </td>
+          <td><%= a.actual_filename.split('.').last.upcase %></td>
+          <td><%= number_to_human_size a.filesize %></td>
+          <td><%= simple_format a.description %></td>
+          <td><%= l a.updated_at %></td>
+          <td class="text-right">
+            <%= link_to icon(:trash), unlink_backend_images_path(klass: @image_collection.class.name, id: @image_collection.id, asset_id: a.id), data: { confirm: t('b.msg.confirm') }, title: t('b.delete') %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>

data/app/views/backend/image_collections/index.html.erb

@@ -0,0 +1,30 @@
+<%= render 'backend/breadcrumbs' %>
+
+<p class="text-right">
+  <%= link_to icon(:plus, t('b.add')), new_backend_image_collection_path, class: 'btn btn-primary btn-sm' %>
+</p>
+
+<% if @image_collections.any? %>
+  <table class="table table-striped table-hover">
+    <thead class="thead-inverse">
+      <tr>
+        <th><%= t 'b.description' %></th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @image_collections.each do |c| %>
+        <tr>
+          <td><%= c.description %></td>
+          <td class="text-right">
+            <%= link_to_edit [:backend, c] %>
+            <%= link_to_delete [:backend, c] %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>

data/app/views/backend/image_collections/new.html.erb

@@ -0,0 +1,5 @@
+<% breadcrumb.add t('b.add') %>
+<%= render 'backend/breadcrumbs' %>
+
+<%= render 'form' %>
+

data/app/views/backend/lightbox_saved.html.erb

@@ -0,0 +1,3 @@
+<script type="text/javascript">
+  parent.window.location.reload();
+</script>

data/app/views/layouts/backend/_top_navigation.html.erb

@@ -7,6 +7,7 @@
         <%= link_to t('b.articles'), backend_articles_path, class: 'dropdown-item' %>
         <%= link_to t('b.snippets'), backend_snippets_path, class: 'dropdown-item' %>
         <%= link_to t('b.files'), backend_assets_path, class: 'dropdown-item' %>
+        <%= link_to t('b.image_collections'), backend_image_collections_path, class: 'dropdown-item' %>
         <%= link_to t('b.forms'), backend_forms_path, class: 'dropdown-item' %>
         <%= link_to t('b.tags'), backend_tags_path, class: 'dropdown-item' %>
       </div>

data/app/views/layouts/backend/lightbox.html.erb

@@ -12,9 +12,11 @@
 </head>
 
 <body class="lightbox">
-  <div class="row">
-    <div class="col-sm-12 col-md-8 offset-md-2">
-      <%= yield %>
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-12">
+        <%= yield %>
+      </div>
     </div>
   </div>
 

data/changelog.md

@@ -1,3 +1,16 @@
+6.4.0 - 2017-06-16
+--
+* Add the AssetCollection model with a module. This allows you to put certai
+  assets in one or more collections. These can then be used in the future to
+  create slideshows, photo albums and even file lists.
+* Bugfix: reworked to Udongo::Search::Frontend visible/publishable check tests
+  to help fix a test that failed Sometimes™.
+* Flexible content rows can now have a background color and padding/margin for
+  the bottom/top.
+* All flexible content actions are now shown in popups.
+* Add field 'external_reference' to form fields.
+
+
 6.3.2 - 2017-06-07
 --
 * Bugfix: there was an issue with the has_many :addresses relation in the

data/config/locales/en_backend.yml

@@ -81,6 +81,7 @@ en:
     sent_at: Sent at
     settings: Settings
     size: Size
+    slideshow: Slideshow
     snippet: Snippet
     snippets: Snippets
     source: Source
@@ -118,6 +119,7 @@ en:
         form: Form
         image: Image (deprecated!)
         picture: Picture
+        slideshow: Slideshow
         text: Text
         video: Video
       deleted: '%{actor} was deleted.'
@@ -133,17 +135,14 @@ en:
         align_vertical_bottom: Align vertical bottom
         align_vertical_center: Align vertically
         align_vertical_top: Align vertical top
-        edit_column: Edit column
-        edit_form: Edit form
-        edit_image: Edit image
-        edit_picture: Edit picture
-        edit_text: Edit text
-        edit_video: Edit video
         explanation: With this module you can create flexible responsive content. Click the button below to create the first row.
         full_width: Full width
+        margin_explanation: Margin is the whitespace above and below this row.
         no_form_present: No form has been linked yet.
         no_picture_present: No picture has been uploaded/linked yet.
+        no_slideshow_present: No slideshow has been configured yet.
         no_video_present: No valid video URL was given.
+        padding_explanation: Padding is the top and bottom whitespace within this row.
         width_explanation: For the flexible content we use a grid layout. This works with rows and columns. Every row can contain at most 12 columns. That's why the column width is expressed as a fracture.
       forgot_password: Forgot password?
       form_fields:

data/config/locales/en_forms.yml

@@ -15,6 +15,7 @@ en:
       defaults:
         active: Active
         author: Author
+        autoplay: Autoplay
         bcc: BCC
         caption: Caption
         category: Category
@@ -24,6 +25,7 @@ en:
         description: Description
         disabled: Disabled
         email: E-mail
+        external_reference: External reference
         extra: Extra
         field_type: Field type
         first_name: First name
@@ -66,6 +68,18 @@ en:
         width_lg: Width (large)
         width_xl: Width (extra large)
 
+      content_row:
+        background_color: Background color
+        margin_bottom: Bottom margin
+        margin_top: Top margin
+        padding_bottom: Bottom padding
+        padding_top: Top padding
+
+      content_slideshow:
+        autoplay: Autoplay
+        image_collection_id: Image collection
+        slide_interval: Interval between slides
+
       email_template:
         from_email: Sender e-mail address
         from_name: Sender name