ab_admin 0.1.0 → 0.1.1

data/Gemfile

@@ -23,10 +23,13 @@ gem 'globalize3', :git => 'git://github.com/leschenko/globalize3.git', :ref => '
 
 gem 'carrierwave'
 gem 'mini_magick'
+gem 'will_paginate', '>= 3.0.3'
+# disabled links broken styling in 0.2.2
+gem 'will_paginate-bootstrap', '0.2.1'
 gem 'bootstrap-sass', '2.0.4'
 gem 'bootstrap-wysihtml5-rails'
-gem 'will_paginate', '>= 3.0.3'
-gem 'will_paginate-bootstrap'
+gem 'bootstrap-x-editable-rails'
+gem 'select2-rails'
 gem 'nested_form', '0.2.2'
 gem 'simple_form'
 gem 'russian'

data/README.md

@@ -7,12 +7,10 @@ Simple and real-life tested Rails::Engine admin interface based on slim, bootstr
 To build a new Rails application with AbAdmin, run:
 
 ```bash
-$ rails new [MyAppName] -m https://raw.github.com/leschenko/ab_admin/master/lib/generators/template.rb
+rails new [MyAppName] -m https://raw.github.com/leschenko/ab_admin/master/lib/generators/template.rb
 ```
 
-Or add [list of gems](https://gist.github.com/leschenko/752aaa0f03323aa8c6b3) to an existing application
-
-Run generators
+Or add [list of gems](https://gist.github.com/leschenko/752aaa0f03323aa8c6b3) to an existing application and run generators:
 
 ```bash
 rails generate devise:install

data/TODO

@@ -0,0 +1,3 @@
+form has_many has_one
+settings and locales reloading
+add resource history

data/ab_admin.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'bootstrap-sass', '~> 2.0.4'
   gem.add_dependency 'bootstrap-wysihtml5-rails'
   gem.add_dependency 'will_paginate'
-  gem.add_dependency 'will_paginate-bootstrap'
+  gem.add_dependency 'will_paginate-bootstrap', '0.2.1'
   gem.add_dependency 'nested_form', '~> 0.2.2'
   gem.add_dependency 'simple_form'
   gem.add_dependency 'gon'

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

@@ -5,6 +5,7 @@
 //= require jquery.pjax
 //= require jquery.ui.nestedSortable
 //= require jquery_nested_form
+//= require jquery.hotkeys
 //= require bootstrap
 //= require ab_admin/bootstrap-tab-multi
 //= require ab_admin/bootstrap-datepicker/core
@@ -12,13 +13,15 @@
 //= require ab_admin/bootstrap-timepicker
 //= require bootstrap-wysihtml5
 //= require bootstrap-wysihtml5/locales/ru
-//= require chosen
+//= require bootstrap-editable-inline
+//= require select2
 //= require jquery.ui.nestedSortable
 //= require ab_admin/components/sortable_tree
 //= require ab_admin/components/google_translate
 //= require ab_admin/components/locator
 //= require ab_admin/components/admin_assets
 //= require ab_admin/components/gmaps
+//= require ab_admin/components/in_place_edit
 
 //= require ab_admin/core/init
 //= require ab_admin/inputs/datetime_input

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

@@ -0,0 +1,23 @@
+EditableForm = $.fn.editableform.Constructor
+EditableForm.prototype.saveWithUrlHook = (value) ->
+  url = @options.url
+  @options.url = (params) =>
+    params[@options.model] ||= {}
+    params[@options.model][params.name] = value
+    ajax_opts =
+      url: url
+      data: params
+      type: 'PUT'
+      dataType: 'json'
+    delete params.name
+    delete params.value
+    delete params.pk
+    $.ajax $.extend(ajax_opts, @options.ajaxOptions)
+  @saveWithoutUrlHook(value)
+EditableForm.prototype.saveWithoutUrlHook = EditableForm.prototype.save
+EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook
+
+$(document).on 'admin:init', (e) ->
+  return unless window.viewType == 'list'
+  $('.editable').editable
+    onblur: 'submit'

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

@@ -11,9 +11,12 @@ $ ->
     submitBatch = (el) ->
       if $("#list [name='ids[]']:checked")[0]
         $el = $(el)
+        ids = $("#list [name='ids[]']:checked").map(-> $(this).val()).get()
         action = $el.data('action')
         $('#batch_action').val(action)
-        $('#batch_action_form').submit()
+        $form = $('#batch_action_form')
+        $form.append("<input type='checkbox' name='ids[]' checked='1' value='#{id}'/>") for id in ids
+        $form.submit()
 
     $('#list tbody tr').live 'click', (e) ->
       return true unless _.include(['TR', 'TD'], e.target.tagName)

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

@@ -2,13 +2,17 @@ class window.ColumnsHider
   constructor: ->
     @store_key = 'cols'
     @data_el = $('#columns_hider_data')
-    @data = @getData()
-    @collection_name = $('html').attr('id').replace(/^controller_/, '')
     @column_names = @columnNames()
+    @collection_name = $('html').attr('id').replace(/^controller_/, '')
+    @data = @getData()
+    @initDefaults()
     @initButtons()
     @initHandlers()
     @refreshColumns()
 
+  initDefaults: ->
+    @data
+
   setData: ->
     res = {}
     _.each @data, (v, k) ->
@@ -22,6 +26,10 @@ class window.ColumnsHider
       data[k] = []
       _.each v.split('_'), (el) ->
         data[k].push to_i(el) if el
+    unless data[@collection_name]
+      data[@collection_name] = []
+      for col, i in @column_names
+        data[@collection_name].push(i) if col.disabled
     data
 
   fetchData: ->
@@ -36,15 +44,15 @@ class window.ColumnsHider
 
   initButtons: ->
     @data_el.empty()
-    for name, i in @column_names
+    for col, i in @column_names
       css_class = if _.include(@data[@collection_name], i) then 'active' else ''
-      html = "<button class='btn btn-primary #{css_class}' data-val='#{i}'>#{name}</button>"
+      html = "<button class='btn btn-primary #{css_class}' data-val='#{i}'>#{col.name}</button>"
       @data_el.append(html)
 
   columnNames: ->
     _.map $('#list th'), (el) ->
       $el = $(el)
-      $.trim($el.text().replace(/[▼▲]/g, ''))
+      {disabled: $el.hasClass('hide_cell'), name: $.trim($el.text().replace(/[▼▲]/g, ''))}
 
   initHandlers: ->
     $('#submit_columns_hider').click =>

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

@@ -19,36 +19,51 @@ $ ->
     initPopover()
     initTooltip()
 
-    $('#list tbody tr').dblclick (e) ->
-      e.preventDefault()
-      $el = $(this)
-      window.location.href = $el.find('td a.resource_id_link').prop('href')
-
     $('.per_page').click ->
       $.cookie('pp', $(this).data('val'))
 
+    $('#list').on 'click', '.form_cancel', (e) ->
+      e.preventDefault()
+      $(this).closest('tr').remove()
+
 
   $(document).on 'admin:init', (e) ->
     return unless window.viewType == 'form'
     window.resource_id = $('form.simple_form').data('id')
-    initEditor()
-    inputSetToggle()
+    $(document).trigger('admin:form_init')
 
-#    $('form .region_ac').regionAc()
-#    new NestedFieldsAdder
-#      region_ac: true
-#      callback: ->
-#        initPickers()
-#        initChosen()
-#        initEditor()
 
+  $(document).on 'admin:form_init', 'form', (e) ->
+    focusInput($(this))
+    initEditor()
+    initFancySelect()
+    inputSetToggle()
 
   $(document).on 'pjax:end', ->
     $(document).trigger({type: 'admin:init', pjax: true})
   $(document).trigger({type: 'admin:init'})
 
+  $(document).on 'dblclick', '#list tbody tr', (e) ->
+    e.preventDefault()
+    $el = $(this)
+    $el.find('td a.resource_id_link').click()
+
 
-  initChosen()
+  initFancySelect()
   #  initAcFileds()
   if window.gon?.bg_color
     $('body').css('background-color', "##{window.gon.bg_color.replace(/^#/, '')}")
+
+  if window.gon?.hotkeys
+    $(document).bind 'keydown.alt_n', -> $('a.new_resource:first').click()
+    $(document).bind 'keydown.alt_left', -> $('a[rel^="prev"]:first').click()
+    $(document).bind 'keydown.alt_right', -> $('a[rel="next"]:first').click()
+    $(document).bind 'keydown.alt_s', -> $('#search_form').submit()
+
+#    $('form .region_ac').regionAc()
+#    new NestedFieldsAdder
+#      region_ac: true
+#      callback: ->
+#        initPickers()
+#        initFancySelect()
+#        initEditor()

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

@@ -15,14 +15,19 @@ window.initPopover = ->
   $('.popover').hide()
   $('a[rel=popover]').popover({trigger: 'hover'})
 
-window.initChosen = ->
+window.initFancySelect = ->
   return if gon.test
-  chosen_options =
-    allow_single_deselect: true
-    no_results_text: I18n.t('admin_js.no_results')
-    placeholder_text_single: ' '
-    placeholder_text_multiple: ' '
-  $('form .do_chosen, .without_form.do_chosen, form .do_chosen_multi').chosen(chosen_options)
+  options =
+    formatNoMatches: -> I18n.t('admin_js.no_results')
+    placeholder: ' '
+    width: 'resolve'
+  $('form .fancy_select, .without_form.fancy_select, form .fancy_select_multi').select2(options)
+#  chosen_options =
+#    allow_single_deselect: true
+#    no_results_text: I18n.t('admin_js.no_results')
+#    placeholder_text_single: ' '
+#    placeholder_text_multiple: ' '
+#  $('form .do_chosen, .without_form.do_chosen, form .do_chosen_multi').chosen(chosen_options)
 
 window.initAcFileds = ->
   for el in $('.ac_field')
@@ -60,3 +65,6 @@ window.inputSetToggle = ->
 
 window.flash = (type, message) ->
   $('#wrap').prepend $("<div class='alert alert-#{type}'><a class='close' data-dismiss='alert'>×</a>#{message}</div>")
+
+window.focusInput = (scope=null) ->
+  $('input[type="text"],input[type="string"],select:visible,textarea:visible', scope || $('form.simple_form:first')).get(0)?.focus()

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

@@ -68,6 +68,9 @@ $.fn.loadSelect = (optionsDataArray) ->
         else
           selectElement.add option, null
 
+$.fn.scrollToEl = ->
+  $('html, body').animate({scrollTop: $(this).offset().top}, 'slow')
+
 $.parseQuery = ->
   window.location.search.replace("?", "").parseQuery()
 

data/app/assets/javascripts/ab_admin/inputs/datetime_input.js.coffee

@@ -20,4 +20,4 @@ $ ->
 
   $('.simple_form').bind "nested:fieldAdded", =>
     initPickers()
-    initChosen()
+    initFancySelect()

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

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

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

@@ -72,4 +72,16 @@ table.index_table {
   tr.selected td {
     background: #d9e4ec;
   }
+  .form-actions {
+    position: static;
+    background-color: transparent;
+    border-top: none;
+    margin: 0;
+    .extra_buttons button {
+      display: none;
+    }
+  }
+  form.simple_form {
+    margin: 0;
+  }
 }

data/app/controllers/admin/base_controller.rb

@@ -19,7 +19,7 @@ class Admin::BaseController < ::InheritedResources::Base
   helper_method :button_scopes, :collection_action?, :action_items, :resource_action_items, :csv_builder,
                 :preview_resource_path, :get_subject, :settings, :batch_action_list, :tree_node_renderer
 
-  respond_to :json, :only => [:index]
+  respond_to :json, :only => [:index, :update]
 
   rescue_from ::CanCan::AccessDenied, :with => :render_unauthorized
 
@@ -42,6 +42,8 @@ class Admin::BaseController < ::InheritedResources::Base
   def create
     create! do |success, failure|
       success.html { redirect_to redirect_to_on_success }
+      success.js { render :layout => false }
+      failure.js { render :new, :layout => false }
     end
   end
 
@@ -49,6 +51,8 @@ class Admin::BaseController < ::InheritedResources::Base
     update! do |success, failure|
       success.html { redirect_to redirect_to_on_success }
       failure.html { render :edit }
+      success.js { render :layout => false }
+      failure.js { render :edit, :layout => false }
     end
   end
 
@@ -56,6 +60,18 @@ class Admin::BaseController < ::InheritedResources::Base
     destroy! { redirect_to_on_success }
   end
 
+  def edit
+    edit! do |format|
+      format.js { render :layout => false }
+    end
+  end
+
+  def new
+    new! do |format|
+      format.js { render :layout => false }
+    end
+  end
+
   def batch
     raise 'No ids specified for batch action' unless params[:ids].present?
     batch_action = params[:batch_action].to_sym
@@ -119,7 +135,8 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def settings
-    {:index_view => 'table', :sidebar => collection_action?, :well => (collection_action? || action_name == 'show'), :search => true, :batch => true}
+    {:index_view => 'table', :sidebar => collection_action?, :well => (collection_action? || action_name == 'show'),
+     :search => true, :batch => true, :hotkeys => true}
   end
 
   def action_items
@@ -223,6 +240,7 @@ class Admin::BaseController < ::InheritedResources::Base
     gon.bg_color = current_user.bg_color
     gon.admin = admin?
     gon.test = Rails.env.test?
+    gon.hotkeys = settings[:hotkeys]
   end
 
   def moderator?

data/app/controllers/admin/manager_controller.rb

@@ -1,5 +1,3 @@
-#load 'ab_admin/abstract_resource.rb'
-
 class ::Admin::ManagerController < ::Admin::BaseController
   include AbAdmin::Utils::EvalHelpers
   include AbAdmin::Controllers::Tree

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

@@ -0,0 +1,6 @@
+<%
+  form_wrap_id = dom_id(resource_class.new, 'list_edit')
+  html = render('table', :collection => [resource])[/<tr id[^>]+>.*<\/tr>/].html_safe
+%>
+$('#<%= form_wrap_id %>').remove();
+$('#list tbody').prepend('<%= j html %>');

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

@@ -0,0 +1,10 @@
+<%
+  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
+%>
+$('#<%= form_wrap_id %>').remove();
+$('#<%= el_id %>').after('<%= j html %>');
+$('#<%= form_wrap_id %> td').attr('colspan', $('#list tr:first th').length);
+$('#<%= el_id %>').scrollToEl();
+$('#<%= form_wrap_id %> form').trigger('admin:form_init');

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

@@ -2,9 +2,8 @@
   = form_tag url_for(:action => :batch), :id => 'batch_action_form', :class => 'pjax-form' do
     input name='batch_action' id='batch_action' type='hidden'
     = render 'admin/shared/batch_actions'
-    #content= render settings[:index_view]
-- else
-  #content= render settings[:index_view]
+    
+#content= render settings[:index_view]
 .pagination.pull-left
   = will_paginate collection, :renderer => BootstrapPagination::Rails
   .pagination_info= pagination_info collection

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

@@ -0,0 +1,8 @@
+<%
+  form_wrap_id = dom_id(resource, 'list_edit')
+  html = %[<tr id="#{form_wrap_id}" class="warning"><td>#{render('form')}</td></tr>].html_safe
+%>
+$('#<%= form_wrap_id %>').remove();
+$('#list tbody').prepend('<%= j html %>');
+$('#<%= form_wrap_id %> td').attr('colspan', $('#list tr:first th').length);
+$('#<%= form_wrap_id %> form').trigger('admin:form_init');

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

@@ -0,0 +1,7 @@
+<%
+  form_wrap_id = dom_id(resource, 'list_edit')
+  html = render('table', :collection => [resource])[/<tr id[^>]+>.*<\/tr>/].html_safe
+%>
+$('#<%= form_wrap_id %>').remove();
+$('#<%= dom_id(resource, 'list') %>').replaceWith('<%= j html %>');
+$('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl()

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

@@ -2,4 +2,4 @@
   = render tmpl
 - else
   - search_builder.fields.each do |field|
-    = f.input field.data
+    = f.input field.data, field.options

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

@@ -0,0 +1,7 @@
+- if tmpl = admin_partial_name(show_builder)
+  = render tmpl
+- else
+  - show_builder.fields.each do |field|
+    tr
+      td= ha(field.name)
+      td= admin_pretty_data call_method_or_proc_on(resource, field.data)

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

@@ -19,9 +19,13 @@
         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)
           - table_builder.fields.each do |field|
-            td= admin_pretty_data call_method_or_proc_on(item, field.data)
+            td
+              - if field.options[:editable] && field.data.is_a?(Symbol)
+                = admin_editable item, field.data, field.options[:editable]
+              - else
+                = admin_pretty_data call_method_or_proc_on(item, field.data)
           td.actions= item_index_actions(item)

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

@@ -19,6 +19,6 @@ input type='hidden' name='return_to' value=return_to
     - if can? :edit, resource
       button.btn.btn-info type="submit" name="_add_edit" data-disable-with=t('admin.form.save_and_edit')
         = t('admin.form.save_and_edit')
-    a.btn href=(return_to || collection_path)
+    a.btn.form_cancel href=(return_to || collection_path)
       = icon('remove')
       = t('admin.form.cancel')

data/features/dsl/action_items.feature

@@ -24,7 +24,7 @@ Feature: Actions items
     Then I should see action items:
       | Create | Review | Remove |
 
-    When I am on the show admin product page
+    When I am on the the admin product page
     Then I should see action items:
       | Create | Edit | Remove |
 
@@ -47,7 +47,7 @@ Feature: Actions items
         end
       end
       """
-    When I am on the show admin product page
+    When I am on the the admin product page
     Then I should see an action item to "Main page"
 
   Scenario: Conditional action item
@@ -59,7 +59,7 @@ Feature: Actions items
         end
       end
       """
-    When I am on the show admin product page
+    When I am on the the admin product page
     Then I should see an action item to "Secret link"
 
     When I am on the edit admin product page
@@ -75,5 +75,5 @@ Feature: Actions items
         action_item :destroy, false
       end
       """
-    When I am on the show admin product page
+    When I am on the the admin product page
     Then I should not see an action item to "Remove"

data/features/dsl/in_place_edit.feature

@@ -0,0 +1,26 @@
+@dsl @javascript
+Feature: In place edit
+
+  Background:
+    Given I am logged in
+    And a product with sku "sofa-12"
+    And a configuration of:
+      """
+      class AbAdminProduct < AbAdmin::AbstractResource
+        table do
+          field :sku, :editable => true
+          field :name
+          field :created_at
+        end
+      end
+      """
+    And I am on the admin products page
+
+  Scenario: In place edit field
+    When I click "sofa-12"
+    And I fill in place with "sofa_new"
+    And I submit in place form
+    Then I should see "sofa_new"
+
+    When I reload the page
+    Then I should see "sofa_new"

data/features/dsl/list_edit.feature

@@ -0,0 +1,46 @@
+@dsl @javascript
+Feature: Editing records in the list
+
+  Background:
+    Given I am logged in
+    And a product with sku "sofa-12"
+    And a configuration of:
+      """
+      class AbAdminProduct < AbAdmin::AbstractResource
+        settings :list_edit => true
+      end
+      """
+    And I am on the admin products page
+
+  Scenario: Saving record with valid attributes
+    Given I click "Edit"
+    Then I should be on the admin products page
+    And I fill in "Sku" with "new_sofa" within "#list"
+    And I submit form
+    When I should see "new_sofa"
+    And I should not see "Save"
+
+  Scenario: Saving record with invalid attributes
+    Given I click "Edit"
+    Then I should be on the admin products page
+    And I fill in "Sku" with "" within "#list"
+    And I submit form
+    When I should see "Sku can't be blank"
+    And I should see "Save"
+
+  Scenario: Creating record with valid attributes
+    Given I click "Create" within ".resource_actions"
+    Then I should be on the admin products page
+    And I fill in "Sku" with "new_sofa" within "#list"
+    And I submit form
+    When I should see "new_sofa"
+    And I should not see "Save"
+
+  Scenario: Creating record with invalid attributes
+    Given I click "Create" within ".resource_actions"
+    Then I should be on the admin products page
+    And I fill in "Sku" with "" within "#list"
+    And I submit form
+    When I should see "Sku can't be blank"
+    And I should see "Save"
+

data/features/dsl/show.feature

@@ -0,0 +1,37 @@
+@dsl
+Feature: Show resource page
+
+  Background:
+    Given I am logged in
+    And products exists with attributes:
+      | sku     | name      | price |
+      | sofa-12 | FancySofa | 123   |
+
+  Scenario: Default show view
+    Given a configuration of:
+      """
+      class AbAdminProduct < AbAdmin::AbstractResource
+      end
+      """
+    When I am on the admin product page
+    Then I should see attributes table:
+      | Sku   | sofa-12   |
+      | Name  | FancySofa |
+      | Price | 123       |
+
+  Scenario: Default show view
+    Given a configuration of:
+      """
+      class AbAdminProduct < AbAdmin::AbstractResource
+        show do
+          field :sku
+          field(:price) {|item| "$#{item.price}" }
+        end
+      end
+      """
+    When I am on the admin product page
+    Then I should see attributes table:
+      | Sku   | sofa-12   |
+      | Price | $123      |
+    And I should not see "FancySofa" within "table"
+

data/features/step_definitions/dsl/in_place_edit_steps.rb

@@ -0,0 +1,7 @@
+When /^I fill in place with "(.*?)"$/ do |value|
+  find('#list .editableform input').set(value)
+end
+
+When /^I submit in place form$/ do
+  find('#list .editableform .editable-submit').click()
+end

data/features/step_definitions/dsl/show_steps.rb

@@ -0,0 +1,8 @@
+Then /^I should see attributes table:$/ do |table|
+  within 'table' do
+    table.rows_hash.each do |attr, value|
+      page.should have_content(attr)
+      page.should have_content(value)
+    end
+  end
+end

data/features/step_definitions/dsl/table_steps.rb

@@ -2,9 +2,9 @@ Given /^a product with sku "(.*?)"$/ do |sku|
   @product = FactoryGirl.create(:product, :sku => sku)
 end
 
-Given /^products exists with attributes:$/ do |products|
+Given /^products? exists with attributes:$/ do |products|
   products.hashes.each do |attrs|
-    FactoryGirl.create(:full_product, attrs)
+    @product = FactoryGirl.create(:full_product, attrs)
   end
 end