check filter file, page content part, css

@@ -542,7 +542,7 @@ jQuery(document).ready(function(){
                                 '<li class="dropdown-item"><a class="col-content" href="javascript;void(0);">Edit</a></li>' +                                
                                 '<li class="dropdown-item"><a class="col-duplicate" href="javascript;void(0);">Duplicate</a></li>' +
                                 '<li class="dropdown-item"><a class="col-edit popover-link" href="javascript;void(0);">Settings</a></li>' +
-                                '<li class="dropdown-item"><a class="col-remove" href="javascript;void(0);">Remove</a></li>' +
+                                '<li class="dropdown-item"><a class="col-remove" href="javascript;void(0);">Delete</a></li>' +
                             '</ul>'+
                         '</div>' + 
                     '</div>';
@@ -565,7 +565,7 @@ jQuery(document).ready(function(){
 
                                 content += '<li class="dropdown-item"><a class="col-duplicate" href="javascript;void(0);">Duplicate</a></li>';
 
-                                content += '<li class="dropdown-item"><a class="row-remove" href="javascript;void(0);">Remove</a></li>';
+                                content += '<li class="dropdown-item"><a class="row-remove" href="javascript;void(0);">Delete</a></li>';
 
                 content += '</ul>'+
                         '</div>' + 

@@ -56,11 +56,12 @@ jQuery(document).ready(function(){
         if($this.hasClass('active')){
           $this.removeClass('active');
         }else{
+          $('.filter label').removeClass('active');
           $this.addClass('active');
         }
-        if($this.data('value') == 'all' && $this.hasClass('active')){
-          $wrapper.find(".filter label.active").not($this).removeClass('active');
-        };
+        //if($this.data('value') == 'all' && $this.hasClass('active')){
+        //  $wrapper.find(".filter label.active").not($this).removeClass('active');
+        //};
         if($this.data('value') != 'all' && $this.hasClass('active')){
           $wrapper.find(".filter label.active[data-value=all]").removeClass('active');
         };    

@@ -58,4 +58,23 @@
   label{margin-right:10px;}
 }
 
-.block{display:block !important;}
\ No newline at end of file
+.block{display:block !important;}
+
+.card-header-back{
+  margin-bottom: 10px;
+  display: inline-block;
+}
+
+.dropdown-item,
+.html-generator .html-content .col-inner .col-operation .dropdown-item a, .html-generator .html-content .row-inner .row-operation .dropdown-item a {
+  display: block;
+  width: 100%;
+  padding: 0.25rem 1.5rem;
+  clear: both;
+  font-weight: 400;
+  color: #212529 !important;
+  text-align: inherit;
+  white-space: nowrap;
+  background-color: transparent;
+  font-size: 14px !important;
+  border: 0; }
\ No newline at end of file

 module Kanjai
   class Admin::TagsController < AdminController
     def  index
-      render json: ActsAsTaggableOn::Tag.order(:name).collect{|item|  {title: item.name}}
+      render json: ActsAsTaggableOn::Tag.order(:id).collect{|item|  {title: item.name}}
     end
 
     def delete

 <label data-value='all' class="btn btn-primary active">All</label>
-<% ActsAsTaggableOn::Tag.most_used.each do |tag| %>
+<% ActsAsTaggableOn::Tag.order(:id).each do |tag| %>
   <label data-value='<%= tag.name %>' class="btn btn-primary tag-item-<%= tag.id %>">
     <%= tag.name %>
     <div class="delete-tag-wrapper text-right">

@@ -5,7 +5,7 @@
       
           <div class="card card-default">
             <div class="card-header">
-              <%= link_to t('back_to_page_list'), admin_pages_path(domain_id: @page.domain.id) %>
+              <%= link_to t('back_to_page_list'), admin_pages_path(domain_id: @page.domain.id), class: 'card-header-back' %>
               <div class="card-title"><%= t('admin.pages.edit', title: @page.lang_attributes(Kanjai::PageLang.default(@page.domain), :title)) %></div>
             </div>            
             <%= render partial: 'form' %>

@@ -11,9 +11,11 @@
         </div>
         <div class="html-content container-fluid clearfix"><%= get_html_by_json(@page_data).html_safe %></div>
         <div class="html-elements">
+
           <div class="item label label-default element-row btn btn-primary"><%= t('admin.page_structure.row') %></div>
           <div class="item label label-default element-col btn btn-primary"><%= t('admin.page_structure.col') %></div>
           <div class="item label label-default element-block btn btn-primary"><%= t('admin.page_structure.block') %></div>
+          <%= link_to t('back_to_page_list'), admin_pages_path(domain_id: @page.domain.id), class: 'btn btn-secondary float-right' %>
         </div>
 
         <div class="card-footer not-visible">

 module Kanjai
-  VERSION = "0.0.238"
+  VERSION = "0.0.239"
 end