ab_admin 0.8.3 → 0.10.0

data/lib/ab_admin/models/user.rb

@@ -6,17 +6,14 @@ module AbAdmin
       included do
         has_one :avatar, as: :assetable, dependent: :destroy, autosave: true
 
-        scope :managers, -> { where(user_role_id: [::UserRoleType.admin.id, ::UserRoleType.moderator.id]) }
         scope :active, -> { where(locked_at: nil) }
         scope :admin, proc { includes(:avatar) }
 
-        after_initialize :init
-        before_validation :generate_login
-        before_validation :set_default_role, unless: :user_role_id?
-
-        validate :check_role
-
         enumerated_attribute :user_role_type, id_attribute: :user_role_id, class: ::UserRoleType
+        delegate *UserRoleType.codes.map{|code| "#{code}?" }, to: :user_role_type
+      end
+
+      def admin_menu_builder
       end
 
       def name
@@ -40,6 +37,10 @@ module AbAdmin
         active_for_authentication?
       end
 
+      def admin_access?
+        admin? || moderator?
+      end
+
       def generate_password!
         raw_password = AbAdmin.test_env? ? '654321' : AbAdmin.friendly_token
         self.password = self.password_confirmation = raw_password
@@ -47,47 +48,10 @@ module AbAdmin
         raw_password
       end
 
-      def admin_access?
-        moderator?
-      end
-
-      def default?
-        has_role?(:default)
-      end
-
-      def redactor?
-        has_role?(:redactor)
-      end
-
-      def moderator?
-        has_role?(:admin) || has_role?(:moderator)
-      end
-
-      def admin?
-        has_role?(:admin)
-      end
-
-      def has_role?(role_name)
-        user_role_type.code == role_name
-      end
-
-      def set_default_role
-        self.user_role_id ||= ::UserRoleType.default.id
-      end
-
-      protected
-
-      def generate_login
-        self.login ||= begin
-          unless email.blank?
-            tmp_login = email.split('@').first
-            tmp_login.parameterize.downcase.gsub(/[^A-Za-z0-9-]+/, '-').gsub(/-+/, '-')
-          end
-        end
-      end
-
-      def check_role
-        errors.add(:user_role_id, :invalid) unless ::UserRoleType.valid?(user_role_id)
+      def password_required?
+        return true if password.present?
+        return false if persisted? && password.blank?
+        super
       end
     end
   end

data/lib/ab_admin/utils/csv_document.rb

@@ -3,8 +3,6 @@ require 'csv'
 module AbAdmin
   module Utils
     class CsvDocument
-      include AbAdmin::Utils::EvalHelpers
-
       def initialize(source, options = {})
         @source = source
         @options = options
@@ -27,12 +25,17 @@ module AbAdmin
         @filename ||= [@options[:filename] || "#{@klass.model_name.plural}-#{Time.now.strftime('%Y-%m-%d')}", '.csv'].join
       end
 
-      def render
+      def render(context=nil, options={})
         ::CSV.generate(col_sep: @options[:column_separator] || ',') do |csv|
           csv << columns_names
 
-          each_record do |item|
-            csv << column_data.map { |column| AbAdmin.pretty_data call_method_or_proc_on(item, column, exec: false) }
+          I18n.with_locale options[:locale] do
+            each_record do |item|
+              csv << column_data.map do |column|
+                value = column.is_a?(Symbol) ? item.public_send(column) : context.instance_exec(item, &column)
+                AbAdmin.pretty_data value
+              end
+            end
           end
         end
       end
@@ -60,7 +63,6 @@ module AbAdmin
           @source.class
         end
       end
-
     end
   end
 end

data/lib/ab_admin/utils/eval_helpers.rb

@@ -83,19 +83,6 @@ module AbAdmin
             raise ArgumentError, 'Methods must be a symbol denoting the method to call, a block to be invoked, or a string to be evaluated'
           end
       end
-
-      def call_method_or_proc_on(obj, symbol_or_proc, options = {})
-        exec = options[:exec].nil? ? true : options[:exec]
-        case symbol_or_proc
-          when String
-            ActiveSupport::Deprecation.warn('`call_method_or_proc_on` don\'t accept method name as String, use Symbol instead') if symbol_or_proc =~ /\A\w+\z/
-            symbol_or_proc
-          when Symbol
-            obj.public_send(symbol_or_proc.to_sym, *options[:attrs])
-          when Proc
-            exec ? obj.instance_exec(&symbol_or_proc) : symbol_or_proc.call(obj)
-        end
-      end
     end
   end
 end

data/lib/ab_admin/utils/logger.rb

@@ -8,11 +8,21 @@ module AbAdmin
           error("#{e.class} #{message}\n#{backtrace}\n\n")
         end
 
+        def puts(msg)
+          debug msg
+        end
+
         def reopen
           @logdev = LogDevice.new(@logdev.filename)
         end
       end
 
+      class BasicFormatter
+        def call(severity, time, _, msg)
+          "#{msg}\n"
+        end
+      end
+
       class Formatter
         FORMAT = "[%s] %5s %s\n".freeze
         DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%3N'.freeze
@@ -22,9 +32,9 @@ module AbAdmin
         end
       end
 
-      def self.for_file(filename)
+      def self.for_file(filename, formatter: nil)
         logger = ExtendedLogger.new(Rails.root.join('log', filename))
-        logger.formatter = Formatter.new
+        logger.formatter = formatter || Formatter.new
         logger
       end
     end

data/lib/ab_admin/utils/mysql.rb

@@ -14,14 +14,13 @@ module AbAdmin
 
         # remove duplicate records by columns
         def remove_duplicates(*cols, deleted_id_order: '<')
-          conds = cols.map { |col| "#{table_name}.#{col} IS NOT NULL AND #{table_name}.#{col} = t.#{col}" }.join(' AND ')
+          condition_sql = cols.map { |col| "#{table_name}.#{col} IS NOT NULL AND #{table_name}.#{col} = t.#{col}" }.join(' AND ')
           query = <<-SQL
-            DELETE FROM #{table_name} USING #{table_name}, #{table_name} AS t WHERE #{table_name}.id #{deleted_id_order} t.id AND #{conds}
+            DELETE FROM #{table_name} USING #{table_name}, #{table_name} AS t WHERE #{table_name}.id #{deleted_id_order} t.id AND #{condition_sql}
           SQL
           connection.execute(query)
         end
 
-
         # Disables key updates for model table
         def disable_keys
           connection.execute("ALTER TABLE #{quoted_table_name} DISABLE KEYS")

data/lib/ab_admin/utils/xls_document.rb

@@ -12,8 +12,6 @@ module AbAdmin
     end
 
     class XlsDocument
-      include AbAdmin::Utils::EvalHelpers
-
       def initialize(source, options = {})
         @source = source
         @options = options
@@ -49,25 +47,27 @@ module AbAdmin
         @filename ||= [@options[:filename] || "#{@klass.model_name.plural}-#{Time.now.strftime('%Y-%m-%d')}", '.xlsx'].join
       end
 
-      def render
+      def render(context, options={})
         date_format = workbook.add_format(num_format: 'dd.mm.yyyy')
         time_format = workbook.add_format(num_format: 'dd.mm.yyyy HH:MM')
 
-        each_with_index do |item, index|
-          row = index + 1
-
-          column_data.each_with_index do |column, num|
-            value = call_method_or_proc_on(item, column, exec: false)
-
-            case value
-              when Date
-                worksheet.write_string(row, num, value.strftime('%Y-%m-%dT'), date_format)
-              when DateTime, Time
-                worksheet.write_date_time(row, num, value.strftime('%Y-%m-%dT%H:%M:%S.%L'), time_format)
-              when String
-                worksheet.write_string(row, num, value)
-              else
-                worksheet.write(row, num, AbAdmin.pretty_data(value))
+        I18n.with_locale options[:locale] do
+          each_with_index do |item, index|
+            row = index + 1
+
+            column_data.each_with_index do |column, num|
+              value = column.is_a?(Symbol) ? item.public_send(column) : context.instance_exec(item, &column)
+
+              case value
+                when Date
+                  worksheet.write_string(row, num, value.strftime('%Y-%m-%dT'), date_format)
+                when DateTime, Time
+                  worksheet.write_date_time(row, num, value.strftime('%Y-%m-%dT%H:%M:%S.%L'), time_format)
+                when String
+                  worksheet.write_string(row, num, value)
+                else
+                  worksheet.write(row, num, AbAdmin.pretty_data(value))
+              end
             end
           end
         end

data/lib/ab_admin/utils.rb

@@ -1,10 +1,5 @@
 module AbAdmin
   module Utils
-    autoload :CSVBuilder, 'ab_admin/utils/csv_builder'
-    autoload :EvalHelpers, 'ab_admin/utils/eval_helpers'
-    autoload :Logger, 'ab_admin/utils/logger'
-    autoload :Mysql, 'ab_admin/utils/mysql'
-
     def all_models
       Kernel.suppress_warnings do
         Dir.glob(Rails.root.to_s + '/app/models/**/*.rb').reject { |path| path =~ /concerns|shared/ }.each { |file| require file }

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.8.3'
+  VERSION = '0.10.0'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -1,14 +1,16 @@
 module AbAdmin
   module Views
     module AdminHelpers
-
       def admin_form_for(object, *args, &block)
         record = Array(object).last
         record.fallbacks_for_empty_translations = false if record.respond_to?(:fallbacks_for_empty_translations)
         options = args.extract_options!
+        options[:wrapper] = :bootstrap
         options[:remote] = true if request.xhr?
         options[:html] ||= {}
-        options[:html][:class] ||= 'form-horizontal'
+        options[:html][:class] = Array(options[:html][:class])
+        options[:html][:class] << 'form-horizontal' if options[:html][:class].empty?
+        options[:html][:class] << 'save-error' if Array(object).last.errors.of_kind?(:base, :changed)
         options[:builder] ||= ::AbAdmin::Views::FormBuilder
         options[:html]['data-id'] = record.id
         if controller_name == 'manager' && resource_class == Array(object).last.class
@@ -21,11 +23,11 @@ module AbAdmin
         end
       end
 
-      def editable_bool(item, attr, label: nil)
+      def editable_bool(item, attr, label: nil, wrapper_class: nil)
         url = "/admin/#{item.class.model_name.plural}/#{item.id}.json"
         html = check_box_tag("#{item.class.model_name.singular}[#{attr}]", '1', item.send(attr), class: 'js-auto-submit-checkbox', data: {url: url})
         html = content_tag(:label, "#{label}&nbsp;#{html}".html_safe) if label
-        content_tag :div, html, class: 'auto-submit-checkbox-wrap white-space-nowrap'
+        content_tag :div, html, class: ['auto-submit-checkbox-wrap', 'white-space-nowrap', ('tool' unless label), wrapper_class], title: attr
       end
 
       def admin_editable(item, attr, opts=nil)
@@ -78,11 +80,11 @@ module AbAdmin
             value: opts[:value] || item[attr],
             title: opts[:title] || item[attr]
         }
-        link_to html_title, '#', class: "editable #{opts[:class]}", data: data.update(opts[:data] || {})
+        link_to html_title, '#', class: "editable #{opts[:class]}", placeholder: opts[:placeholder], data: data.update(opts[:data] || {})
       end
 
       def options_for_ckeditor(options = {})
-        {width: 930, height: 200, toolbar: 'VeryEasy', namespace: ''}.update(options)
+        {width: 930, height: 200, namespace: ''}.update(options)
       end
 
       def admin_tree_item(item)
@@ -97,13 +99,13 @@ module AbAdmin
       def admin_layout_css
         css = []
         css << 'content_with_sidebar' if settings[:sidebar] || content_for?(:sidebar)
-        css << 'well' if settings[:well] && current_index_view != 'tree'
-        css << "#{current_index_view}_view"
+        css << 'well' if !@settings[:well].is_a?(FalseClass) && (collection_action? || %w(show history).include?(action_name)) && @settings[:current_index_view] != :tree
+        css << "#{settings[:current_index_view]}_view"
         css
       end
 
       def admin_title
-        base = @breadcrumbs ? @breadcrumbs.map_val(:name).reverse : []
+        base = @breadcrumbs ? @breadcrumbs.map{|b| b[:name] }.reverse : []
         base << @page_title || 'Ab Admin'
         base.join(' - ')
       end
@@ -123,18 +125,27 @@ module AbAdmin
         %(<span class="badge #{css}">#{text}</span>).html_safe
       end
 
-      def icon(name, white=false)
-        "<i class='icon-#{name} #{'icon-white' if white}'></i> ".html_safe
+      def icon(name, white=false, title: nil)
+        title_html = %( title="#{h(title)}") if title
+        "<i class='icon-#{name}#{' icon-white' if white}#{' tool' if title}'#{title_html}></i> ".html_safe
+      end
+
+      def locale_flag(code)
+        (AbAdmin.locale_to_country_code[code] || code).to_s[0..1].upcase.tr('A-Z', '🇦-🇿')
       end
 
       def admin_pretty_data(object)
         case object
-          when String, Integer, BigDecimal, Float
+          when Integer, BigDecimal, Float
             object
+          when String
+            object.html_safe? ? object : object.no_html.gsub("\n", '<br/>').html_safe
           when TrueClass, FalseClass
             color_bool(object)
-          when Date, DateTime, Time, ActiveSupport::TimeWithZone
-            I18n.l(object, format: :long)
+          when Date
+            I18n.l(object, format: AbAdmin.date_format)
+          when DateTime, Time, ActiveSupport::TimeWithZone
+            I18n.l(object, format: AbAdmin.datetime_format)
           when NilClass
             ''
           when ActiveRecord::Base
@@ -167,10 +178,6 @@ module AbAdmin
         image_tag_if(item.send(assoc).try(:url, size))
       end
 
-      def per_page_variants
-        AbAdmin.per_page_variants.map{|variant| [variant, max_per_page].min }.uniq
-      end
-
       # input_set 'title', legend_class: 'do_sort', label_class: 'label-info' do
       def input_set(title, options={}, &block)
         options.reverse_merge!(class: "inputs well well-small clearfix #{options.delete(:legend_class) || 'do_sort'}", id: options.delete(:legend_id))
@@ -179,6 +186,11 @@ module AbAdmin
         content_tag(:div, html, options)
       end
 
+      def copy_btn(text, btn_text: nil, tooltip: false)
+        return if text.blank?
+        content_tag(:div, "#{icon('share')} #{btn_text}".html_safe, 'data-clipboard-text' => text, class: ['btn', 'btn-mini', 'js-copy', ('tool' if tooltip)], title: (text.no_html if tooltip))
+      end
+
       def ha(attr)
         resource_class.han(attr)
       end
@@ -187,16 +199,19 @@ module AbAdmin
         AbAdmin.site_name.is_a?(String) ? AbAdmin.site_name : AbAdmin.site_name.call
       end
 
-      def call_method_or_proc_on(obj, symbol_or_proc, options = {})
-        exec = options[:exec].nil? ? true : options[:exec]
-        case symbol_or_proc
-          when String
-            ActiveSupport::Deprecation.warn('`call_method_or_proc_on` don\'t accept method name as String, use Symbol instead') if symbol_or_proc =~ /\A\w+\z/
-            symbol_or_proc
-          when Symbol
-            obj.send(symbol_or_proc.to_sym)
-          when Proc
-            exec ? instance_exec(obj, &symbol_or_proc) : symbol_or_proc.call(obj)
+      def option_conditions_met?(options, object=nil)
+        return true unless options
+        condition = options[:if] || options[:unless]
+        return true unless condition
+        options[:if] ? method_or_proc_on(condition, object) : !method_or_proc_on(condition, object)
+      end
+
+      def method_or_proc_on(symbol_or_proc, object=nil)
+        return unless symbol_or_proc
+        if symbol_or_proc.is_a?(Symbol)
+          (object || self).public_send(symbol_or_proc)
+        else
+          object ? instance_exec(object, &symbol_or_proc) : instance_exec(&symbol_or_proc)
         end
       end
     end

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -16,7 +16,7 @@ module AbAdmin
       end
 
       def list_sort_link(attribute, options={})
-        adapter = options[:adapter] || @search
+        adapter = options[:adapter] || ransack_collection
         if adapter && adapter.klass == resource_class
           sort_link(adapter, attribute, options)
         else
@@ -25,7 +25,7 @@ module AbAdmin
       end
 
       def sort_link(adapter, attribute, options={})
-        name = options[:title] || (attribute.is_a?(Symbol) ? ha(attribute) : attribute)
+        name = options.delete(:title) || (attribute.is_a?(Symbol) ? ha(attribute) : attribute)
         return name unless adapter
         search_params = (params[:q] || {}).to_h.with_indifferent_access
         attr_name = (options.delete(:column) || attribute).to_s
@@ -48,7 +48,7 @@ module AbAdmin
         html_options = options.delete(:html_options) || {}
         html_options[:class] = ['sort_link', current_dir, html_options[:class]].compact.join(' ')
 
-        options.merge!(q: search_params.merge(s: "#{attr_name} #{new_dir}"), **scope_params)
+        options.merge!(q: search_params.merge(s: "#{attr_name} #{new_dir}"), **collection_params)
         link_to [name, order_indicator_for(current_dir)].join(' ').html_safe, url_for(options), html_options
       end
 
@@ -62,8 +62,8 @@ module AbAdmin
         end
       end
 
-      def scope_params
-        params.slice(*button_scopes.map(&:first)).permit!.to_h.symbolize_keys
+      def collection_params
+        params.slice(:index_view, :view_options, *button_scopes.map(&:name)).permit!.to_h.symbolize_keys
       end
 
       def short_action_link(action, item)
@@ -80,9 +80,7 @@ module AbAdmin
                               class: 'btn btn-info', title: t('admin.actions.show.link')
           when :preview
             preview_path = preview_resource_path(item)
-            if preview_path
-              link_to icon('eye-open', true), preview_path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank'
-            end
+            link_to(icon('eye-open', true), preview_path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank') if preview_path
           when :history
             item_link_to_can? :history, item, icon('book', true), history_resource_path(item),
                               class: 'btn btn-info', title: t('admin.actions.history.link')
@@ -111,9 +109,8 @@ module AbAdmin
           when :show
             link_to_can? :show, t('admin.actions.show.link'), resource_path, class: 'btn btn-info'
           when :preview
-            if path = preview_resource_path(resource)
-              link_to t('admin.actions.preview.link'), path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank'
-            end
+            preview_path = preview_resource_path(resource)
+            link_to(t('admin.actions.preview.link'), preview_path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank') if preview_path
           when :history
             link_to_can? :history, t('admin.actions.history.link'), history_resource_path, class: 'btn btn-info'
           when AbAdmin::Config::ActionItem
@@ -129,8 +126,14 @@ module AbAdmin
         end
       end
 
+      def preview_resource_path(item)
+        return unless controller_name == 'manager' && manager.preview_path && option_conditions_met?(manager.preview_path[:options], item)
+        manager.preview_path[:value].is_a?(Symbol) ? public_send(manager.preview_path[:value], item) : instance_exec(item, &manager.preview_path[:value])
+      end
+
       def link_to_can?(act, *args, &block)
-        item_link_to_can?(act, get_subject, *args, &block)
+        subject = params[:id] ? resource : resource_class
+        item_link_to_can?(act, subject, *args, &block)
       end
 
       def item_link_to_can?(act, item, *args, &block)
@@ -167,8 +170,7 @@ module AbAdmin
         if total_entries.zero?
           t('will_paginate.pagination_info_empty')
         else
-          per_page = (params[:per_page] || resource_class.per_page).to_i
-          t('will_paginate.pagination_info', from: offset + 1, to: [offset + per_page, total_entries].min, count: total_entries).html_safe
+          t('will_paginate.pagination_info', from: offset + 1, to: [offset + settings[:per_page], total_entries].min, count: total_entries).html_safe
         end
       end
 
@@ -192,7 +194,7 @@ module AbAdmin
       end
 
       def admin_comments_button(item)
-        title = [icon('comment', true), item.admin_comments_count_non_zero].compact.join(' ').html_safe
+        title = [icon('comment', true), (item.admin_comments_count unless item.admin_comments_count.zero?)].compact.join(' ').html_safe
         link_to title, admin_admin_comments_path(resource_type: item.class.name, resource_id: item.id), remote: true,
                 class: 'btn btn-info list_admin_comments_link'
       end
@@ -208,7 +210,7 @@ module AbAdmin
       def batch_action_item(item)
         if settings[:batch]
           content_tag :td do
-            check_box_tag 'by_ids[]', item.id, false, id: "batch_action_item_#{item.id}", class: 'batch_check'
+            check_box_tag 'q[id_in][]', item.id, false, id: "batch_action_item_#{item.id}", class: 'batch_check'
           end
         end
       end

data/lib/ab_admin/views/form_builder.rb

@@ -93,21 +93,23 @@ module AbAdmin
         return if @disable_all
         model = @object.class.reflect_on_association(assoc).klass
         title = [@template.icon('plus', true), I18n.t('admin.add'), options[:title] || model.model_name.human].join(' ').html_safe
-        link_to_add title, assoc, class: "btn btn-primary #{options[:class]}"
+        options[:class] = "btn btn-primary #{options[:class]}"
+        link_to_add title, assoc, options
       end
 
-      def link_to_remove_assoc
+      def link_to_remove_assoc(options={})
         return if @disable_all
-        link_to_remove @template.icon('trash', true) + I18n.t('admin.delete'), class: 'btn btn-danger btn-mini pull-right'
+        options[:class] ||= 'btn btn-danger btn-mini pull-right'
+        link_to_remove @template.icon('trash', true) + I18n.t('admin.delete'), options
       end
 
       def locale_tabs(options={}, &block)
         locale_html = {}
-        options[:locales] ||= Globalize.available_locales
+        options[:locales] ||= AbAdmin.translated_locales
         options[:locales].each do |l|
           locale_html[l] = template.capture { block.call(l) }
         end
-        template.render 'admin/shared/locale_tabs', locale_html: locale_html, locales: options[:locales]
+        template.render 'admin/shared/locale_tabs', locale_html: locale_html, locales: options[:locales], tab_nav: options[:tab_nav]
       end
 
       def save_buttons

data/lib/ab_admin/views/helpers.rb

@@ -1,15 +1,6 @@
 module AbAdmin
   module Views
     module Helpers
-
-      def admin?
-        user_signed_in? && current_user.admin?
-      end
-
-      def moderator?
-        user_signed_in? && current_user.moderator?
-      end
-
       def as_html(text)
         return ''.html_safe if text.nil?
         Nokogiri::HTML.fragment(text).to_html.html_safe

data/lib/ab_admin/views/inputs/ckeditor_input.rb

@@ -3,11 +3,7 @@ module AbAdmin
     module Inputs
       class CkeditorInput < ::SimpleForm::Inputs::Base
         def input(wrapper_options=nil)
-          unless @builder.template.instance_variable_get(:@ckeditor_init)
-            @builder.template.concat @builder.template.javascript_include_tag('/javascripts/ckeditor/init')
-            @builder.template.instance_variable_set(:@ckeditor_init, true)
-          end
-          input_html_options.reverse_merge!({width: 800, height: 200, toolbar: 'Easy'})
+          input_html_options.reverse_merge!({width: 800, height: 200, data: {cdn_url: Ckeditor.cdn_url}})
           @builder.cktext_area(attribute_name, input_html_options)
         end
       end

data/lib/ab_admin/views/manager_helpers.rb

@@ -1,9 +1,6 @@
 module AbAdmin
   module Views
     module ManagerHelpers
-
-      INDEX_VIEW_ICONS = {table: 'list', tree: 'move', grid: 'th', chart: 'signal'}
-
       def table_builder
         manager.table ||= ::AbAdmin::Config::Table.default_for_model(resource_class)
       end
@@ -20,6 +17,14 @@ module AbAdmin
         manager.chart ||= ::AbAdmin::Config::Chart.default_for_model(resource_class)
       end
 
+      def stats_builder
+        manager.stats ||= ::AbAdmin::Config::Stats.default_for_model(resource_class)
+      end
+
+      def map_builder
+        manager.map ||= ::AbAdmin::Config::Map.default_for_model(resource_class)
+      end
+
       def modal_form_builder
         manager.modal_form ||= ::AbAdmin::Config::ModalForm.default_for_model(resource_class, skip: [:id, :created_at, :updated_at, :lft, :rgt, :depth])
       end
@@ -38,7 +43,7 @@ module AbAdmin
         elsif field.options[:image]
           item_image_link(item, assoc: field.name)
         else
-          admin_pretty_data call_method_or_proc_on(item, field.data)
+          admin_pretty_data method_or_proc_on(field.data, item)
         end
       end
 
@@ -52,10 +57,14 @@ module AbAdmin
         end
       end
 
+      INDEX_VIEW_ICONS = {table: 'list', tree: 'move', grid: 'th', chart: 'signal', map: 'map-marker', stats: 'eye-open'}
+      INDEX_VIEW_SYMBOLS = {pie_chart: '◔'}
       def index_view_link(index_view)
-        options = {class: "btn #{('active' if current_index_view == index_view)}", title: t("admin.index_view.#{index_view}", default: index_view.to_s)}
+        options = {class: ['btn', 'tool', 'tool-bottom', ('active' if settings[:current_index_view] == index_view)], title: t("admin.index_view.#{index_view}", default: index_view.to_s)}
         url = url_for({index_view: index_view, q: params[:q]}.reject_blank)
-        link_to icon(INDEX_VIEW_ICONS[index_view.to_sym]), url, options
+        title = INDEX_VIEW_ICONS[index_view.to_sym] ? icon(INDEX_VIEW_ICONS[index_view.to_sym]) : (INDEX_VIEW_SYMBOLS[index_view.to_sym] || index_view.to_s)
+        options[:class] << 'btn-symbol' if INDEX_VIEW_SYMBOLS[index_view.to_sym]
+        link_to title, url, options
       end
     end
   end