ab_admin 0.8.3 → 0.9.0

data/app/controllers/admin/dashboards_controller.rb

@@ -13,7 +13,7 @@ class Admin::DashboardsController < Admin::BaseController
     []
   end
 
-  def settings
-    {}
+  def custom_settings
+    {search: false}
   end
 end

data/app/controllers/admin/locators_controller.rb

@@ -12,8 +12,14 @@ class ::Admin::LocatorsController < ::Admin::BaseController
 
   def import
     if params[:csv_file].present?
-      Locator.import_csv(params[:csv_file].read, locales: params[:locales])
-      flash[:notice] = 'File imported'
+      csv = params[:csv_file].read.force_encoding('UTF-8')
+      errors = Locator.csv_errors(csv)
+      if errors.present?
+        flash[:error] = errors.join('<br/>').html_safe.first(500)
+      else
+        Locator.import_csv(csv, locales: params[:locales])
+        flash[:notice] = 'File imported'
+      end
     else
       flash[:error] = 'Missing or invalid csv file'
     end
@@ -59,10 +65,6 @@ class ::Admin::LocatorsController < ::Admin::BaseController
     []
   end
 
-  def settings
-    {}
-  end
-
   def action_items
     []
   end

data/app/controllers/admin/manager_controller.rb

@@ -95,8 +95,8 @@ class ::Admin::ManagerController < ::Admin::BaseController
     manager.batch_action_list
   end
 
-  def settings
-    super.merge(manager.custom_settings || {})
+  def custom_settings
+    manager.custom_settings || {}
   end
 
   def export_options

data/app/controllers/admin/static_pages_controller.rb

@@ -7,10 +7,6 @@ class Admin::StaticPagesController < Admin::BaseController
 
   private
 
-  def settings
-    {}
-  end
-
   def permitted_params
     params[:static_page].try!(:permit!)
   end

data/app/controllers/admin/structures_controller.rb

@@ -17,8 +17,8 @@ class Admin::StructuresController < Admin::BaseController
     @tree_node_renderer ||= lambda { |r| link_to r.admin_title, edit_structure_record_path(r), class: 'tree-item_link' }
   end
 
-  def settings
-    {index_view: 'tree', default_order: 'lft'}
+  def custom_settings
+    {index_views: [:tree], default_order: 'lft'}
   end
 
   def permitted_params

data/app/views/admin/assets/batch_edit.html.slim

@@ -1,5 +1,5 @@
 = admin_form_for Asset.new, url: batch_update_admin_assets_path, remote: true, html: {class: 'fileupload-edit-form'} do |f|
-  - first_locale = Globalize.available_locales.first
+  - first_locale = AbAdmin.translated_locales.first
   - f.locale_tabs do |l|
     - @assets.each do |asset|
       .row-fluid

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

@@ -1,10 +1,11 @@
 #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(scope_params) do |f|
+= search_admin_form_for ransack_collection, url: collection_path(collection_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'
+    div
+      = f.submit t('admin.search.submit'), class: 'btn btn-success search-submit'
+      button.js-search-cancel.btn.search-cancel= icon('remove')
   = render 'search_form', f: f
-  br
   div
-    = f.submit t('admin.search.submit'), class: 'btn btn-success btn-large'
-    = f.submit t('admin.search.cancel'), class: 'btn', id: 'search_cancel'
+    = f.submit t('admin.search.submit'), class: 'btn btn-success search-submit'
+    button.js-search-cancel.btn.search-cancel= icon('remove')

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

@@ -1,13 +1,16 @@
+<% if params[:flash] %>
+  flash("<%= t("flash.admin.actions.#{action_name}.notice", resource_name: resource_class.model_name.human(count: 1)) %>")
+<% end %>
+
 <% unless params[:modal] %>
   <%
     form_wrap_id = dom_id(resource_class.new, 'list_edit')
     html = render('table', collection: [resource]).match(/<tbody>(.*)<\/tbody>/m)[1].html_safe
   %>
   $('#<%= form_wrap_id %>').remove();
-  $('#list tbody').prepend('<%= j html %>');
+  $('#list tbody:first').prepend('<%= j html %>');
   $(document).trigger('admin:list_init');
   $('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl();
 <% end %>
 
-
 window.ab_admin_last_created = <%= raw resource.for_input_token.to_json %>;

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

@@ -2,14 +2,14 @@
   input name='batch_action' id='batch_action' type='hidden'
   = render 'admin/shared/content_actions'
     
-#content= render current_index_view
-- unless settings[:skip_pagination]
+#content= render settings[:current_index_view].to_s
+- if settings[:pagination]
   .pagination-wrap.pull-left
-    = will_paginate collection, renderer: BootstrapPagination::Rails
+    = will_paginate collection, renderer: AbAdmin::Views::WillPaginateBootstrapRenderer
     .pagination_info= pagination_info collection
   .btn-toolbar.pull-right.pjax_links
     .btn-group
-      - per_page_variants.each do |c|
+      - settings[:per_page_variants].each do |c|
         a.btn.per_page data-val=c href=url_for(params_for_links.merge(per_page: c)) class=('active' if c == collection.per_page) = c
 
 - if pjax? && flash.present?

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

@@ -1,3 +1,8 @@
+<% if params[:flash] %>
+  flash("<%= t("flash.admin.actions.#{action_name}.notice", resource_name: resource_class.model_name.human(count: 1)) %>")
+<% end %>
+
+
 <% unless params[:modal] %>
   <%
     form_wrap_id = dom_id(resource, 'list_edit')

data/app/views/admin/fileupload/_asset_templates.html.slim

@@ -3,9 +3,8 @@ script#image_template type='text/x-handlebars-template'
     = link_to icon('remove', true), '/admin/assets/{{id}}', remote: true, method: :delete, title: t('admin.delete'), class: 'destroy_asset', \
        data: {confirm: t('admin.delete_confirmation')}
     .main_image title=t('admin.fileupload.main_image') = icon('home', true)
-    .crop_image title=t('admin.fileupload.crop') = icon('resize-full', true)
     .rotate_image title=t('admin.fileupload.rotate') = icon('repeat', true)
-    a.fileupload-file.fancybox href='{{url}}' rel='fancybox'
+    a.fileupload-file href='{{url}}' target='_blank' data-fancybox=1
       img src='{{thumb_url}}' title='{{name}}' alt="{{alt}}"
 
 

data/app/views/admin/fileupload/_image.html.slim

@@ -2,8 +2,7 @@
   = link_to icon('remove', true), admin_asset_path(image), remote: true, method: :delete, title: t('admin.delete'), class: 'destroy_asset', \
      data: {confirm: t('admin.delete_confirmation')}
   .main_image title=t('admin.fileupload.main_image') = icon('home', true)
-  .crop_image title=t('admin.fileupload.crop') = icon('resize-full', true)
   .rotate_image title=t('admin.fileupload.rotate') = icon('repeat', true)
-  a.fileupload-file.fancybox href=image.url rel='fancybox'
+  a.fileupload-file href=image.url target='_blank' data-fancybox=1
     - I18n.with_locale(image.assetable.try(:locale)) do
       img src=image.thumb_url title=image.name alt=image.alt

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

@@ -12,13 +12,14 @@
 
   button#translate_incomplete.btn.btn-danger.pull-left type="button" = t 'admin.locators.translate_incomplete'
 
+- master_locale = params[:master_locale].try!(:to_sym) || I18n.default_locale
 - locale_file = Locator.prepare_data(@file)
 table.table.table-bordered.table-striped
   thead
     tr
-      th = t 'admin.locators.key'
-      th = locale_file.locale
-      th = I18n.default_locale
+      th= t 'admin.locators.key'
+      th= locale_file.locale
+      th= master_locale
     tr
       - [:key_contains, :edit_locale_contains, :main_locale_contains].each do |param|
         th
@@ -26,7 +27,7 @@ table.table.table-bordered.table-striped
   = form_tag(admin_locators_path, method: :put) do
     tbody#locale_data
       = hidden_field_tag 'edit_locale_name', locale_file.locale
-      = hidden_field_tag 'main_locale_name', I18n.default_locale
+      = hidden_field_tag 'main_locale_name', master_locale
       = hidden_field_tag 'filename', locale_file.filename
 
       - locale_file.flat_data.each do |keys, value|
@@ -34,8 +35,8 @@ table.table.table-bordered.table-striped
           td.locale_keys
             div== keys.join(' > ')
             .btn.btn-mini.btn-inverse.auto_translate.pull-right google translate
-          td = text_area_tag 'locale_hash' + keys.map{|k| "[#{k}]" }.join, value
-          td = text_area_tag 'fake', t(keys.join('.'), locale: I18n.default_locale), disabled: true
+          td= text_area_tag 'locale_hash' + keys.map{|k| "[#{k}]" }.join, value
+          td= text_area_tag 'fake', t(keys.join('.'), locale: master_locale), disabled: true
     tbody
       tr
         td colspan=3 = submit_tag t('admin.form.save'), class: 'btn btn-primary'

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

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

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

@@ -26,7 +26,7 @@
           - table_builder.fields.each do |field|
             td class=(field.options[:cell_class] if field.options[:cell_class])
               - field_content = table_item_field(item, field)
-              - if field.options[:copy_button]
+              - if field_content.present? && 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')

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

@@ -1,63 +1,61 @@
 .content_actions.clearfix
-  - if settings[:batch] && current_index_view =~ /table/
+  - if settings[:batch] && settings[:current_index_view] == :table
     .btn-group
       a.btn.dropdown-toggle data-toggle="dropdown" href="#"
         = t 'admin.batch_actions.title'
         span.caret
       ul.dropdown-menu
-        - batch_action_list.each do |batch_action|
-          li
-            a.batch_action_link(
-              href='#'
-              data-form=batch_action.form
-              data-action=batch_action.name
-              data-confirm=batch_action.confirm
-            )
-              = batch_action.title
-  - unless button_scopes.blank?
+        - batch_action_list.each do |ba|
+          li: a.batch_action_link href='#' data-form=ba.form data-action=ba.name data-confirm=ba.confirm = ba.title
+  - if settings[:button_scopes] && button_scopes.present?
     .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)
-          = opts[:title] || t("admin.scopes.#{name}", default: name.to_s.titleize)
+        - url = url_for(param_name => (active ? nil : 1), index_view: params[:index_view])
+        a.btn href=url title=opts[:title] class=[opts[:class], ('active' if active), ('tool tool-bottom' if opts[:title])]
+          = opts[:label] || opts[:title] || t("admin.scopes.#{name}", default: name.to_s.titleize)
           - if opts[:badge]
             - 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].try(:[], :type) || 'important'}") = scope_count
 
-  a.btn.pull-left#columns_hider_show href="#columns_hider" data-toggle='modal' = t 'admin.columns_hider.button'
+  - if settings[:current_index_view] == :table
+    .btn-group#columns_hider_wrap
+      a.btn.dropdown-toggle data-toggle="dropdown" href="#"
+        = t 'admin.columns_hider.button'
+        span.caret
+      .dropdown-menu
 
   .btn-group#view_layout
     .btn data-css='main_wide' = icon('align-left')
     .btn data-css='main_reverse' = icon('align-right')
 
-  - if normalized_index_views.length > 1
+  - if settings[:index_views].length > 1
     .btn-group#index_views
-      - normalized_index_views.each do |index_view|
+      - settings[:index_views].each do |index_view|
         = index_view_link(index_view)
 
   - if can?(:export, resource_class) && !settings[:skip_export]
     .btn-group.downloads
       = icon('download-alt')
-      /- %w(csv xls json).each do |format|
       - %w(csv xlsx).each do |format|
         - next if format == 'xlsx' && !Mime[:xlsx]
         = link_to format, params_for_links.merge(per_page: 10_000, format: format), id: "export_#{format}"
 
-  - if @search && settings[:sort_buttons]
+  - if ransack_collection && settings[:sort_buttons]
     .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]
+  - if collection_action? && 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)
+            = search_collection.distinct(false).sum(ag[:column]).try!(:round, 2)
           - elsif ag[:type] == :average
-            = @search_collection.average(ag[:column]).try!(:round, 2)
+            = search_collection.average(ag[:column]).try!(:round, 2)

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

@@ -1,4 +1,5 @@
-- flash.each do |type, message|
-  .alert class="alert-#{type}"
-    a.close(data-dismiss='alert') ×
-    == message
+#flash
+  - flash.each do |type, message|
+    .alert class="alert-#{type}"
+      a.close(data-dismiss='alert') ×
+      == message

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

@@ -3,8 +3,8 @@
     - active_locale = params[:edit_locale].present? ? params[:edit_locale].to_sym : locales.first
     - locales.each_with_index do |l, i|
       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")
+        a data-toggle="tab" href="##{l}" class="ico_#{l}" title=l = locale_flag(l)
+        = tab_nav.call(l) if tab_nav
   .tab-content
     - locales.each_with_index do |l, i|
       .tab-pane id=l class="tab_#{l} #{'active' if l == active_locale}" = locale_html[l]

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

@@ -6,7 +6,7 @@ nav.navbar-inner
       span.icon-bar
     a.brand href=(AbAdmin.root_path || root_path) target='_blank' = admin_site_name
     .nav-collapse.collapse
-      = AdminMenu.render(self)
+      = (current_user.admin_menu_builder || AdminMenu).render(self)
 
       .btn-group.pull-right
         a.btn.dropdown-toggle data-toggle="dropdown" href="#"

data/app/views/admin/structures/_form.html.slim

@@ -3,7 +3,7 @@
     = f.input :title, locale: l
     = f.input :redirect_url, locale: l, as: :string
 
-  - Structure.simple_slug_columns.each do |column|
+  - Structure.simple_slug_adapter.column_names.each do |column|
     = f.input column
   - if @structure.moveable?
     = f.input :parent, as: :tree_select

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

@@ -15,7 +15,7 @@
     = f.input :gender, collection: GenderType.all, include_blank: false, as: :radio_buttons, item_wrapper_class: 'inline'
 
     = f.input :time_zone, fancy: true, priority: %w(Moscow Kyiv).map{|t| ActiveSupport::TimeZone[t] }
-    = f.input :locale, collection: Globalize.available_locales
+    = f.input :locale, collection: AbAdmin.translated_locales
     = f.input :bg_color, as: :color
 
     = f.input :password, input_html: {autocomplete: 'off'}

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

@@ -10,7 +10,7 @@
 = f.input :user_role_id, collection: UserRoleType.all
 
 = f.input :gender, collection: GenderType.all
-= f.input :locale, collection: Globalize.available_locales
+= f.input :locale, collection: AbAdmin.translated_locales
 
 = f.input :updated_at
 = f.input :created_at

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

@@ -6,7 +6,6 @@
       .muted.footer-notes= AbAdmin.footer_notes
 
   = render 'admin/fileupload/asset_templates'
-  = render 'admin/shared/columns_hider'
 
 - unless admin?
   css:

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

@@ -1,6 +1,6 @@
 header.navbar.navbar-inverse
   = render 'admin/shared/main_menu'
-  ul.breadcrumb
+  ul.breadcrumb.clearfix
     li.resource_actions= render 'admin/shared/action_items'
     = render 'admin/shared/breadcrumbs'
 

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

@@ -16,13 +16,13 @@ html id="controller_#{controller_name}"
       = render 'layouts/admin/navigation'
       #main role="main"
         .container-fluid
-          = render('admin/shared/flash', flash: flash) if flash
           #container.row-fluid
             .wrap_content
               .clearfix data-pjax-container=true class=admin_layout_css = yield
             - if collection_action? && settings[:search]
-              .sidebar.well= render 'search_layout'
+              .sidebar.well.well-tiny= render 'search_layout'
             = yield :sidebar
+        = render('admin/shared/flash', flash: flash) if flash
       #modal_form.modal.hide
       #loading.label.label-warning= t 'admin.loading'
       #push

data/config/locales/de.yml

@@ -89,7 +89,7 @@ de:
     choose: Select %{attr}
     close: Close
     columns_hider:
-      button: Adjust the table
+      button: Columns
       title: Setting the display of columns
     comments:
       add: Comment
@@ -105,7 +105,6 @@ de:
       drop_here: Drag and drop files here
       main_image: Set Main
       max_size: Max size
-      crop: Crop
       rotate: Rotate
     form:
       cancel: Cancel

data/config/locales/en.yml

@@ -89,7 +89,7 @@ en:
     choose: Select %{attr}
     close: Close
     columns_hider:
-      button: Adjust the table
+      button: Columns
       title: Setting the display of columns
     comments:
       add: Comment
@@ -105,7 +105,6 @@ en:
       drop_here: Drag and drop files here
       main_image: Set Main
       max_size: Max size
-      crop: Crop
       rotate: Rotate
     form:
       cancel: Cancel

data/config/locales/ru.yml

@@ -105,7 +105,6 @@ ru:
       drop_here: или бросьте файл(ы) сюда
       main_image: Сделать главным
       max_size: Макс разм.
-      crop: Обрезать
       rotate: Повернуть
     form:
       cancel: Отмена