hancock_cms 1.0.1 → 1.0.2.2

data/app/models/concerns/hancock/insertion_field.rb

@@ -0,0 +1,115 @@
+module Hancock::InsertionField
+  extend ActiveSupport::Concern
+
+  included do
+    class_attribute :added_insertions, :removed_insertions, :insertions_fields
+    self.removed_insertions ||= []
+    self.added_insertions ||= []
+    self.insertions_fields ||= {}
+    def possible_insertions
+      self.class.possible_insertions
+    end
+
+    # /(\[\[(\w+?)\]\] | \{\{(self\.(\w+?))\}\} | \{\{(([\w\-\.]+?)\.(\w+?))\}\} | \{\{(\w+?)\}\} | \{\{(BS\|(\w+?))\}\})/
+    #
+    # reg1 = /\[\[(?<new_bs>(?<new_bs_name>\w+?))\]\]/i
+    # reg2 = /\{\{(?<insertion_old>self\.(?<insertion_old_name>\w+?))\}\}/i
+    # reg3 = /\{\{(?<setting_with_ns>(?<setting_with_ns_ns>[\w\-\.]+?)\.(?<setting_with_ns_name>\w+?))\}\}/i
+    # reg4 = /\{\{(?<setting>(?<setting_name>\w+?))\}\}/i
+    # reg5 = /\{\{(?<old_bs>BS\|(?<old_bs_name>\w+?))\}\}/i
+    # reg6 = /\{\{\{\{(?<insertion>(?<insertion_name>\w+?))\}\}\}\}/i
+    private
+    def process_with_insertions(_data)
+      if _data.nil?
+        ''
+      else
+        if _data.is_a?(Symbol)
+          if insertions_fields.include?(_data)
+            _data = self.send(_data)
+          else
+            return ''
+          end
+        end
+        # {{self.%insertion%}}
+        _ret = _data.gsub(/\{\{self\.(.*?)\}\}/) do
+          get_insertion($1)
+        # {{"some_text"}} #temporary disabled - need tests
+        # end.gsub(/\{\{(['"])(.*?)(\1)\}\}/) do
+        #   $2
+        # {{%ns%.%key%}}
+        end.gsub(/\{\{(([^\.]*?)\.)?(.*?)\}\}/) do
+          (Settings and !$3.nil? and $2 != "self") ? Settings.ns($2).get($3).val : "" #temp
+        end
+        _ret
+      end
+    end
+    def get_insertion(name)
+      begin
+        self.send(name) if possible_insertions.include?(name)
+      rescue
+        ""
+      end
+    end
+  end
+
+  class_methods do
+    def insertions_field(name, opts = {type: String, default: ''})
+      field name, opts
+      insertions_for name, opts
+    end
+    def insertions_for(name, opts = {})
+      return if name.blank?
+      name = name.to_sym
+      return if insertions_fields.keys.include?(name)
+      (opts.delete(:add_insertions) || []).each do |_ins|
+        add_insertion _ins
+      end
+      (["page_#{name}", name.to_s] + (opts.delete(:remove_insertions) || [])).uniq.each do |_ins|
+        remove_insertion _ins
+      end
+      _method_name = opts[:as].present? ? opts[:as] : "page_#{name}"
+      insertions_fields[name] = {
+        method: _method_name,
+        options: opts
+      }
+      if _method_name
+        class_eval <<-RUBY
+          def #{_method_name}
+            process_with_insertions(#{name})
+          end
+        RUBY
+      end
+      name
+    end
+
+    def insertion(name, opts = {})
+      name = name.to_s.strip
+      if opts[:remove]
+        self.removed_insertions << name unless self.removed_insertions.include?(name)
+      else
+        self.added_insertions << name unless self.added_insertions.include?(name)
+      end
+    end
+    def add_insertion(name)
+      insertion(name.to_s.strip)
+    end
+    def remove_insertion(name, opts = {})
+      insertion(name.to_s.strip, opts.merge({remove: true}))
+    end
+
+    def default_insertions
+      # self.fields.keys # we was here but inheritance and we need check
+
+      # # version with store in
+      # return @default_insertions unless @default_insertions.nil?
+      # @default_insertions =
+      self.fields.select { |_name, _field|
+        _field.options[:klass] and self <= _field.options[:klass]
+      }.keys
+    end
+    def possible_insertions
+      @possible_insertions ||= (default_insertions + added_insertions).map(&:to_s).uniq - removed_insertions.map(&:to_s)
+    end
+  end
+
+end

data/app/models/concerns/hancock/mappable.rb

@@ -88,4 +88,5 @@ module Hancock::Mappable
       map_address
     end
   end
+  
 end

data/app/models/concerns/hancock/model_localizeable.rb

@@ -1,12 +1,14 @@
 module Hancock::ModelLocalizeable
   extend ActiveSupport::Concern
 
-  module ClassMethods
+  class_methods do
+    
     def convert2localize
       self.all.to_a.map do |p|
         p.convert2localize
       end
     end
+
   end
 
   def convert2localize(save_it = true)
@@ -30,4 +32,5 @@ module Hancock::ModelLocalizeable
     end
     self.save if save_it
   end
+
 end

data/app/models/concerns/hancock/rails_admin_patch.rb

@@ -5,9 +5,25 @@ module Hancock::RailsAdminPatch
     self.class.rails_admin_model
   end
 
-  module ClassMethods
+  def admin_can_actions
+    self.class.admin_can_actions
+  end
+  def admin_cannot_actions
+    self.class.admin_cannot_actions
+  end
+  def manager_can_actions
+    self.class.manager_can_actions
+  end
+  def manager_cannot_actions
+    self.class.manager_cannot_actions
+  end
+
+  class_methods do
     def rails_admin_model
-      to_param.gsub("::", "~").underscore
+      name.split('::').collect(&:underscore).join('~')
+    end
+    def rails_admin_param_key
+      name.split('::').collect(&:underscore).join('_')
     end
 
     def rails_admin_add_fields
@@ -17,6 +33,9 @@ module Hancock::RailsAdminPatch
     def rails_admin_add_config(config)
     end
 
+    def rails_admin_name_synonyms
+      ''.freeze
+    end
 
 
     def admin_can_default_actions
@@ -57,7 +76,7 @@ module Hancock::RailsAdminPatch
       (manager_can_default_actions + manager_can_add_actions + manager_can_user_defined_actions).uniq.freeze
     end
     def manager_cannot_default_actions
-      [].freeze
+      [:model_accesses, :user_abilities].freeze
     end
     def manager_cannot_add_actions
       [].freeze

data/app/models/concerns/hancock/sort_field.rb

@@ -1,12 +1,17 @@
 module Hancock::SortField
   extend ActiveSupport::Concern
 
-  module ClassMethods
-    def sort_field(prefix = '')
+  class_methods do
+
+    def sort_field(prefix = '', opts = {type: Integer, default: 0})
+      if prefix.is_a?(Hash)
+        opts = prefix
+        prefix = opts.delete(:prefix) || ""
+      end
       prefix = "#{prefix}_" unless prefix == ''
 
       if Hancock.mongoid?
-        field "#{prefix}order".to_sym, type: Integer
+        field "#{prefix}order".to_sym, opts
         alias_method "#{prefix}sort", "#{prefix}order"
         scope "#{prefix}ordered".to_sym,  -> { asc("#{prefix}order".to_sym) }
         scope "#{prefix}sorted".to_sym,   -> { asc("#{prefix}order".to_sym) }
@@ -15,6 +20,24 @@ module Hancock::SortField
         scope "#{prefix}ordered".to_sym,  -> { order("#{prefix}order".to_sym => :asc) }
         scope "#{prefix}sorted".to_sym,   -> { order("#{prefix}order".to_sym => :asc) }
       end
+
+
+      class_eval <<-RUBY
+        def set_default_#{prefix}order_value
+          if (_embed_method = self.try(:embed_method_for_parent))
+            begin
+              if (self.#{prefix}order.nil? or self.#{prefix}order == 0) and (_parent = self._parent)
+                self.#{prefix}order = _parent.send(_embed_method).max("#{prefix}order").to_i + 1
+              end
+            rescue
+            end
+          end
+          self.#{prefix}order ||= 0
+          self
+        end
+      RUBY
     end
+
   end
+
 end

data/app/models/concerns/hancock/sortable.rb

@@ -4,5 +4,8 @@ module Hancock::Sortable
 
   included do
     sort_field
+
+    before_create :set_default_order_value
   end
+
 end

data/app/views/blocks/_footer.html.slim

@@ -1 +1 @@
-p = Settings.copyright(default: "© Copyright {{year|2016}} | Etc", kind: :html).html_safe
+p = Settings.copyright(default: "© Copyright {{year|2017}} | Etc", kind: :html).html_safe

data/app/views/devise/passwords/edit.html.slim

@@ -1,4 +1,3 @@
-/ h2 Change your password
 .devise-box
   .white-box
     = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
@@ -15,7 +14,6 @@
       
       .form-group
         / = f.label :password_confirmation
-        / br
         / .form-control = f.password_field :password_confirmation, label: I18n.t("shared.password_confirmation"), autocomplete: "off", placeholder: I18n.t("shared.password_confirmation")
         = f.input :password_confirmation, as: :password, autocomplete: 'off', title: I18n.t("shared.password_confirmation"), placeholder: I18n.t("shared.password_confirmation"), label: false, wrapper_html: {class: "form-control"}
     

data/app/views/devise/passwords/new.html.slim

@@ -1,4 +1,3 @@
-/ h2 Forgot your password?
 .devise-box
   .white-box
     = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
@@ -6,7 +5,6 @@
       h2.title Забыли пароль?
       .form-group
         / = f.label :email
-        / br/
         / .form-control = f.email_field :email, autofocus: true, placeholder: I18n.t("shared.email")
         = f.input :email, as: :email, autocomplete: 'off', title: I18n.t("shared.email"), placeholder: I18n.t("shared.email"), label: false, wrapper_html: {class: "form-control"}
 

data/app/views/devise/registrations/edit.html.slim

@@ -1,4 +1,3 @@
-/ h2 Редактирование профиля
 .devise-box
   .white-box
     = simple_form_for(resource, as: resource_name, url: user_registration_path) do |f|
@@ -18,7 +17,6 @@
       
       .form-group
         / = f.label :password_confirmation
-        / br
         / .form-control = f.password_field :password_confirmation, label: I18n.t("shared.password_confirmation"), autocomplete: "off", placeholder: I18n.t("shared.password_confirmation")
         = f.input :password_confirmation, as: :password, autocomplete: 'off', title: I18n.t("shared.password_confirmation"), placeholder: I18n.t("shared.password_confirmation"), label: false, wrapper_html: {class: "form-control"}
       

data/app/views/devise/registrations/new.html.slim

@@ -1,4 +1,3 @@
-/h2 Регистрация
 .devise-box
   .white-box
     = simple_form_for(resource, as: resource_name, url: user_registration_path) do |f|
@@ -18,7 +17,6 @@
       
       .form-group
         / = f.label :password_confirmation
-        / br
         / .form-control = f.password_field :password_confirmation, label: I18n.t("shared.password_confirmation"), autocomplete: "off", placeholder: I18n.t("shared.password_confirmation")
         = f.input :password_confirmation, as: :password, autocomplete: 'off', title: I18n.t("shared.password_confirmation"), placeholder: I18n.t("shared.password_confirmation"), label: false, wrapper_html: {class: "form-control"}
       

data/app/views/devise/sessions/new.html.slim

@@ -1,6 +1,4 @@
-/ h2= I18n.t("shared.enter_site")
 .devise-box
-  / = resource.errors.inspect if resource
   .white-box
     = simple_form_for(resource, as: resource_name, url: user_session_path) do |f|
       / = devise_error_messages!

data/app/views/hancock/home/index.html.slim

@@ -1 +1,4 @@
-div hancock_cms test app
+div Hancock CMS Application
+
+- if defined?(Hancock::Pages) and @seo_page
+  = render file: "hancock/pages/pages/show"

data/app/views/layouts/application.html.slim

@@ -9,18 +9,19 @@ html lang="ru"
     
     / - cache 'favicons', skip_digest: true do
     /   = render partial: 'blocks/favicon'
-
+    
     - async = false #Rails.env.production?
-    = stylesheet_link_tag "application", media: "all", async: async
-    = javascript_include_tag "application", async: async
+    - defer = true #Rails.env.production?
+    = stylesheet_link_tag "application", media: "all", async: async, defer: defer
+    = javascript_include_tag "application", async: async, defer: defer
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async, defer: defer
     - cache 'layouts/application/custom_head', skip_digest: true do
       - _cache_key = ['views/layouts/application/custom_head']
       css:
-        #{Settings.ns('application_layout').custom_css(default: '', kind: :css, label: "Дополнительный CSS", cache_keys: _cache_key)}
+        #{{Settings.ns('application_layout').custom_css(default: '', kind: :css, label: "Дополнительный CSS", cache_keys: _cache_key)}}
       javascript:
-        #{Settings.ns('application_layout').custom_js(default: '', kind: :js, label: "Дополнительный JS", cache_keys: _cache_key)}
+        #{{Settings.ns('application_layout').custom_js(default: '', kind: :js, label: "Дополнительный JS", cache_keys: _cache_key)}}
 
   body{class="application_layout #{controller_name} #{action_name} #{controller_name}_#{action_name}"}
 

data/app/views/layouts/hancock/devise/confirmations.html.slim

@@ -6,13 +6,16 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    = render partial: 'blocks/favicon'
+    
+    / - cache 'favicons', skip_digest: true do
+    /   = render partial: 'blocks/favicon'
     
     - async = false #Rails.env.production?
-    = stylesheet_link_tag "application", media: "all", async: async
-    = javascript_include_tag "application", async: async
+    - defer = false #Rails.env.production?    
+    = stylesheet_link_tag "application", media: "all", defer: defer
+    = javascript_include_tag "application", defer: defer
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", defer: defer
       
   body
     #preloader

data/app/views/layouts/hancock/devise/passwords.html.slim

@@ -6,13 +6,16 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    = render partial: 'blocks/favicon'
+    
+    / - cache 'favicons', skip_digest: true do
+    /   = render partial: 'blocks/favicon'
     
     - async = false #Rails.env.production?
-    = stylesheet_link_tag "application", media: "all", async: async
-    = javascript_include_tag "application", async: async
+    - defer = false #Rails.env.production?    
+    = stylesheet_link_tag "application", media: "all", defer: defer
+    = javascript_include_tag "application", defer: defer
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", defer: defer
       
   body
     #preloader

data/app/views/layouts/hancock/devise/registrations.html.slim

@@ -6,13 +6,16 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    = render partial: 'blocks/favicon'
+    
+    / - cache 'favicons', skip_digest: true do
+    /   = render partial: 'blocks/favicon'
     
     - async = false #Rails.env.production?
-    = stylesheet_link_tag "application", media: "all", async: async
-    = javascript_include_tag "application", async: async
+    - defer = false #Rails.env.production?    
+    = stylesheet_link_tag "application", media: "all", defer: defer
+    = javascript_include_tag "application", defer: defer
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", defer: defer
       
   body
     #preloader

data/app/views/layouts/hancock/devise/sessions.html.slim

@@ -6,13 +6,16 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    = render partial: 'blocks/favicon'
+    
+    / - cache 'favicons', skip_digest: true do
+    /   = render partial: 'blocks/favicon'
     
     - async = false #Rails.env.production?
-    = stylesheet_link_tag "application", media: "all", async: async
-    = javascript_include_tag "application", async: async
+    - defer = false #Rails.env.production?    
+    = stylesheet_link_tag "application", media: "all", defer: defer
+    = javascript_include_tag "application", defer: defer
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", defer: defer
       
   body
     #preloader

data/app/views/layouts/hancock/devise/unlocks.html.slim

@@ -6,13 +6,16 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    = render partial: 'blocks/favicon'
+    
+    / - cache 'favicons', skip_digest: true do
+    /   = render partial: 'blocks/favicon'
     
     - async = false #Rails.env.production?
-    = stylesheet_link_tag "application", media: "all", async: async
-    = javascript_include_tag "application", async: async
+    - defer = false #Rails.env.production?    
+    = stylesheet_link_tag "application", media: "all", defer: defer
+    = javascript_include_tag "application", defer: defer
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", defer: defer
       
   body
     #preloader

data/app/views/layouts/rails_admin/_footer.html.slim

@@ -1,2 +1,2 @@
-= "2016 © Hancock By "
-= link_to "Redrocks", "http://redrocks.pro", title: "Redrocks", target: "_blank"
+= "2016-#{Time.new.year} © Hancock By "
+= link_to "Redrocks", "https://redrocks.pro", title: "Redrocks", target: "_blank"

data/app/views/layouts/rails_admin/_footer_navigation.html.slim

@@ -1,20 +1,36 @@
 ul
   - actions(:root).each do |action|
     - next if action.action_name.to_s == "dashboard"
-    - data_method = nil if action.http_methods.include?(:get)
     - data_method = "post" if action.http_methods.include?(:post)
     - data_method = "put" if action.http_methods.include?(:put)
     - data_method = "delete" if action.http_methods.include?(:delete)
+    - data_method = nil if action.http_methods.include?(:get)
 
     li{class="#{action.action_name} footer-nav-link"}
-      = link_to wording_for(:menu, action), {action: action.action_name, controller: 'rails_admin/main'}, class: (action.pjax? ? "pjax" : ""), title: wording_for(:menu, action), data: data_method ? {method: data_method, confirm: t("admin.actions.#{action.action_name}.confirm")} : nil
+      / = link_to wording_for(:menu, action), {action: action.action_name, controller: 'rails_admin/main'}, class: (action.pjax? ? "pjax" : ""), title: wording_for(:menu, action), data: data_method ? {method: data_method, confirm: t("admin.actions.#{action.action_name}.confirm")} : nil
+      ruby:
+        opts = {}
+        opts[:action] = action.action_name
+        opts[:controller] = 'rails_admin/main'
+        html_opts = {}
+        html_opts[:class] = (action.pjax? ? "pjax" : "")
+        html_opts[:title] = wording_for(:menu, action)
+        html_opts[:data] = {
+          method: data_method,
+          confirm: (data_method ? t("admin.actions.#{action.action_name}.confirm") : nil)
+        }.compact
+        
+      = link_to opts, html_opts
+        span
+          = content_tag :i, '', class: action.link_icon
+      / = link_to wording_for(:menu, action), opts, html_opts
 
   - if main_app_root_path = (main_app.root_path rescue false)
     li.footer-nav-link = link_to main_app_root_path, title: "На сайт".freeze
       span
         i.fa.fa-home
 
-  - if logout_path.present?
-    li.footer-nav-link = link_to logout_path, title: "Выйти".freeze, method: logout_method
+  - if signed_in? and logout_path.present?
+    li.footer-nav-link = link_to logout_path, title: "Выйти".freeze, method: logout_method, confirm: t("admin.logout.confirm")
       span
         i.fa.fa-power-off

data/app/views/layouts/rails_admin/_navigation.html.slim

@@ -1,19 +1,6 @@
-/.logo-block
-/  = link_to dashboard_path, title: "Hancock CMS".freeze, class: "admin-title".freeze
-/    = image_tag "rails-admin/hancock_logo.svg", title: "Hancock CMS".freeze, alt: "Hancock CMS".freeze, class: "hancock-main-logo"
-/
-/.top-nav
-/  .left-nav
-/    .top-nav-project = link_to dashboard_path, title: "Административная панель".freeze
-/      - plugin_name = _get_plugin_name[0] || 'Rails'
-/      span = "Административная панель: #{plugin_name}".freeze
-/  .right-nav
-/    = render partial: "layouts/rails_admin/secondary_navigation"
-
-
 .navbar-header-brand
   = link_to dashboard_path, title: "Hancock CMS".freeze, class: "admin-title".freeze
-    = image_tag "rails-admin/hancock_logo.svg", title: "Hancock CMS".freeze, alt: "Hancock CMS".freeze, class: "hancock-main-logo"
+    = image_tag "hancock/rails_admin/hancock_logo.svg", title: "Hancock CMS".freeze, alt: "Hancock CMS".freeze, class: "hancock-main-logo"
 
 .navbar-container.container-fluid
   .plugin-name-panel
@@ -37,37 +24,16 @@
             li.user-logout-action
               = link_to logout_path, title: "Выйти".freeze, method: logout_method
                 span Выйти
-
-        /.user_root_link = edit_user_link
-
-
-/.app-header.fixed
-/  .app-header-inner
-/    .brand-title
-/      h2 = link_to dashboard_path, title: "Hancock CMS".freeze, class: "admin-title".freeze
-/        span = image_tag "rails-admin/hancock_logo.svg", title: "Hancock CMS".freeze, alt: "Hancock CMS".freeze
-/
-/    .top-nav-left
-/      .top-nav-project = link_to dashboard_path, title: "Административная панель".freeze
-/        - plugin_name = _get_plugin_name[0] || 'Rails'
-/        span = "Административная панель: #{plugin_name}".freeze
-/    /
-/    .top-nav-right
-/      = render partial: "layouts/rails_admin/secondary_navigation"
-      / ul.nav.navbar-nav.root_links
-        / - actions(:root).each do |action|
-        /   / li.top-nav-control-panel = link_to "", { action: action.action_name, controller: 'rails_admin/main' }, class: action.pjax? ? "pjax" : ""
-        /   li.top-nav-control-panel = link_to "/admin", title: "Контрольная панель"
+                
+        / - if main_app_root_path = (main_app.root_path rescue false)
+        /   li.top-nav-goto-home = link_to main_app_root_path, title: "На главную".freeze
         /     span
-        /       i.fa.fa-server
-        - if main_app_root_path = (main_app.root_path rescue false)
-          li.top-nav-goto-home = link_to main_app_root_path, title: "На главную".freeze
-            span
-              i.fa.fa-home
-        - if _current_user
-          - if user_link = edit_user_link
-           li.top-nav-user_root_link = edit_user_link
-          - if logout_path.present?
-            li.top-nav-logout = link_to logout_path, title: "Выйти".freeze, method: logout_method
-              span
-                i.fa.fa-sign-out
+        /       i.fa.fa-home
+        /       
+        / - if _current_user
+        /   - if user_link = edit_user_link
+        /    li.top-nav-user_root_link = edit_user_link
+        /   - if logout_path.present?
+        /     li.top-nav-logout = link_to logout_path, title: "Выйти".freeze, method: logout_method
+        /       span
+        /         i.fa.fa-sign-out

data/app/views/layouts/rails_admin/_secondary_navigation.html.slim

@@ -1,13 +1,16 @@
 ul.nav.navbar-nav.root_links
   - actions(:root).each do |action|
     - next if action.action_name.to_s == "dashboard"
-    - data_method = nil       if action.http_methods.include?(:get)
     - data_method = "post"    if action.http_methods.include?(:post)
     - data_method = "put"     if action.http_methods.include?(:put)
     - data_method = "delete"  if action.http_methods.include?(:delete)
+    - data_method = nil       if action.http_methods.include?(:get)
 
     li{class="#{action.action_name}_root_link top-nav-control-panel"}
-      = link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: (action.pjax? ? "pjax" : ""), data: data_method ? {method: data_method, confirm: t("admin.actions.#{action.action_name}.confirm")} : nil
+      / = link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: (action.pjax? ? "pjax" : ""), data: data_method ? {method: data_method, confirm: t("admin.actions.#{action.action_name}.confirm")} : nil
+      = link_to { action: action.action_name, controller: 'rails_admin/main' }, class: (action.pjax? ? "pjax" : ""), data: data_method ? {method: data_method, confirm: t("admin.actions.#{action.action_name}.confirm")} : nil
+        span
+          = content_tag :i, '', class: action.link_icon
       
       
   - if main_app_root_path = (main_app.root_path rescue false)
@@ -20,13 +23,3 @@ ul.nav.navbar-nav.root_links
       li.top-nav-logout = link_to logout_path, title: "Выйти".freeze, method: logout_method
         span
           i.fa.fa-sign-out
-
-  / - if main_app_root_path = (main_app.root_path rescue false)
-  /   li= link_to t('admin.home.name').capitalize, main_app_root_path
-  / - if _current_user
-  /   - if user_link = edit_user_link
-  /     li= user_link
-  /   - if logout_path.present?
-  /     li= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-important'), logout_path, method: logout_method
-  /   - if _current_user.respond_to?(:email) && _current_user.email.present?
-  /     li= image_tag "#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", style: 'padding-top:5px'

data/app/views/layouts/rails_admin/_sidebar_navigation.html.slim

@@ -0,0 +1,2 @@
+ul.nav.nav-pills.nav-stacked= hancock_main_navigation
+ul.nav.nav-pills.nav-stacked= static_navigation

data/app/views/layouts/rails_admin/_sidebar_navigation_filter.html.slim

@@ -0,0 +1,3 @@
+= text_field_tag 'navigation_filter', '', placeholder: 'Filter...', class: 'navigation_filter_field', autofocus: (action_name=="dashboard")
+span.clear_navigation_filter_field
+  i.fa.fa-close

data/app/views/layouts/rails_admin/application.html.haml

@@ -18,7 +18,9 @@
       = render "layouts/rails_admin/navigation"
 
     .admin-menubar.admin-menubar-fixed.admin-menubar-dark
-      .toolbar
+      .navigation-filter
+        = render "layouts/rails_admin/sidebar_navigation_filter"
+      .toolbar.custom_scroll
         = render "layouts/rails_admin/sidebar_navigation"
       .admin-menubar-footer
         = render "layouts/rails_admin/footer_navigation"