hancock_cms 1.0.1 → 1.0.2.2

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

@@ -0,0 +1,198 @@
+body.rails_admin .form-horizontal .tab-content .tab-pane > .remove_nested_fields, body.rails_admin .form-horizontal .tab-content .tab-pane > .remove_nested_one_fields
+  opacity: 1
+  z-index: 10
+  left: 50px
+  top: 10px
+
+body.rails_admin .form-horizontal.denser
+  margin-top: 15px
+  fieldset > legend
+    margin-bottom: 0px
+  legend i
+    font-size: 14px
+
+body.rails_admin .nav.nav-tabs
+  margin-bottom: -1px
+  border-bottom: 0px
+  padding: 0px 5px
+
+body.rails_admin .form-horizontal .tab-content .tab-pane
+  fieldset
+    margin-left: 50px
+    margin-right: 25px
+
+.form-horizontal.denser
+  fieldset.opened
+    min-height: 180px
+    padding-bottom: 10px
+    fieldset
+      .form-group
+        margin-left: 25px !important
+        margin-top: 15px
+        margin-bottom: 15px
+  fieldset.default_fieldset
+    padding-top: 0px
+    border: 0px
+
+  fieldset
+    +border-radius(4px)
+    border: 1px solid #e3e3e3
+    background: #fff
+    margin-bottom: 5px
+    padding: 0px
+    min-height: 30px
+    overflow: visible
+    padding-top: 29px
+    &:first-child
+      margin-top: 5px
+    &:last-child
+      margin-bottom: 0px
+    legend
+      height: 30px
+      padding: 5px 10px
+      font-size: 18px
+      line-height: 20px
+      top: 0px
+      position: absolute
+    .form-group
+      margin-left: 25px
+      margin-right: 0px
+      margin-top: 15px
+      margin-bottom: 15px
+    .input-group
+      float: none !important
+    input[type=checkbox]
+      width: 25px !important
+      height: 25px !important
+    label
+      font-size: 13px
+    label.dropdown-toggle
+      width: auto
+    .help-block
+      margin-bottom: 0px
+      color: #aaaaaa
+      font-size: 12px
+      line-height: 12px
+    .ra-multiselect .ra-multiselect-column
+      float: left
+      margin-bottom: 5px
+
+fieldset.default.hover
+  > .leftside_hider
+    opacity: 0
+
+fieldset.hover
+  > .leftside_hider
+    opacity: 1.0
+
+fieldset
+  +transition(all 0.3s)
+  position: relative
+  > .leftside_hider
+    overflow: hidden
+    width: 65px
+    position: absolute
+    top: 30px
+    bottom: 0px
+    background: rgba(100,100,100,0.05)
+    cursor: pointer
+    padding: 10px 0px
+    z-index: 9
+    opacity: 0
+    +transition(background 0.3s, opacity 0.2s)
+    &:hover
+      background: rgba(100,100,100,0.1)
+    &:active
+      background: rgba(100,100,100,0.075)
+
+  .scroll_fieldset_block
+    overflow: visible
+    position: absolute
+    width: 45px
+    top: 10px
+    margin-left: 10px
+    height: 126px
+    opacity: 0.75
+    cursor: pointer
+    z-index: 10
+    background: #fff
+    border: 1px solid #e3e3e3
+    +border-radius(4px)
+    +transition(scale 0.3s, opacity 0.3s)
+    +transform(scale(0))
+    transform-origin: top center
+    -webkit-transform-origin: top left
+    -o-transform-origin: top left
+    -moz-transform-origin: top left
+    padding: 5px
+    +box-shadow(0px 5px 10px -5px rgba(0, 0, 0, 0.5))
+    &:hover
+      opacity: 1.0
+    > *
+      height: 35px
+      width: 35px
+      +border-radius(4px)
+      margin-bottom: 5px
+      z-index: 11
+      display: flex
+      align-items: center
+      justify-content: center
+      background-color: #e53935
+      +transition(all 0.3s)
+      color: #fff
+      &:hover
+        background-color: #c73800
+        opacity: 1
+      &:active
+        background-color: #e53935
+        opacity: 1
+
+    .links-list
+      width: auto
+      display: inline-flex
+      background: #fff
+      border: 1px solid #e3e3e3
+      +border-radius(4px)
+      +box-shadow(0px 5px 10px -5px rgba(0, 0, 0, 0.5))
+      padding: 3px
+
+    .select_fieldset
+      +transition(all 0.3s)
+      overflow: visible
+      a, span
+        background-color: #e53935
+        display: inline-block
+        text-align: center
+        width: 50px
+        height: 29px
+        margin-right: 3px
+        overflow: hidden
+        white-space: nowrap
+        text-overflow: ellipsis
+        color: #ffffff
+        padding: 0px 3px
+        font-size: 10px
+        line-height: 29px
+        text-decoration: none
+        +transition(all 0.3s)
+        +border-radius(4px)
+        &:hover
+          background-color: #c73800
+          opacity: 1
+      &:last-child
+        margin-right: 0px
+      span
+        background-color: lightblue
+        cursor: auto
+        color: black
+        &:hover
+          background-color: lightblue
+          opacity: 1
+
+fieldset.opened, fieldset.default_fieldset
+  .scroll_fieldset_block
+    +transform(scale(1))
+
+fieldset[disabled] .btn-info, fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info:active, fieldset[disabled] .btn-info.active
+  background-color: #ef3b36
+  border-color: #e53a36

data/app/assets/stylesheets/rails_admin/custom/theming.sass

@@ -1,4 +1,4 @@
 @import hancock/cms/mixins
 
 @import hancock/rails_admin/cms.theming
-@import hancock/rails_admin/custom/theming
+@import hancock/rails_admin/custom/theming

data/app/controllers/concerns/hancock/decorators/home.rb

@@ -2,7 +2,7 @@ module Hancock::Decorators
   module Home
     extend ActiveSupport::Concern
 
-    # included
+    # included do
     #   def index
     #     render layout: Hancock.config.main_index_layout
     #   end

data/app/controllers/concerns/hancock/errors.rb

@@ -26,12 +26,10 @@ module Hancock::Errors
         unless exception.nil?
           Rails.logger.error exception.message
           Rails.logger.error exception.backtrace.join("\n")
-          capture_exception(exception) if defined?(Raven)
+          Raven.capture_exception(exception) if defined?(Raven)
         end
         Rails.logger.error "__________________________"
         if !user_signed_in?
-          #scope = rails_admin? ? main_app : self
-          #redirect_to scope.new_user_session_path, alert: "Необходимо авторизоваться"
           authenticate_user!
         else
           if rails_admin? and can?(:access, :rails_admin)
@@ -44,7 +42,7 @@ module Hancock::Errors
     end
 
     rescue_from ActionController::InvalidAuthenticityToken do |exception|
-      redirect_to :back, alert: t('hancock.errors.form_expired')
+      redirect_back(fallback_location: root_path, alert: t('hancock.errors.form_expired'))
     end
   end
 
@@ -57,7 +55,7 @@ module Hancock::Errors
     unless exception.nil?
       Rails.logger.error exception.message
       Rails.logger.error exception.backtrace.join("\n")
-      capture_exception(exception) if defined?(Raven)
+      Raven.capture_exception(exception) if defined?(Raven)
     end
     Rails.logger.error "__________________________".freeze
     render_error(404)
@@ -76,7 +74,7 @@ module Hancock::Errors
     Rails.logger.error "__________________________".freeze
     begin
       if rails_admin?
-        render text: t('hancock.errors.internal_error_full', klass: exception.class.name, message: exception.message), status: 500
+        render plain: t('hancock.errors.internal_error_full', klass: exception.class.name, message: exception.message), status: 500
         return
       end
     rescue Exception => e

data/app/controllers/hancock/registrations_controller.rb

@@ -1,20 +1,15 @@
 class Hancock::RegistrationsController < Devise::RegistrationsController
   prepend_before_action :check_recaptcha, only: [:create]
 
-  private
+  # private :check_recaptcha
   def check_recaptcha
     if Hancock.config.recaptcha_support and (!Rails.env.development? or Hancock.config.captcha_on_development)
-      if verify_recaptcha
-        true
-      else
+      unless verify_recaptcha
         self.resource = resource_class.new sign_up_params
         self.resource.valid?
         @recaptcha_error = "Вы робот?".freeze
         respond_with_navigational(resource) { render :new }
       end
-
-    else
-      true
     end
   end
 

data/app/controllers/hancock/sessions_controller.rb

@@ -1,21 +1,17 @@
 class Hancock::SessionsController < Devise::SessionsController
   prepend_before_action :check_recaptcha, only: [:create]
+  prepend_before_action :require_no_authentication, :only => [ :new, :create ]
 
-  private
+  # private :check_recaptcha
   def check_recaptcha
     if Hancock.config.recaptcha_support and (!Rails.env.development? or Hancock.config.captcha_on_development)
-      if verify_recaptcha
-        true
-      else
+      unless verify_recaptcha
         self.resource = resource_class.new sign_in_params
         resource.errors.add(:email, "Неверный e-mail или пароль".freeze)
         resource.errors.add(:password, "Неверный e-mail или пароль".freeze)
         @recaptcha_error = "Вы робот?".freeze
         respond_with_navigational(resource) { render :new }
       end
-
-    else
-      true
     end
   end
 

data/app/helpers/hancock/powered_helper.rb

@@ -15,7 +15,7 @@ module Hancock::PoweredHelper
   #         "hancock-goto-disabled": true
   #       }
   #     }
-  #     ret << link_to("Hancock CMS", "http://hancock.redrocks.pro/", _attrs)
+  #     ret << link_to("Hancock CMS", "https://hancock.redrocks.pro/", _attrs)
   #     ret.join.html_safe
   #   end
   # end
@@ -29,12 +29,12 @@ module Hancock::PoweredHelper
       _attrs = {
         class: "created_by",
         target: "_blank",
-        title: "Hancock Creative studio",
+        title: "Redrocks Creative studio",
         data: {
           "hancock-goto-disabled": true
         }
       }.freeze
-      ret << link_to("Redrocks studio".freeze, "http://redrocks.pro/".freeze, _attrs)
+      ret << link_to("Redrocks studio".freeze, "https://redrocks.pro/".freeze, _attrs)
       ret.join.html_safe
     end
   end

data/app/helpers/hancock/settings_helper.rb

@@ -0,0 +1,44 @@
+module Hancock::SettingsHelper
+
+  def hancock_settings(key, options = {}, &block)
+    if key.is_a?(Hash)
+      key, options = key[:key], key
+    end
+    ns = options.delete(:ns)
+    settings_scope = options.delete(:settings_scope) || Settings.ns(ns)
+    key ||= options.delete(:key)
+    options.delete(:key)
+
+    cache_keys = options[:cache_keys_str] || options[:cache_keys] || options[:cache_key] || []
+    if cache_keys.is_a?(::Array)
+      cache_keys = cache_keys.map { |k| k.to_s.strip }.join(" ")
+    else
+      cache_keys = cache_keys.to_s.strip
+    end
+    options.delete(:cache_keys)
+    options.delete(:cache_key)
+
+    # options[:loadable] = cache_keys.blank? if options[:loadable].nil? # temporary
+    options[:cache_keys_str] = cache_keys
+    options[:kind] ||= :html
+
+    options[:default] = capture(&block) if block
+    case (options.delete(:as) || :value).to_sym
+    when :value
+      ret = settings_scope.__send__(key, options)
+    when :object
+      ret = settings_scope.getnc(key)
+      ret.loadable ||= options[:loadable]
+      _old_cache_keys = options[:cache_keys_str].strip.split(" ")
+      options[:cache_keys_str] = (_old_cache_keys + ret.cache_keys).uniq
+      if (options[:cache_keys_str] - _old_cache_keys).blank?
+        ret.cache_keys_str = options[:cache_keys_str]
+      end
+      ret.save unless ret.changes.blank?
+      ret
+    else
+      ret = settings_scope.__send__(key, options)
+    end
+  end
+
+end

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

@@ -0,0 +1,19 @@
+require 'rails_admin/application_helper'
+module RailsAdmin::Application
+  module HancockHelper
+
+    def hancock_navigation(nodes_stack, nodes, level = 0)
+      nodes.collect do |node|
+        model_param = node.abstract_model.to_param
+        url         = rails_admin.url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
+        level_class = " nav-level-#{level}" if level > 0
+        nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
+        li = content_tag :li, data: {model: model_param, "name-synonyms": node.name_synonyms} do
+          link_to nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}", title: capitalize_first_letter(node.label_plural)
+        end
+        li + hancock_navigation(nodes_stack, nodes_stack.select { |n| n.parent.to_s == node.abstract_model.model_name }, level + 1)
+      end.join.html_safe
+    end
+
+  end
+end

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

@@ -0,0 +1,44 @@
+require 'rails_admin/form_builder'
+module RailsAdmin::Hancock
+  class FormBuilder < ::RailsAdmin::FormBuilder
+
+    def fieldset_for(fieldset, nested_in)
+      fields = fieldset.with(
+        form: self,
+        object: @object,
+        view: @template,
+        controller: @template.controller,
+      ).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
+            @template.content_tag(:div, class: 'scroll_fieldset_block') do
+              ret = []
+              ret << @template.content_tag(:div, class: 'scroll_fieldset_top', title: "Вверх блока") do
+                @template.content_tag(:i, "", class: 'fa fa-arrow-up')
+              end
+              ret << @template.content_tag(:div, class: 'select_fieldset', title: "Выбрать другой блок") do
+                @template.content_tag(:i, "", class: 'fa fa-indent')
+              end
+              ret << @template.content_tag(:div, class: 'scroll_fieldset_bottom', title: "Вниз блока") do
+                @template.content_tag(:i, "", class: 'fa fa-arrow-down')
+              end
+              ret.join.html_safe
+            end
+          end
+        end
+
+        contents = []
+        contents << @template.content_tag(:legend, %(<i class="icon-chevron-#{(fieldset.active? ? 'down' : 'right')}"></i> #{fieldset.label}).html_safe, style: fieldset.name == :default ? 'display:none' : '')
+        contents << @template.content_tag(:p, fieldset.help) if fieldset.help.present?
+        contents << leftside_hider if fieldset.leftside_hider and leftside_hider
+        contents << fields.collect { |field| field_wrapper_for(field, nested_in) }.join
+        contents.join.html_safe
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'rails_admin/main_helper'
+module RailsAdmin::Main
+  module HancockHelper
+
+    def hancock_rails_admin_form_for(*args, &block)
+      options = args.extract_options!.reverse_merge(builder: RailsAdmin::Hancock::FormBuilder)
+      (options[:html] ||= {})[:novalidate] ||= !RailsAdmin::Config.browser_validations
+
+      form_for(*(args << options), &block) << after_nested_form_callbacks
+    end
+
+    def hancock_main_navigation
+      nodes_stack = RailsAdmin::Config.visible_models(controller: controller)
+      node_model_names = nodes_stack.collect { |c| c.abstract_model.model_name }
+
+      nodes_stack.group_by(&:navigation_label).collect do |navigation_label, nodes|
+        nodes = nodes.select { |n| n.parent.nil? || !n.parent.to_s.in?(node_model_names) }
+        li_stack = hancock_navigation nodes_stack, nodes
+
+        label = navigation_label || t('admin.misc.navigation')
+
+        %(<li class='dropdown-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
+      end.join.html_safe
+    end
+
+  end
+end

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

@@ -1,11 +1,13 @@
 module Hancock::BooleanField
   extend ActiveSupport::Concern
-  module ClassMethods
+
+  class_methods do
+
     def boolean_field(name, default = true)
       if default.is_a?(Hash)
         default = default[:default]
       end
-      
+
       if Hancock.mongoid?
         field name, type: Mongoid::Boolean, default: default
       end
@@ -16,6 +18,9 @@ module Hancock::BooleanField
       elsif name == 'enabled'
         scope :disabled,  -> { where(enabled: false) }
       end
+      
     end
+
   end
+
 end

data/app/models/concerns/hancock/decorators/embedded_element.rb

@@ -3,15 +3,7 @@ module Hancock::Decorators
     extend ActiveSupport::Concern
 
     included do
-
-      # def image_styles
-      #   super
-      # end
-      #
-      # def image_jcrop_options
-      #   super
-      # end
-      #
+      
       # ############# rails_admin ##############
       # def self.rails_admin_add_fields
       #   [] #super

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

@@ -5,4 +5,5 @@ module Hancock::Enableable
   included do
     boolean_field(:enabled)
   end
+  
 end

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

@@ -2,7 +2,7 @@ if Hancock.mongoid?
   module Hancock::HashField
     extend ActiveSupport::Concern
 
-    module ClassMethods
+    class_methods do
       def hancock_cms_hash_field(name, opts = {})
         opts.merge!({type: Hash, default: {}})
         field "#{name}_hash", opts
@@ -14,7 +14,7 @@ if Hancock.mongoid?
         if opts[:localize]
           meth_str_t = "#{meth_str}_translations".freeze
           meth_hsh_t = "#{meth_hsh}_translations".freeze
-          class_eval <<-EVAL
+          class_eval <<-RUBY
             def #{meth_str_t}=(val)
               return self.#{meth_hsh_t} = {} if val.blank?
               _hash = {}
@@ -63,10 +63,10 @@ if Hancock.mongoid?
               end
               true
             end
-          EVAL
+          RUBY
 
         else
-          class_eval <<-EVAL
+          class_eval <<-RUBY
             def #{meth_str}=(val)
               return self.#{meth_hsh} = {} if val.blank?
               if val.is_a?(String)
@@ -105,9 +105,10 @@ if Hancock.mongoid?
                 true
               end
             end
-          EVAL
-        end
-      end
-    end
+          RUBY
+        end #if opts[:localize]
+      end #def hancock_cms_hash_field(name, opts = {})
+    end # class_methods do
+
   end
 end

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

@@ -2,7 +2,7 @@ if Hancock.mongoid?
   module Hancock::HtmlField
     extend ActiveSupport::Concern
 
-    module ClassMethods
+    class_methods do
       def hancock_cms_html_field(name, opts = {})
         clear_by_default = opts.delete(:clear_by_default)
         clear_by_default = false unless clear_by_default == true
@@ -12,7 +12,9 @@ if Hancock.mongoid?
         field _html_field_name, opts
         field "#{name}_clear", type: Boolean, default: clear_by_default, localize: opts[:localize]
 
-        class_eval <<-EVAL
+        insertions_for(name) if respond_to?(:insertions_for)
+
+        class_eval <<-RUBY
           def #{name}
             self.#{_html_field_name} ||= ""
             return self.#{_html_field_name} unless self.#{name}_clear
@@ -26,8 +28,9 @@ if Hancock.mongoid?
             self.#{_html_field_name} ||= ""
             Rails::Html::FullSanitizer.new.sanitize(self.#{_html_field_name}.strip)
           end
-        EVAL
+        RUBY
       end
     end
+
   end
 end