add support alternative language domain

Karpikau Andrei
1 parent 1ffe9c0c
Showing 20 changed files with 417 additions and 46 deletions
Gemfile.lock
app/assets/javascripts/kanjai/cocoon.js
app/assets/javascripts/kanjai/general.js
app/controllers/kanjai/admin/domains_controller.rb
app/controllers/kanjai/admin/page_langs_controller.rb
app/helpers/kanjai/application_helper.rb
app/models/kanjai/domain.rb
app/models/kanjai/language_domain.rb
app/models/kanjai/page_lang.rb
app/views/kanjai/admin/domains/_form.html.erb
app/views/kanjai/admin/domains/_language_domain_fields.html.erb
app/views/kanjai/admin/page_langs/_form.html.erb
app/views/layouts/kanjai/admin.html.erb
config/locales/en.yml
db/migrate/20200803113411_create_kanjai_language_domains.rb
db/migrate/20200803121045_add_language_domain_to_page_lang.rb
kanjai.gemspec
lib/kanjai/version.rb
test/fixtures/kanjai/language_domains.yml
test/models/kanjai/language_domain_test.rb
--- a/Gemfile.lock
View file @4f26e08
+++ b/Gemfile.lock
View file @4f26e08
 PATH
   remote: .
   specs:
-    kanjai (0.0.198)
+    kanjai (0.0.203)
       acts-as-taggable-on (~> 6.5)
       acts_as_list
       acts_as_tree
@@ -65,53 +65,53 @@ GEM
       activerecord (>= 3.0.0)
     arel (9.0.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.326.0)
+    aws-partitions (1.349.0)
     aws-sdk (3.0.1)
       aws-sdk-resources (~> 3)
-    aws-sdk-accessanalyzer (1.7.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-accessanalyzer (1.9.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-acm (1.31.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-acm (1.34.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-acmpca (1.24.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-acmpca (1.26.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-alexaforbusiness (1.36.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-alexaforbusiness (1.40.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-amplify (1.17.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-amplify (1.21.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigateway (1.42.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-apigateway (1.48.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewaymanagementapi (1.14.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-apigatewaymanagementapi (1.16.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.21.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-apigatewayv2 (1.23.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-appconfig (1.6.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-appconfig (1.9.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-applicationautoscaling (1.40.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-applicationautoscaling (1.44.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-applicationdiscoveryservice (1.27.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-applicationdiscoveryservice (1.30.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-applicationinsights (1.10.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-applicationinsights (1.12.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-appmesh (1.24.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-appmesh (1.28.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-appstream (1.41.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-appstream (1.44.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-appsync (1.26.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-appsync (1.30.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-athena (1.27.0)
       aws-sdk-core (~> 3, >= 3.71.0)
@@ -227,7 +227,7 @@ GEM
     aws-sdk-connectparticipant (1.3.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.98.0)
+    aws-sdk-core (3.104.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -968,8 +968,8 @@ GEM
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sigv2 (1.0.1)
-    aws-sigv4 (1.1.4)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.2.1)
+      aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.15)
     builder (3.2.4)
     concurrent-ruby (1.1.6)
@@ -984,10 +984,10 @@ GEM
     ffi (1.13.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    loofah (2.5.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -1001,11 +1001,11 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.1)
     nio4r (2.5.2)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     pg (1.0.0)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.4.3)
@@ -1066,7 +1066,7 @@ GEM
       railties
     warden (1.2.8)
       rack (>= 2.0.6)
-    websocket-driver (0.7.2)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
--- a/app/assets/javascripts/kanjai/cocoon.js 0 → 100644
View file @4f26e08
+++ b/app/assets/javascripts/kanjai/cocoon.js 0 → 100644
View file @4f26e08
+(function($) {
+
+  var cocoon_element_counter = 0;
+
+  var create_new_id = function() {
+    return (new Date().getTime() + cocoon_element_counter++);
+  }
+
+  var newcontent_braced = function(id) {
+    return '[' + id + ']$1';
+  }
+
+  var newcontent_underscord = function(id) {
+    return '_' + id + '_$1';
+  }
+
+  var getInsertionNodeElem = function(insertionNode, insertionTraversal, $this){
+
+    if (!insertionNode){
+      return $this.parent();
+    }
+
+    if (typeof insertionNode == 'function'){
+      if(insertionTraversal){
+        console.warn('association-insertion-traversal is ignored, because association-insertion-node is given as a function.')
+      }
+      return insertionNode($this);
+    }
+
+    if(typeof insertionNode == 'string'){
+      if (insertionTraversal){
+        return $this[insertionTraversal](insertionNode);
+      }else{
+        return insertionNode == "this" ? $this : $(insertionNode);
+      }
+    }
+
+  }
+
+  $(document).on('click', '.add_fields', function(e) {
+    e.preventDefault();
+    var $this                 = $(this),
+        assoc                 = $this.data('association'),
+        assocs                = $this.data('associations'),
+        content               = $this.data('association-insertion-template'),
+        insertionMethod       = $this.data('association-insertion-method') || $this.data('association-insertion-position') || 'before',
+        insertionNode         = $this.data('association-insertion-node'),
+        insertionTraversal    = $this.data('association-insertion-traversal'),
+        count                 = parseInt($this.data('count'), 10),
+        regexp_braced         = new RegExp('\\[new_' + assoc + '\\](.*?\\s)', 'g'),
+        regexp_underscord     = new RegExp('_new_' + assoc + '_(\\w*)', 'g'),
+        new_id                = create_new_id(),
+        new_content           = content.replace(regexp_braced, newcontent_braced(new_id)),
+        new_contents          = [],
+        originalEvent         = e;
+
+
+    if (new_content == content) {
+      regexp_braced     = new RegExp('\\[new_' + assocs + '\\](.*?\\s)', 'g');
+      regexp_underscord = new RegExp('_new_' + assocs + '_(\\w*)', 'g');
+      new_content       = content.replace(regexp_braced, newcontent_braced(new_id));
+    }
+
+    new_content = new_content.replace(regexp_underscord, newcontent_underscord(new_id));
+    new_contents = [new_content];
+
+    count = (isNaN(count) ? 1 : Math.max(count, 1));
+    count -= 1;
+
+    while (count) {
+      new_id      = create_new_id();
+      new_content = content.replace(regexp_braced, newcontent_braced(new_id));
+      new_content = new_content.replace(regexp_underscord, newcontent_underscord(new_id));
+      new_contents.push(new_content);
+
+      count -= 1;
+    }
+
+    var insertionNodeElem = getInsertionNodeElem(insertionNode, insertionTraversal, $this)
+
+    if( !insertionNodeElem || (insertionNodeElem.length == 0) ){
+      console.warn("Couldn't find the element to insert the template. Make sure your `data-association-insertion-*` on `link_to_add_association` is correct.")
+    }
+
+    $.each(new_contents, function(i, node) {
+      var contentNode = $(node);
+
+      var before_insert = jQuery.Event('cocoon:before-insert');
+      insertionNodeElem.trigger(before_insert, [contentNode, originalEvent]);
+
+      if (!before_insert.isDefaultPrevented()) {
+        // allow any of the jquery dom manipulation methods (after, before, append, prepend, etc)
+        // to be called on the node.  allows the insertion node to be the parent of the inserted
+        // code and doesn't force it to be a sibling like after/before does. default: 'before'
+        var addedContent = insertionNodeElem[insertionMethod](contentNode);
+
+        insertionNodeElem.trigger('cocoon:after-insert', [contentNode,
+          originalEvent]);
+      }
+    });
+  });
+
+  $(document).on('click', '.remove_fields.dynamic, .remove_fields.existing', function(e) {
+    var $this = $(this),
+        wrapper_class = $this.data('wrapper-class') || 'nested-fields',
+        node_to_delete = $this.closest('.' + wrapper_class),
+        trigger_node = node_to_delete.parent(),
+        originalEvent = e;
+
+    e.preventDefault();
+    e.stopPropagation();
+
+    var before_remove = jQuery.Event('cocoon:before-remove');
+    trigger_node.trigger(before_remove, [node_to_delete, originalEvent]);
+
+    if (!before_remove.isDefaultPrevented()) {
+      var timeout = trigger_node.data('remove-timeout') || 0;
+
+      setTimeout(function() {
+        if ($this.hasClass('dynamic')) {
+            node_to_delete.detach();
+        } else {
+            $this.prev("input[type=hidden]").val("1");
+            node_to_delete.hide();
+        }
+        trigger_node.trigger('cocoon:after-remove', [node_to_delete,
+          originalEvent]);
+      }, timeout);
+    }
+  });
+
+
+  $(document).on("ready page:load turbolinks:load", function() {
+    $('.remove_fields.existing.destroyed').each(function(i, obj) {
+      var $this = $(this),
+          wrapper_class = $this.data('wrapper-class') || 'nested-fields';
+
+      $this.closest('.' + wrapper_class).hide();
+    });
+  });
+
+})(jQuery);
+
--- a/app/assets/javascripts/kanjai/general.js
View file @4f26e08
+++ b/app/assets/javascripts/kanjai/general.js
View file @4f26e08
@@ -14,6 +14,8 @@
 //= require kanjai/admin/jquery.fileupload
+//= require kanjai/cocoon
+
 //= require kanjai/froala_editor/froala_editor.min
 //= require kanjai/froala_editor/plugins/align.min
 //= require kanjai/froala_editor/plugins/char_counter.min
--- a/app/controllers/kanjai/admin/domains_controller.rb
View file @4f26e08
+++ b/app/controllers/kanjai/admin/domains_controller.rb
View file @4f26e08
@@ -45,7 +45,7 @@ module Kanjai
     private
     def permitted_params
-      params.permit(:domain => [:title])
+      params.permit(:domain => [:title, language_domains_attributes: [:id, :title, :_destroy]])
     end
   end
--- a/app/controllers/kanjai/admin/page_langs_controller.rb
View file @4f26e08
+++ b/app/controllers/kanjai/admin/page_langs_controller.rb
View file @4f26e08
@@ -55,7 +55,7 @@ module Kanjai
     private
     def permitted_params
-      params.permit(:page_lang => [:code, :title, :default_use, :domain_id])
+      params.permit(:page_lang => [:code, :title, :default_use, :domain_id, :language_domain_id])
     end
   end
--- a/app/helpers/kanjai/application_helper.rb
View file @4f26e08
+++ b/app/helpers/kanjai/application_helper.rb
View file @4f26e08
 module Kanjai
   module ApplicationHelper
+
+
     def csrf_meta_tag
       if protect_against_forgery?
         out = %(<meta name="csrf-param" content="%s"/>\n)
@@ -91,5 +93,162 @@ module Kanjai
       return markers
     end
+
+    # COCCON
+
+
+    # this will show a link to remove the current association. This should be placed inside the partial.
+    # either you give
+    # - *name* : the text of the link
+    # - *f* : the form this link should be placed in
+    # - *html_options*:  html options to be passed to link_to (see <tt>link_to</tt>)
+    #
+    # or you use the form without *name* with a *&block*
+    # - *f* : the form this link should be placed in
+    # - *html_options*:  html options to be passed to link_to (see <tt>link_to</tt>)
+    # - *&block*:        the output of the block will be show in the link, see <tt>link_to</tt>
+
+    def link_to_remove_association(*args, &block)
+      if block_given?
+        link_to_remove_association(capture(&block), *args)
+      elsif args.first.respond_to?(:object)
+        form = args.first
+        association = form.object.class.to_s.tableize
+        name = I18n.translate("cocoon.#{association}.remove", default: I18n.translate('cocoon.defaults.remove'))
+
+        link_to_remove_association(name, *args)
+      else
+        name, f, html_options = *args
+        html_options ||= {}
+
+        is_dynamic = f.object.new_record?
+
+        classes = []
+        classes << "remove_fields"
+        classes << (is_dynamic ? 'dynamic' : 'existing')
+        classes << 'destroyed' if f.object.marked_for_destruction?
+        html_options[:class] = [html_options[:class], classes.join(' ')].compact.join(' ')
+
+        wrapper_class = html_options.delete(:wrapper_class)
+        html_options[:'data-wrapper-class'] = wrapper_class if wrapper_class.present?
+
+        f.hidden_field(:_destroy, value: f.object._destroy) + link_to(name, '#', html_options)
+      end
+    end
+
+    # :nodoc:
+    def render_association(association, f, new_object, form_name, render_options={}, custom_partial=nil)
+      partial = get_partial_path(custom_partial, association)
+      locals =  render_options.delete(:locals) || {}
+      ancestors = f.class.ancestors.map{|c| c.to_s}
+      method_name = ancestors.include?('SimpleForm::FormBuilder') ? :simple_fields_for : (ancestors.include?('Formtastic::FormBuilder') ? :semantic_fields_for : :fields_for)
+      f.send(method_name, association, new_object, {:child_index => "new_#{association}"}.merge(render_options)) do |builder|
+        partial_options = {form_name.to_sym => builder, :dynamic => true}.merge(locals)
+        render(partial, partial_options)
+      end
+    end
+
+    # shows a link that will allow to dynamically add a new associated object.
+    #
+    # - *name* :         the text to show in the link
+    # - *f* :            the form this should come in (the formtastic form)
+    # - *association* :  the associated objects, e.g. :tasks, this should be the name of the <tt>has_many</tt> relation.
+    # - *html_options*:  html options to be passed to <tt>link_to</tt> (see <tt>link_to</tt>)
+    #          - *:render_options* : options passed to `simple_fields_for, semantic_fields_for or fields_for`
+    #              - *:locals*     : the locals hash in the :render_options is handed to the partial
+    #          - *:partial*        : explicitly override the default partial name
+    #          - *:wrap_object*    : a proc that will allow to wrap your object, especially suited when using
+    #                                decorators, or if you want special initialisation
+    #          - *:form_name*      : the parameter for the form in the nested form partial. Default `f`.
+    #          - *:count*          : Count of how many objects will be added on a single click. Default `1`.
+    # - *&block*:        see <tt>link_to</tt>
+
+    def link_to_add_association(*args, &block)
+      if block_given?
+        link_to_add_association(capture(&block), *args)
+      elsif args.first.respond_to?(:object)
+        association = args.second
+        name = I18n.translate("cocoon.#{association}.add", default: I18n.translate('cocoon.defaults.add'))
+
+        link_to_add_association(name, *args)
+      else
+        name, f, association, html_options = *args
+        html_options ||= {}
+
+        render_options   = html_options.delete(:render_options)
+        render_options ||= {}
+        override_partial = html_options.delete(:partial)
+        wrap_object = html_options.delete(:wrap_object)
+        force_non_association_create = html_options.delete(:force_non_association_create) || false
+        form_parameter_name = html_options.delete(:form_name) || 'f'
+        count = html_options.delete(:count).to_i
+
+        html_options[:class] = [html_options[:class], "add_fields"].compact.join(' ')
+        html_options[:'data-association'] = association.to_s.singularize
+        html_options[:'data-associations'] = association.to_s.pluralize
+
+        new_object = create_object(f, association, force_non_association_create)
+        new_object = wrap_object.call(new_object) if wrap_object.respond_to?(:call)
+
+        html_options[:'data-association-insertion-template'] = CGI.escapeHTML(render_association(association, f, new_object, form_parameter_name, render_options, override_partial).to_str).html_safe
+
+        html_options[:'data-count'] = count if count > 0
+
+        link_to(name, '#', html_options)
+      end
+    end
+
+    # creates new association object with its conditions, like
+    # `` has_many :admin_comments, class_name: "Comment", conditions: { author: "Admin" }
+    # will create new Comment with author "Admin"
+
+    def create_object(f, association, force_non_association_create=false)
+      assoc = f.object.class.reflect_on_association(association)
+
+      assoc ? create_object_on_association(f, association, assoc, force_non_association_create) : create_object_on_non_association(f, association)
+    end
+
+    def get_partial_path(partial, association)
+      partial ? partial : association.to_s.singularize + "_fields"
+    end
+
+    private
+
+    def create_object_on_non_association(f, association)
+      builder_method = %W{build_#{association} build_#{association.to_s.singularize}}.select { |m| f.object.respond_to?(m) }.first
+      return f.object.send(builder_method) if builder_method
+      raise "Association #{association} doesn't exist on #{f.object.class}"
+    end
+
+    def create_object_on_association(f, association, instance, force_non_association_create)
+      if instance.class.name.starts_with?('Mongoid::') || force_non_association_create
+        create_object_with_conditions(instance)
+      else
+        assoc_obj = nil
+
+        # assume ActiveRecord or compatible
+        if instance.collection?
+          assoc_obj = f.object.send(association).build
+          f.object.send(association).delete(assoc_obj)
+        else
+          assoc_obj = f.object.send("build_#{association}")
+          f.object.send(association).delete
+        end
+
+        assoc_obj = assoc_obj.dup if assoc_obj.frozen?
+
+        assoc_obj
+      end
+    end
+
+    def create_object_with_conditions(instance)
+      # in rails 4, an association is defined with a proc
+      # and I did not find how to extract the conditions from a scope
+      # except building from the scope, but then why not just build from the
+      # association???
+      conditions = instance.respond_to?(:conditions) ? instance.conditions.flatten : []
+      instance.klass.new(*conditions)
+    end    
+
   end
 end
--- a/app/models/kanjai/domain.rb
View file @4f26e08
+++ b/app/models/kanjai/domain.rb
View file @4f26e08
@@ -4,5 +4,7 @@ module Kanjai
     has_many :pages, dependent: :destroy
     has_many :page_langs, dependent: :destroy
+    has_many :language_domains, dependent: :destroy
+    accepts_nested_attributes_for :language_domains, reject_if: :all_blank, allow_destroy: true
   end
 end
--- a/app/models/kanjai/language_domain.rb 0 → 100644
View file @4f26e08
+++ b/app/models/kanjai/language_domain.rb 0 → 100644
View file @4f26e08
+module Kanjai
+  class LanguageDomain < ApplicationRecord
+    belongs_to :domain
+    has_many :page_langs, dependent: :nullify
+  end
+end
--- a/app/models/kanjai/page_lang.rb
View file @4f26e08
+++ b/app/models/kanjai/page_lang.rb
View file @4f26e08
@@ -2,6 +2,7 @@ module Kanjai
   class PageLang < ActiveRecord::Base
     belongs_to :domain
+    belongs_to :language_domain
     validates :code, :title, presence: true
--- a/app/views/kanjai/admin/domains/_form.html.erb
View file @4f26e08
+++ b/app/views/kanjai/admin/domains/_form.html.erb
View file @4f26e08
@@ -6,6 +6,15 @@
     <%= error_messages(@domain, :title) %>
   </div>  
+  <div id="language_domains">
+    <%=f.fields_for :language_domains do |f2| %>
+      <%= render partial: '/kanjai/admin/domains/language_domain_fields', locals: {f: f2} %>
+    <% end %>
+    <div class="links text-right">
+      <%= link_to_add_association t('add_alternative_domain'), f, :language_domains, class: 'btn btn-info' %>
+    </div>
+  </div>
+
   <div class="card-footer mt-20">
     <div class="clearfix">
--- a/app/views/kanjai/admin/domains/_language_domain_fields.html.erb 0 → 100644
View file @4f26e08
+++ b/app/views/kanjai/admin/domains/_language_domain_fields.html.erb 0 → 100644
View file @4f26e08
+<div class="nested-fields mt-20">
+  <div class="row">
+    <div class="col-md-8"><%= f.text_field :title, class: 'form-control' %></div>
+    <div class="col-md-4"><%= link_to_remove_association t('actions.delete'), f %></div>
+  </div>
+</div>
--- a/app/views/kanjai/admin/page_langs/_form.html.erb
View file @4f26e08
+++ b/app/views/kanjai/admin/page_langs/_form.html.erb
View file @4f26e08
@@ -21,6 +21,14 @@
     </div>
   </div>
+  <% if @page_lang.domain.language_domains.count > 0 %>
+    <div class="form-group">
+      <%= f.label :language_domain_id, Kanjai::PageLang.human_attribute_name(:language_domain) + ' *', class: 'col-form-label' %>
+      <%= f.select :language_domain_id, options_for_select(@page_lang.domain.language_domains.collect{|item| [item.title, item.id]}, @page_lang.language_domain_id.to_i), {include_blank: true}, class: "form-control " %>
+      <%= error_messages(@page_lang, :language_domain_id) %>
+    </div>    
+  <% end %>
+
   <div class="card-footer mt-20">
     <div class="clearfix">
--- a/app/views/layouts/kanjai/admin.html.erb
View file @4f26e08
+++ b/app/views/layouts/kanjai/admin.html.erb
View file @4f26e08
@@ -37,14 +37,12 @@
                   <li class="nav-item dropdown <%= ['admin_users', 'page_langs'].include?(controller_name) ? 'active' : '' %>">
                      <%= link_to t('configuration_menu_title'), kanjai.admin_configuration_url, :class => 'nav-link dropdown-toggle dropdown-toggle-nocaret', data: {toggle: 'dropdown'} %>
                      <div class="dropdown-menu animated fadeIn">
+                        <%= link_to t('domains_menu_title'), kanjai.admin_domains_url, :class => 'dropdown-item' %>                        
                         <%= link_to t('user_menu_title'), kanjai.admin_admin_users_url, :class => 'dropdown-item' %>
                         <%= link_to t('page_langs_menu_title'), kanjai.admin_page_langs_url, :class => 'dropdown-item' %>
                      </div>                     
                   </li>
-                  <li class="nav-item <%= controller_name == 'domains' ? 'active' : '' %>">
-                     <%= link_to t('domains_menu_title'), kanjai.admin_domains_url, :class => 'nav-link' %>
-                  </li>
                   <li class="nav-item <%= controller_name == 'pages' ? 'active' : '' %>">
                      <%= link_to t('pages_menu_title'), kanjai.admin_pages_url, :class => 'nav-link' %>
                   </li>
--- a/config/locales/en.yml
View file @4f26e08
+++ b/config/locales/en.yml
View file @4f26e08
@@ -44,6 +44,7 @@ en:
   password_reset_email: "Email address"
   password_reset_error: "Can not send instrution, please check email"
   rte_choose_image: "Choose Image"
+  add_alternative_domain: "Add Alternative Domain"
   date:
@@ -82,6 +83,7 @@ en:
         code: Code
         title: Language title
         default_use: "Use Default"
+        language_domain: "Alternative Domain"
       kanjai/page_template:
         title: "Title"
         updated_at: "Updated at"
--- a/db/migrate/20200803113411_create_kanjai_language_domains.rb 0 → 100644
View file @4f26e08
+++ b/db/migrate/20200803113411_create_kanjai_language_domains.rb 0 → 100644
View file @4f26e08
+class CreateKanjaiLanguageDomains < ActiveRecord::Migration[5.2]
+  def change
+    create_table :kanjai_language_domains do |t|
+      t.references :domain
+      t.string :title
+      t.timestamps
+    end
+  end
+end
--- a/db/migrate/20200803121045_add_language_domain_to_page_lang.rb 0 → 100644
View file @4f26e08
+++ b/db/migrate/20200803121045_add_language_domain_to_page_lang.rb 0 → 100644
View file @4f26e08
+class AddLanguageDomainToPageLang < ActiveRecord::Migration[5.2]
+  def change
+    add_column :kanjai_page_langs, :language_domain_id, :integer
+  end
+end
--- a/kanjai.gemspec
View file @4f26e08
+++ b/kanjai.gemspec
View file @4f26e08
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mini_magick'
+
   #s.add_dependency 'json'
   #s.add_dependency "daemons"
--- a/lib/kanjai/version.rb
View file @4f26e08
+++ b/lib/kanjai/version.rb
View file @4f26e08
 module Kanjai
-  VERSION = "0.0.203"
+  VERSION = "0.0.204"
 end
--- a/test/fixtures/kanjai/language_domains.yml 0 → 100644
View file @4f26e08
+++ b/test/fixtures/kanjai/language_domains.yml 0 → 100644
View file @4f26e08
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
--- a/test/models/kanjai/language_domain_test.rb 0 → 100644
View file @4f26e08
+++ b/test/models/kanjai/language_domain_test.rb 0 → 100644
View file @4f26e08
+require 'test_helper'
+
+module Kanjai
+  class LanguageDomainTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end