check language part

 PATH
   remote: .
   specs:
-    kanjai (0.0.203)
+    kanjai (0.0.232)
       acts-as-taggable-on (~> 6.5)
       acts_as_list
       acts_as_tree
@@ -59,7 +59,7 @@ GEM
       tzinfo (~> 1.1)
     acts-as-taggable-on (6.5.0)
       activerecord (>= 5.0, < 6.1)
-    acts_as_list (1.0.1)
+    acts_as_list (1.0.2)
       activerecord (>= 4.2)
     acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
@@ -970,7 +970,7 @@ GEM
     aws-sigv2 (1.0.1)
     aws-sigv4 (1.2.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.15)
+    bcrypt (3.1.16)
     builder (3.2.4)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
@@ -1064,8 +1064,8 @@ GEM
       thread_safe (~> 0.1)
     unobtrusive_flash (3.3.1)
       railties
-    warden (1.2.8)
-      rack (>= 2.0.6)
+    warden (1.2.9)
+      rack (>= 2.0.9)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

@@ -50,4 +50,8 @@
 .filter .btn-group-toggle > .btn{margin-bottom:5px;position:relative;}
 .filter .btn-group-toggle > .btn a, .filter .btn-group-toggle > .btn a:hover{text-decoration:none;position:absolute;top:-14px;right:2px;font-size:14px;line-height:14px;}
 .filter .btn-group-toggle > .btn a{display:none;}
-.filter .btn-group-toggle > .btn:hover a{display:inline;}
\ No newline at end of file
+.filter .btn-group-toggle > .btn:hover a{display:inline;}
+.checkbox-list{
+  input{margin-right:3px;}
+  label{margin-right:10px;}
+}
\ No newline at end of file

@@ -45,7 +45,7 @@ module Kanjai
     private
 
     def permitted_params
-      params.permit(:domain => [:title, language_domains_attributes: [:id, :title, :_destroy]])
+      params.permit(:domain => [:title, :default_lang_id, language_domains_attributes: [:id, :title, :page_lang_id, :_destroy], page_lang_ids: []])
     end
 
   end

@@ -6,17 +6,17 @@ module Kanjai
     end
 
     def new
-      @domain = Domain.find(params[:domain_id])
+      #@domain = Domain.find(params[:domain_id])
       @page_lang = PageLang.new
-      @page_lang.domain = @domain      
+      #@page_lang.domain = @domain      
     end
 
     def create
       @page_lang = PageLang.new(permitted_params[:page_lang])
 
-      if params[:page_lang][:default_use].to_i == 1
-        @page_lang.domain.page_langs.all.each {|item| item.update_column(:default_use, false) }
-      end
+      #if params[:page_lang][:default_use].to_i == 1
+      #  @page_lang.domain.page_langs.all.each {|item| item.update_column(:default_use, false) }
+      #end
 
       if @page_lang.save
         redirect_to admin_page_langs_url

@@ -48,15 +48,19 @@ module Kanjai
 
       if domain.nil?
         # try found alternative domain
-        lang_domain = LanguageDomain.joins(:page_langs).where(title: domain_title,  kanjai_page_langs: {default_use: false}).first
-        if lang_domain && lang_domain.page_langs.count > 0
+        lang_domain = LanguageDomain.where(title: domain_title).first
+        if lang_domain
           domain = lang_domain.domain
-          lang = lang_domain.page_langs.where(default_use: false).first.code
+          if lang_domain.page_lang
+            lang = lang_domain.page_lang.code
+          else
+            lang = domain.default_lang.try(:code)
+          end
         else
           render plain: "Domain #{domain_title} Not Exist" and return 
         end   
       else
-        lang = domain.page_langs.where(default_use: true).first.try(:code)
+        lang = domain.default_lang.try(:code)
       end
 
       if params && params[:locale].present? && request.original_fullpath.split('/')[1].length == 2

@@ -2,8 +2,10 @@ module Kanjai
   class Domain < ApplicationRecord
     validates :title, presence: true
 
+    belongs_to :default_lang, class_name: 'Kanjai::PageLang', optional: true
+
     has_many :pages, dependent: :destroy
-    has_many :page_langs, dependent: :destroy
+    has_and_belongs_to_many :page_langs
     has_many :language_domains, dependent: :destroy
     accepts_nested_attributes_for :language_domains, reject_if: :all_blank, allow_destroy: true
   end

 module Kanjai
   class LanguageDomain < ApplicationRecord
     belongs_to :domain
-    has_many :page_langs, dependent: :nullify
+    belongs_to :page_lang, optional: true
+    #has_many :page_langs, dependent: :nullify
   end
 end

 module Kanjai
   class PageLang < ActiveRecord::Base
 
-    belongs_to :domain
     belongs_to :language_domain, optional: true
 
+    has_and_belongs_to_many :domains
+
     validates :code, :title, presence: true
 
     default_scope { order('code') }

@@ -5,6 +5,21 @@
     <%= f.text_field :title, class: "form-control #{@domain.errors.include?(:title) ? 'parsley-error' : ''} " %>
     <%= error_messages(@domain, :title) %>
   </div>  
+  <div class="form-group">
+    <%= f.label :page_lang_ids, Kanjai::Domain.human_attribute_name(:page_lang_ids), class: 'col-form-label' %>
+    <div class="checkbox-list">
+      <%= f.collection_check_boxes :page_lang_ids, Kanjai::PageLang.order(:title), :id, :title %>
+    </div>
+  </div>    
+
+  <div class="form-group">
+    <%= f.label :default_lang_id, Kanjai::Domain.human_attribute_name(:default_lang_id), class: 'col-form-label' %>
+    <div class="checkbox-list">
+      <%= f.select :default_lang_id, @domain.page_langs.collect{|item|  [item.title, item.id]}, {include_blank: true}, class: 'form-control' %>
+    </div>
+  </div>      
+
+
 
   <div id="language_domains">
     <%=f.fields_for :language_domains do |f2| %>

 <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 class="col-md-5"><%= f.text_field :title, class: 'form-control' %></div>
+    <div class="col-md-5"><%= f.select :page_lang_id, @domain.page_langs.order(:title).collect{|item| [item.title, item.id] } , {include_blank: true}, class: 'form-control' %></div>
+    <div class="col-md-2"><%= link_to_remove_association t('actions.delete'), f %></div>
   </div>
 </div>
\ No newline at end of file

@@ -14,23 +14,6 @@
   </div>  
 
 
-  <div class="form-group row">
-    <%= f.label :default_use, Kanjai::PageLang.human_attribute_name(:default_use), class: 'col-md-2 col-form-label' %>  
-    <div class="col-md-10">
-      <label class="switch switch-lg"><%= f.check_box :default_use, class: 'default-lang-checkbox' %><span></span></label>
-    </div>
-  </div>
-
-  <div class="language-domain-wrapper <%= f.object.default_use ? 'not-visible' : '' %>" >
-  <% 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>
-
 
   <div class="card-footer mt-20">
     <div class="clearfix">

@@ -4,42 +4,35 @@
       <!-- START card-->
 
   <div id="accordion">
-    <% Kanjai::Domain.order(:title).each do |domain| %>
-     <div class="card card-default mb-1">
-        <div class="card-header" id="domain-headline-<%= domain.id %>">
-           <h4 class="mb-0"><a class="text-inherit" data-toggle="collapse" data-target="#domain-<%= domain.id %>" aria-expanded="true" aria-controls="domain-<%= domain.id %>" href=""><%= domain.title %></a></h4>
+
+      <!-- START card-->
+      <div class="card card-default">
+        <div class="card-header">
+          <div class="row">
+            <div class="col-md-8">
+              <%= t('admin.page_langs.page_title') %>
+            </div>
+            <div class="col-md-4 text-right">
+              <%= link_to I18n.t('admin.page_langs.create'), new_admin_page_lang_url, class: 'btn btn-primary' %>
+            </div>
+          </div>
         </div>
-        <div class="collapse <%= params[:domain_id].to_i == domain.id ? 'show' : '' %>" id="domain-<%= domain.id %>" aria-labelledby="domain-headline-<%= domain.id %>" data-parent="#accordion" style="">
-           <div class="card-body border-top">
-              <div class="card card-default">
-                <div class="card-header">
-                  <div class="row">
-                    <div class="col-md-8">
-                      <%= t('admin.page_langs.title') %>
-                    </div>
-                    <div class="col-md-4 text-right">
-                      <%= link_to I18n.t('admin.page_langs.create'), new_admin_page_lang_url(domain_id: domain.id), class: 'btn btn-primary' %>
-                    </div>
-                  </div>
-                </div>
-                <div class="card-body">
-                  <!-- START table-responsive-->
-                  <div class="table-responsive">
+        <div class="card-body">
+          <!-- START table-responsive-->
+          <div class="table-responsive">
                      <table class="table">
                         <thead>
                            <tr>
                               <th><%= Kanjai::PageLang.human_attribute_name(:code) %></th>
                               <th><%= Kanjai::PageLang.human_attribute_name(:title) %></th>
-                              <th><%= Kanjai::PageLang.human_attribute_name(:language_domain) %></th>
                               <th width="50px"></th>
                            </tr>
                         </thead>
                         <tbody>
-                          <% domain.page_langs.order(:code).each do |item| %>
+                          <% @collection.each do |item| %>
                               <tr id='<%= dom_id(item) %>'>
                                 <td><%= item.code %></td>
                                 <td><%= item.title %></td>
-                                <td><%= !item.default_use ? item.language_domain.try(:title) : '' %></td>
                                 <td>
                                   <div class="dropdown">
                                     <button class="btn btn-secondary  dropdown-toggle dropdown-toggle-nocaret" type="button" data-toggle="dropdown" aria-expanded="false">
@@ -56,15 +49,11 @@
 
                         </tbody>
                      </table>
-                  </div><!-- END table-responsive-->
-                </div>
-              </div><!-- END card-->
+          </div><!-- END table-responsive-->
+        </div>
+      </div><!-- END card-->
 
 
-           </div>
-        </div>
-     </div>
-    <% end %>
   </div>
 
 

@@ -102,6 +102,9 @@ en:
         meta_title: Meta Title
         meta_description: Meta Description
         meta_keywords: Meta Keywords
+      kanjai/domain:
+        page_lang_ids: "Languages" 
+        default_lang_id: "Default Language"
 
 
   actions:
@@ -146,6 +149,7 @@ en:
       empty_text: "Empty language list"
       create: "Add new language"
       edit: "Edit language"
+      page_title: "Languages"
     pages:
       page_title: "Pages"
       add_new: "Add page"
@@ -167,7 +171,7 @@ en:
       add_new: "Add domain"
       empty_text: "Empty domain list"
       create: "Add new domain"
-      edit: "Edit domain"      
+      edit: "Edit domain"     
     template_status:
       not_file: ""
       unzip: "Ready"

+class CreateJoinTableDomainPageLang < ActiveRecord::Migration[5.2]
+  def change
+    create_table :kanjai_domains_page_langs, id: false do |t|
+      t.integer :domain_id
+      t.integer :page_lang_id
+    end
+  end
+end

+class AddPageLangIdToKanjaiLanguageDomain < ActiveRecord::Migration[5.2]
+  def change
+    add_column :kanjai_language_domains, :page_lang_id, :integer
+  end
+end

+class AddDefaultPageLangIdToKanjaiDomain < ActiveRecord::Migration[5.2]
+  def change
+    add_column :kanjai_domains, :default_lang_id, :integer
+  end
+end

 module Kanjai
-  VERSION = "0.0.232"
+  VERSION = "0.0.233"
 end

+# 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

+require 'test_helper'
+
+module Kanjai
+  class DomainLanguageTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end