udongo 7.1.3 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8868b90455b60b96f91fe0c563ab19bac5adb6
-  data.tar.gz: 67b57f1669cd4bde2ae0bb680e1a24d7922ede61
+  metadata.gz: 5c701bf9ff7ebe6af8d5ca23fb2f612a910001a7
+  data.tar.gz: 4b38b1933f9e41d1706dc20b1bb3d1aa51c21c27
 SHA512:
-  metadata.gz: b7b5b8e9df01cf64d6dd188dd19ae627bf0674ca4ac65130b7101d65e3288fc70b0e5099664c364762fead9ac932bbef151c969e3be44177b7775797f193b0ee
-  data.tar.gz: cb560a8b8025d206a9e78f357e179ba62298fe21c6de05a535137b135a9342074f243c02473556d855694e832f55b2571641c8a4bc3441891a278a5703f0617a
+  metadata.gz: 5a188750f343d64da5d6df6b07afaed9357491dde3a1c4839f1e2fe7300c4af3dc849bd6fa91f60f19480290aa94b11fac915fc4edc25aa33a7dd936fa9ae130
+  data.tar.gz: 3925dc94bfb6bb8d45dd52a8a0f00bb931c34c2d4dc9dca22ca13663c11720da4798657e4dacfccc5144276f09e332381eaf2962ccd561fa06a1f24eebafa411

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

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

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

@@ -1,6 +1,10 @@
 <% if object.present? && object.asset.present? %>
 
-  <%= image_tag object.asset.image.url(1100, 1100, quality: 65), alt: '', class: 'img-fluid' %>
+  <% if object.disallow_resize? %>
+    <%= image_tag object.asset.image.url, alt: '', class: 'img-fluid' %>
+  <% else %>
+    <%= image_tag object.asset.image.url(1100, 1100, quality: 65), alt: '', class: 'img-fluid' %>
+  <% end %>
 
   <% if object.caption.present? %>
     <% if Udongo.config.flexible_content.picture_caption_editor? %>

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

@@ -3,6 +3,7 @@
 <%= 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 %>
   <%= f.input :url, as: :string %>
 
   <% content_type = Udongo.config.flexible_content.picture_caption_editor? ? :ckeditor : :text %>

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

@@ -3,11 +3,19 @@
 
   <% 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' %>
+      <% 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 %>
 
   <% else %>
-    <%= image_tag object.asset.image.url(max_img_size, max_img_size, quality: 65), alt: '', class: 'img-fluid' %>
+    <% 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.caption.present? %>

data/changelog.md

@@ -1,3 +1,8 @@
+7.2.0 - 2017-12-17
+--
+* Make it possible to specify that a content picture may not be resized.
+
+
 7.1.3 - 2017-11-30
 --
 * Added a third parameter to IconHelper#icon that makes it possible to pass

data/config/locales/en_forms.yml

@@ -81,6 +81,9 @@ en:
         image_collection_id: Image collection
         slide_interval: Interval between slides
 
+      content_picture:
+        disallow_resize: Disallow resize
+
       email_template:
         from_email: Sender e-mail address
         from_name: Sender name

data/config/locales/nl_forms.yml

@@ -82,6 +82,9 @@ nl:
         image_collection_id: Afbeeldingsgroep
         slide_interval: Interval tussen slides
 
+      content_picture:
+        disallow_resize: Niet automatisch bijschalen
+
       email_template:
         from_email: E-mail adres afzender
         from_name: Naam afzender

data/db/migrate/20171217163339_add_disallow_resizeto_content_picture.rb

@@ -0,0 +1,5 @@
+class AddDisallowResizetoContentPicture < ActiveRecord::Migration[5.0]
+  def change
+    add_column :content_pictures, :disallow_resize, :boolean, after: 'url'
+  end
+end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.1.3'
+  VERSION = '7.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.2.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -536,7 +536,6 @@ files:
 - app/helpers/page_helper.rb
 - app/helpers/snippet_helper.rb
 - app/helpers/udongo_helper.rb
-- app/inputs/button_radios_input.rb
 - app/inputs/date_picker_input.rb
 - app/inputs/date_range_picker_input.rb
 - app/mailers/general_mailer.rb
@@ -745,7 +744,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
@@ -861,6 +859,7 @@ files:
 - db/migrate/20170728125838_remove_content_images.rb
 - db/migrate/20170919135942_add_external_reference_to_content_column.rb
 - db/migrate/20171119182643_larger_email_plain_html_storage.rb
+- db/migrate/20171217163339_add_disallow_resizeto_content_picture.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb

data/app/inputs/button_radios_input.rb

@@ -1,6 +0,0 @@
-class ButtonRadiosInput < SimpleForm::Inputs::Base
-  def input(wrapper_options = nil)
-    merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
-    f.radio_button :toggle, value: 'success_message', as: :boolean
-  end
-end