udongo 6.4.1 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7af3025b7000b2796022a990432ad72423452f12
-  data.tar.gz: fddc5df340c155adbb57a7c825ebc47317388059
+  metadata.gz: b472cb5a6fd52fc04293198da1bcb0b55d45011d
+  data.tar.gz: 0f77a3f2825ec25f82581e811e118463b221e075
 SHA512:
-  metadata.gz: 30ad50179b1fa591933b7e0af3cac9950875ee9b14849db4dc96b896948a8ff005eab5a05f39317b36ac3ad2bc633f08e1fb75b84b3329cdf86c302c5d393570
-  data.tar.gz: dd2b398e65166f6a1824ef1232f86a4fc43e3260d6f17c57d9741e22a243f2478accbea549b9a3eda2967d6e44a00ba490dfb44ff04e717f61b5d9e908ce151d
+  metadata.gz: 253742cc8ec2d84c1ad471d2b5f9fc848ceb0c86b1f194d881094288d989abcb73d2a39f21d862257966fdcc70f8fc25692ab756bc8a823c3282e24b581c6ae4
+  data.tar.gz: c3a932e95ae6ea2ff16ac4d53c8aaa8f6099acb2f3ae828ca0009373bdb8ceea4c4ec27f489cb4c150a12c5e021747c6ba8c96b0ed6711c311c49b5a78df6401

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

@@ -2,5 +2,5 @@ class Backend::Content::Rows::VideosController < Backend::BaseController
   include Concerns::Backend::ContentTypeController
 
   model ContentVideo
-  allowed_params :url, :aspect_ratio
+  allowed_params :url, :aspect_ratio, :caption
 end

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

@@ -67,7 +67,7 @@ class Backend::Content::RowsController < Backend::BaseController
   def allowed_params
     params.require(:content_row).permit(
       :background_color, :margin_top, :margin_bottom, :padding_top,
-      :padding_bottom
+      :padding_bottom, :no_gutters
     )
   end
 end

data/app/decorators/content_picture_decorator.rb

@@ -1,3 +1,7 @@
 class ContentPictureDecorator < ApplicationDecorator
   delegate_all
+
+  def max_image_size
+    (1600.0 / 12.0 * column.width_xl.to_f).to_i
+  end
 end

data/app/decorators/content_row_decorator.rb

@@ -9,6 +9,7 @@ class ContentRowDecorator < ApplicationDecorator
 
   def classes
     list = []
+    list << 'no-gutters' if no_gutters?
 
     if horizontal_alignment.to_s == 'center'
       list << 'justify-content-center'

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

@@ -7,7 +7,7 @@
       <%= object.caption.html_safe %>
     <% else %>
       <div class="text-center">
-        <%= object.caption%>
+        <%= object.caption %>
       </div>
     <% end %>
   <% end %>

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

@@ -3,6 +3,16 @@
     <iframe class="embed-responsive-item" src="<%= object.embed_url %>" allowfullscreen></iframe>
   </div>
 
+  <% if object.caption.present? %>
+    <% if Udongo.config.flexible_content.video_caption_editor? %>
+      <%= object.caption.html_safe %>
+    <% else %>
+      <div class="text-center">
+        <%= object.caption %>
+      </div>
+    <% end %>
+  <% end %>
+
 <% else %>
   <p><%= t 'b.msg.flexible_content.no_video_present' %></p>
 <% end %>

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

@@ -1,10 +1,4 @@
 <%= 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">
@@ -27,5 +21,15 @@
     </div>
   </div>
 
+  <div class="row">
+    <div class="col-md-6">
+      <%= f.input :background_color, placeholder: 'eg #336699' %>
+    </div>
+
+    <div class="col-md-6">
+      <%= f.input :no_gutters, as: :boolean %>
+    </div>
+  </div>
+
   <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
 <% end %>

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

@@ -9,5 +9,12 @@
     </div>
   </div>
 
+  <div class="row">
+    <div class="col-12">
+      <% content_type = Udongo.config.flexible_content.video_caption_editor? ? :ckeditor : :text %>
+      <%= f.input :caption, as: content_type %>
+    </div>
+  </div>
+
   <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
 <% end %>

data/app/views/frontend/flexible_content/_form.html.erb

@@ -0,0 +1,3 @@
+<div class="alert alert-danger">
+  Please create app/views/frontend/flexible_content/_form.html.erb
+</div>

data/app/views/frontend/flexible_content/_picture.html.erb

@@ -0,0 +1,24 @@
+<% if object.present? && object.asset.present? %>
+  <% max_img_size = object.max_image_size %>
+
+  <% if object.url.present? %>
+    <%= link_to object.url do %>
+      <%= image_tag object.asset.image.url(max_img_size, max_img_size, quality: 65), alt: '', class: 'img-fluid' %>
+    <% end %>
+
+  <% else %>
+    <%= image_tag object.asset.image.url(max_img_size, max_img_size, quality: 65), alt: '', class: 'img-fluid' %>
+  <% end %>
+
+  <% if object.caption.present? %>
+    <% if Udongo.config.flexible_content.picture_caption_editor? %>
+      <div class="img-caption">
+        <%= object.caption.html_safe %>
+      </div>
+    <% else %>
+      <div class="text-center">
+        <%= object.caption %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/frontend/flexible_content/_rows.html.erb

@@ -0,0 +1,24 @@
+<% javascript 'frontend/forms' %>
+
+<% cache [model, :flexible_content, I18n.locale] do %>
+  <div class="flexible-content">
+    <% model.content_rows.where(locale: I18n.locale).decorate.each do |row| %>
+      <div class="container<%= '-fluid' if row.full_width? %>">
+        <% styles = row.styles.map { |k,v| "#{k}: #{v};" }.join %>
+        <div class="row <%= row.classes.join(' ') %>" style="<%= styles %>">
+          <% row.columns.each do |column| %>
+            <div class="col-sm-<%= column.width_sm %> col-md-<%= column.width_md %> col-lg-<%= column.width_lg %> col-xl-<%= column.width_xl %>">
+              <% content = column.content.decorate %>
+
+              <% Udongo.config.flexible_content.types.each do |content_type| %>
+                <% if content.content_type_is?(content_type) %>
+                  <%= render "frontend/flexible_content/#{content_type}", object: content, column: column %>
+                <% end %>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/frontend/flexible_content/_slideshow.html.erb

@@ -0,0 +1,18 @@
+<% if object.image_collection && object.slide_interval && object.image_collection.images.any? %>
+  <% interval = object.autoplay? ? object.slide_interval * 1000 : false %>
+  <div id="carousel-<%= column.id %>" class="carousel slide" data-ride="carousel" data-interval="<%= interval %>">
+    <ol class="carousel-indicators justify-content-end">
+      <% object.image_collection.images.each_with_index do |_img,i| %>
+        <li data-target="#carousel-<%= column.id %>" data-slide-to="<%= i %>" class="<%= 'active' if i == 0 %>"></li>
+      <% end %>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+      <% object.image_collection.images.each_with_index do |img,i| %>
+        <div class="carousel-item <%= 'active' if i == 0 %>">
+          <%= image_tag img.asset.image.url(800, 800, quality: 65), alt: '' %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+

data/app/views/frontend/flexible_content/_text.html.erb

@@ -0,0 +1 @@
+<%= object.render if object.content.present? %>

data/app/views/frontend/flexible_content/_video.html.erb

@@ -0,0 +1,17 @@
+<% if object.url.present? && object.aspect_ratio.present? %>
+  <div class="embed-responsive embed-responsive-<%= object.aspect_ratio_class %>">
+    <iframe class="embed-responsive-item" src="<%= object.embed_url %>" allowfullscreen></iframe>
+  </div>
+
+  <% if object.caption.present? %>
+    <% if Udongo.config.flexible_content.video_caption_editor? %>
+      <div class="img-caption">
+        <%= object.caption.html_safe %>
+      </div>
+    <% else %>
+      <div class="text-center">
+        <%= object.caption %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>

data/changelog.md

@@ -1,3 +1,14 @@
+6.5.0 - 2017-06-25
+--
+* It's now possible to disable the flexible content row gutters.
+* Video's can now have a caption. You can configure whether or not this caption
+  uses an editor.
+* For each flexible content type, we now provide a placeholder as default. In
+  most cases this will be ok. If you want something different, you can simply
+  override this partial. We don't provide a default for 'image' because that's
+  actually discontinued and you should stop using that.
+
+
 6.4.1 - 2017-06-16
 --
 * Make it easier to fetch all the content row styles as a hash.
@@ -5,7 +16,7 @@
 
 6.4.0 - 2017-06-16
 --
-* Add the AssetCollection model with a module. This allows you to put certai
+* Add the ImageCollection model with a module. This allows you to put certain
   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

data/config/locales/en_forms.yml

@@ -72,6 +72,7 @@ en:
         background_color: Background color
         margin_bottom: Bottom margin
         margin_top: Top margin
+        no_gutters: No whitespace between columns
         padding_bottom: Bottom padding
         padding_top: Top padding
 

data/config/locales/nl_forms.yml

@@ -72,6 +72,7 @@ nl:
         background_color: Achtergrondkleur
         margin_bottom: Marge onderaan
         margin_top: Marge bovenaan
+        no_gutters: Geen witruimte tussen kolommen
         padding_bottom: Padding onderaan
         padding_top: Padding bovenaan
 

data/db/migrate/20170623121241_add_no_gutters_to_content_row.rb

@@ -0,0 +1,5 @@
+class AddNoGuttersToContentRow < ActiveRecord::Migration[5.0]
+  def change
+    add_column :content_rows, :no_gutters, :boolean, after: 'background_color'
+  end
+end

data/db/migrate/20170623124218_add_caption_to_content_video.rb

@@ -0,0 +1,5 @@
+class AddCaptionToContentVideo < ActiveRecord::Migration[5.0]
+  def change
+    add_column :content_videos, :caption, :text, after: 'url'
+  end
+end

data/lib/udongo/configs/flexible_content.rb

@@ -8,10 +8,15 @@ module Udongo
 
       attribute :types, Array, default: %w(text picture video slideshow form image)
       attribute :picture_caption_editor, Axiom::Types::Boolean, default: false
+      attribute :video_caption_editor, Axiom::Types::Boolean, default: false
 
       def picture_caption_editor?
         picture_caption_editor
       end
+
+      def video_caption_editor?
+        video_caption_editor
+      end
     end
   end
 end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '6.4.1'
+  VERSION = '6.5.0'
 end

data/readme.md

@@ -124,6 +124,11 @@ Udongo.config.flexible_content.types = %w(text picture video)
 Udongo.config.flexible_content.picture_caption_editor = false
 ```
 
+### video_caption_editor
+```ruby
+Udongo.config.flexible_content.video_caption_editor = false
+```
+
 ## Assets
 ### image_white_list
 ```ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.5.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -732,6 +732,12 @@ files:
 - app/views/backend/users/edit.html.erb
 - app/views/backend/users/index.html.erb
 - app/views/backend/users/new.html.erb
+- app/views/frontend/flexible_content/_form.html.erb
+- app/views/frontend/flexible_content/_picture.html.erb
+- app/views/frontend/flexible_content/_rows.html.erb
+- app/views/frontend/flexible_content/_slideshow.html.erb
+- app/views/frontend/flexible_content/_text.html.erb
+- app/views/frontend/flexible_content/_video.html.erb
 - app/views/layouts/backend/_top_navigation.html.erb
 - app/views/layouts/backend/application.html.erb
 - app/views/layouts/backend/lightbox.html.erb
@@ -847,6 +853,8 @@ files:
 - db/migrate/20170615131909_create_content_slideshows.rb
 - db/migrate/20170615184855_add_content_row_margin_padding_and_bg_color.rb
 - db/migrate/20170616114757_add_external_ref_to_form_field.rb
+- db/migrate/20170623121241_add_no_gutters_to_content_row.rb
+- db/migrate/20170623124218_add_caption_to_content_video.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb