udongo 7.3.1 → 7.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bccd2a5bcab0646de1ca2051091b223106c0277
-  data.tar.gz: 26b8e222f21dd5c458121cabb8f43d3c003a5a30
+  metadata.gz: 72ee824452a56fde697bee3c5ab8e57e771534be
+  data.tar.gz: 8c7fb89313641ebaa1aaa21b2b03b3b6725bbdb2
 SHA512:
-  metadata.gz: 96e306e0c15c3f4cca4e31569196b18447a962742e9b1818adf1e8e6e87fbe85b5acdfaee2d0eb06c96899289bfc9f4d06d59deb3a96f9ca851fbc7d0f126c0e
-  data.tar.gz: 2c285c4d370a2bacd1cf5bc4e1c07aa9443cba6970a7ac9d2447dba0c98aaea1e7c6ba034b99c56d0ef71d069cf76f609f1f6ae6e6630e31e862493e00af85ec
+  metadata.gz: cc05eab37bbed87a75c4f000d69a684c15aa512b20da601eef883125b7f1bd7d628f49715163ddcf52e0435f325d9a5ab0fdee0ee92a5ca855ad435675d1028f
+  data.tar.gz: a7db9a80123d29a6842f8a87e0f7ca546835852a1ed11da865789ab078061690ea8dc7a3a898964512376e83af51255d4f557b68211e599039d24ff0a78fa274

data/app/controllers/backend/tags_controller.rb

@@ -1,8 +1,9 @@
 class Backend::TagsController < Backend::BaseController
+  include Concerns::Backend::TranslatableController
   include Concerns::PaginationController
 
-  before_action -> { breadcrumb.add t('b.tags'), backend_tags_path }
   before_action :find_model, only: [:show, :edit, :update, :destroy]
+  before_action -> { breadcrumb.add t('b.tags'), backend_tags_path }
 
   def index
     @search = Tag.ransack params[:q]
@@ -21,7 +22,11 @@ class Backend::TagsController < Backend::BaseController
     @tag = Tag.new(allowed_params)
 
     if @tag.save
-      redirect_to backend_tags_path, notice: translate_notice(:added, :tag)
+      redirect_to edit_translation_backend_tag_path(
+                    @tag,
+                    translation_locale: default_app_locale,
+                    notice: translate_notice(:added, :article)
+                  )
     else
       render :new
     end
@@ -49,4 +54,12 @@ class Backend::TagsController < Backend::BaseController
   def find_model
     @tag = Tag.find params[:id]
   end
+
+  def translation_form
+    Backend::TagTranslationForm.new(
+      @model,
+      @model.translation(params[:translation_locale]),
+      @model.seo(params[:translation_locale])
+    )
+  end
 end

data/app/forms/backend/tag_translation_form.rb

@@ -0,0 +1,9 @@
+class Backend::TagTranslationForm < Backend::TranslationWithSeoForm
+  attribute :summary, String
+
+  validates :summary, presence: true
+
+  def self.model_name
+    Tag.model_name
+  end
+end

data/app/models/tag.rb

@@ -1,5 +1,9 @@
 class Tag < ApplicationRecord
   include Concerns::Locale
+  include Concerns::Seo
+
+  include Concerns::Translatable
+  translatable_fields :summary
 
   has_many :tagged_items, dependent: :destroy
 

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

@@ -0,0 +1,21 @@
+<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_tag_path(model), class: klass %>
+      </li>
+
+      <% Udongo.config.i18n.app.locales.each do |locale| %>
+        <li class="nav-item">
+          <% klass = %w(nav-link) %>
+          <% klass << 'active' if active == locale.to_sym %>
+
+          <%= link_to locale.upcase, edit_translation_backend_tag_path(model, locale), class: klass %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

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

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

data/app/views/backend/tags/edit_translation.html.erb

@@ -0,0 +1,31 @@
+<% breadcrumb.add truncate(@tag.name, length: 40), edit_backend_tag_path(@tag) %>
+<% breadcrumb.add t('b.edit') %>
+<%= render 'backend/breadcrumbs' %>
+
+<%= render 'tabs', model: @tag, active: params[:translation_locale].to_sym %>
+<%= render 'backend/general_form_error', object: @translation %>
+
+<%= simple_form_for([:backend, @translation], url: edit_translation_backend_tag_path, html: { class: 'no-focus' }) do |f| %>
+  <%= trigger_dirty_inputs_warning %>
+
+  <div class="row">
+    <div class="col-md-12">
+      <!-- Content -->
+      <div class="card">
+        <div class="card-header">
+          <%= t 'b.content' %>
+        </div>
+
+        <div class="card-block">
+          <% summary_type = Udongo.config.tags.editor_for_summary? ? :ckeditor : :text %>
+          <%= f.input :summary, as: summary_type %>
+        </div>
+      </div>
+
+      <!-- SEO -->
+      <%= render 'backend/seo_form', f: f, slug: @tag.name %>
+    </div>
+  </div>
+
+  <%= render 'backend/form_actions', cancel_url: backend_tags_path %>
+<% end %>

data/changelog.md

@@ -1,3 +1,8 @@
+7.3.2 - 2018-03-01
+--
+* Made Tags translatable with SEO, to allow them to have a summary page in projects.
+
+
 7.3.1 - 2018-02-28
 --
 * Republish gem because of an issue with rubygems.

data/config/routes.rb

@@ -22,7 +22,9 @@ Rails.application.routes.draw do
     resources :users
     resources :redirects, except: :show
     resources :search_synonyms, except: :show
-    resources :tags
+    resources :tags do
+      concerns :translatable
+    end
 
     resources :pages, except: [:show] do
       concerns :translatable

data/db/migrate/20180301093228_add_locales_to_tags.rb

@@ -0,0 +1,5 @@
+class AddLocalesToTags < ActiveRecord::Migration[5.0]
+  def change
+    add_column :tags, :locales, :text, after: :id
+  end
+end

data/db/migrate/20180301101320_add_seo_locales_to_tags.rb

@@ -0,0 +1,5 @@
+class AddSeoLocalesToTags < ActiveRecord::Migration[5.0]
+  def change
+    add_column :tags, :seo_locales, :text, after: :locales
+  end
+end

data/lib/udongo/configs/tags.rb

@@ -4,10 +4,15 @@ module Udongo
       include Virtus.model
 
       attribute :allow_new, Axiom::Types::Boolean, default: true
+      attribute :editor_for_summary, Axiom::Types::Boolean, default: false
 
       def allow_new?
         allow_new === true
       end
+
+      def editor_for_summary?
+        editor_for_summary === true
+      end
     end
   end
 end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.3.1'
+  VERSION = '7.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.3.1
+  version: 7.3.2
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -523,6 +523,7 @@ files:
 - app/forms/backend/navigation_item_translation_form.rb
 - app/forms/backend/page_translation_form.rb
 - app/forms/backend/snippet_translation_form.rb
+- app/forms/backend/tag_translation_form.rb
 - app/forms/backend/translation_form.rb
 - app/forms/backend/translation_with_seo_form.rb
 - app/helpers/backend/dropdown_helper.rb
@@ -722,8 +723,10 @@ files:
 - app/views/backend/snippets/new.html.erb
 - app/views/backend/tags/_filter.html.erb
 - app/views/backend/tags/_form.html.erb
+- app/views/backend/tags/_tabs.html.erb
 - app/views/backend/tags/_tag_usages.html.erb
 - app/views/backend/tags/edit.html.erb
+- app/views/backend/tags/edit_translation.html.erb
 - app/views/backend/tags/index.html.erb
 - app/views/backend/tags/new.html.erb
 - app/views/backend/users/_filter.html.erb
@@ -744,6 +747,7 @@ 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 +865,8 @@ files:
 - db/migrate/20171119182643_larger_email_plain_html_storage.rb
 - db/migrate/20171217163339_add_disallow_resizeto_content_picture.rb
 - 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
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb