ab_admin 0.8.3 → 0.9.0

data/app/assets/stylesheets/ab_admin/components/_grid_view.scss

@@ -1,5 +1,5 @@
 .grid_view {
-  #columns_hider_show, .pagination .pagination, .per_page {
+  #columns_hider_wrap, .pagination .pagination, .per_page {
     display: none;
   }
   .pagination_info {
@@ -21,7 +21,7 @@
 
 #main {
   .grid_view {
-    #columns_hider_show {
+    #columns_hider_wrap {
       display: none;
     }
     .content_actions {

data/app/assets/stylesheets/ab_admin/components/_locale_tabs.scss

@@ -3,43 +3,31 @@
 }
 
 .locale_tabs {
-  @each $locale in ru, uk, en, it, de, fr, es, pl {
-    li {
-      a.ico_#{$locale} {
-        opacity: 0.5;
-        padding-left: 12px;
-      }
-      &.active a.ico_#{$locale} {
-        opacity: 1;
-      }
+  .nav-tabs li {
+    a {
+      opacity: 0.5;
+      font-size: 28px;
+      padding: 8px 12px;
     }
-
-    .t_locale_#{$locale} {
-      background: image-url("admin/flags/#{$locale}.png") 10px center no-repeat;
-    }
-    ##{$locale} {
-      .t_locale_#{$locale} {
-         display: none;
-      }
+    &.active a {
+      opacity: 1;
+      padding: 14px 12px 2px;
     }
   }
 }
 
 .t_locales {
   position: absolute;
-  top: 0;
-  left: -5px;
-  height: 60px;
-  width: 40px;
+  top: 25px;
+  left: 2px;
   margin-left: 5px;
 }
 
 .t_locale {
   cursor: pointer;
-  width: 30px;
-  height: 19px;
   padding: 5px;
   opacity: 0.6;
+  font-size: 26px;
   &:hover {
     opacity: 1;
   }

data/app/assets/stylesheets/ab_admin/components/_navigation.scss

@@ -74,15 +74,6 @@
   }
 }
 
-#columns_hider {
-  width: 60%;
-  margin-left: -30%;
-}
-
-#columns_hider_show {
-  margin-left: 10px;
-}
-
 #lang_bar img {
   height: 16px;
   width: 24px;

data/app/assets/stylesheets/ab_admin/components/_table_view.scss

@@ -93,8 +93,8 @@ table.index_table {
     border: none;
     .actions_panel-wrap_outer {
       position: relative;
-      top: 0px;
-      bottom: 0px;
+      top: 0;
+      bottom: 0;
       height: 100%;
       padding: 0 0 20px 0
     }
@@ -134,3 +134,11 @@ table.index_table {
   margin-bottom: 10px;
 }
 
+#columns_hider_wrap {
+  .dropdown-menu {
+    margin-top: 60px;
+  }
+  label {
+    margin: 0 10px;
+  }
+}

data/app/assets/stylesheets/ab_admin/components/_tooltip.scss

@@ -0,0 +1,80 @@
+.tool {
+  position: relative;
+}
+
+.tool::before,
+.tool::after {
+  left: 50%;
+  position: absolute;
+  color: white;
+  opacity: 0;
+  z-index: -100;
+}
+
+//.tool::before,
+//.tool::after,
+.tool:hover::before,
+.tool:focus::before,
+.tool:hover::after,
+.tool:focus::after {
+  opacity: 0.8;
+  z-index: 100;
+}
+
+.tool::before {
+  border-style: solid;
+  border-width: 4px 3px 0 3px;
+  border-color: black transparent transparent transparent;
+  bottom: 100%;
+  content: "";
+  transform: translateX(-50%);
+}
+
+.tool::after {
+  background: black;
+  border-radius: 5px;
+  bottom: calc(100% + 4px);;
+  color: white;
+  content: attr(title);
+  padding: 5px 10px;
+  transform: translateX(-50%);
+}
+
+.tool-left::before, .tool-left::after {
+  right: 100%;
+  left: auto;
+  bottom: 50%;
+  margin-bottom: 2px;
+  transform: none;
+}
+
+.tool-left::before {
+  border-width: 3px 2px 3px 4px;
+  border-color: transparent transparent transparent black;
+  transform: translateY(50%);
+}
+
+.tool-left::after {
+  white-space: nowrap;
+  margin-right: 6px;
+  transform: translateY(50%);
+}
+
+.tool-bottom::before, .tool-bottom::after {
+  bottom: auto;
+  top: 100%;
+  left: 50%;
+  margin-bottom: 2px;
+}
+
+.tool-bottom::before {
+  border-width: 0 3px 4px 3px;
+  border-color: transparent transparent black transparent;
+  transform: translateX(-50%);
+}
+
+.tool-bottom::after {
+  white-space: nowrap;
+  margin-top: 4px;
+  transform: translateX(-50%);
+}

data/app/assets/stylesheets/ab_admin/components/_tree_view.scss

@@ -46,7 +46,7 @@ ol.sortable_tree {
 
 #main {
   .tree_view {
-    #columns_hider_show {
+    #columns_hider_wrap {
       display: none;
     }
     .content_actions {

data/app/assets/stylesheets/ab_admin/devise.scss

@@ -1,5 +1,5 @@
-@import "bootstrap";
-@import "bootstrap-responsive";
+@import "bootstrap_2_3_2/bootstrap";
+@import "bootstrap_2_3_2/bootstrap-responsive";
 
 $element_width: 280px;
 $element_font_size: 16px;

data/app/assets/stylesheets/ab_admin/fileupload.scss

@@ -1,5 +1,3 @@
-//q= require ab_admin/jquery.Jcrop.min
-
 .fileupload {
   overflow: hidden;
   position: relative;
@@ -48,7 +46,7 @@
       margin: 3px;
       position: relative;
       z-index: 3;
-      .destroy_asset, .main_image, .crop_image, .rotate_image {
+      .destroy_asset, .main_image, .rotate_image {
         position: absolute;
         cursor: pointer;
         background: rgba(100, 131, 137, 0.6);
@@ -63,14 +61,9 @@
         right: 0;
         bottom: 0;
       }
-      .crop_image {
-        display: none;
-        left: 0;
-        bottom: 0;
-      }
       .rotate_image {
         left: 0;
-        bottm: 0;
+        bottom: 0;
       }
     }
     &.fileupload-single .main_image {

data/app/assets/stylesheets/ab_admin/main.scss

@@ -1,6 +1,5 @@
 //= require bootstrap-wysihtml5
 //= require select2
-//= require fancybox
 //= require ab_admin/bootstrap_and_overrides
 //= require ab_admin/bootstrap-editable
 //= require ab_admin/bootstrap-datetimepicker

data/app/controllers/admin/base_controller.rb

@@ -8,7 +8,7 @@ class Admin::BaseController < ::InheritedResources::Base
 
   define_admin_callbacks :save, :create
 
-  before_action :authenticate_user!, :require_require_admin_access, :set_user_vars
+  before_action :authenticate_user!, :require_admin_access, :build_settings, :set_user_vars
   before_action :add_breadcrumbs, :set_title, unless: :xhr?
 
   class_attribute :export_builder, :batch_action_list, :button_scopes, instance_reader: false, instance_writer: false
@@ -19,9 +19,10 @@ class Admin::BaseController < ::InheritedResources::Base
 
   helper_method :admin?, :moderator?
 
+  attr_reader :settings
   helper_method :button_scopes, :collection_action?, :action_items, :resource_action_items, :query_params,
                 :preview_resource_path, :get_subject, :settings, :batch_action_list, :tree_node_renderer,
-                :normalized_index_views, :current_index_view, :pjax?, :xhr?, :max_per_page, :params_for_links
+                :pjax?, :xhr?, :params_for_links, :resource_list_id, :ransack_collection, :search_collection
 
   rescue_from ::CanCan::AccessDenied, with: :render_unauthorized
 
@@ -31,13 +32,13 @@ class Admin::BaseController < ::InheritedResources::Base
       format.csv do
         authorize! :export, resource_class
         doc = AbAdmin::Utils::CsvDocument.new(collection, export_options)
-        send_data(doc.render, filename: doc.filename, type: Mime[:csv], disposition: 'attachment')
+        send_data(doc.render(self, locale: params[:locale]), filename: doc.filename, type: Mime[:csv], disposition: 'attachment')
       end
       if Mime[:xlsx]
         format.xlsx do
           authorize! :export, resource_class
           doc = AbAdmin::Utils::XlsDocument.new(collection, export_options)
-          send_data(doc.render, filename: doc.filename, type: Mime[:xlsx], disposition: 'attachment')
+          send_data(doc.render(self, locale: params[:locale]), filename: doc.filename, type: Mime[:xlsx], disposition: 'attachment')
         end
       end
     end
@@ -66,7 +67,7 @@ class Admin::BaseController < ::InheritedResources::Base
 
   def destroy
     destroy! do
-      track_action! if settings[:history]
+      track_action! if @settings[:history]
       redirect_to_on_success
     end
   end
@@ -96,7 +97,7 @@ class Admin::BaseController < ::InheritedResources::Base
       if batch_action.to_s.end_with?('_collection')
         count = collection.size
         resource_class.public_send(batch_action, collection, *[params[:batch_params]].compact)
-        if settings[:history]
+        if @settings[:history]
           if Object.const_defined?('ActiveRecord::Import') && Track.respond_to?(:import)
             tracks = collection.map { |item| track_action("batch_#{batch_action}", item) }
             Track.import_from_batch_collection_action(tracks)
@@ -132,13 +133,13 @@ class Admin::BaseController < ::InheritedResources::Base
   def default_url_options
     options = {format: nil}
     options.update instance_exec(&AbAdmin.default_url_options) if AbAdmin.default_url_options
-    options.update instance_exec(&settings[:default_url_options]) if settings[:default_url_options]
+    options.update instance_exec(&@settings[:default_url_options]) if @settings[:default_url_options]
     options
   end
 
   def apply_batch_action(item, batch_action, *batch_params)
     success = item.send(batch_action, *batch_params)
-    track_action!("batch_#{batch_action}", item) if settings[:history]
+    track_action!("batch_#{batch_action}", item) if @settings[:history]
     success
   end
 
@@ -181,7 +182,7 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def track_current_action(*)
-    track_action if settings[:history]
+    track_action if @settings[:history]
   end
 
   def flash_interpolation_options
@@ -205,8 +206,22 @@ class Admin::BaseController < ::InheritedResources::Base
     nil
   end
 
-  def settings
-    {sidebar: collection_action?, well: (collection_action? || %w(show history).include?(action_name))}.update(AbAdmin.default_resource_settings)
+  def custom_settings
+    {}
+  end
+
+  def build_settings
+    @settings = AbAdmin.default_resource_settings.deep_dup.merge!(custom_settings)
+    @settings[:index_views] = Array(@settings[:index_views]).map(&:to_sym)
+    if collection_action?
+      @settings[:current_index_view] = current_index_view
+      @settings[:button_scopes] = @settings[:current_index_view] != :stats
+      @settings[:per_page] ||= per_page
+      @settings[:per_page_variants] ||= @settings[:per_page_variants].find_all{|n| n <= @settings[:max_per_page] }
+      @settings[:sidebar] = true unless @settings.key?(:sidebar)
+      @settings[:pagination] = @settings[:pagination_index_views].include?(@settings[:current_index_view])
+    end
+    @settings[:well] = (collection_action? || %w(show history).include?(action_name)) && @settings[:current_index_view] != :tree unless @settings.key?(:well)
   end
 
   def action_items
@@ -225,7 +240,7 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def collection_action?
-    %w(index search batch rebuild).include?(action_name)
+    @settings[:collection_actions].include?(action_name)
   end
 
   def self.scope(name, options={}, &block)
@@ -271,57 +286,38 @@ class Admin::BaseController < ::InheritedResources::Base
     @tree_node_renderer ||= lambda { |r| link_to AbAdmin.display_name(r), resource_path(r), class: 'tree-item_link' }
   end
 
-  def search_collection
-    @search_collection ||= begin
-      @search = end_of_association_chain.accessible_by(current_ability).ransack(query_params)
-      with_scopes(@search.result(distinct: @search.object.joins_values.present?)).admin(current_user)
-    end
-  end
-
-  def query_params
-    query = params[:q].try! {|q| q.permit!.to_h} || {}
-    nested = resource_class.respond_to?(:acts_as_nested_set_options) && current_index_view == 'tree'
-    query[:s] ||= settings[:default_order] || ('id desc' unless nested)
-    query.reject_blank
-  end
-
-  def with_scopes(relation)
-    relation
-  end
-
   def collection
+    return unless collection_action?
     @collection ||= begin
       result = search_collection
-      result = result.paginate(page: params[:page], per_page: per_page, large: true) if action_name != 'batch' && !settings[:skip_pagination]
+      result = result.paginate(page: params[:page], per_page: @settings[:per_page], large: true) if @settings[:pagination]
       result
     end
   end
 
-  def per_page
-    request_per_page = (params[:per_page].presence || cookies[:pp].presence).to_i.nonzero?
-    params[:per_page] = [request_per_page || AbAdmin.view_default_per_page[current_index_view.to_sym], max_per_page].min
+  def search_collection
+    return unless collection_action?
+    @search_collection ||= with_scopes(ransack_collection.result(distinct: ransack_collection.object.joins_values.present?)).admin(current_user)
   end
 
-  def max_per_page
-    settings[:max_per_page] || AbAdmin.max_per_page
+  def ransack_collection
+    return unless collection_action?
+    @ransack_collection ||= end_of_association_chain.accessible_by(current_ability).ransack(query_params)
   end
 
-  def set_layout
-    pjax? ? false : 'admin/application'
+  def query_params
+    query = params[:q].try! {|q| q.permit!.to_h} || {}
+    nested = resource_class.respond_to?(:acts_as_nested_set_options) && @settings[:current_index_view] == :tree
+    query[:s] ||= @settings[:default_order] || ('id desc' unless nested)
+    query.reject_blank
   end
 
-  def normalized_index_views
-    Array(settings[:index_view])
+  def with_scopes(relation)
+    relation
   end
 
-  def current_index_view
-    index_view = params[:index_view].presence || cookies[:iv].presence
-    if index_view && normalized_index_views.include?(index_view)
-      cookies[:iv] = index_view
-      index_view
-    else
-      normalized_index_views.first
-    end
+  def set_layout
+    pjax? ? false : 'admin/application'
   end
 
   def back_or_collection
@@ -356,8 +352,8 @@ class Admin::BaseController < ::InheritedResources::Base
     fv.locale = I18n.locale
     fv.bg_color = current_user.bg_color
     fv.admin = admin?
-    fv.hotkeys = settings[:hotkeys]
-    fv.list_dblclick = settings[:list_dblclick]
+    fv.hotkeys = @settings[:hotkeys]
+    fv.list_dblclick = @settings[:list_dblclick]
     fv.env = Rails.env
     if resource_class.respond_to?(:model_name)
       fv.resource_plural = resource_class.model_name.plural
@@ -378,31 +374,23 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def moderator?
-    user_signed_in? && current_user.moderator?
+    current_user.try!(:moderator?)
   end
 
   def admin?
-    user_signed_in? && current_user.admin?
+    current_user.try!(:admin?)
   end
 
-  def require_require_admin_access
+  def require_admin_access
     raise CanCan::AccessDenied unless current_user.admin_access?
   end
 
-  def require_moderator
-    raise CanCan::AccessDenied unless moderator?
-  end
-
-  def require_admin
-    raise CanCan::AccessDenied unless admin?
-  end
-
   def bind_current_user(*)
-    resource.user_id = current_user.id if !settings[:skip_bind_current_user] && resource.respond_to?(:user_id)
+    resource.user_id = current_user.id if !@settings[:skip_bind_current_user] && resource.respond_to?(:user_id)
   end
 
   def bind_current_updater(*)
-    resource.updater_id = current_user.id if !settings[:skip_bind_current_updater] && resource.respond_to?(:updater_id)
+    resource.updater_id = current_user.id if !@settings[:skip_bind_current_updater] && resource.respond_to?(:updater_id)
   end
 
   def get_subject
@@ -428,4 +416,20 @@ class Admin::BaseController < ::InheritedResources::Base
       {root: false}
     end
   end
+
+  def resource_list_id
+    "list_#{resource_instance_name}_#{resource.id}"
+  end
+
+  private
+
+  def per_page
+    request_per_page = (params[:per_page].presence || cookies[:pp].presence).to_i.nonzero?
+    params[:per_page] = [request_per_page || @settings[:view_default_per_page][@settings[:current_index_view]], @settings[:max_per_page]].min
+  end
+
+  def current_index_view
+    index_view = params[:index_view].presence.try!(:to_sym)
+    @settings[:index_views].include?(index_view) ? index_view : @settings[:index_views].first
+  end
 end