ab_admin 0.8.3 → 0.9.0

data/lib/generators/ab_admin/model/templates/resource.erb

@@ -2,11 +2,14 @@ class AbAdmin<%= model.name %> < AbAdmin::AbstractResource
   permitted_params :all
 
 <% if model.respond_to?(:acts_as_nested_set_options) -%>
-  settings index_view: 'tree'
+  settings index_views: [:tree]
 <% else -%>
   table do
 <% index_attrs.without('id', 'updated_at').each do |attr| -%>
-    field :<%= attr -%><%= ', sortable: false' if translated_columns.include?(attr) %>
+    field :<%= attr -%><%= ', sortable: false' if translated_columns.include?(attr.to_s) %>
+<% end -%>
+<% translated_columns.each do |attr| -%>
+    field :<%= attr -%>, sortable: false
 <% end -%>
   end
 

data/lib/generators/ab_admin/resource/templates/controller.erb

@@ -15,8 +15,8 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
 <% if model.respond_to?(:acts_as_nested_set_options) -%>
   protected
 
-  def settings
-    {index_view: 'tree'}
+  def build_settings
+    super.merge!(index_views: 'tree')
   end
 <% end -%>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ab_admin
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2020-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 6.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
@@ -126,30 +126,30 @@ dependencies:
   name: simple_slug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -196,16 +196,16 @@ dependencies:
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +262,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bootstrap-sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.2.2
 - !ruby/object:Gem::Dependency
   name: bootstrap-wysihtml5-rails
   requirement: !ruby/object:Gem::Requirement
@@ -304,20 +290,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: will_paginate-bootstrap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: nested_form
   requirement: !ruby/object:Gem::Requirement
@@ -336,16 +308,16 @@ dependencies:
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n-js
   requirement: !ruby/object:Gem::Requirement
@@ -378,16 +350,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: '0'
 description: Simple and real-life tested Rails::Engine admin interface
 email:
 - leschenko.al@gmail.com
@@ -398,24 +370,13 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/images/admin/Jcrop.gif
 - app/assets/images/admin/empty.gif
-- app/assets/images/admin/flags/de.png
-- app/assets/images/admin/flags/en.png
-- app/assets/images/admin/flags/es.png
-- app/assets/images/admin/flags/fr.png
-- app/assets/images/admin/flags/it.png
-- app/assets/images/admin/flags/ja.png
-- app/assets/images/admin/flags/pl.png
-- app/assets/images/admin/flags/ru.png
-- app/assets/images/admin/flags/uk.png
 - app/assets/images/admin/main_image.png
 - app/assets/images/admin/preloader.gif
 - app/assets/images/admin/transp_cross.png
 - app/assets/javascripts/ab_admin/application.js
 - app/assets/javascripts/ab_admin/components/admin_assets.js.coffee
 - app/assets/javascripts/ab_admin/components/base_assets.js.coffee
-- app/assets/javascripts/ab_admin/components/croppable_image.js.coffee
 - app/assets/javascripts/ab_admin/components/gmaps.js.coffee
 - app/assets/javascripts/ab_admin/components/google_translate.js.coffee
 - app/assets/javascripts/ab_admin/components/grid_input.js.coffee
@@ -442,14 +403,13 @@ files:
 - app/assets/stylesheets/ab_admin/components/_admin_comments.scss
 - app/assets/stylesheets/ab_admin/components/_base.scss
 - app/assets/stylesheets/ab_admin/components/_colored_tabs.scss
-- app/assets/stylesheets/ab_admin/components/_columns_hider.scss
 - app/assets/stylesheets/ab_admin/components/_form.scss
 - app/assets/stylesheets/ab_admin/components/_geo_input.scss
 - app/assets/stylesheets/ab_admin/components/_grid_view.scss
 - app/assets/stylesheets/ab_admin/components/_locale_tabs.scss
 - app/assets/stylesheets/ab_admin/components/_navigation.scss
-- app/assets/stylesheets/ab_admin/components/_perms.scss
 - app/assets/stylesheets/ab_admin/components/_table_view.scss
+- app/assets/stylesheets/ab_admin/components/_tooltip.scss
 - app/assets/stylesheets/ab_admin/components/_translations.scss
 - app/assets/stylesheets/ab_admin/components/_tree_view.scss
 - app/assets/stylesheets/ab_admin/components/_view_layout.scss
@@ -507,6 +467,7 @@ files:
 - app/views/admin/locators/show.html.slim
 - app/views/admin/manager/_chart.html.slim
 - app/views/admin/manager/_form.html.slim
+- app/views/admin/manager/_map.html.slim
 - app/views/admin/manager/_modal_form.html.slim
 - app/views/admin/manager/_search_form.html.slim
 - app/views/admin/manager/_show_table.html.slim
@@ -515,7 +476,6 @@ files:
 - app/views/admin/settings/_form.html.slim
 - app/views/admin/shared/_action_items.html.slim
 - app/views/admin/shared/_breadcrumbs.html.slim
-- app/views/admin/shared/_columns_hider.html.slim
 - app/views/admin/shared/_content_actions.html.slim
 - app/views/admin/shared/_flash.html.slim
 - app/views/admin/shared/_flash.js.erb
@@ -564,6 +524,7 @@ files:
 - lib/ab_admin/concerns/nested_set.rb
 - lib/ab_admin/concerns/reloadable.rb
 - lib/ab_admin/concerns/silencer.rb
+- lib/ab_admin/concerns/translations_macro.rb
 - lib/ab_admin/concerns/utilities.rb
 - lib/ab_admin/concerns/validations.rb
 - lib/ab_admin/config/base.rb
@@ -581,8 +542,6 @@ files:
 - lib/ab_admin/devise.rb
 - lib/ab_admin/engine.rb
 - lib/ab_admin/hooks.rb
-- lib/ab_admin/hooks/globalize_locale_suffix_accessors.rb
-- lib/ab_admin/hooks/globalize_valid_locale.rb
 - lib/ab_admin/hooks/will_paginate_id_prefetch.rb
 - lib/ab_admin/hooks/will_paginate_no_uri.rb
 - lib/ab_admin/i18n_tools/google_translate.rb
@@ -629,7 +588,7 @@ files:
 - lib/ab_admin/views/manager_helpers.rb
 - lib/ab_admin/views/search_form_builder.rb
 - lib/ab_admin/views/url_for_routes.rb
-- lib/generators/ab_admin/ckeditor_assets/ckeditor_assets_generator.rb
+- lib/ab_admin/views/will_paginate_bootstrap_renderer.rb
 - lib/generators/ab_admin/glob/glob_generator.rb
 - lib/generators/ab_admin/glob/templates/migration.erb
 - lib/generators/ab_admin/install/USAGE
@@ -684,7 +643,6 @@ files:
 - lib/generators/ab_admin/resource/templates/_search_form.slim.erb
 - lib/generators/ab_admin/resource/templates/_table.slim.erb
 - lib/generators/ab_admin/resource/templates/controller.erb
-- lib/generators/template.rb
 - lib/tasks/assets.rake
 - lib/tasks/cache.rake
 - lib/tasks/i18n.rake
@@ -706,7 +664,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Simple and real-life tested Rails::Engine admin interface based on slim,

data/app/assets/javascripts/ab_admin/components/croppable_image.js.coffee

@@ -1,33 +0,0 @@
-class window.CroppableImage
-  @crop_defaults = {}
-#    aspectRatio: 760 / 350
-#    setSelect: [0, 0, 760, 350]
-
-  constructor: (@el, @options = {}) ->
-    @options = {} unless _.isObject(@options)
-
-  fancyboxHandler: =>
-    _.defaults(@options, CroppableImage.crop_defaults)
-    @options.onSelect = @setCropData
-    @options.onChange = @setCropData
-    $img = $('.fancybox-image:first')
-    @options.trueSize = [$img[0].naturalWidth, $img[0].naturalHeight]
-    $img.Jcrop @options
-    $('.fancybox-nav').hide()
-
-    $cont = $('.fancybox-outer:first')
-    $btn = $("<a href='#' class='btn btn-primary' id='crop_button'>Обрезать</a>")
-    $cont.append($btn)
-    $btn.click @cropHandler
-
-  setCropData: (coords) =>
-    @cropData = coords
-
-  cropHandler: (e) =>
-    e.preventDefault()
-    asset_id = to_i($('.fancybox-image:first').attr('src').match(/\/[\d\/]{1,}\//)[0].replace(/\//g, ''))
-    $asset = $(@options.asset_selector || "#asset_#{asset_id}")
-    geometry = [@cropData['w'], @cropData['h'], @cropData['x'], @cropData['y']].join(',')
-    $.post "/admin/assets/#{asset_id}/crop", {geometry: geometry}, (data) =>
-      $asset.replaceWith @el.data('assets').template(data.asset)
-      $.fancybox.close()

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

@@ -1,5 +0,0 @@
-#columns_hider {
-  .btn-group .btn {
-    float: left;
-  }
-}

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

@@ -1,39 +0,0 @@
-.perms_form {
-  table {
-    width: 100%;
-    select {
-      width: auto;
-    }
-    label {
-      display: inline;
-    }
-  }
-  .collection_perms {
-    td, th {
-      width: 11%;
-    }
-    td.big_col {
-      width: 66%;
-    }
-    .big_col td {
-      width: 20%;
-    }
-    .token-input-list-facebook {
-      width: 200px;
-    }
-  }
-  .resource_perms {
-    td, th {
-      width: 25%;
-    }
-    td.big_col {
-      width: 42%;
-    }
-    .big_col td {
-      width: 50%;
-    }
-    .token-input-list-facebook {
-      width: 200px;
-    }
-  }
-}

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

@@ -1,9 +0,0 @@
-#columns_hider.modal.hide
-  .modal-header
-    button.close data-dismiss="modal" type="button" ×
-    h3= t 'admin.columns_hider.title'
-  .modal-body
-    .btn-group#columns_hider_data data-toggle="buttons-checkbox" 
-  .modal-footer
-    span.btn data-dismiss="modal" href="#" = t 'admin.close'
-    span.btn.btn-danger#submit_columns_hider href="#" = t 'admin.save'