hancock_cms 2.0.1.2 → 2.0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d704984b8108ff83c5209e9505440d03c02e70a7
-  data.tar.gz: 6babb6286249198815ea9ea6cd263c19039c84ea
+  metadata.gz: 10e89db845873d72c3c7cc2af8ecbc9ef4e82cb7
+  data.tar.gz: 38b09a986571dccb38748dc529bdbf981630ce76
 SHA512:
-  metadata.gz: 137c2780400f149ce76a608935f57fab9c22460415f1c444e5e460c793cf2cefc1258b8b68916a6ea70549508f9a823ba331382ae00898d56c58e0385683be02
-  data.tar.gz: 10eb370df745331d9294a7df88a0d41a7d7a66fe169383f34482b7ca5862624f3579e7dbc57c5c2e41c837df8188c3ee2a24191b0bb843ed72ba4ddc651204ba
+  metadata.gz: 2f2e6ced5a464438a0d72edd90eb8c57c6fbec8847c459d9c884366b23c6add4d1e0ef93b56ce4b732be496701908bb1ff64f47b0911e207bcaea0460537cae7
+  data.tar.gz: 675d2cf95e60c4b3e999a4192c9dd4e2c589aac3e3c05488529afdd834b2a9c44bec12abfe3f0c673720cd9046497fbd56caa54e4788a78a51337c8b67e9298d

data/app/assets/javascripts/hancock/cms.coffee

@@ -9,3 +9,4 @@
 #= require ./cms/init
 #= require ./cms/map
 #= require ./cms/flash
+

data/app/assets/javascripts/hancock/rails_admin/cms.ui.coffee

@@ -12,6 +12,9 @@
 #= require ./multiselect
 #= require ./enum_with_custom
 
+#= require ./hancock_array
+#= require ./hancock_hash
+
 #= require ./plugins
 
 window.hancock_cms ||= {}

data/app/assets/javascripts/hancock/rails_admin/hancock_array.coffee

@@ -0,0 +1,43 @@
+$(document).on "click", ".hancock_array_type .array_element_add_link", (e)->
+  e.preventDefault()
+  link = $(e.currentTarget)
+  link_parent = link.parent()
+  link_parent.before(link.data('template'))
+  link_parent.prev().find('input:first').focus().select().trigger('change')
+  return false
+
+
+$(document).on 'click', '.hancock_array_type .array_element_delete_link', (e)->
+  e.preventDefault()
+  hidden_field = $(e.currentTarget).closest(".hancock_array_type").find("[type='hidden']")
+  $(e.currentTarget).parent().remove()
+  hidden_field.trigger('change')
+  return false
+
+
+$(document).on 'click', '.hancock_array_type .array_element_move_link', (e)->
+  e.preventDefault()
+  link = $(e.currentTarget)
+  array_element_block = link.parent()
+  if link.hasClass("up")
+    prev = array_element_block.prev(".array_element_block")
+    array_element_block.insertBefore(prev) if prev.length > 0
+  if link.hasClass("down")
+    next = array_element_block.next(".array_element_block")
+    array_element_block.insertAfter(next) if next.length > 0
+  return false
+
+
+
+$(document).on "change", ".hancock_array_type :input, .hancock_enum_type :input, .hancock_enum_with_custom_type :input, .enum_type :input", (e)->
+  field_block = $(e.currentTarget).closest(".hancock_array_type, .hancock_enum_type, .hancock_enum_with_custom_type, .enum_type")
+  hidden_field = field_block.find("[type='hidden']")
+  if field_block.find(":input:not([type='hidden'])").serializeArray().length == 0
+    hidden_field.prop('name', hidden_field.data('name')) if hidden_field.data('name')
+  else
+    hidden_field.data('name', hidden_field.prop('name')) if hidden_field.prop('name')
+    hidden_field.prop('name', '')
+
+
+$(document).on "rails_admin.dom_ready", (e)->
+  $(".hancock_array_type, .hancock_enum_type, .hancock_enum_with_custom_type, .enum_type").find(":input[type='hidden']").trigger('change')

data/app/assets/javascripts/hancock/rails_admin/hancock_hash.coffee

@@ -0,0 +1,90 @@
+$(document).on "click", ".hancock_hash_type .hash_element_renamer_link", (ev)->
+  ev.preventDefault()
+  renamer_link = $(ev.currentTarget)
+  label = renamer_link.closest('.hash_element_block').find('label')
+  input = renamer_link.closest('.hash_element_block').find('input')
+  new_renamer_link = renamer_link.clone()
+  renamer_field = $("<input>").addClass('hash_element_renamer_field').prop("type", "string").prop("placeholder", "Новое имя").prop("value", label.text())
+  renamer_link.replaceWith(renamer_field)
+  label.hide()
+  input.hide()
+  renamer_field.focus().blur( ->
+    renamer_field.replaceWith(renamer_link)
+    label.show()
+    input.show()
+  ).keypress((e)->
+    key = e.which || e.keyCode
+    if key == 13
+      e.preventDefault()
+      new_name = renamer_field.val().trim()
+      if new_name.length > 0
+        old_id    = input.prop('id')
+        old_name  = input.prop('name')
+        reg_for_id = /\[[^\[\]]+\]$/i
+        reg_for_name = /\[[^\[\]]+\]\]$/i
+        label.prop('for',   old_id.replace(reg_for_id, "[" + new_name + "]")).text(new_name)
+        input.prop('id',    old_id.replace(reg_for_id, "[" + new_name + "]"))
+        input.prop('name',  old_name.replace(reg_for_name, "[" + new_name + "]]"))
+      renamer_field.blur()
+      input.focus()
+      return false
+  ).keydown((e)->
+    key = e.which || e.keyCode
+    if key == 27
+      renamer_field.blur()
+      return false
+  ).select()
+  return false
+
+
+
+$(document).on "click", ".hancock_hash_type .hash_element_add_link", (e)->
+  e.preventDefault()
+  link = $(e.currentTarget)
+  link_parent = link.parent()
+  link_parent.before(link.data('template'))
+  # link_parent.prev().find('input:first').focus().select()
+  link_parent.prev().find('.hash_element_renamer_link').click()
+  return false
+
+
+$(document).on 'click', '.hancock_hash_type .hash_element_delete_link', (e)->
+  e.preventDefault()
+  $(e.currentTarget).parent().remove()
+  return false
+
+$(document).on 'blur', '.hancock_hash_type .hash_element_key_field', (e)->
+  e.preventDefault()
+  input = $(e.currentTarget).siblings('input')
+  old_id    = input.prop('id')
+  old_name  = input.prop('name')
+  new_name = e.currentTarget.value
+  reg_for_id = /\[[^\[\]]+\]$/i
+  reg_for_name = /\[[^\[\]]+\]\]$/i
+  input.prop('id',    old_id.replace(reg_for_id, "[" + new_name + "]"))
+  input.prop('name',  old_name.replace(reg_for_name, "[" + new_name + "]]"))
+  return false
+
+
+$(document).on 'blur', '.hancock_hash_type .hash_element_block input', (e)->
+  fields_block = $(e.currentTarget).closest(".controls")
+  fields_block.find('.value_field').each ->
+    $(this).parent().removeClass('duplicate')
+    fields_block.find('.value_field').not($(this)).filter("[name='" + this.name + "']").parent().addClass('duplicate')
+
+
+
+
+  # $(document).on 'click', '.hash_element_duplicate_trigger', (e)->
+  #   e.preventDefault()
+  #   link = $(e.currentTarget)
+  #   link.data('show-duplicates', link.data('show-duplicates') ^ 1)
+  #   fields_block = link.closest(".controls")
+  #   fields_block.find('.value_field').each ->
+  #     $(this).parent().removeClass('duplicate')
+  #     if link.data('show-duplicates')
+  #       fields_block.find('.value_field').not($(this)).filter("[name='" + this.name + "']").parent().addClass('duplicate')
+  #   old_text = link.text()
+  #   new_text = link.data('text')
+  #   link.text(new_text).data('text', old_text)
+  #   return false

data/app/assets/javascripts/hancock/rails_admin/navigation_filter.coffee

@@ -11,8 +11,11 @@ $(document).on 'keydown', '#navigation_filter', (e)->
     _navig = $(e.currentTarget).parent().siblings('.toolbar').find('.nav')
     return true if _navig.find("li:visible").length == 0 and _code != 13
     if (_selected = _navig.find("li.current_selected")).length == 1
-      if _selected.find("a").length > 0
-        _selected.find('a').click()
+      if (_link = _selected.find('a')).length > 0
+        if e.ctrlKey
+          window.open(_link[0].href, "_blank")
+        else
+          _link.click()
       else
         if _selected.hasClass('opened')
           _selected.addClass('forced-closed').removeClass('forced-opened').click()
@@ -22,7 +25,11 @@ $(document).on 'keydown', '#navigation_filter', (e)->
     else
       return true if _code == 37
       if (_selected = _navig.find('li.visible[data-model]')).length == 1
-        _selected.find('a').click()
+        _link = _selected.find('a')
+        if e.ctrlKey
+          window.open(_link[0].href, "_blank")
+        else
+          _link.click()
       else
         return true if _code == 39
 

data/app/assets/javascripts/rails_admin/custom/ui.coffee

@@ -1,3 +1,11 @@
 #= require_self
 #= require hancock/rails_admin/cms.ui
 #= require hancock/rails_admin/custom/ui
+
+$(window).load ->
+  $('#preloader').fadeOut 'slow', ->
+    $(this).remove()
+
+$(document).on 'ready pjax:success', ->
+  $('#preloader').fadeOut 'slow', ->
+    $(this).remove()

data/app/assets/stylesheets/hancock/rails_admin/cms.theming.sass

@@ -1,6 +1,9 @@
 @import 'jquery.mCustomScrollbar'
 
-@import "./fieldsets"
+@import 'hancock/rails_admin/fieldsets'
+@import 'hancock/rails_admin/settings'
+@import 'hancock/rails_admin/tables'
+@import 'hancock/rails_admin/hancock_hash'
 
 .btn
   +transition(all 0.3s)
@@ -860,6 +863,29 @@ body.rails_admin .nav.nav-tabs
       white-space: nowrap
       text-overflow: ellipsis
 
+body.rails_admin .nav-tabs.filter
+  li
+    max-width: none
+    a
+      text-overflow: clip
+  #filters
+    li
+      display: block
+      width: 100%
+
+#filters_box
+  .label-info
+    color: #fff
+    background-color: #e53935
+    +transition(all 0.3s ease-in-out)
+    &:hover
+      color: #fff
+      background-color: darken(#e53935, 10%)
+    a
+      color: #fff
+    a:hover
+      color: #fff
+
 .form-group.form-actions
   margin-left: 0px
   margin-right: 0px
@@ -906,5 +932,3 @@ body.rails_admin .nav.nav-tabs
 
 
 @import "hancock/rails_admin/plugins"
-
-@import "hancock/rails_admin/custom/theming"

data/app/assets/stylesheets/hancock/rails_admin/hancock_hash.sass

@@ -0,0 +1,4 @@
+.hancock_hash_type
+  .hash_element_block
+    &.duplicate
+      background-color: rgb(255, 107, 107)

data/app/assets/stylesheets/hancock/rails_admin/settings.sass

@@ -0,0 +1,19 @@
+.form-group.raw_field
+  input, textarea
+    display: block
+    width: 100%
+    min-width: 406px
+    min-height: 34px
+    padding: 6px 12px
+    font-size: 14px
+    line-height: 1.42857
+    color: #555555
+    background-color: #fff
+    background-image: none
+    border: 1px solid #ccc
+    border-radius: 4px
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075)
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075)
+    -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s
+    -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s
+    transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s

data/app/assets/stylesheets/hancock/rails_admin/tables.sass

@@ -0,0 +1,15 @@
+td.other
+  a
+    font-size: 0
+  a:before
+    font-family: FontAwesome
+    font-size: 12px
+    margin-left: 20px
+
+td.other.right
+  a:before
+    content: "\f051"
+
+td.other.left
+  a:before
+    content: "\f048"

data/app/controllers/hancock/registrations_controller.rb

@@ -12,7 +12,7 @@ class Hancock::RegistrationsController < Devise::RegistrationsController
       end
     end
   end
-
+  
   include Hancock::Decorators::Registrations
 
 end

data/app/controllers/hancock/sessions_controller.rb

@@ -14,7 +14,7 @@ class Hancock::SessionsController < Devise::SessionsController
       end
     end
   end
-
+  
   include Hancock::Decorators::Sessions
 
 end

data/app/helpers/rails_admin/application/hancock_helper.rb

@@ -1,4 +1,4 @@
-require 'rails_admin/application_helper'
+# require 'rails_admin/application_helper'
 module RailsAdmin::Application
   module HancockHelper
 
@@ -15,5 +15,23 @@ module RailsAdmin::Application
       end.join.html_safe
     end
 
+    def hancock_show_path(obj, opts = {})
+      if obj.is_a?(Hash)
+        (opts ||= {}).merge!(obj)
+      else
+        (opts ||= {}).merge!({model_name: obj.rails_admin_model, id: obj.id})
+      end
+      show_path(opts)
+    end
+
+    def hancock_edit_path(obj, opts = {})
+      if obj.is_a?(Hash)
+        (opts ||= {}).merge!(obj)
+      else
+        (opts ||= {}).merge!({model_name: obj.rails_admin_model, id: obj.id})
+      end
+      edit_path(opts)
+    end
+
   end
 end

data/app/helpers/rails_admin/hancock/form_builder.rb

@@ -11,10 +11,10 @@ module RailsAdmin::Hancock
       ).visible_fields
       return if fields.empty?
 
-      _defailt_fieldset = fieldset.name == :default
-      @template.content_tag :fieldset, class: _defailt_fieldset ? 'default_fieldset' : '' do
-        if fieldset.leftside_hider
-          leftside_hider = @template.content_tag(:div, class: 'control-group leftside_hider', title: _defailt_fieldset ? "" : "Свернуть блок") do
+      _default_fieldset = fieldset.name == :default
+      @template.content_tag :fieldset, class: _default_fieldset ? 'default_fieldset' : '' do
+        if fieldset.leftside_hider and !nested_in
+          leftside_hider = @template.content_tag(:div, class: 'control-group leftside_hider', title: _default_fieldset ? "" : "Свернуть блок") do
             @template.content_tag(:div, class: 'scroll_fieldset_block') do
               ret = []
               ret << @template.content_tag(:div, class: 'scroll_fieldset_top', title: "Вверх блока") do

data/app/helpers/rails_admin/main/hancock_helper.rb

@@ -1,4 +1,4 @@
-require 'rails_admin/main_helper'
+# require 'rails_admin/main_helper'
 module RailsAdmin::Main
   module HancockHelper
 

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

@@ -13,11 +13,13 @@ module Hancock::InsertionField
     # /(\[\[(\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
+    # reg2 = /\[\[\[\[(?<new_helper>(?<new_helper_name>\w+?))\]\]\]\]/i
+    # reg3 = /\{\{(?<insertion_old>self\.(?<insertion_old_name>\w+?))\}\}/i
+    # reg4 = /\{\{(?<setting_with_ns>(?<setting_with_ns_ns>[\w\-\.]+?)\.(?<setting_with_ns_name>\w+?))\}\}/i
+    # reg5 = /\{\{(?<setting>(?<setting_name>\w+?))\}\}/i
+    # reg6 = /\{\{(?<old_bs>BS\|(?<old_bs_name>\w+?))\}\}/i
+    # reg7 = /\{\{(?<old_helper>HELPER\|(?<old_helper_name>\w+?))\}\}/i
+    # reg8 = /\{\{\{\{(?<insertion>(?<insertion_name>\w+?))\}\}\}\}/i
     private
     def process_with_insertions(_data)
       if _data.nil?

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

@@ -5,7 +5,7 @@ module Hancock::Mappable
 
     if Hancock.mongoid?
       include ::Geocoder::Model::Mongoid
-      field :coordinates, type: Array
+      field :coordinates, type: Array, default: []
       field :address, type: String, localize: Hancock.configuration.localize
 
       field :map_address, type: String
@@ -88,5 +88,5 @@ module Hancock::Mappable
       map_address
     end
   end
-  
+
 end

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

@@ -1,6 +1,34 @@
 module Hancock::RailsAdminPatch
   extend ActiveSupport::Concern
 
+  included do
+    if respond_to?(:rails_admin_block) and (_block = rails_admin_block).is_a?(Proc)
+      rails_admin &_block
+    end
+    class << self
+      def inherited(base)
+        super
+        base_name = base.name.to_sym
+        self_name = self.name.to_sym
+        registry = ::RailsAdmin::Config.registry
+        if registry.keys.include?(self_name) and !registry.keys.include?(base_name)
+          # puts "inheriting #{base_name} from #{self_name}"
+          registry[base_name] = RailsAdmin::Config.model(base)
+          # puts registry[self_name].get_deferred_blocks.inspect
+          registry[self_name].get_deferred_blocks.each do |b|
+            registry[base_name].add_deferred_block &b
+          end
+        end
+        # puts "inheriting #{base_name} from #{self_name}"
+        if self.respond_to?(:rails_admin_block) and (_block = self.rails_admin_block).is_a?(Proc)
+          base.rails_admin &_block
+        end
+        # puts registry[base_name].get_deferred_blocks.inspect
+      end
+    end
+
+  end
+
   def rails_admin_model
     self.class.rails_admin_model
   end
@@ -19,6 +47,8 @@ module Hancock::RailsAdminPatch
   end
 
   class_methods do
+    def rails_admin_block
+    end
     def rails_admin_model
       name.split('::').collect(&:underscore).join('~')
     end

data/app/views/{layouts/hancock → hancock}/_assets.html.slim

@@ -1,15 +1,19 @@
-- layout_name ||= 'application'
-- stylesheet_name ||= layout_name
-- javascript_name ||= layout_name
+- layout_name           ||= controller.send(:_layout, []) || 'application' rescue 'application'
+- stylesheet_name       ||= layout_name
+- javascript_name       ||= layout_name
+- custom_head_cache_key ||= "layouts/#{layout_name}/custom_head"
 - 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"]
+    
+== hancock_settings "custom_head", ns: "#{layout_name}_layout", default: '', kind: :code, label: "Дополнительный код в head"
+
+- cache custom_head_cache_key, skip_digest: true do
+  - _cache_keys = [custom_head_cache_key]
   css:
-    #{{Settings.ns("#{layout_name}_layout").custom_css(default: '', kind: :css, label: "Дополнительный CSS", cache_keys: _cache_key)}}
+    #{{Settings.ns("#{layout_name}_layout").custom_css(default: '', kind: :css, label: "Дополнительный CSS", cache_keys: _cache_keys)}}
   javascript:
-    #{{Settings.ns("#{layout_name}_layout").custom_js(default: '', kind: :js, label: "Дополнительный JS", cache_keys: _cache_key)}}
+    #{{Settings.ns("#{layout_name}_layout").custom_js(default: '', kind: :js, label: "Дополнительный JS", cache_keys: _cache_keys)}}

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

@@ -8,9 +8,9 @@ html lang="ru"
     = csrf_meta_tags
     
     / - cache 'favicons', skip_digest: true do
-    /   = render partial: 'blocks/favicon'
+    /   = render partial: 'blocks/favicon'    
 
-    = render partial: 'assets'      
+    = render partial: 'hancock/assets'          
 
   body{class="application_layout #{controller_name} #{action_name} #{controller_name}_#{action_name}"}
 

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

@@ -0,0 +1,125 @@
+ruby:
+  preloader_style = []
+  preloader_style << "position: fixed"
+  preloader_style << "left: 0px"
+  preloader_style << "top: 0px"
+  preloader_style << "right: 0px"
+  preloader_style << "bottom: 0px"
+  preloader_style << "z-index: 9999"
+  preloader_style << "overflow: visible"
+  preloader_style << "background: #e53935 no-repeat center center"
+
+  spinner_style = []
+  spinner_style << "width: 60px"
+  spinner_style << "height: 60px"
+  spinner_style << "top: 50%"
+  spinner_style << "margin-top: -20px"
+  spinner_style << "left: 50%"
+  spinner_style << "margin-left: -20px"
+  spinner_style << "position: relative"
+  # spinner_style << "-webkit-animation: rotate 2.0s infinite linear"
+  # spinner_style << "animation: rotate 2.0s infinite linear"
+
+  circle1_style = []
+  circle1_style << "background-color: #FF8682"
+  circle1_style << "width: 20px"
+  circle1_style << "height: 20px"
+  circle1_style << "position: absolute"
+  circle1_style << "top: 20px"
+  circle1_style << "left: 20px"
+  circle1_style << "border-radius: 50%"
+  circle1_style << "-webkit-border-radius: 50%"
+  circle1_style << "-moz-border-radius: 50%"
+  circle1_style << "-webkit-animation: circlebounce 1.8s infinite ease-in-out"
+  circle1_style << "animation: circlebounce 1.8s infinite ease-in-out"
+
+  circle2_style = []
+  circle2_style << "background-color: #FFB8B4"
+  circle2_style << "width: 20px"
+  circle2_style << "height: 20px"
+  circle2_style << "position: absolute"
+  circle2_style << "top: 20px"
+  circle2_style << "left: 20px"
+  circle2_style << "border-radius: 50%"
+  circle2_style << "-webkit-border-radius: 50%"
+  circle2_style << "-moz-border-radius: 50%"
+  circle2_style << "-webkit-animation: circlebounce2 1.8s infinite ease-in-out"
+  circle2_style << "animation: circlebounce2 1.8s infinite ease-in-out"
+
+#preloader{style="#{preloader_style.join(";")}"}
+  .spinner{style="#{spinner_style.join(";")}"}
+    .circle1{style="#{circle1_style.join(";")}"}
+    .circle2{style="#{circle2_style.join(";")}"}
+
+  css:
+    @-webkit-keyframes circlebounce {
+      0% {
+        -webkit-transform: scale(0);
+      }
+      25% {
+        z-index: 2;
+      }
+      50% {
+        -webkit-transform: scale(2);
+      }
+      75% {
+        z-index: 1;
+      }
+      100% {
+        -webkit-transform: scale(0);
+      }
+    }
+
+    @keyframes circlebounce {
+      0% {
+        -webkit-transform: scale(0);
+      }
+      25% {
+        z-index: 2;
+      }
+      50% {
+        -webkit-transform: scale(2);
+      }
+      75% {
+        z-index: 1;
+      }
+      100% {
+        -webkit-transform: scale(0);
+      }
+    }
+
+    @-webkit-keyframes circlebounce2 {
+      0% {
+        -webkit-transform: scale(2);
+      }
+      25% {
+        z-index: 1;
+      }
+      50% {
+        -webkit-transform: scale(0);
+      }
+      75% {
+        z-index: 2;
+      }
+      100% {
+        -webkit-transform: scale(2);
+      }
+    }
+
+    @keyframes circlebounce2 {
+      0% {
+        -webkit-transform: scale(2);
+      }
+      25% {
+        z-index: 1;
+      }
+      50% {
+        -webkit-transform: scale(0);
+      }
+      75% {
+        z-index: 2;
+      }
+      100% {
+        -webkit-transform: scale(2);
+      }
+    }

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

@@ -13,7 +13,8 @@
       RailsAdmin.I18n.init('#{I18n.locale}', JSON.parse("#{j I18n.t("admin.js").to_json}"))
 
   %body.rails_admin
-    #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
+    #loading.label.label-warning = t('admin.loading')
+
     %nav.admin-navbar.admin-navbar-fixed.bg-red{:role => "navigation"}
       = render "layouts/rails_admin/navigation"
 
@@ -31,3 +32,5 @@
 
     %footer.admin-footer
       = render "layouts/rails_admin/footer"
+
+    = render "layouts/rails_admin/preloader"

data/app/views/rails_admin/main/_hancock_array.html.slim

@@ -0,0 +1,9 @@
+= form.hidden_field field.method_name, value: "", multiple: true
+- (field.value || []).each do |val|
+  = render partial: 'rails_admin/main/hancock_array/element', locals: {form: form, field: field, val: val}
+    
+- _template = capture do
+  = render partial: 'rails_admin/main/hancock_array/element', locals: {form: form, field: field, val: ""}
+p
+  = link_to "добавить", "#", class: "array_element_add_link", data: {template: _template.html_safe}
+  

data/app/views/rails_admin/main/_hancock_hash.html.slim

@@ -1,9 +1,36 @@
-ruby:
-  _opts = {}
-  _opts[:rows] = 10
-  _opts[:cols] = 80
-  _opts[:class] = 'form-control'
-  _opts[:value] = field.formatted_value
-  _opts[:style] = "font-family: monospace"
-  
-= form.text_area field.string_method, _opts
+- case field.editor_type.to_sym
+- when :default, :standard, :main, :text, :text_area, :textarea, :string
+  ruby:
+    _opts = {}
+    _opts[:rows] = 10
+    _opts[:cols] = 80
+    _opts[:class] = 'form-control'
+    _opts[:value] = field.formatted_value
+    _opts[:style] = "font-family: monospace"
+    
+  = form.text_area field.string_method, _opts
+
+- when :fixed_keys
+  - (field.value || {}).each_pair do |name, val|
+    = render partial: 'rails_admin/main/hancock_hash/fixed_keys', locals: {form: form, field: field, name: name, val: val}
+      
+  - _template = capture do
+    - name, val = "new", ""
+    = render partial: 'rails_admin/main/hancock_hash/fixed_keys', locals: {form: form, field: field, name: name, val: val}
+  p
+    = link_to "добавить", "#", class: "hash_element_add_link", data: {template: _template.html_safe}
+    / = " | "
+    / = link_to "показать дубликаты", "#", class: "hash_element_duplicate_trigger", data: {text: "скрыть дубликаты"}
+    
+      
+- when :full
+  - (field.value || {}).each_pair do |name, val|
+    = render partial: 'rails_admin/main/hancock_hash/full', locals: {form: form, field: field, name: name, val: val}
+      
+  - _template = capture do
+    - name, val = "new", ""
+    = render partial: 'rails_admin/main/hancock_hash/full', locals: {form: form, field: field, name: name, val: val}
+  p
+    = link_to "добавить", "#", class: "hash_element_add_link", data: {template: _template.html_safe}
+    / = " | "
+    / = link_to "показать дубликаты", "#", class: "hash_element_duplicate_trigger", data: {text: "скрыть дубликаты"}

data/app/views/rails_admin/main/hancock_array/_element.html.slim

@@ -0,0 +1,8 @@
+.array_element_block
+  = form.text_field field.method_name, value: val, multiple: true
+  span= " "
+  = link_to "(удалить)", "#", class: "array_element_delete_link", tabindex: -1
+  span= " "
+  = link_to "/\\", "#", class: "array_element_move_link array_element_move_up_link up", tabindex: -1
+  span= " "
+  = link_to "\\/", "#", class: "array_element_move_link array_element_move_down_link down", tabindex: -1

data/app/views/rails_admin/main/hancock_hash/_fixed_keys.html.slim

@@ -0,0 +1,8 @@
+.hash_element_block
+  = link_to "(изм)", "#", class: "hash_element_renamer_link", tabindex: -1
+  span= " "
+  = form.label "#{field.method_name}[#{name}]", name
+  span= ": "
+  = form.text_field "#{field.method_name}[#{name}]", value: val, class: 'value_field'
+  span= " "
+  = link_to "(удалить)", "#", class: "hash_element_delete_link", tabindex: -1

data/app/views/rails_admin/main/hancock_hash/_full.html.slim

@@ -0,0 +1,6 @@
+.hash_element_block
+  = form.text_field nil, value: name, class: 'hash_element_key_field', name: ""
+  span= ": "
+  = form.text_field "#{field.method_name}[#{name}]", value: val, class: 'value_field'
+  span= " #{name} "
+  = link_to "(удалить)", "#", class: "hash_element_delete_link", tabindex: -1

data/config/initializers/nested_set_patch.rb

@@ -30,8 +30,8 @@ if defined?(Mongoid)
           :left_field => 'lft',
           :right_field => 'rgt',
           :outline_number_field => nil,
-          :dependent => :delete_all, # or :destroy
-          :klass => self,
+          :dependent => :destroy,
+          :klass => self
         }.merge(options)
 
         if options[:scope].is_a?(Symbol) && options[:scope].to_s !~ /_id$/

data/config/locales/ru.hancock_admin.yml

@@ -3,4 +3,7 @@ ru:
     actions:
       custom_show_in_app:
         title: 'На сайте'
-        menu: "Показать на сайте"
+        menu: "Показать на сайте"
+
+    logout:
+      confirm: "Вы точно хотите покинуть АдминПанель?"

data/hancock_cms.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'rails', ['>= 5.0.0', '< 6.0']
+  spec.add_dependency 'rails', ['>= 5.0.0', '< 5.1']
 
   spec.add_dependency 'sprockets', '~> 3.7.1'
 

data/lib/hancock/admin.rb

@@ -5,7 +5,7 @@ module Hancock
         is_active, options = (is_active[:active] || false), is_active
       end
       fields = (options[:fields] ||= {})
-      field_names = [:slugs, :text_slug]
+      field_names = [:address, :map_address, :map_hint, :coordinates, :lat, :lon]
       field_showings = get_field_showings(fields, field_names)
 
       Proc.new {
@@ -38,7 +38,6 @@ module Hancock
           searchable true
         end if field_showings[:lon]
 
-
         Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields])
 
         if block_given?

data/lib/hancock/model.rb

@@ -4,12 +4,6 @@ module Hancock
     included do
       Hancock.register_model(self)
 
-      def self.inherited(base)
-        super
-        Hancock.register_model(base)
-        Hancock.register_model(self)
-      end
-
       if Hancock.mongoid?
         include Mongoid::Document
         include Mongoid::Timestamps::Short
@@ -45,5 +39,15 @@ module Hancock
       include Hancock::RailsAdminPatch
     end
 
+
+    class_methods do
+
+      def inherited(base)
+        Hancock.register_model(base)
+        super
+      end
+
+    end
+
   end
 end

data/lib/hancock/rails_admin_ext/hancock_array.rb

@@ -8,6 +8,10 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :partial do
+            enum.blank? ? :hancock_array : :form_hancock_enum_with_custom
+          end
+
           register_instance_option :multiple do
             true
           end

data/lib/hancock/rails_admin_ext/hancock_enum.rb

@@ -12,18 +12,29 @@ module RailsAdmin
             true
           end
           register_instance_option :searchable_columns do
-            [{column: "#{abstract_model.table_name}.#{enum_method}" , type: :string}]
+            if enum_method
+              [{column: "#{abstract_model.table_name}.#{enum_method}" , type: :string}]
+            else
+              []
+            end
           end
           register_instance_option :queryable do
             true
           end
 
+          register_instance_option :enum_method do
+            if bindings and (_obj = bindings[:object])
+              _class = _obj.class
+              @enum_method ||= _class.respond_to?("#{name}_enum") || _obj.respond_to?("#{name}_enum") ? "#{name}_enum" : name
+            end
+          end
+
           register_instance_option :partial do
             :form_hancock_enum
           end
 
           register_instance_option :help do
-            'Двойной клик перемещает между списками'
+            'Двойной клик перемещает между списками' if multiple
           end
 
         end

data/lib/hancock/rails_admin_ext/hancock_hash.rb

@@ -10,12 +10,21 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types::register(self)
           include RailsAdmin::Engine.routes.url_helpers
 
+          register_instance_option :editor_type do
+            :default
+          end
+
           register_instance_option :string_method do
             "#{name}_str"
           end
 
           register_instance_option :hash_method do
-            "#{name}_hash"
+            case editor_type
+            when :default, :standard, :main, :text, :text_area, :textarea, :string
+              "#{name}_hash"
+            else
+              name
+            end
           end
 
           register_instance_option :value do
@@ -36,7 +45,13 @@ module RailsAdmin
 
           ############ localize ######################
           register_instance_option :translations_field do
-            (string_method.to_s + '_translations').to_sym
+            case editor_type
+            when :default, :standard, :main, :text, :text_area, :textarea, :string
+              (string_method.to_s + '_translations').to_sym
+            else
+              (name.to_s + '_translations').to_sym
+            end
+
           end
 
           register_instance_option :localized? do
@@ -62,23 +77,42 @@ module RailsAdmin
           register_instance_option :formatted_value do
             if localized?
               _val = bindings[:object].send((hash_method.to_s + '_translations').to_sym)
-              _val.each_pair { |l, _hash|
+
+              case editor_type
+              when :default, :standard, :main, :text, :text_area, :textarea, :string
+                _val.each_pair { |l, _hash|
+                  begin
+                    _val[l] = JSON.pretty_generate(_hash)
+                  rescue
+                  end
+                }
+              else
+                _val
+              end
+
+
+            else
+              case editor_type
+              when :default, :standard, :main, :text, :text_area, :textarea, :string
                 begin
-                  _val[l] = JSON.pretty_generate(_hash)
+                  JSON.pretty_generate(bindings[:object].send hash_method)
                 rescue
+                  bindings[:object].send hash_method
                 end
-              }
-            else
-              begin
-                JSON.pretty_generate(bindings[:object].send hash_method)
-              rescue
+              else
                 bindings[:object].send hash_method
               end
             end
           end
 
           register_instance_option :allowed_methods do
-            localized? ? [string_method, translations_field] : [string_method]
+            case editor_type
+            when :default, :standard, :main, :text, :text_area, :textarea, :string
+              localized? ? [string_method, translations_field] : [string_method]
+            else
+              localized? ? [hash_method, translations_field] : [hash_method]
+            end
+
           end
 
           register_instance_option :partial do

data/lib/hancock/rails_admin_ext/patches/hancock_cms_group.rb

@@ -3,40 +3,49 @@ module Hancock::RailsAdminGroupPatch
   class << self
     def hancock_cms_group(config, fields = {})
       return unless fields
+      if fields.is_a?(Proc)
+        return config.group :default, &fields
+      end
 
       if fields.is_a?(Array)
         fields.reject { |f| f.empty? }.each do |_group|
           _name_default = :default
-          _name = _group.delete(:name) || _name_default
+          _name = _group.delete(:name) || _group.delete(:group) || _name_default
           _active_default = _name == :default
           _group[:active] ||= _active_default
           _fields_default = {}
           _group_fields = (_group.delete(:fields) || _fields_default)
 
-          config.group _name do
-            _group.each_pair do |name, val|
+          if _group_fields.is_a?(Proc)
+            config.group _name, &_group_fields
+
+          else
+            config.group _name do
+              _group.each_pair do |name, val|
 
-              # TODO: find more logical solution
-              begin
+                # TODO: find more logical solution
                 begin
-                  send name, val
-                rescue
-                  send name
+                  begin
+                    send name, val
+                  rescue
+                    send name
+                  end
                 end
               end
-            end
 
-            _group_fields.each_pair do |name, type|
-              next if type == false
-              if type.blank?
-                field name
-              else
-                if type.is_a?(Array)
-                  field name, type[0], &type[1]
+              _group_fields.each_pair do |name, type|
+                next if type == false
+                if type.blank?
+                  field name
                 else
-                  field name, type
+                  if type.is_a?(Array)
+                    field name, type[0], &type[1]
+                  else
+                    field name, type
+                  end
                 end
               end
+
             end
 
 

data/lib/hancock/rails_admin_ext/patches/lazy_model.rb

@@ -0,0 +1,13 @@
+require 'rails_admin/config/lazy_model'
+
+module RailsAdmin
+  module Config
+    class LazyModel
+
+      def get_deferred_blocks
+        @deferred_blocks.clone
+      end
+
+    end
+  end
+end

data/lib/hancock/rails_admin_ext/patches/section_list_patch.rb

@@ -0,0 +1,30 @@
+require 'rails_admin/config/sections/list'
+module RailsAdmin
+  module Config
+    module Sections
+      # Configuration of the list view
+      class List < RailsAdmin::Config::Sections::Base
+
+        register_instance_option :sort_by do
+          # _fields = parent.abstract_model.model.fields.keys
+          # ret = :order if _fields.include?(:order)
+          # ret ||= :lft if _fields.include?(:lft)
+          # # ret ||= :counter if _fields.include?(:counter)
+          # ret ||= parent.abstract_model.primary_key
+          # ret
+        end
+
+        register_instance_option :sort_reverse? do
+          true # By default show latest first
+        end
+
+        register_instance_option :scopes do
+          _model_scopes = parent.abstract_model.model.scopes.keys
+          _possible_scopes = [:sorted, :by_date, :enabled]
+          (_possible_scopes & _model_scopes ) + [nil]
+        end
+
+      end
+    end
+  end
+end

data/lib/hancock/rails_admin_settings_patch.rb

@@ -25,6 +25,23 @@ module Hancock
         self.for_admin
       end
 
+      def val
+        ((upload_kind? and !file.blank?) ? file.url : value)
+      end
+      def value
+        ((upload_kind? and !file.blank?) ? file.url : super)
+      end
+      def processed_value
+        ((upload_kind? and !file.blank?) ? file.url : super)
+      end
+      def blank?
+        if upload_kind?
+          file.blank?
+        else
+          super
+        end
+      end
+
       # def self.manager_can_default_actions
       #   # [:index, :show, :read, :edit, :update]
       #   super - [:new, :create]
@@ -217,3 +234,35 @@ module Hancock
 
   end
 end
+
+
+
+class ::Settings
+
+  def self.exists?(key)
+    !getnc(key).nil?
+  end
+  def self.enabled?(key)
+    getnc(key).enabled?
+  end
+  def self.rename(old_key, new_key)
+    get_default_ns.rename(old_key, new_key)
+  end
+
+end
+class ::RailsAdminSettings::Namespaced
+
+  def exists?(key)
+    !getnc(key).nil?
+  end
+  def enabled?(key)
+    getnc(key).enabled?
+  end
+  def rename(old_key, new_key)
+    _obj = getnc(old_key)
+    if _obj
+      _obj.key = new_key
+      _obj.save
+    end
+  end
+end

data/lib/hancock/version.rb

@@ -1,3 +1,3 @@
 module Hancock
-  VERSION = "2.0.1.2".freeze
+  VERSION = "2.0.1.3".freeze
 end

data/lib/hancock_cms.rb

@@ -31,6 +31,7 @@ require 'hancock/rails_admin_ext/hancock_html'
 require 'hancock/rails_admin_ext/hancock_slugs'
 require 'hancock/rails_admin_ext/hancock_multiselect'
 
+require 'hancock/rails_admin_ext/patches/lazy_model'
 require 'hancock/rails_admin_ext/patches/navigation_patch'
 require 'hancock/rails_admin_ext/patches/field_patch'
 require 'hancock/rails_admin_ext/patches/fieldset_patch'
@@ -38,6 +39,7 @@ require 'hancock/rails_admin_ext/patches/new_controller_patch'
 require 'hancock/rails_admin_ext/patches/group_patch'
 require 'hancock/rails_admin_ext/patches/hancock_cms_group'
 require 'hancock/rails_admin_ext/patches/has_fields'
+require 'hancock/rails_admin_ext/patches/section_list_patch'
 
 
 require 'rails_admin_nested_set'

data/template.rb

@@ -51,7 +51,7 @@ gem 'rails_admin_model_settings'#, '~> 0.3'
 
 gem 'slim-rails', '3.1.1'
 gem 'rs_russian'
-gem 'cancancan'
+gem 'cancancan', '~> 1.16'
 
 # gem 'cloner'
 gem 'unicorn'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.1.2
+  version: 2.0.1.3
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,7 +47,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +324,8 @@ files:
 - app/assets/javascripts/hancock/rails_admin/en_ru_switcher.coffee
 - app/assets/javascripts/hancock/rails_admin/enum_with_custom.coffee
 - app/assets/javascripts/hancock/rails_admin/form_controls_fixed.coffee
+- app/assets/javascripts/hancock/rails_admin/hancock_array.coffee
+- app/assets/javascripts/hancock/rails_admin/hancock_hash.coffee
 - app/assets/javascripts/hancock/rails_admin/leftside_hider.coffee
 - app/assets/javascripts/hancock/rails_admin/multiselect.coffee
 - app/assets/javascripts/hancock/rails_admin/navigation_dropdown.coffee
@@ -342,7 +344,10 @@ files:
 - app/assets/stylesheets/hancock/rails_admin/cms.theming.sass
 - app/assets/stylesheets/hancock/rails_admin/custom/theming.sass
 - app/assets/stylesheets/hancock/rails_admin/fieldsets.sass
+- app/assets/stylesheets/hancock/rails_admin/hancock_hash.sass
 - app/assets/stylesheets/hancock/rails_admin/plugins.sass.erb
+- app/assets/stylesheets/hancock/rails_admin/settings.sass
+- app/assets/stylesheets/hancock/rails_admin/tables.sass
 - app/assets/stylesheets/hancock/toplink/toplink.sass
 - app/assets/stylesheets/rails_admin/custom/theming.sass
 - app/controllers/concerns/hancock/current_user.rb
@@ -387,6 +392,7 @@ files:
 - app/views/devise/registrations/new.html.slim
 - app/views/devise/sessions/new.html.slim
 - app/views/devise/shared/_links.html.slim
+- app/views/hancock/_assets.html.slim
 - app/views/hancock/errors/_base.html.slim
 - app/views/hancock/errors/error_403.html.slim
 - app/views/hancock/errors/error_404.html.slim
@@ -395,7 +401,6 @@ files:
 - app/views/hancock/simple_captcha/_simple_captcha.html.slim
 - app/views/hancock/toplink/_toplink.html.slim
 - app/views/layouts/application.html.slim
-- app/views/layouts/hancock/_assets.html.slim
 - app/views/layouts/hancock/devise/confirmations.html.slim
 - app/views/layouts/hancock/devise/passwords.html.slim
 - app/views/layouts/hancock/devise/registrations.html.slim
@@ -404,6 +409,7 @@ files:
 - app/views/layouts/rails_admin/_footer.html.slim
 - app/views/layouts/rails_admin/_footer_navigation.html.slim
 - app/views/layouts/rails_admin/_navigation.html.slim
+- app/views/layouts/rails_admin/_preloader.html.slim
 - app/views/layouts/rails_admin/_secondary_navigation.html.slim
 - app/views/layouts/rails_admin/_sidebar_navigation.html.slim
 - app/views/layouts/rails_admin/_sidebar_navigation_filter.html.slim
@@ -417,11 +423,15 @@ files:
 - app/views/rails_admin/main/_form_hancock_enum_with_custom.slim
 - app/views/rails_admin/main/_form_hancock_multiselect.html.slim
 - app/views/rails_admin/main/_form_raw.html.slim
+- app/views/rails_admin/main/_hancock_array.html.slim
 - app/views/rails_admin/main/_hancock_hash.html.slim
 - app/views/rails_admin/main/_hancock_hash_ml.html.slim
 - app/views/rails_admin/main/_hancock_html.html.slim
 - app/views/rails_admin/main/_hancock_html_ml.html.slim
 - app/views/rails_admin/main/edit.html.haml
+- app/views/rails_admin/main/hancock_array/_element.html.slim
+- app/views/rails_admin/main/hancock_hash/_fixed_keys.html.slim
+- app/views/rails_admin/main/hancock_hash/_full.html.slim
 - app/views/rails_admin/main/new.html.haml
 - app/views/shared/_admin_link.html.slim
 - app/views/shared/_messages.html.slim
@@ -509,8 +519,10 @@ files:
 - lib/hancock/rails_admin_ext/patches/group_patch.rb
 - lib/hancock/rails_admin_ext/patches/hancock_cms_group.rb
 - lib/hancock/rails_admin_ext/patches/has_fields.rb
+- lib/hancock/rails_admin_ext/patches/lazy_model.rb
 - lib/hancock/rails_admin_ext/patches/navigation_patch.rb
 - lib/hancock/rails_admin_ext/patches/new_controller_patch.rb
+- lib/hancock/rails_admin_ext/patches/section_list_patch.rb
 - lib/hancock/rails_admin_settings_patch.rb
 - lib/hancock/routes.rb
 - lib/hancock/simple_form_patch.rb