udongo 7.4.2 → 7.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 782d1c04c4bb2a9ca57a523d068582841d149186dfd382ca2c05ef7b6999e713
-  data.tar.gz: d82f128c4c5378faf9979f48a2d30bbd92da9135e4ab66f3bdee1207d6a384bd
+SHA1:
+  metadata.gz: cc8c7b4bbcf91c6533f4bd2d275a64c63971d114
+  data.tar.gz: b5f234c45d64860b99918f7ae082fe955d3398c5
 SHA512:
-  metadata.gz: 54a7f0738658edcabda0e6cd23d86eb6ccf959d2297f08a914d61b7e136a63969a56059f5dd3b4129e236a47a561176f9867c62d671f24a4427c75a543b22596
-  data.tar.gz: 9c2637de8cf436ece920aa6dd4dd8c49c2c44b75300228822de5281e237127083b3aff3b75ab07df74d3647cdb7365aaa085098382d09dda04fc33dd7c9c350b
+  metadata.gz: 715f1f441cf1f7dcb94b077ad5f4843473e43316bcfa1db370556fd29ca3b1feea01d303cdcebd3f991a5f9024cc53552641fb56ed567b8f01b71212aaa46c2d
+  data.tar.gz: 47edb83449ec1052d115c6a53b5420205454540ed8cd92c8e23ce20107abad3d35ee475bedd9274faac6b703128e9bd389483a5fe902fa7d3c99e7968912d96a

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

@@ -5,7 +5,8 @@ class Backend::Content::Rows::PicturesController < Backend::BaseController
   before_action :prepare_upload, only: [:link_or_upload, :upload]
 
   model ContentPicture
-  allowed_params :caption, :url, :target, :disallow_resize
+  allowed_params :caption, :url, :target, :disallow_resize, :background_image,
+                 :min_height
 
   def link
     @model.asset = Asset.find params[:asset_id]

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

@@ -1,21 +1,41 @@
 <%= render 'backend/general_form_error', object: @model %>
 
-<%= image_tag @model.asset.image.url(900, 900, quality: 65), alt: '', class: 'img-fluid' %>
-
 <%= simple_form_for [:backend, @model] do |f| %>
-  <%= f.input :disallow_resize, as: :boolean %>
-
   <div class="row">
-    <div class="col-md-8">
-      <%= f.input :url, as: :string %>
-    </div>
-    <div class="col-md-4">
-      <%= f.input :target, collection: ContentPicture::TARGETS, include_blank: false %>
+    <div class="col-md-5">
+      <%= image_tag @model.asset.image.url(900, 900, quality: 65), alt: '', class: 'img-fluid' %>
     </div>
-  </div>
 
-  <% content_type = Udongo.config.flexible_content.picture_caption_editor? ? :ckeditor : :text %>
-  <%= f.input :caption, as: content_type %>
+    <div class="col-md-7">
+      <div class="row">
+        <div class="col-md-6">
+          <%= f.input :disallow_resize, as: :boolean %>
+        </div>
+        <div class="col-md-6">
+          <%= f.input :background_image, as: :boolean %>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-6">
+          <% pixels = (50..1000).step(50).map { |i| ["#{i}px", i] } %>
+          <%= f.input :min_height, collection: pixels %>
+        </div>
+      </div>
 
-  <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
+      <div class="row">
+        <div class="col-md-8">
+          <%= f.input :url, as: :string %>
+        </div>
+        <div class="col-md-4">
+          <%= f.input :target, collection: ContentPicture::TARGETS, include_blank: false %>
+        </div>
+      </div>
+
+      <% content_type = Udongo.config.flexible_content.picture_caption_editor? ? :ckeditor : :text %>
+      <%= f.input :caption, as: content_type %>
+
+      <%= render 'backend/form_actions', cancel_url: '#lity-close' %>
+    </div>
+  </div>
 <% end %>

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

@@ -1,32 +1,37 @@
 <% if object.present? && object.asset.present? %>
   <% max_img_size = object.max_image_size %>
 
-  <% if object.url.present? %>
-    <%= link_to object.url, target: object.target do %>
-      <% if object.disallow_resize? %>
-        <%= image_tag object.asset.image.url, alt: '', class: 'img-fluid' %>
-      <% else %>
-        <%= image_tag object.asset.image.url(max_img_size, max_img_size, quality: 65), alt: '', class: 'img-fluid' %>
-      <% end %>
-    <% end %>
+  <% if object.background_image? %>
+    <div style="background-image: url('<%= object.asset.image.url(max_img_size, max_img_size, quality: 65) %>'); height: 100%; min-height: <%= object.min_height %>px">
+      &nbsp;
+    </div>
 
   <% else %>
     <% if object.disallow_resize? %>
-      <%= image_tag object.asset.image.url, alt: '', class: 'img-fluid' %>
+      <% img_path = object.asset.image.url %>
     <% else %>
-      <%= image_tag object.asset.image.url(max_img_size, max_img_size, quality: 65), alt: '', class: 'img-fluid' %>
+      <% img_path = object.asset.image.url(max_img_size, max_img_size, quality: 65) %>
     <% end %>
-  <% end %>
 
-  <% if object.caption.present? %>
-    <% if Udongo.config.flexible_content.picture_caption_editor? %>
-      <div class="img-caption">
-        <%= object.caption.html_safe %>
-      </div>
+    <% if object.url.present? %>
+      <%= link_to object.url, target: object.target do %>
+        <%= image_tag img_path, alt: '', class: 'img-fluid' %>
+      <% end %>
+
     <% else %>
-      <div class="text-center">
-        <%= object.caption %>
-      </div>
+      <%= image_tag img_path, 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 %>
 <% end %>

data/changelog.md

@@ -1,3 +1,10 @@
+7.5.0 - 2018-06-13
+--
+* Make it possible to mark a content picture to be used in the background with a
+  certain min height.
+* Rework the frontend/flexible_content/_picture.html.erb file.
+
+
 7.4.2 - 2018-05-02
 --
 * Upgrades Rails from 5.0.0 to 5.0.1 to introduce fixes made for Ruby 2.4
@@ -42,7 +49,7 @@
 
 7.3.0 - 2018-02-28
 --
-* Make it possible for emails to have attachments. You can also see the them in
+* Make it possible for emails to have attachments. You can also see them in
   the backend.
 
 

data/config/locales/en_forms.yml

@@ -82,7 +82,9 @@ en:
         slide_interval: Interval between slides
 
       content_picture:
+        background_image: Use in the background
         disallow_resize: Disallow resize
+        min_height: Min. height
         target: URL target
 
       email_template:

data/config/locales/nl_forms.yml

@@ -83,7 +83,9 @@ nl:
         slide_interval: Interval tussen slides
 
       content_picture:
+        background_image: In de achtergrond gebruiken
         disallow_resize: Niet automatisch bijschalen
+        min_height: Min. hoogte
         target: Doel van de URL
 
       email_template:

data/db/migrate/20180613113816_add_content_picture_bg_image_fields.rb

@@ -0,0 +1,6 @@
+class AddContentPictureBgImageFields < ActiveRecord::Migration[5.0]
+  def change
+    add_column :content_pictures, :background_image, :boolean, after: 'target'
+    add_column :content_pictures, :min_height, :integer, after: 'disallow_resize'
+  end
+end

data/lib/udongo/assets/resizer.rb

@@ -14,6 +14,7 @@ module Udongo
         background = options[:background].to_s.parameterize
 
         str = action.to_s.split('_').last
+        # TODO: rekening houden met asset updated_at
         str << "-q#{quality}" if quality.present?
         str << "-g#{gravity}" if gravity.present?
         str << "-b#{background}" if background.present?

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.4.2'
+  VERSION = '7.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.4.2
+  version: 7.5.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -745,7 +745,6 @@ files:
 - app/views/layouts/backend/login.html.erb
 - app/views/layouts/frontend/application.html.erb
 - changelog.md
-- config/environment.rb
 - config/initializers/assets.rb
 - config/initializers/ckeditor.rb
 - config/initializers/core_ext/string.rb
@@ -868,6 +867,7 @@ files:
 - db/migrate/20180419115752_add_target_to_content_picture.rb
 - db/migrate/20180427144338_add_missing_seo_fields_to_tags.rb
 - db/migrate/20180427150844_remove_locales_and_seo_locales_from_tags.rb
+- db/migrate/20180613113816_add_content_picture_bg_image_fields.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb
@@ -1017,7 +1017,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Blimp CMS