check save and cancel page, tags part, check small errors

@@ -1348,6 +1348,31 @@ $('body').on('click', '.delete-image-from-list', function(){
     return false;
 });
 
+
+$('body').on('click', '.delete-tag-from-list', function(){
+    var $this = $(this),
+        url = $this.attr('href'),
+        title = "Are you sure? If files are assigned to this tag, the assignment is removed.";
+
+    bootbox.confirm(title, function(result) {
+        if(result){
+            jQuery.ajax({
+                type: 'GET',
+                url: url,
+                dataType: 'json',
+                success: function(data){
+                  if(data.status == 'ok'){
+                    $('.tag-item-' + data.id).remove();
+                  }
+                }
+
+            });
+        }
+    });
+
+    return false;
+});
+
 $('body').on('click', '.copy-to-memory', function(){
   var str = $(this).data('str');
   var el = document.createElement('textarea');
@@ -2101,6 +2126,12 @@ jQuery(document).ready(function(){
           });
         }
               
+        $this.find('.bootstrap-tagsinput').popover({
+          trigger: 'manual',
+          placement: 'top',
+          content: 'Content',
+          title: 'Title'
+        });
 
         $this.find('.filestyle').each(function() {
           var $this = $(this), options = {
@@ -2193,6 +2224,18 @@ jQuery(document).ready(function(){
       }
     });
 
+    $('body').on('click', '.btn-form-reset', function(){
+      $(this).closest('form').trigger('reset');
+      return false;
+    });
+
+    $('.nav-tabs.tab-with-url-prefix a').on('shown.bs.tab', function(e){
+      window.location.hash = e.target.hash;
+    });
+    var url = document.location.toString();
+    if(url.match('#')){
+      $('.nav-tabs a[href="#' + url.split('#')[1] + '"]').tab('show');
+    }
 
 
 });

@@ -6,6 +6,7 @@ jQuery(document).ready(function(){
     $('.html-generator').on('click', '.col-operation .col-edit', function(){
         var $this = $(this),
             $cell = $this.closest('.col'),
+            $block = $cell.closest('.html-generator'),
             size = $cell.data('size'),
             offset = $cell.data('offset'),
             className = $cell.data('class');
@@ -58,6 +59,8 @@ jQuery(document).ready(function(){
 
             $this.popover('hide');
 
+            $block.find('.save').trigger('click');
+
             return false;
         });
 
@@ -69,11 +72,14 @@ jQuery(document).ready(function(){
             $this.popover('dispose');
         }).popover('show');
 
+
         return false;
     });
 
     $('.html-generator').on('click', '.col-operation .col-remove', function(){
-        var $this = $(this);
+        var $this = $(this),
+            $block = $this.closest('.html-generator');    
+
         bootbox.confirm('Are you sure?', function(result) {
             if (result) {
                 var $cell = $this.closest('.col'),
@@ -88,6 +94,7 @@ jQuery(document).ready(function(){
                     data: {structure_id: $cell.data('id')},
                     success: function (data) {
                         $cell.remove();
+                        $block.find('.save').trigger('click');
                     }
                 });
 
@@ -101,7 +108,9 @@ jQuery(document).ready(function(){
 
 
     $('.html-generator').on('click', '.row-operation .row-remove', function(){
-        var $this = $(this);
+        var $this = $(this),
+        $block = $this.closest('.html-generator');    
+
         bootbox.confirm('Are you sure?', function(result) {
             if (result) {
                 var $row = $this.closest('.row-fluid'),
@@ -120,6 +129,7 @@ jQuery(document).ready(function(){
                         data: {structure_ids: mas_cell_id},
                         success: function (data) {
                             $row.remove();
+                            $block.find('.save').trigger('click');
                         }
                     });
                 }
@@ -131,6 +141,7 @@ jQuery(document).ready(function(){
                         data: {structure_id: $row.data('id')},
                         success: function (data) {
                             $row.remove();
+                            $block.find('.save').trigger('click');
                         }
                     });
                 }                
@@ -284,7 +295,8 @@ jQuery(document).ready(function(){
     });
 
     $('.html-generator').on('click', '.col-operation .col-disable, .row-operation .col-disable', function(){
-        var $this = $(this);
+        var $this = $(this),
+            $block = $this.closest('.html-generator');
 
         if($this.closest('.row-element-block, .row-element-row').length > 0){
           var $cell = $this.closest('.row-element-block, .row-element-row');
@@ -302,6 +314,7 @@ jQuery(document).ready(function(){
             $this.text('Disable');
         }
         $('body').trigger('click');
+        $block.find('.save').trigger('click');
 
         return false;
     });
@@ -696,7 +709,7 @@ jQuery(document).ready(function(){
                         $obj.sortable({
                             items: ".col"
                         });
-
+                        $block.find('.save').trigger('click');
                     }
 
                 }
@@ -753,6 +766,7 @@ jQuery(document).ready(function(){
                             items: ".row-fluid"
                         });
                     }
+                    $block.find('.save').trigger('click');
                 }
             }
         });
@@ -816,7 +830,10 @@ jQuery(document).ready(function(){
                 url: url,
                 data: {content: JSON.stringify(res) },
                 success: function () {
-                    alert('Success save');
+                    $.notify('Success save', {
+                        status: 'info',
+                        pos:"top-right"
+                    });                      
                 }
             });
 

@@ -29,20 +29,22 @@ jQuery(document).ready(function(){
   if($('.image-list').length > 0){
     var $wrapper = $('.image-list');
     loadImage($wrapper);
-    $wrapper.find('.filter label').click(function(){
-      var $this = $(this);
-      if($this.hasClass('active')){
-        $this.removeClass('active');
-      }else{
-        $this.addClass('active');
+    $wrapper.find('.filter label').click(function(e){
+      if(e.target.tagName != 'A'){
+        var $this = $(this);
+        if($this.hasClass('active')){
+          $this.removeClass('active');
+        }else{
+          $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[data-value=all]").removeClass('active');
+        };      
+        loadImage($wrapper);
       }
-      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');
-      };      
-      loadImage($wrapper);
     });
   }
 

@@ -250,7 +250,6 @@
           val = $.map(self.items(), function(item) {
             return self.options.itemValue(item).toString();
           });
-
       self.$element.val(val, true).trigger('change');
     },
 
@@ -353,6 +352,7 @@
 
         if (self.options.addOnBlur && self.options.freeInput) {
           self.$input.on('focusout', $.proxy(function(event) {
+
               // HACK: only process on focusout when no typeahead opened, to
               //       avoid adding the typeahead text as tag
               if ($('.typeahead, .twitter-typeahead', self.$container).length === 0) {
@@ -419,11 +419,11 @@
         var textLength = $input.val().length,
             wordSpace = Math.ceil(textLength / 5),
             size = textLength + wordSpace + 1;
-        $input.attr('size', Math.max(this.inputSize, $input.val().length));
+        $input.attr('size', Math.max(this.inputSize, size ));
       }, self));
 
       self.$container.on('keypress', 'input', $.proxy(function(event) {
-         event.stopPropagation();
+         //event.stopPropagation();
          var $input = $(event.target);
 
          if (self.$element.attr('disabled')) {
@@ -449,7 +449,7 @@
          var textLength = $input.val().length,
             wordSpace = Math.ceil(textLength / 5),
             size = textLength + wordSpace + 1;
-         $input.attr('size', Math.max(this.inputSize, $input.val().length));
+         $input.attr('size', Math.max(this.inputSize, size));
          if(keyCombinationInList(event, [13]) ){
           return false;
          }else{

@@ -1484,7 +1484,8 @@
                 this._checkLanguageDirection();
             },
             resetInputValue: function resetInputValue() {
-                this.setInputValue(this.query);
+                //this.setInputValue(this.query);
+                this.setInputValue('');
             },
             getHint: function getHint() {
                 return this.$hint.val();

@@ -45,4 +45,9 @@
 
 .gray-theme.fr-toolbar .fr-command.fr-btn.fr-disabled, .gray-theme.fr-popup .fr-command.fr-btn.fr-disabled{
   
-}
\ No newline at end of file
+}
+
+.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

@@ -83,7 +83,7 @@ module Kanjai
           end
         end
 
-        redirect_to admin_pages_path(domain_id: @page.domain.id)
+        redirect_to :action => :edit, lang: params[:lang]
       else
         render :action => :edit, lang: params[:lang]
       end
@@ -192,7 +192,7 @@ module Kanjai
       @step = 'meta'
 
       if @page_data.update(permitted_params[:page_datum])
-        redirect_to :action => :index
+        redirect_to  edit_admin_page_url(@page, lang: params[:lang]) + '#meta'
       else
         render :action => :edit, lang: params[:lang]
       end

@@ -3,5 +3,13 @@ module Kanjai
     def  index
       render json: ActsAsTaggableOn::Tag.order(:name).collect{|item|  {title: item.name}}
     end
+
+    def delete
+      tag = ActsAsTaggableOn::Tag.where(id: params[:id].to_i).first
+      if tag
+        tag.destroy
+      end
+      render json: {status: 'ok', id: tag.id}
+    end
   end
 end
\ No newline at end of file

@@ -32,6 +32,7 @@
               <label class="col-md-2 col-form-label">Tags</label>
               <div class="col-md-10">
                 <%= f.text_field :tag_list, class: 'form-control', data: {role: 'tagsinput'}, value: f.object.tag_list.join(', ') %>
+                <div class="form-text"><%= t('tag_input_help_text') %></div>
               </div>
             </div>
           </fieldset>

@@ -29,7 +29,10 @@
           <div class="btn-group-toggle">
             <label data-value='all' class="btn btn-primary active">All</label>
             <% ActsAsTaggableOn::Tag.most_used.each do |tag| %>
-              <label data-value='<%= tag.name %>' class="btn btn-primary"><%= tag.name %></label>
+              <label data-value='<%= tag.name %>' class="btn btn-primary tag-item-<%= tag.id %>">
+                <%= tag.name %>
+                <a class="delete-tag-from-list" href="<%= url_for(controller: 'tags', action: 'delete', id: tag.id) %>"><i class="fa fa-times"></i></a>  
+              </label>
             <% end %>
           </div>
         </div>        

 <div role="tabpanel">
    <!-- Nav tabs-->
    <% unless @page.new_record? %>
-      <ul class="nav nav-tabs" role="tablist">
+      <ul class="nav nav-tabs tab-with-url-prefix" role="tablist">
          <li class="nav-item" role="presentation"><a class="nav-link <%= @step == 'general' ? 'active' : '' %>" href="#general" aria-controls="general" role="tab" data-toggle="tab">General</a></li>
          <li class="nav-item" role="presentation"><a class="nav-link <%= @step == 'meta' ? 'active' : '' %>" href="#meta" aria-controls="meta" role="tab" data-toggle="tab">Meta</a></li>
          <li class="nav-item" role="presentation"><a class="nav-link" href="#content" aria-controls="content" role="tab" data-toggle="tab">Content</a></li>

@@ -16,10 +16,9 @@
           <div class="item label label-default element-block btn btn-primary"><%= t('admin.page_structure.block') %></div>
         </div>
 
-        <div class="card-footer mt-20">
+        <div class="card-footer not-visible">
           <div class="clearfix">
             <div class="float-right">
-              <%= link_to t('actions.cancel'), admin_pages_url(domain_id: @page.domain.id), class: 'btn btn-secondary' %>
               <button class="btn btn-primary save" type="submit"><%= t('actions.save') %></button>
             </div>
           </div>

@@ -91,7 +91,7 @@
         </div>
         <div class="col-md-6">
           <div class="float-right">
-            <%= link_to t('actions.cancel'), admin_pages_url(domain_id: @page.domain.id), class: 'btn btn-secondary' %>
+            <%= link_to t('actions.reset'), 'javascript:void(0)', class: 'btn btn-secondary btn-form-reset' %>
             <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
           </div>
         </div>

@@ -28,7 +28,7 @@
     <div class="card-footer mt-20">
       <div class="clearfix">
         <div class="float-right">
-          <%= link_to t('actions.cancel'), admin_pages_url(domain_id: @page.domain.id), class: 'btn btn-secondary' %>
+          <%= link_to t('actions.reset'), 'javascript:void(0)', class: 'btn btn-secondary btn-form-reset' %>
           <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
         </div>
       </div>

@@ -45,6 +45,7 @@ en:
   password_reset_error: "Can not send instrution, please check email"
   rte_choose_image: "Choose Image"
   add_alternative_domain: "Add Alternative Domain"
+  tag_input_help_text: "Type the name of the tag and finish the input with enter"
 
 
   date:
@@ -122,6 +123,7 @@ en:
     back_to_choose_image: "Back to choose image"
     choose_file: "Choose File"
     remove_file: "Remove File"
+    reset: "Reset"
 
   admin:
     page_structure:

@@ -22,6 +22,7 @@ Kanjai::Engine.routes.draw do
     post 'page_contents/delete_item' => "page_contents#delete_item"
     post 'page_contents/sorting' => "page_contents#sorting"
     get 'tags' => 'tags#index'
+    get 'remove-tag' => 'tags#delete'
 
     resources :admin_users
 

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