udongo 7.3.5 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23b0abf6ffac51e5c3d5cfbf4d1fc2d43ddb2e1f
-  data.tar.gz: 0a8dfea964ff8271a8567e8eab56a3010337c7bf
+  metadata.gz: 11b2aeb4979d4fca8f1274b0dce729807dbf797c
+  data.tar.gz: f684fbfb3794fcabf4d524c9d4d43113f060c98d
 SHA512:
-  metadata.gz: 1efec8809f119ca1cc0eeb7ac289a1d9798e546935acb3598d061ec1239cee753655565a3710d97ad89d9cff77d48592c31c250b1bdde1012762470bc28eee23
-  data.tar.gz: 3cc644ad130ab942a44495b187878729500df206980e1693113d76a5b6bafff978e54af7e4f4c8f7a0b309c5271fde37bf8eb386c71dcc8508f0d3ae44607414
+  metadata.gz: 64861a406fc432d4e22a1a79cd1b034cd5168c076ef108b1a21adbce9799a8156e37c7f887bf369a6853c53dc796a0de4ba63dd7773d25fcd6da614b65064be6
+  data.tar.gz: 821bbab8349cbbbb2d16681fbf52c2b059c98d1670d8bf45b2073005db9b82bc6bb720b93c348d2ff107015a1642be3faed7e11149c92ec51ae2991473461a06

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, :disallow_resize
+  allowed_params :caption, :url, :target, :disallow_resize
 
   def link
     @model.asset = Asset.find params[:asset_id]

data/app/models/content_picture.rb

@@ -1,6 +1,8 @@
 class ContentPicture < ApplicationRecord
   include Concerns::ContentType
 
+  TARGETS = %w(_self _blank)
+
   belongs_to :asset
 
   def content_type

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

@@ -4,7 +4,15 @@
 
 <%= simple_form_for [:backend, @model] do |f| %>
   <%= f.input :disallow_resize, as: :boolean %>
-  <%= f.input :url, as: :string %>
+
+  <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 %>

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

@@ -2,7 +2,7 @@
   <% max_img_size = object.max_image_size %>
 
   <% if object.url.present? %>
-    <%= link_to object.url do %>
+    <%= link_to object.url, target: object.target do %>
       <% if object.disallow_resize? %>
         <%= image_tag object.asset.image.url, alt: '', class: 'img-fluid' %>
       <% else %>

data/changelog.md

@@ -1,6 +1,12 @@
+7.4.0 - 2018-04-19
+--
+* Add target to content pictures (eg _blank).
+
+
 7.3.5 - 2018-03-30
 --
 * The tag summary is no longer a mandatory field.
+* Email vars if-conditionals can now contain numbers in the var name.
 
 
 7.3.4 - 2018-03-15

data/config/locales/en_forms.yml

@@ -83,6 +83,7 @@ en:
 
       content_picture:
         disallow_resize: Disallow resize
+        target: URL target
 
       email_template:
         from_email: Sender e-mail address

data/config/locales/nl_forms.yml

@@ -84,6 +84,7 @@ nl:
 
       content_picture:
         disallow_resize: Niet automatisch bijschalen
+        target: Doel van de URL
 
       email_template:
         from_email: E-mail adres afzender

data/db/migrate/20180419115752_add_target_to_content_picture.rb

@@ -0,0 +1,5 @@
+class AddTargetToContentPicture < ActiveRecord::Migration[5.0]
+  def change
+    add_column :content_pictures, :target, :string, after: 'url'
+  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/email_vars_parser.rb

@@ -14,7 +14,7 @@ module Udongo::EmailVarsParser
   end
 
   def replace_ifs(content, vars)
-    content.to_s.scan(/\[if\:([a-z\._\-]+)\](.*?)\[\/if\]/mi).each do |match|
+    content.to_s.scan(/\[if\:([a-z0-9\._\-]+)\](.*?)\[\/if\]/mi).each do |match|
       if_var = match.first
       if_content = match.last
 

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.3.5'
+  VERSION = '7.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.3.5
+  version: 7.4.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -747,7 +747,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
@@ -867,6 +866,7 @@ files:
 - db/migrate/20180228071957_add_attachments_to_emails.rb
 - db/migrate/20180301093228_add_locales_to_tags.rb
 - db/migrate/20180301101320_add_seo_locales_to_tags.rb
+- db/migrate/20180419115752_add_target_to_content_picture.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb