ab_admin 0.3.4 → 0.3.5

data/.gitignore

@@ -18,6 +18,8 @@ tmp
 
 .idea
 .rvmrc
+.ruby-gemset
+.ruby-version
 .rspec
 .DS_Store
 

data/Gemfile

@@ -9,6 +9,8 @@ gem 'slim'
 gem 'devise', '~> 2.1.0'
 gem 'devise-encryptable'
 gem 'cancan'
+# for ruby 2.0
+#gem 'inherited_resources', git: 'git://github.com/josevalim/inherited_resources.git'
 gem 'inherited_resources', '~> 1.3.0'
 gem 'rack-pjax'
 gem 'configatron'
@@ -19,7 +21,7 @@ gem 'friendly_id'
 gem 'galetahub-enum_field', require: 'enum_field'
 gem 'awesome_nested_set'
 gem 'sunrise-file-upload', git: 'git://github.com/leschenko/sunrise-file-upload.git', ref: '53da968'
-gem 'globalize3', git: 'git://github.com/leschenko/globalize3.git', ref: '586ccbd'
+gem 'globalize3', :git => 'git://github.com/leschenko/globalize3.git', :ref => 'f16ab7f', branch: 'master'
 
 gem 'carrierwave'
 gem 'mini_magick'
@@ -28,7 +30,6 @@ gem 'will_paginate', '>= 3.0.3'
 gem 'will_paginate-bootstrap', '0.2.1'
 gem 'bootstrap-sass', '2.0.4'
 gem 'bootstrap-wysihtml5-rails'
-gem 'bootstrap-x-editable-rails'
 gem 'fancybox2-rails'
 gem 'select2-rails'
 gem 'nested_form', '0.2.2'
@@ -57,6 +58,7 @@ group :development, :test do
 end
 
 group :test do
+  gem 'childprocess', '0.3.6'
   gem 'cucumber-rails', require: false
   gem 'capybara'
   gem 'shoulda-matchers'

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

@@ -48,7 +48,7 @@ class window.GoogleLocaleTabs
   @locales = ['ru', 'en', 'it']
   constructor: ->
     @locales = GoogleLocaleTabs.locales
-    @limit = 1000
+    @limit = 10000
     html = '<div class="t_locales">'
     for l in @locales
       html += "<div class='t_locale t_locale_#{l}'></div>"

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

@@ -1,6 +1,6 @@
 window.initNestedFields = (opts={}) ->
-  $form = $('form.simple_form:first')
-  $form.bind 'nested:fieldAdded', (e) =>
+  $(document).on 'nested:fieldAdded', 'form.simple_form', (e) =>
     window.locale_tabs?.initHandlers() unless opts.skip_tabs
     window.initFancySelect() unless opts.skip_fancy
+    window.initPickers() unless opts.skip_pickers
     opts.callback.call(e) if opts.callback

data/app/assets/javascripts/ab_admin/core/batch_actions.js.coffee

@@ -1,11 +1,11 @@
 $ ->
   if $('#list')[0]
-    $("#list input.toggle").live "click", ->
+    $(document).on 'click', '#list input.toggle', ->
       checked = $(this).is(":checked")
       $("#list [name='ids[]']").attr "checked", checked
       $('#list tbody tr').toggleClass('active_row', checked)
 
-    $("#list tbody input").live "click", ->
+    $(document).on 'click', '#list input.batch_check', ->
       $(this).closest('tr').toggleClass('active_row')
 
     submitBatch = (el) ->
@@ -23,7 +23,7 @@ $ ->
       e.preventDefault()
       e.stopPropagation()
       $el = $(this)
-      if $(e.target).closest('table').attr('id') == 'list'
+      unless $(e.target).closest('#list > tbody > tr > td').hasClass('list_adds')
         $el.closest('tr').toggleClass('active_row')
         $el.find('td:first input').attr 'checked', (i, v) -> !v
 

data/app/assets/javascripts/ab_admin/core/init.js.coffee

@@ -22,7 +22,7 @@ $ ->
     $('.per_page').click ->
       $.cookie('pp', $(this).data('val'))
 
-    $('#list').on 'click', '.form_cancel', (e) ->
+    $('#list').on 'click', 'tr.list_edit .form_cancel', (e) ->
       e.preventDefault()
       $(this).closest('tr').remove()
 
@@ -47,12 +47,14 @@ $ ->
     $(document).trigger({type: 'admin:init', pjax: true})
   $(document).trigger({type: 'admin:init'})
 
-  $(document).on 'dblclick', '#list tbody tr', (e) ->
+  $(document).on 'dblclick', '#list > tbody > tr', (e) ->
     e.preventDefault()
-    $(this).find('td a.resource_id_link').toHref()
+    unless $(e.target).closest('#list > tbody > tr > td').hasClass('list_adds')
+      $(this).find('td a.resource_id_link').toHref()
 
   initFancySelect()
   initNestedFields()
+  initNestedFields()
   #  initAcFileds()
 
   if window.gon?.bg_color

data/app/assets/javascripts/ab_admin/core/search_form.js.coffee

@@ -5,9 +5,9 @@ $ ->
       $el.next('input').attr('name', "q[#{$el.val()}]")
 
     $("#search_form").submit ->
-      $("#search_form [id$='_gteq']").val (i, v) ->
+      $("#search_form [name$='_at_gteq]']").val (i, v) ->
         v + " 00:00" if v
-      $("#search_form [id$='_lteq']").val (i, v) ->
+      $("#search_form [name$='_at_lteq]']").val (i, v) ->
         v + " 23:59" if v
 
     $('#search_cancel').click (e) ->

data/app/assets/javascripts/ab_admin/core/ui_utils.js.coffee

@@ -102,14 +102,26 @@ window.initFancySelect = ->
               if $el.data('c')[kind]
                 cond[kind] ||= {}
                 for attr, id of $el.data('c')[kind]
-                  cond[kind][attr] = $('#' + id).val()
+                  value = $('#' + id).val()
+                  cond[kind][attr] = value if value
 
             for kind in ['with_term', 'without_term']
               if $el.data('c')[kind]
                 kind_key = kind.replace(/_term$/, '')
                 cond[kind_key] ||= {}
                 for attr, value of $el.data('c')[kind]
-                  cond[kind_key][attr] = value
+                  cond[kind_key][attr] = value if value
+
+            for kind in ['with_selector', 'without_selector']
+              if $el.data('c')[kind]
+                kind_key = kind.replace(/_selector$/, '')
+                cond[kind_key] ||= {}
+                for attr, value of $el.data('c')[kind]
+                  selectors = value.split(/\s+/)
+                  value = $el.closest(selectors[1] || 'html').find(selectors[0]).val()
+                  cond[kind_key][attr] = value if value
+
+            log cond
 
           data = {q: term, class: $el.data('class'), token: true}
           _.extend(data, cond)

data/app/assets/javascripts/ab_admin/core/utils.js.coffee

@@ -68,13 +68,14 @@ $.fn.loadSelect = (optionsDataArray) ->
         else
           selectElement.add option, null
 
-$.fn.scrollToEl = ->
-  $('html, body').animate({scrollTop: $(this).offset().top}, 'slow')
+$.fn.scrollToEl = (speed='slow') ->
+  return unless $(this)[0]
+  $('html, body').animate({scrollTop: $(this).offset().top}, speed)
 
 $.fn.toHref = ->
   $el = $(this)
   if _.isEmpty($el.data())
-    window.location.href = $el.attr('href')
+    window.location.href = $el.attr('href') if $el.attr('href')
   else
     $el.click()
 

data/app/assets/javascripts/ab_admin/main.js

@@ -1,5 +1,7 @@
 //= require i18n
 //= require i18n/translations
+//= require jquery/jquery.min
+//= require jquery/jquery-ui.min
 //= require jquery_ujs
 //= require handlebars.min
 //= require underscore.min
@@ -15,7 +17,7 @@
 //= require ab_admin/bootstrap-timepicker
 //= require bootstrap-wysihtml5
 //= require bootstrap-wysihtml5/locales/ru
-//= require bootstrap-editable-inline
+//= require ab_admin/bootstrap-editable-inline
 //= require select2
 //= require fancybox
 //= require jquery.ui.nestedSortable

data/app/assets/stylesheets/ab_admin/bootstrap_and_overrides.css.scss

@@ -16,6 +16,7 @@ $iconWhiteSpritePath: asset-url('glyphicons-halflings-white.png', image);
 @import "ab_admin/components/admin_comments";
 @import "ab_admin/components/geo_input";
 @import "ab_admin/components/sortable_tree";
+@import "ab_admin/components/text_styles";
 
 .dropdown .caret {
   margin-left: 5px;
@@ -120,19 +121,19 @@ label.control-label.label-reset {
 }
 
 .table tbody {
-  tr.success > td {
+  tr.success > td, &.success > tr > td {
     background-color: #dff0d8;
   }
 
-  tr.error > td {
+  tr.error > td, &.error > tr > td {
     background-color: #f2dede;
   }
 
-  tr.warning > td {
+  tr.warning > td, &.warning > tr > td {
     background-color: #fcf8e3;
   }
 
-  tr.info > td {
+  tr.info > td, &.info > tr > td {
     background-color: #d9edf7;
   }
 }

data/app/assets/stylesheets/ab_admin/components/_text_styles.css.scss

@@ -0,0 +1,47 @@
+.text-warning {
+  color: #c09853;
+}
+
+a.text-warning:hover,
+a.text-warning:focus {
+  color: #a47e3c;
+}
+
+.text-error {
+  color: #b94a48;
+}
+
+a.text-error:hover,
+a.text-error:focus {
+  color: #953b39;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+a.text-info:hover,
+a.text-info:focus {
+  color: #2d6987;
+}
+
+.text-success {
+  color: #468847;
+}
+
+a.text-success:hover,
+a.text-success:focus {
+  color: #356635;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}

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

@@ -1,7 +1,7 @@
 //= require ab_admin/bootstrap-datepicker
 //= require ab_admin/bootstrap-timepicker
 //= require bootstrap-wysihtml5
-//= require bootstrap-editable
+//= require ab_admin/bootstrap-editable
 //= require select2
 //= require fancybox
 //= require ab_admin/bootstrap_and_overrides

data/app/controllers/admin/base_controller.rb

@@ -24,7 +24,7 @@ class Admin::BaseController < ::InheritedResources::Base
 
   def index
     super do |format|
-      format.js { render collection }
+      format.js { render layout: false }
       format.csv do
         doc = AbAdmin::Utils::CsvDocument.new(collection, export_options)
         send_data(doc.render, filename: doc.filename, type: Mime::CSV, disposition: 'attachment')

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

@@ -1,7 +1,7 @@
 <%
   el_id = dom_id(resource, 'list')
   form_wrap_id = dom_id(resource, 'list_edit')
-  html = %[<tr id="#{form_wrap_id}" class="warning"><td>#{render('form')}</td></tr>].html_safe
+  html = %[<tr id="#{form_wrap_id}" class="list_edit warning"><td>#{render('form')}</td></tr>].html_safe
 %>
 $('#<%= form_wrap_id %>').remove();
 $('#<%= el_id %>').after('<%= j html %>');

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

@@ -1,6 +1,6 @@
 <%
   form_wrap_id = dom_id(resource, 'list_edit')
-  html = %[<tr id="#{form_wrap_id}" class="warning"><td>#{render('form')}</td></tr>].html_safe
+  html = %[<tr id="#{form_wrap_id}" class="warning list_edit"><td>#{render('form')}</td></tr>].html_safe
 %>
 $('#<%= form_wrap_id %>').remove();
 $('#list tbody').prepend('<%= j html %>');

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

@@ -5,4 +5,4 @@
 $('#<%= form_wrap_id %>').remove();
 $('#<%= dom_id(resource, 'list') %>').replaceWith('<%= j html %>');
 $('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl();
-$(document).trigger('admin:list_init');
+$(document).trigger('admin:list_init');

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

@@ -5,7 +5,9 @@
   .fileupload-list.clearfix= render partial: "admin/fileupload/#{asset_template}", collection: assets
   .file-types
     span.fileupload-button
-      button.btn.btn-primary type="button" = t("admin.fileupload.button#{'s' if multiple}")
-    .type-info== "#{file_title}.  #{t('admin.fileupload.max_size')}: <b>#{file_max_size}</b> MB"
+      button.btn type="button" = button_title
+    .type-info
+      span.file_title== "#{file_title}. "
+      span.file_max_size== "#{t('admin.fileupload.max_size')}: <b>#{file_max_size}</b> MB"
 
 = init_js(js)

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

@@ -1,5 +1,5 @@
 .asset id="asset_#{file.id}" data-id=file.id
   a href=file.url target='_blank' = file.original_name
   span== " (#{file.human_filesize}) - #{l(file.created_at, format: :long)}"
-  = link_to t('admin.delete'), admin_asset_path(file), remote: true, method: :delete, \
+  = link_to icon('remove', true), admin_asset_path(file), remote: true, method: :delete, \
     class: 'del_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}

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

@@ -2,5 +2,5 @@ script#fileupload_ftmpl type="text/x-jquery-tmpl"
   .asset id="asset_${id}" data-id='${id}'
     a href='${url}' target='_blank' ${original_name}
     span  (${human_filesize})
-    = link_to t('admin.delete'), '/admin/assets/${id}', remote: true, method: :delete, title: t('admin.delete'), \
+    = link_to icon('remove', true), '/admin/assets/${id}', remote: true, method: :delete, title: t('admin.delete'), \
       class: 'del_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}

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

@@ -1,5 +1,5 @@
 - if tmpl = admin_partial_name(search_builder)
-  = render tmpl
+  = render tmpl, f: f
 - else
   - search_builder.fields.each do |field|
     = f.input field.data, field.options

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

@@ -1,14 +1,13 @@
 .batch_actions.clearfix
-  - cache [I18n.locale, 'admin', resource_class.name, 'batch_actions'] do
-    - if settings[:batch] && settings[: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-action=batch_action.name data-confirm=batch_action.confirm]= batch_action.title
+  - if settings[:batch] && settings[: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-action=batch_action.name data-confirm=batch_action.confirm]= batch_action.title
   .btn-group.pjax_links
     - button_scopes.each do |name, opts|
       - active = params[opts[:as]]

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

@@ -6,8 +6,8 @@ html id="controller_#{controller_name}"
     meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" 
     title= @page_title || 'Ab Admin'
     = stylesheet_link_tag 'ab_admin/application', media: 'all'
-    script(src='//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js')
-    script(src='//ajax.googleapis.com/ajax/libs/jqueryui/1.8.24/jquery-ui.min.js')
+    /script(src='//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js')
+    /script(src='//ajax.googleapis.com/ajax/libs/jqueryui/1.8.24/jquery-ui.min.js')
     = include_gon
     = javascript_include_tag 'ab_admin/application'
     = csrf_meta_tags
@@ -23,9 +23,7 @@ html id="controller_#{controller_name}"
               .clearfix[data-pjax-container=true class=layout_css]= yield
             - if collection_action? && settings[:search]
               .sidebar.well= render 'search_layout'
-            - elsif content_for? :sidebar
-              = yield :sidebar
-            = yield :bottom
+            = yield :sidebar
       #loading.label.label-warning= t 'admin.loading'
       #push
     = render 'layouts/admin/footer'

data/config/locales/ru.yml

@@ -109,12 +109,13 @@ ru:
     form:
       cancel: "Отмена"
       save: "Сохранить"
-      save_and_add_another: "Сохранить и добавить новый"
-      save_and_edit: "Сохранить и продолжить редактирование"
+      save_and_add_another: "Сохранить & новый"
+      save_and_edit: "Применить"
       save_and_edit_next: "Сохранить и след."
       save_and_edit_prev: "Сохранить и пред."
       details: "Подробнее"
       base: "Основное"
+      keywords: 'Мета теги'
     gender:
       female: "Женский"
       male: "Мужской"

data/features/menu.feature

@@ -2,8 +2,6 @@ Feature: Admin menu
 
   Background:
     Given I am logged in
-
-  Scenario: Show menu tree
     Given i18n key "admin.navigation.system" with value "System"
     And i18n key "admin.navigation.for_admin" with value "for admin"
     And a menu configuration of:
@@ -22,9 +20,16 @@ Feature: Admin menu
         end
       end
       """
+
+  Scenario: Show menu tree
     When I am on the dashboard page
     Then I should see menu item for "User" with path "/admin/users"
     Then I should see menu item for "Settings" with path "/admin/settings/edit"
     And I should see group "System" with menu item for "Structure"
     And I should see group "Moderator" with menu item for "for moderator"
     And I should see group "Admin" with menu item for "for admin"
+
+  Scenario: Active menu link for current resource
+    When I am on the admin structures page
+    Then menu item for "Structure" should be active
+    And menu item for "User" should not be active

data/features/step_definitions/menu_steps.rb

@@ -11,3 +11,10 @@ Then /^I should see group "(.*?)" with menu item for "(.*?)"$/ do |group, name|
   page.should have_css('header.navbar ul.dropdown-menu a', text: name)
 end
 
+Then /^menu item for "(.*?)" should be active$/ do |link|
+  page.should have_css('header.navbar li.active a', text: link)
+end
+
+Then /^menu item for "(.*?)" should not be active$/ do |link|
+  page.should_not have_css('header.navbar li.active a', text: link)
+end