ab_admin 0.7.0 → 0.8.0

data/app/controllers/admin/locators_controller.rb

@@ -4,6 +4,24 @@ class ::Admin::LocatorsController < ::Admin::BaseController
   before_action :find_files, only: [:show, :edit, :update]
   before_action :find_file, only: [:edit, :update]
 
+  def export
+    authorize! :export, resource_class
+    locales = I18n.available_locales & params[:locales].split(',').map(&:to_sym) if params[:locales].present?
+    keys = Locator.export_csv(*params[:keys].to_s.split(','), locales: locales)
+    send_data(keys, filename: "locales_#{Time.now.strftime('%Y_%m_%d')}.csv", type: Mime[:csv], disposition: 'attachment')
+  end
+
+  def import
+    if params[:csv_file].present?
+      locales = I18n.available_locales & params[:locales].split(',').map(&:to_sym) if params[:locales].present?
+      Locator.import_csv(params[:csv_file].read, locales: locales)
+      flash[:notice] = 'File imported'
+    else
+      flash[:error] = 'Missing or invalid csv file'
+    end
+    redirect_to admin_locators_path
+  end
+
   def edit
     @locale_hash = YAML.load_file(@file)
   end

data/app/controllers/admin/manager_controller.rb

@@ -23,7 +23,11 @@ class ::Admin::ManagerController < ::Admin::BaseController
   end
 
   def with_scopes(relation)
-    manager.scopes.inject(relation) { |result, scope| scope.apply(result, params) }
+    scopes_to_apply.inject(relation) { |result, scope| scope.apply(result, params) }
+  end
+
+  def scopes_to_apply
+    manager.scopes.find_all{|scope| params[scope.name].present? }
   end
 
   def begin_of_association_chain
@@ -125,13 +129,7 @@ class ::Admin::ManagerController < ::Admin::BaseController
   end
 
   def permitted_params
-    attrs = case manager.permitted_params
-              when Proc then
-                instance_exec(&manager.permitted_params)
-              else
-                Array(manager.permitted_params)
-            end
-
+    attrs = Array(manager.permitted_params.is_a?(Proc) ? instance_exec(&manager.permitted_params) : manager.permitted_params)
     resource_params = params[resource_class.model_name.param_key]
     return {} unless resource_params
     if attrs.first == :all

data/app/controllers/admin/settings_controller.rb

@@ -11,7 +11,7 @@ class ::Admin::SettingsController < ::Admin::BaseController
 
   def cache_clear
     Rails.cache.clear
-    render nothing: true
+    head :ok
   end
 
   private

data/app/controllers/admin/static_pages_controller.rb

@@ -12,8 +12,6 @@ class Admin::StaticPagesController < Admin::BaseController
   end
 
   def permitted_params
-    attrs = [:structure_id, :title, :content, :kind, :is_visible,
-             *StaticPage.all_translated_attribute_names, *AbAdmin.default_permitted_params]
-    params[:static_page].try!(:permit, *attrs)
+    params[:static_page].try!(:permit!)
   end
 end

data/app/controllers/admin/structures_controller.rb

@@ -8,7 +8,7 @@ class Admin::StructuresController < Admin::BaseController
   def resource_action_items
     edit_structure = AbAdmin::Config::ActionItem.new({}) { |r| link_to icon('wrench', true), edit_resource_path(r), class: 'btn btn-warning' }
     edit_static_page = AbAdmin::Config::ActionItem.new({}) do |r|
-      link_to(icon('pencil', true), edit_structure_record_path(r), class: 'btn btn-primary') if r.structure_type.static_page? || r.structure_type.main?
+      link_to(icon('pencil', true), edit_structure_record_path(r), class: 'btn btn-primary') if r.structure_type.has_static_page?
     end
     [edit_static_page, edit_structure, :destroy, :show]
   end
@@ -22,11 +22,6 @@ class Admin::StructuresController < Admin::BaseController
   end
 
   def permitted_params
-    attrs = [:structure_type_id, :position_type_id, :parent_id, :title, :redirect_url, :is_visible,
-             :structure_type, :position_type,
-             *Structure.simple_slug_columns,
-             *AbAdmin.default_permitted_params,
-             *Structure.all_translated_attribute_names, header_attributes: [:id, *Header.all_translated_attribute_names]]
-    params[:structure].try!(:permit, *attrs)
+    params[:structure].try!(:permit!)
   end
 end

data/app/controllers/admin/users_controller.rb

@@ -42,7 +42,7 @@ class Admin::UsersController < Admin::BaseController
 
   def build_resource
     super
-    resource.skip_confirmation!
+    resource.try(:skip_confirmation!)
     resource
   end
 

data/app/views/ab_admin/devise/sessions/new.html.slim

@@ -1,10 +1,10 @@
 = simple_form_for(resource, as: resource_name, url: session_path(resource_name), wrapper: :bootstrap) do |f|
-  h2= t 'admin.auth.sessions.title'
+  h2= t 'admin.auth.sessions.title', default: 'Sign in'
   .form-inputs
     = f.input :email, required: false, autofocus: true
     = f.input :password, required: false
     = f.input :remember_me, as: :boolean, wrapper: :default if devise_mapping.rememberable?
-  = f.button :submit, t('admin.auth.sessions.button'), class: 'btn-primary btn-large'
+  = f.button :submit, t('admin.auth.sessions.button', default: 'Sign in'), class: 'btn-primary btn-large'
   br
   br
-  = link_to t('admin.auth.passwords.new.title'), new_password_path(resource_name)
+  = link_to t('admin.auth.passwords.new.title', default: 'Forgot your password?'), new_password_path(resource_name) if devise_mapping.recoverable?

data/app/views/admin/base/_search_layout.html.slim

@@ -1,6 +1,8 @@
 #toggle_sidebar_off.btn.btn-large = icon('chevron-left')
 #toggle_sidebar_on.btn.btn-large = icon('chevron-right')
-= search_admin_form_for @search, url: collection_path do |f|
+= search_admin_form_for @search, url: collection_path(scope_params) do |f|
+  - if settings.dig(:search_form, :submit_on_top)
+    = f.submit t('admin.search.submit'), class: 'btn btn-success btn-small search-submit-wide'
   = render 'search_form', f: f
   br
   div

data/app/views/admin/base/_table.html.slim

@@ -8,7 +8,7 @@ table.table.table-striped.index_table#list
       th=t 'admin.table.actions'
   tbody
     - collection.each do |item|
-      tr
+      tr id=dom_id(item, 'list')
         = batch_action_item(item)
         td= id_link(item)
         - resource_class.content_columns.map(&:name).without('updated_at').each do |col|

data/app/views/admin/base/update.js.erb

@@ -5,8 +5,10 @@
   %>
   $('#<%= form_wrap_id %>').remove();
   $('#<%= dom_id(resource, 'list') %>').replaceWith('<%= j html %>');
+  var $el = $('#<%= dom_id(resource, 'list') %>');
   $(document).trigger('admin:list_init');
-  $('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl();
+  if (!$el[0].className) $el.addClass('success');
+  $el.scrollToEl();
 <% end %>
 
 window.ab_admin_last_updated = <%= raw resource.for_input_token.to_json %>;

data/app/views/admin/locators/show.html.slim

@@ -10,4 +10,25 @@ table.table.table-striped.table-bordered style='width: 1050px;'
       td= link_to filename, edit_admin_locators_path(filename: filename)
 
 => link_to t('admin.locators.prepare'), prepare_admin_locators_path, class: 'btn btn-warning', method: :post
-=> link_to t('admin.locators.restart'), reload_admin_locators_path, class: 'btn btn-primary', method: :post
+=> link_to t('admin.locators.restart'), reload_admin_locators_path, class: 'btn btn-primary', method: :post
+
+hr
+
+= form_tag export_admin_locators_path, method: :get do
+  input.input-xxlarge> type='text' name='keys' placeholder='Keys comma separated'
+  br
+  input.input-medium.fancy_select> type='text' name='locales' placeholder='Locales, all by default' data-tags=I18n.available_locales.to_json
+  br
+  br
+  button.btn Export CSV
+
+hr
+
+= form_tag import_admin_locators_path, method: :post, multipart: true do
+  = file_field_tag :csv_file
+  br
+  input.input-medium.fancy_select> type='text' name='locales' placeholder='Locales, all by default' data-tags=I18n.available_locales.to_json
+  br
+  br
+  button.btn Import CSV
+

data/app/views/admin/manager/_chart.html.slim

@@ -0,0 +1,4 @@
+- if tmpl = admin_partial_name(chart_builder)
+  = render partial: tmpl, locals: local_assigns
+- else
+  h2 Generic chart template is not implemented yet. It can be here `admin/#{resource_collection_name}/_chart.html.slim`

data/app/views/admin/manager/_table.html.slim

@@ -9,26 +9,29 @@
         th.actions_panel
         - table_builder.fields.each do |field|
           th class=('hide_cell' if field.options[:hidden])
-            - if field.options[:sortable] && !field.options[:image]
-              - if field.options[:sortable].is_a?(TrueClass)
-                = list_sort_link field.name
-              - else
-                - opts = field.options[:sortable].is_a?(Hash) ? field.options[:sortable] : {column: field.options[:sortable]}
-                = list_sort_link field.name, opts
+            - if field.options[:sortable].is_a?(FalseClass)
+              = field.name.is_a?(Symbol) ? ha(field.name) : field.name
+            - elsif field.options[:sortable].is_a?(TrueClass)
+              = list_sort_link field.name
+            - elsif field.options[:sortable].is_a?(Hash)
+              = list_sort_link field.name, field.options[:sortable]
+            - elsif resource_class.column_names.include?(field.name.to_s)
+              = list_sort_link field.name
             - else
               = field.name.is_a?(Symbol) ? ha(field.name) : field.name
     tbody
       - is_edit_link = manager.actions.include?(:edit)
       - collection.each do |item|
-        tr id=dom_id(item, 'list') class=(table_builder.options[:row_class].call(item) if table_builder.options[:row_class])
+        tr id=dom_id(item, 'list') class=(call_method_or_proc_on(item, table_builder.options[:row_class]) if table_builder.options[:row_class])
           = batch_action_item(item)
           td= id_link(item, edit: is_edit_link)
           = item_index_actions_panel(item)
           - table_builder.fields.each do |field|
-            td
-              - if field.options[:editable] && field.data.is_a?(Symbol)
-                = admin_editable item, field.data, field.options[:editable]
-              - elsif field.options[:image]
-                = item_image_link(item, assoc: field.name)
+            td class=(field.options[:css_class] if field.options[:css_class])
+              - field_content = table_item_field(item, field)
+              - if field.options[:copy_button]
+                - field_id = dom_id(item, field.name)
+                span> id=field_id = field_content
+                .btn.btn-mini> class='js-copy' data-clipboard-target="##{field_id}" = icon('share')
               - else
-                = admin_pretty_data call_method_or_proc_on(item, field.data)
+                = field_content

data/app/views/admin/shared/_action_items.html.slim

@@ -0,0 +1,12 @@
+- action_items.group_by{|ai| ai.is_a?(AbAdmin::Config::ActionItem) && ai.options[:group] }.each do |group, action_items|
+  - if group
+    .btn-group
+      a.btn.dropdown-toggle data-toggle="dropdown" href="#"
+        = group.to_s.humanize
+        span.caret
+      ul.dropdown-menu
+        - action_items.each do |action_item|
+          li= action_link(action_item)
+  - else
+    - action_items.each do |action_item|
+      = action_link(action_item)

data/app/views/admin/shared/_content_actions.html.slim

@@ -15,16 +15,18 @@
             )
               = batch_action.title
   - unless button_scopes.blank?
-    .btn-group.pjax_links
+    .btn-group
       - button_scopes.each do |name, opts|
+        - next if opts[:if] && !call_method_or_proc_on(controller, opts[:if])
         - param_name = opts[:as] || name
         - active = params[param_name]
         a.btn href=url_for(param_name => (active ? nil : 1)) class=('active' if active)
           = t "admin.scopes.#{name}", default: name.to_s.titleize
           - if opts[:badge]
-            - scope_count = resource_class.send(name).count
+            - scope = opts[:block] ? opts[:block].call(controller, resource_class) : resource_class.send(name)
+            - scope_count = scope.send(*[opts[:badge][:value_type] || :count, opts[:badge][:column]].compact)
             - unless scope_count.zero?
-              span.badge< class=("badge-#{opts[:badge][:type] || 'important'}") = scope_count
+              span.badge< class=("badge-#{opts[:badge].try(:[], :type) || 'important'}") = scope_count
 
   a.btn.pull-left#columns_hider_show href="#columns_hider" data-toggle='modal' = t 'admin.columns_hider.button'
 
@@ -49,3 +51,13 @@
     .btn-group
       - settings[:sort_buttons].each do |opts|
         = list_sort_link(opts[:title], column: opts[:column], html_options: {class: 'btn'})
+
+  - if @search_collection && settings[:aggregations]
+    .aggregations
+      - settings[:aggregations].each do |ag|
+        .label> class=(ag[:css] || 'label-success')
+          => ag[:label] || "#{ag[:column].to_s.humanize}:"
+          - if !ag[:type] || ag[:type] == :sum
+            = @search_collection.distinct(false).sum(ag[:column]).try!(:round, 2)
+          - elsif ag[:type] == :average
+            = @search_collection.average(ag[:column]).try!(:round, 2)

data/app/views/admin/shared/_locale_tabs.html.slim

@@ -1,8 +1,10 @@
 .tabbable.locale_tabs
   ul.nav.nav-tabs
+    - active_locale = params[:edit_locale].present? ? params[:edit_locale].to_sym : locales.first
     - locales.each_with_index do |l, i|
-      li class=('active' if i.zero?)
-        a data-toggle="tab" href="##{l}" class="ico_#{l}" = t("admin.langs.#{l}", default: l.to_s)
+      li class=('active' if l == active_locale)
+        a data-toggle="tab" href="##{l}" class="ico_#{l}" title=l
+          img src=image_path("admin/flags/#{l}.png")
   .tab-content
     - locales.each_with_index do |l, i|
-      .tab-pane id=l class="tab_#{l} #{'active' if i.zero?}" = locale_html[l]
+      .tab-pane id=l class="tab_#{l} #{'active' if l == active_locale}" = locale_html[l]

data/app/views/admin/shared/_main_menu.html.slim

@@ -0,0 +1,20 @@
+nav.navbar-inner
+  .container
+    button.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
+      span.icon-bar
+      span.icon-bar
+      span.icon-bar
+    a.brand href=(AbAdmin.root_path || root_path) target='_blank' = AbAdmin.site_name
+    .nav-collapse.collapse
+      = AdminMenu.render(self)
+
+      .btn-group.pull-right
+        a.btn.dropdown-toggle data-toggle="dropdown" href="#"
+          i.icon-user
+          = current_user.name
+          span.caret
+        ul.dropdown-menu
+          li
+            a href=edit_admin_user_path(current_user) = t 'admin.auth.profile'
+          li.divider
+          li= link_to(t('admin.auth.sign_out'), destroy_user_session_path, method: 'delete')

data/app/views/admin/shared/_save_buttons.html.slim

@@ -1,4 +1,5 @@
-- return_to = params[:return_to].presence || request.referer
+- return_to = params[:return_to].presence || request.referer || collection_path
+- return_to = "#{return_to}##{dom_id(resource, 'list')}" if resource.persisted?
 input type='hidden' name='return_to' value=return_to
 .form-actions
   button.btn.btn-primary type="submit" name="_save" data-disable-with=t('admin.form.save')

data/app/views/admin/users/_table.html.slim

@@ -5,6 +5,7 @@ table.table.table-striped.index_table#list
       th= list_sort_link(:id)
       th.actions_panel
       th= list_sort_link(:email)
+      th
       th= ha :avatar
       th= list_sort_link(:user_role_id)
       th= list_sort_link(:first_name)
@@ -23,6 +24,11 @@ table.table.table-striped.index_table#list
           - else
             = link_to icon('ok', true), activate_admin_user_path(item), method: :post, class: 'btn btn-success', title: t('admin.actions.activate.link')
         td= mail_to item.email
+        td
+          - if item.active?
+            .label.label-success= t 'admin.user.state.active'
+          - else
+            .label.label-danger= t 'admin.user.state.suspended'
         td= item_image_link(item, assoc: :avatar)
         td= item.user_role_type.try(:title)
         td= item.first_name

data/app/views/layouts/admin/_navigation.html.slim

@@ -1,28 +1,6 @@
 header.navbar.navbar-inverse
-  nav.navbar-inner
-    .container
-      a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse" 
-        span.icon-bar
-        span.icon-bar
-        span.icon-bar
-      a.brand href=root_path target='_blank' = AbAdmin.site_name
-      .nav-collapse.in.collapse
-        = AdminMenu.render(self)
-
-        .btn-group.pull-right
-          a.btn.dropdown-toggle data-toggle="dropdown" href="#" 
-            i.icon-user
-            = current_user.name
-            span.caret
-          ul.dropdown-menu
-            li
-              a href=edit_admin_user_path(current_user) = t 'admin.auth.profile'
-            li.divider
-            li= link_to(t('admin.auth.sign_out'), destroy_user_session_path, method: 'delete')
-
+  = render 'admin/shared/main_menu'
   ul.breadcrumb
-    li.resource_actions
-      - action_items.each do |act|
-        = action_link(act)
+    li.resource_actions= render 'admin/shared/action_items'
     = render 'admin/shared/breadcrumbs'
 

data/config/locales/de.yml

@@ -246,14 +246,6 @@ de:
     updater_id: ''
     remember_me: Remember
     password: Password
-  attrs:
-    en: Eng.
-    it: Italian
-    ru: Rus.
-    uk: Ukr.
-    de: Deutsch
-    fr: Fr
-    es: Es
   flash:
     admin:
       actions:

data/config/locales/en.yml

@@ -190,10 +190,10 @@ en:
         moderator: Moderator
         redactor: Editor
       state:
-        active: Most Active
+        active: Active
         deleted: Removed
-        pending: Inactive
-        suspended: Frozen
+        pending: Pending
+        suspended: Suspended
     structure:
       kind:
         group: Group
@@ -246,14 +246,6 @@ en:
     updater_id: ''
     remember_me: Remember
     password: Password
-  attrs:
-    en: Eng.
-    it: Italian
-    ru: Rus.
-    uk: Ukr.
-    de: Deutsch
-    fr: Fr
-    es: Es
   flash:
     admin:
       actions:

data/config/locales/it.yml

@@ -64,17 +64,17 @@ it:
       profile: Profilo
       sign_out: Produzione
       sessions:
-        title: ''
-        button: ''
+        title: Accedi
+        button: Accedi
       passwords:
         new:
-          title: ''
-          button: ''
+          title: Hai dimenticato la password?
+          button: Inviami le istruzioni per la reimpostazione della
         edit:
-          title: ''
-          button: ''
-          password: ''
-          password_confirmation: ''
+          title: Cambia la tua password
+          button: Cambia la mia password
+          password: Nuova password
+          password_confirmation: Conferma la tua nuova password
     avatar: Immagine
     batch_actions: Attività
     cache_clear: Cancella cache
@@ -238,15 +238,7 @@ it:
     updater: ''
     updater_id: ''
     remember_me: ''
-    password: ''
-  attrs:
-    en: Ing.
-    it: Italiana.
-    ru: rus.
-    uk: Ukr.
-    de: De
-    fr: Fr
-    es: Es
+    password: 'Password'
   flash:
     admin:
       actions: