hancock_cms 2.0.0.2 → 2.0.1.1

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/models/concerns/hancock/user_defined.rb

@@ -0,0 +1,53 @@
+module Hancock::UserDefined
+  extend ActiveSupport::Concern
+
+  included do
+    include Hancock::InsertionField
+
+    class_attribute :user_defined_fields
+    self.user_defined_fields ||= {}
+    def user_defined_fields
+      self.class.user_defined_fields
+    end
+  end
+
+  class_methods do
+    def user_defined_field(name, opts = {type: String, default: ''})
+      field name, opts
+      user_defined_for name, opts
+    end
+    def user_defined_for(name, opts = {})
+      return if name.blank?
+      name = name.to_sym
+      return if user_defined_fields.keys.include?(name)
+      _method_name = opts[:as].present? ? opts[:as] : "user_defined_#{name}"
+      _render_method_name = "render_#{_method_name}"
+      _advanced_render_method =  "#{_render_method_name}_or"#"render_#{name}"
+      field _render_method_name, type: Boolean, default: false
+      insertions_for name, opts[:insertions_options] || {}
+      user_defined_fields[name] = {
+        method: _method_name,
+        render_method: _render_method_name,
+        advanced_render_method: _advanced_render_method,
+        options: opts
+      }
+      if _method_name
+        class_eval <<-RUBY
+          def #{_method_name}
+            page_#{name}.html_safe
+          end
+          def #{_advanced_render_method}(&block)
+            if #{_render_method_name}
+              #{_method_name}.html_safe
+            else
+              yield if block_given?
+              nil
+            end
+          end
+        RUBY
+      end
+      name
+    end
+
+  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

@@ -10,17 +10,7 @@ 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
-    /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
-    - 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)}
-      javascript:
-        #{Settings.ns('application_layout').custom_js(default: '', kind: :js, label: "Дополнительный JS", cache_keys: _cache_key)}
+    = render partial: 'assets'      
 
   body{class="application_layout #{controller_name} #{action_name} #{controller_name}_#{action_name}"}
 

data/app/views/layouts/hancock/_assets.html.slim

@@ -0,0 +1,15 @@
+- layout_name ||= 'application'
+- stylesheet_name ||= layout_name
+- javascript_name ||= layout_name
+- async = false unless defined?(async) #Rails.env.production?
+- defer = true  unless defined?(defer) #Rails.env.production?
+= stylesheet_link_tag stylesheet_name, media: "all", async: async, defer: defer
+= javascript_include_tag javascript_name, 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, defer: defer
+- cache "layouts/#{layout_name}/custom_head", skip_digest: true do
+  - _cache_key = ["layouts/#{layout_name}/custom_head"]
+  css:
+    #{{Settings.ns("#{layout_name}_layout").custom_css(default: '', kind: :css, label: "Дополнительный CSS", cache_keys: _cache_key)}}
+  javascript:
+    #{{Settings.ns("#{layout_name}_layout").custom_js(default: '', kind: :js, label: "Дополнительный JS", cache_keys: _cache_key)}}

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