activeadmin 1.0.0.pre1 → 1.0.0.pre2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activeadmin might be problematic. Click here for more details.

Files changed (167) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +18 -16
  3. data/CHANGELOG.md +18 -1013
  4. data/Gemfile +18 -11
  5. data/LICENSE +0 -5
  6. data/README.md +0 -2
  7. data/activeadmin.gemspec +3 -1
  8. data/app/assets/javascripts/active_admin/application.js.coffee +8 -3
  9. data/app/assets/javascripts/active_admin/base.js.coffee +1 -6
  10. data/app/assets/javascripts/active_admin/jquery_ui.js.erb +11 -0
  11. data/app/assets/javascripts/active_admin/lib/flash.js.coffee +1 -1
  12. data/app/assets/javascripts/active_admin/lib/modal_dialog.js.coffee +11 -3
  13. data/app/assets/javascripts/active_admin/lib/per_page.js.coffee +5 -1
  14. data/app/assets/stylesheets/active_admin/_base.scss +1 -4
  15. data/app/assets/stylesheets/active_admin/_forms.scss +13 -8
  16. data/app/assets/stylesheets/active_admin/components/_buttons.scss +0 -5
  17. data/app/assets/stylesheets/active_admin/mixins/_all.scss +0 -1
  18. data/app/assets/stylesheets/active_admin/mixins/_sections.scss +0 -1
  19. data/app/assets/stylesheets/active_admin/mixins/_typography.scss +1 -1
  20. data/app/assets/stylesheets/active_admin/mixins/_variables.scss +1 -1
  21. data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +0 -5
  22. data/app/views/layouts/active_admin_logged_out.html.erb +4 -0
  23. data/config/locales/ar.yml +14 -2
  24. data/config/locales/de-CH.yml +2 -0
  25. data/config/locales/de.yml +15 -0
  26. data/config/locales/en.yml +10 -2
  27. data/config/locales/es.yml +26 -4
  28. data/config/locales/fr.yml +5 -0
  29. data/config/locales/id.yml +135 -0
  30. data/config/locales/ja.yml +21 -3
  31. data/config/locales/ko.yml +66 -36
  32. data/config/locales/nl.yml +14 -1
  33. data/config/locales/pt-BR.yml +11 -0
  34. data/config/locales/ru.yml +15 -1
  35. data/config/locales/sv-SE.yml +45 -5
  36. data/config/locales/uk.yml +16 -4
  37. data/config/locales/zh-CN.yml +5 -0
  38. data/config/locales/zh-TW.yml +32 -1
  39. data/docs/0-installation.md +7 -1
  40. data/docs/1-general-configuration.md +9 -0
  41. data/docs/10-custom-pages.md +10 -0
  42. data/docs/12-arbre-components.md +1 -1
  43. data/docs/14-gotchas.md +2 -2
  44. data/docs/2-resource-customization.md +5 -3
  45. data/docs/3-index-pages.md +7 -0
  46. data/docs/3-index-pages/index-as-table.md +4 -0
  47. data/docs/6-show-pages.md +1 -1
  48. data/docs/7-sidebars.md +8 -0
  49. data/features/index/batch_actions.feature +21 -2
  50. data/features/index/pagination.feature +16 -12
  51. data/features/meta_tags.feature +21 -0
  52. data/features/registering_assets.feature +1 -2
  53. data/features/show/columns.feature +40 -0
  54. data/features/show/default_content.feature +2 -1
  55. data/features/step_definitions/asset_steps.rb +3 -3
  56. data/features/step_definitions/batch_action_steps.rb +11 -2
  57. data/features/step_definitions/column_steps.rb +8 -0
  58. data/features/step_definitions/configuration_steps.rb +2 -2
  59. data/features/step_definitions/factory_steps.rb +3 -2
  60. data/features/step_definitions/meta_tag_steps.rb +3 -0
  61. data/features/step_definitions/pagination_steps.rb +8 -0
  62. data/features/step_definitions/table_steps.rb +2 -1
  63. data/lib/active_admin.rb +3 -3
  64. data/lib/active_admin/application.rb +66 -16
  65. data/lib/active_admin/batch_actions.rb +0 -1
  66. data/lib/active_admin/batch_actions/controller.rb +2 -2
  67. data/lib/active_admin/batch_actions/resource_extension.rb +3 -1
  68. data/lib/active_admin/callbacks.rb +1 -1
  69. data/lib/active_admin/csv_builder.rb +2 -2
  70. data/lib/active_admin/dependency.rb +18 -16
  71. data/lib/active_admin/devise.rb +1 -1
  72. data/lib/active_admin/dsl.rb +1 -1
  73. data/lib/active_admin/event.rb +8 -17
  74. data/lib/active_admin/filters/active.rb +29 -0
  75. data/lib/active_admin/filters/forms.rb +6 -1
  76. data/lib/active_admin/filters/humanized.rb +68 -0
  77. data/lib/active_admin/filters/resource_extension.rb +48 -1
  78. data/lib/active_admin/form_builder.rb +4 -4
  79. data/lib/active_admin/generators/boilerplate.rb +37 -0
  80. data/lib/active_admin/helpers/routes/url_helpers.rb +1 -1
  81. data/lib/active_admin/inputs.rb +1 -0
  82. data/lib/active_admin/inputs/filters/date_picker_input.rb +13 -0
  83. data/lib/active_admin/inputs/filters/date_range_input.rb +1 -1
  84. data/lib/active_admin/menu.rb +1 -0
  85. data/lib/active_admin/menu_item.rb +1 -1
  86. data/lib/active_admin/namespace.rb +5 -5
  87. data/lib/active_admin/orm/active_record/comments.rb +10 -1
  88. data/lib/active_admin/orm/active_record/comments/comment.rb +1 -1
  89. data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +11 -0
  90. data/lib/active_admin/resource.rb +9 -3
  91. data/lib/active_admin/resource/action_items.rb +13 -3
  92. data/lib/active_admin/resource/belongs_to.rb +6 -2
  93. data/lib/active_admin/resource/pagination.rb +4 -0
  94. data/lib/active_admin/resource_collection.rb +3 -1
  95. data/lib/active_admin/resource_controller/data_access.rb +6 -11
  96. data/lib/active_admin/resource_controller/decorators.rb +1 -1
  97. data/lib/active_admin/resource_dsl.rb +8 -2
  98. data/lib/active_admin/sidebar_section.rb +4 -12
  99. data/lib/active_admin/version.rb +1 -1
  100. data/lib/active_admin/view_factory.rb +1 -2
  101. data/lib/active_admin/view_helpers.rb +0 -1
  102. data/lib/active_admin/view_helpers/display_helper.rb +3 -4
  103. data/lib/active_admin/view_helpers/method_or_proc_helper.rb +3 -3
  104. data/lib/active_admin/views/components/active_admin_form.rb +3 -3
  105. data/lib/active_admin/views/components/columns.rb +9 -4
  106. data/lib/active_admin/views/components/dropdown_menu.rb +0 -2
  107. data/lib/active_admin/views/components/paginated_collection.rb +35 -13
  108. data/lib/active_admin/views/components/panel.rb +1 -3
  109. data/lib/active_admin/views/components/sidebar_section.rb +6 -1
  110. data/lib/active_admin/views/components/status_tag.rb +3 -2
  111. data/lib/active_admin/views/components/table_for.rb +2 -1
  112. data/lib/active_admin/views/index_as_table.rb +2 -2
  113. data/lib/active_admin/views/pages/base.rb +4 -0
  114. data/lib/active_admin/views/pages/show.rb +1 -1
  115. data/lib/generators/active_admin/assets/assets_generator.rb +1 -1
  116. data/lib/generators/active_admin/assets/templates/{active_admin.css.scss → active_admin.scss} +0 -0
  117. data/lib/generators/active_admin/devise/devise_generator.rb +7 -19
  118. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +29 -0
  119. data/lib/generators/active_admin/page/templates/page.rb +1 -1
  120. data/lib/generators/active_admin/resource/resource_generator.rb +6 -0
  121. data/lib/generators/active_admin/resource/templates/admin.rb +34 -13
  122. data/spec/rails_helper.rb +6 -2
  123. data/spec/requests/memory_spec.rb +1 -3
  124. data/spec/support/active_admin_request_helpers.rb +27 -0
  125. data/spec/support/detect_rails_version.rb +1 -1
  126. data/spec/support/rails_template.rb +7 -0
  127. data/spec/unit/application_spec.rb +29 -4
  128. data/spec/unit/batch_actions/resource_spec.rb +5 -0
  129. data/spec/unit/belongs_to_spec.rb +14 -0
  130. data/spec/unit/comments_spec.rb +24 -2
  131. data/spec/unit/controller_filters_spec.rb +25 -28
  132. data/spec/unit/dsl_spec.rb +1 -1
  133. data/spec/unit/filters/humanized_spec.rb +56 -0
  134. data/spec/unit/filters/resource_spec.rb +1 -1
  135. data/spec/unit/form_builder_spec.rb +71 -11
  136. data/spec/unit/generators/install_spec.rb +3 -2
  137. data/spec/unit/pretty_format_spec.rb +15 -1
  138. data/spec/unit/resource_collection_spec.rb +17 -0
  139. data/spec/unit/resource_controller_spec.rb +2 -2
  140. data/spec/unit/resource_registration_spec.rb +3 -3
  141. data/spec/unit/resource_spec.rb +53 -2
  142. data/spec/unit/view_factory_spec.rb +0 -2
  143. data/spec/unit/view_helpers/display_name_spec.rb +6 -4
  144. data/spec/unit/views/components/{batch_action_popover_spec.rb → batch_action_selector_spec.rb} +9 -13
  145. data/spec/unit/views/components/columns_spec.rb +17 -0
  146. data/spec/unit/views/components/paginated_collection_spec.rb +16 -2
  147. data/spec/unit/views/components/panel_spec.rb +1 -5
  148. data/spec/unit/views/components/sidebar_section_spec.rb +21 -0
  149. data/spec/unit/views/components/status_tag_spec.rb +15 -1
  150. data/spec/unit/views/components/table_for_spec.rb +45 -0
  151. data/tasks/parallel_tests.rake +1 -1
  152. data/tasks/test.rake +4 -4
  153. metadata +29 -30
  154. data/app/assets/javascripts/active_admin/lib/popover.js.coffee +0 -68
  155. data/app/assets/stylesheets/active_admin/components/_popovers.scss +0 -122
  156. data/app/assets/stylesheets/active_admin/mixins/_icons.scss +0 -20
  157. data/lib/active_admin/batch_actions/views/batch_action_popover.rb +0 -28
  158. data/lib/active_admin/iconic.rb +0 -53
  159. data/lib/active_admin/iconic/icons.rb +0 -142
  160. data/lib/active_admin/view_helpers/icon_helper.rb +0 -12
  161. data/lib/active_admin/views/components/action_list_popover.rb +0 -29
  162. data/lib/active_admin/views/components/popover.rb +0 -27
  163. data/spec/javascripts/coffeescripts/jquery.aa.popover-spec.js.coffee +0 -82
  164. data/spec/support/integration_example_group.rb +0 -31
  165. data/spec/unit/event_spec.rb +0 -47
  166. data/spec/unit/views/components/action_list_popover_spec.rb +0 -40
  167. data/spec/unit/views/components/popover_spec.rb +0 -33
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activeadmin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.pre1
4
+ version: 1.0.0.pre2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Greg Bell
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-12 00:00:00.000000000 Z
11
+ date: 2015-09-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: arbre
@@ -118,16 +118,16 @@ dependencies:
118
118
  name: jquery-ui-rails
119
119
  requirement: !ruby/object:Gem::Requirement
120
120
  requirements:
121
- - - "~>"
121
+ - - ">="
122
122
  - !ruby/object:Gem::Version
123
- version: '5.0'
123
+ version: '0'
124
124
  type: :runtime
125
125
  prerelease: false
126
126
  version_requirements: !ruby/object:Gem::Requirement
127
127
  requirements:
128
- - - "~>"
128
+ - - ">="
129
129
  - !ruby/object:Gem::Version
130
- version: '5.0'
130
+ version: '0'
131
131
  - !ruby/object:Gem::Dependency
132
132
  name: kaminari
133
133
  requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,7 @@ files:
217
217
  - app/assets/javascripts/active_admin/base.js.coffee
218
218
  - app/assets/javascripts/active_admin/ext/jquery-ui.js.coffee
219
219
  - app/assets/javascripts/active_admin/ext/jquery.js.coffee
220
+ - app/assets/javascripts/active_admin/jquery_ui.js.erb
220
221
  - app/assets/javascripts/active_admin/lib/batch_actions.js.coffee
221
222
  - app/assets/javascripts/active_admin/lib/checkbox-toggler.js.coffee
222
223
  - app/assets/javascripts/active_admin/lib/dropdown-menu.js.coffee
@@ -224,7 +225,6 @@ files:
224
225
  - app/assets/javascripts/active_admin/lib/has_many.js.coffee
225
226
  - app/assets/javascripts/active_admin/lib/modal_dialog.js.coffee
226
227
  - app/assets/javascripts/active_admin/lib/per_page.js.coffee
227
- - app/assets/javascripts/active_admin/lib/popover.js.coffee
228
228
  - app/assets/javascripts/active_admin/lib/table-checkbox-toggler.js.coffee
229
229
  - app/assets/stylesheets/active_admin/_base.scss
230
230
  - app/assets/stylesheets/active_admin/_forms.scss
@@ -246,7 +246,6 @@ files:
246
246
  - app/assets/stylesheets/active_admin/components/_modal_dialog.scss
247
247
  - app/assets/stylesheets/active_admin/components/_pagination.scss
248
248
  - app/assets/stylesheets/active_admin/components/_panels.scss
249
- - app/assets/stylesheets/active_admin/components/_popovers.scss
250
249
  - app/assets/stylesheets/active_admin/components/_scopes.scss
251
250
  - app/assets/stylesheets/active_admin/components/_status_tags.scss
252
251
  - app/assets/stylesheets/active_admin/components/_table_tools.scss
@@ -256,7 +255,6 @@ files:
256
255
  - app/assets/stylesheets/active_admin/mixins/_all.scss
257
256
  - app/assets/stylesheets/active_admin/mixins/_buttons.scss
258
257
  - app/assets/stylesheets/active_admin/mixins/_gradients.scss
259
- - app/assets/stylesheets/active_admin/mixins/_icons.scss
260
258
  - app/assets/stylesheets/active_admin/mixins/_reset.scss
261
259
  - app/assets/stylesheets/active_admin/mixins/_rounded.scss
262
260
  - app/assets/stylesheets/active_admin/mixins/_sections.scss
@@ -304,6 +302,7 @@ files:
304
302
  - config/locales/he.yml
305
303
  - config/locales/hr.yml
306
304
  - config/locales/hu.yml
305
+ - config/locales/id.yml
307
306
  - config/locales/it.yml
308
307
  - config/locales/ja.yml
309
308
  - config/locales/ko.yml
@@ -376,12 +375,14 @@ files:
376
375
  - features/index/pagination.feature
377
376
  - features/index/switch_index_view.feature
378
377
  - features/menu.feature
378
+ - features/meta_tags.feature
379
379
  - features/new_page.feature
380
380
  - features/registering_assets.feature
381
381
  - features/registering_pages.feature
382
382
  - features/registering_resources.feature
383
383
  - features/renamed_resource.feature
384
384
  - features/root_to.feature
385
+ - features/show/columns.feature
385
386
  - features/show/default_content.feature
386
387
  - features/show/page_title.feature
387
388
  - features/show/tabs.feature
@@ -396,6 +397,7 @@ files:
396
397
  - features/step_definitions/batch_action_steps.rb
397
398
  - features/step_definitions/blog_steps.rb
398
399
  - features/step_definitions/breadcrumb_steps.rb
400
+ - features/step_definitions/column_steps.rb
399
401
  - features/step_definitions/comment_steps.rb
400
402
  - features/step_definitions/configuration_steps.rb
401
403
  - features/step_definitions/dashboard_steps.rb
@@ -409,6 +411,7 @@ files:
409
411
  - features/step_definitions/layout_steps.rb
410
412
  - features/step_definitions/member_link_steps.rb
411
413
  - features/step_definitions/menu_steps.rb
414
+ - features/step_definitions/meta_tag_steps.rb
412
415
  - features/step_definitions/pagination_steps.rb
413
416
  - features/step_definitions/sidebar_steps.rb
414
417
  - features/step_definitions/site_title_steps.rb
@@ -438,7 +441,6 @@ files:
438
441
  - lib/active_admin/batch_actions/controller.rb
439
442
  - lib/active_admin/batch_actions/resource_extension.rb
440
443
  - lib/active_admin/batch_actions/views/batch_action_form.rb
441
- - lib/active_admin/batch_actions/views/batch_action_popover.rb
442
444
  - lib/active_admin/batch_actions/views/batch_action_selector.rb
443
445
  - lib/active_admin/batch_actions/views/selection_cells.rb
444
446
  - lib/active_admin/callbacks.rb
@@ -454,25 +456,27 @@ files:
454
456
  - lib/active_admin/error.rb
455
457
  - lib/active_admin/event.rb
456
458
  - lib/active_admin/filters.rb
459
+ - lib/active_admin/filters/active.rb
457
460
  - lib/active_admin/filters/dsl.rb
458
461
  - lib/active_admin/filters/forms.rb
459
462
  - lib/active_admin/filters/formtastic_addons.rb
463
+ - lib/active_admin/filters/humanized.rb
460
464
  - lib/active_admin/filters/resource_extension.rb
461
465
  - lib/active_admin/form_builder.rb
466
+ - lib/active_admin/generators/boilerplate.rb
462
467
  - lib/active_admin/helpers/collection.rb
463
468
  - lib/active_admin/helpers/i18n.rb
464
469
  - lib/active_admin/helpers/optional_display.rb
465
470
  - lib/active_admin/helpers/routes/url_helpers.rb
466
471
  - lib/active_admin/helpers/scope_chain.rb
467
472
  - lib/active_admin/helpers/settings.rb
468
- - lib/active_admin/iconic.rb
469
- - lib/active_admin/iconic/icons.rb
470
473
  - lib/active_admin/inputs.rb
471
474
  - lib/active_admin/inputs/datepicker_input.rb
472
475
  - lib/active_admin/inputs/filters/base.rb
473
476
  - lib/active_admin/inputs/filters/base/search_method_select.rb
474
477
  - lib/active_admin/inputs/filters/boolean_input.rb
475
478
  - lib/active_admin/inputs/filters/check_boxes_input.rb
479
+ - lib/active_admin/inputs/filters/date_picker_input.rb
476
480
  - lib/active_admin/inputs/filters/date_range_input.rb
477
481
  - lib/active_admin/inputs/filters/numeric_input.rb
478
482
  - lib/active_admin/inputs/filters/select_input.rb
@@ -534,14 +538,12 @@ files:
534
538
  - lib/active_admin/view_helpers/fields_for.rb
535
539
  - lib/active_admin/view_helpers/flash_helper.rb
536
540
  - lib/active_admin/view_helpers/form_helper.rb
537
- - lib/active_admin/view_helpers/icon_helper.rb
538
541
  - lib/active_admin/view_helpers/method_or_proc_helper.rb
539
542
  - lib/active_admin/view_helpers/sidebar_helper.rb
540
543
  - lib/active_admin/view_helpers/title_helper.rb
541
544
  - lib/active_admin/view_helpers/view_factory_helper.rb
542
545
  - lib/active_admin/views.rb
543
546
  - lib/active_admin/views/action_items.rb
544
- - lib/active_admin/views/components/action_list_popover.rb
545
547
  - lib/active_admin/views/components/active_admin_form.rb
546
548
  - lib/active_admin/views/components/attributes_table.rb
547
549
  - lib/active_admin/views/components/blank_slate.rb
@@ -550,7 +552,6 @@ files:
550
552
  - lib/active_admin/views/components/index_list.rb
551
553
  - lib/active_admin/views/components/paginated_collection.rb
552
554
  - lib/active_admin/views/components/panel.rb
553
- - lib/active_admin/views/components/popover.rb
554
555
  - lib/active_admin/views/components/scopes.rb
555
556
  - lib/active_admin/views/components/sidebar_section.rb
556
557
  - lib/active_admin/views/components/site_title.rb
@@ -574,8 +575,8 @@ files:
574
575
  - lib/active_admin/views/title_bar.rb
575
576
  - lib/activeadmin.rb
576
577
  - lib/generators/active_admin/assets/assets_generator.rb
577
- - lib/generators/active_admin/assets/templates/active_admin.css.scss
578
578
  - lib/generators/active_admin/assets/templates/active_admin.js.coffee
579
+ - lib/generators/active_admin/assets/templates/active_admin.scss
579
580
  - lib/generators/active_admin/devise/devise_generator.rb
580
581
  - lib/generators/active_admin/install/install_generator.rb
581
582
  - lib/generators/active_admin/install/templates/active_admin.rb.erb
@@ -593,7 +594,6 @@ files:
593
594
  - script/use_rails
594
595
  - spec/javascripts/coffeescripts/jquery.aa.checkbox-toggler-spec.js.coffee
595
596
  - spec/javascripts/coffeescripts/jquery.aa.flash.js.coffee
596
- - spec/javascripts/coffeescripts/jquery.aa.popover-spec.js.coffee
597
597
  - spec/javascripts/coffeescripts/jquery.aa.table-checkbox-toggler-spec.js.coffee
598
598
  - spec/javascripts/fixtures/checkboxes.html
599
599
  - spec/javascripts/fixtures/flashes.html
@@ -608,9 +608,9 @@ files:
608
608
  - spec/requests/memory_spec.rb
609
609
  - spec/requests/stylesheets_spec.rb
610
610
  - spec/spec_helper.rb
611
+ - spec/support/active_admin_request_helpers.rb
611
612
  - spec/support/deferred_garbage_collection.rb
612
613
  - spec/support/detect_rails_version.rb
613
- - spec/support/integration_example_group.rb
614
614
  - spec/support/jslint.yml
615
615
  - spec/support/rails_template.rb
616
616
  - spec/support/rails_template_with_data.rb
@@ -648,8 +648,8 @@ files:
648
648
  - spec/unit/dependency_spec.rb
649
649
  - spec/unit/devise_spec.rb
650
650
  - spec/unit/dsl_spec.rb
651
- - spec/unit/event_spec.rb
652
651
  - spec/unit/filters/filter_form_builder_spec.rb
652
+ - spec/unit/filters/humanized_spec.rb
653
653
  - spec/unit/filters/resource_spec.rb
654
654
  - spec/unit/form_builder_spec.rb
655
655
  - spec/unit/generators/install_spec.rb
@@ -696,16 +696,14 @@ files:
696
696
  - spec/unit/view_helpers/flash_helper_spec.rb
697
697
  - spec/unit/view_helpers/form_helper_spec.rb
698
698
  - spec/unit/view_helpers/method_or_proc_helper_spec.rb
699
- - spec/unit/views/components/action_list_popover_spec.rb
700
699
  - spec/unit/views/components/attributes_table_spec.rb
701
- - spec/unit/views/components/batch_action_popover_spec.rb
700
+ - spec/unit/views/components/batch_action_selector_spec.rb
702
701
  - spec/unit/views/components/blank_slate_spec.rb
703
702
  - spec/unit/views/components/columns_spec.rb
704
703
  - spec/unit/views/components/index_list_spec.rb
705
704
  - spec/unit/views/components/index_table_for_spec.rb
706
705
  - spec/unit/views/components/paginated_collection_spec.rb
707
706
  - spec/unit/views/components/panel_spec.rb
708
- - spec/unit/views/components/popover_spec.rb
709
707
  - spec/unit/views/components/sidebar_section_spec.rb
710
708
  - spec/unit/views/components/site_title_spec.rb
711
709
  - spec/unit/views/components/status_tag_spec.rb
@@ -733,7 +731,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
733
731
  requirements:
734
732
  - - ">="
735
733
  - !ruby/object:Gem::Version
736
- version: '0'
734
+ version: 1.9.3
737
735
  required_rubygems_version: !ruby/object:Gem::Requirement
738
736
  requirements:
739
737
  - - ">"
@@ -741,7 +739,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
741
739
  version: 1.3.1
742
740
  requirements: []
743
741
  rubyforge_project:
744
- rubygems_version: 2.4.5
742
+ rubygems_version: 2.4.8
745
743
  signing_key:
746
744
  specification_version: 4
747
745
  summary: The administration framework for Ruby on Rails.
@@ -778,12 +776,14 @@ test_files:
778
776
  - features/index/pagination.feature
779
777
  - features/index/switch_index_view.feature
780
778
  - features/menu.feature
779
+ - features/meta_tags.feature
781
780
  - features/new_page.feature
782
781
  - features/registering_assets.feature
783
782
  - features/registering_pages.feature
784
783
  - features/registering_resources.feature
785
784
  - features/renamed_resource.feature
786
785
  - features/root_to.feature
786
+ - features/show/columns.feature
787
787
  - features/show/default_content.feature
788
788
  - features/show/page_title.feature
789
789
  - features/show/tabs.feature
@@ -798,6 +798,7 @@ test_files:
798
798
  - features/step_definitions/batch_action_steps.rb
799
799
  - features/step_definitions/blog_steps.rb
800
800
  - features/step_definitions/breadcrumb_steps.rb
801
+ - features/step_definitions/column_steps.rb
801
802
  - features/step_definitions/comment_steps.rb
802
803
  - features/step_definitions/configuration_steps.rb
803
804
  - features/step_definitions/dashboard_steps.rb
@@ -811,6 +812,7 @@ test_files:
811
812
  - features/step_definitions/layout_steps.rb
812
813
  - features/step_definitions/member_link_steps.rb
813
814
  - features/step_definitions/menu_steps.rb
815
+ - features/step_definitions/meta_tag_steps.rb
814
816
  - features/step_definitions/pagination_steps.rb
815
817
  - features/step_definitions/sidebar_steps.rb
816
818
  - features/step_definitions/site_title_steps.rb
@@ -830,7 +832,6 @@ test_files:
830
832
  - features/users/resetting_password.feature
831
833
  - spec/javascripts/coffeescripts/jquery.aa.checkbox-toggler-spec.js.coffee
832
834
  - spec/javascripts/coffeescripts/jquery.aa.flash.js.coffee
833
- - spec/javascripts/coffeescripts/jquery.aa.popover-spec.js.coffee
834
835
  - spec/javascripts/coffeescripts/jquery.aa.table-checkbox-toggler-spec.js.coffee
835
836
  - spec/javascripts/fixtures/checkboxes.html
836
837
  - spec/javascripts/fixtures/flashes.html
@@ -845,9 +846,9 @@ test_files:
845
846
  - spec/requests/memory_spec.rb
846
847
  - spec/requests/stylesheets_spec.rb
847
848
  - spec/spec_helper.rb
849
+ - spec/support/active_admin_request_helpers.rb
848
850
  - spec/support/deferred_garbage_collection.rb
849
851
  - spec/support/detect_rails_version.rb
850
- - spec/support/integration_example_group.rb
851
852
  - spec/support/jslint.yml
852
853
  - spec/support/rails_template.rb
853
854
  - spec/support/rails_template_with_data.rb
@@ -885,8 +886,8 @@ test_files:
885
886
  - spec/unit/dependency_spec.rb
886
887
  - spec/unit/devise_spec.rb
887
888
  - spec/unit/dsl_spec.rb
888
- - spec/unit/event_spec.rb
889
889
  - spec/unit/filters/filter_form_builder_spec.rb
890
+ - spec/unit/filters/humanized_spec.rb
890
891
  - spec/unit/filters/resource_spec.rb
891
892
  - spec/unit/form_builder_spec.rb
892
893
  - spec/unit/generators/install_spec.rb
@@ -933,16 +934,14 @@ test_files:
933
934
  - spec/unit/view_helpers/flash_helper_spec.rb
934
935
  - spec/unit/view_helpers/form_helper_spec.rb
935
936
  - spec/unit/view_helpers/method_or_proc_helper_spec.rb
936
- - spec/unit/views/components/action_list_popover_spec.rb
937
937
  - spec/unit/views/components/attributes_table_spec.rb
938
- - spec/unit/views/components/batch_action_popover_spec.rb
938
+ - spec/unit/views/components/batch_action_selector_spec.rb
939
939
  - spec/unit/views/components/blank_slate_spec.rb
940
940
  - spec/unit/views/components/columns_spec.rb
941
941
  - spec/unit/views/components/index_list_spec.rb
942
942
  - spec/unit/views/components/index_table_for_spec.rb
943
943
  - spec/unit/views/components/paginated_collection_spec.rb
944
944
  - spec/unit/views/components/panel_spec.rb
945
- - spec/unit/views/components/popover_spec.rb
946
945
  - spec/unit/views/components/sidebar_section_spec.rb
947
946
  - spec/unit/views/components/site_title_spec.rb
948
947
  - spec/unit/views/components/status_tag_spec.rb
@@ -1,68 +0,0 @@
1
- class ActiveAdmin.Popover
2
-
3
- constructor: (@options, @element) ->
4
- @$element = $(@element)
5
-
6
- defaults = {
7
- fadeInDuration: 20,
8
- fadeOutDuration: 100,
9
- autoOpen: true,
10
- pageWrapperElement: "#wrapper",
11
- onClickActionItemCallback: null
12
- }
13
-
14
- @options = $.extend defaults, options
15
- @isOpen = false
16
-
17
- unless (@$popover = $ @$element.attr 'href').length
18
- @$popover = @$element.next '.popover'
19
-
20
- @_buildPopover()
21
- @_bind()
22
-
23
- open: ->
24
- @isOpen = true
25
- @$popover.fadeIn @options.fadeInDuration
26
- @_positionPopover()
27
- @_positionNipple()
28
- @
29
-
30
- close: ->
31
- @isOpen = false
32
- @$popover.fadeOut this.options.fadeOutDuration
33
- @
34
-
35
- destroy: ->
36
- @$element.removeData 'popover'
37
- @$element.unbind()
38
- @$element = null
39
- @
40
-
41
- # Private
42
-
43
- _buildPopover: ->
44
- @$nipple = $('<div class="popover_nipple"></div>')
45
- @$popover.prepend @$nipple
46
- @$popover.hide()
47
- @$popover.addClass 'popover'
48
-
49
-
50
- _bind: ->
51
- $(@options.pageWrapperElement).click =>
52
- @close() if @isOpen
53
-
54
- if @options.autoOpen
55
- @$element.click (e)=>
56
- e.stopPropagation()
57
- if @isOpen then @close() else @open()
58
-
59
- _positionPopover: ->
60
- button_center = @$element.offset().left + @$element.outerWidth() / 2
61
- popover_center = @$popover.outerWidth() / 2
62
- @$popover.css 'left', button_center - popover_center
63
-
64
- _positionNipple: ->
65
- @$popover.css 'top', @$element.offset().top + @$element.outerHeight() + 10
66
- @$nipple.css 'left', @$popover.outerWidth() / 2 - @$nipple.outerWidth() / 2
67
-
68
- $.widget.bridge 'popover', ActiveAdmin.Popover
@@ -1,122 +0,0 @@
1
- .popover {
2
- display: inline-block;
3
- position: absolute;
4
- background-color: white;
5
- padding: 2px;
6
- box-shadow: rgba(0,0,0,0.4) 0 1px 3px, lighten($primary-color, 15%) 0px 1px 0px 0px inset;
7
- background-color: $primary-color;
8
- @include gradient(lighten($primary-color, 4%), darken($primary-color, 5%));
9
- border: solid 1px darken($primary-color, 10%);
10
- border-top-color: darken($primary-color, 4%);
11
- border-bottom-color: darken($primary-color, 17%);
12
-
13
- border-radius: 4px;
14
-
15
- .popover_nipple{
16
-
17
- // The nipple's border
18
- content: "";
19
- position: absolute;
20
- top: -6px;
21
- display: block;
22
- width: 0;
23
- height: 0;
24
- border-width: 0 6px 6px;
25
- border-style: solid;
26
- border-color: darken($primary-color, 4%) transparent;
27
- z-index: 100;
28
-
29
- // The nipple's inner shadow
30
-
31
- &:before {
32
- content: ' ';
33
- position: absolute;
34
- width: 0;
35
- height: 0;
36
- border-width: 0 5px 5px;
37
- border-style: solid;
38
- border-color: lighten($primary-color, 15%) transparent;
39
- left: -5px;
40
- top: 1px;
41
- }
42
-
43
- // The nipple's background color
44
-
45
- &:after {
46
- content: ' ';
47
- position: absolute;
48
- width: 0;
49
- height: 0;
50
- border-width: 0 5px 5px;
51
- border-style: solid;
52
- border-color: lighten($primary-color, 4%) transparent;
53
- left: -5px;
54
- top: 2px;
55
- }
56
- }
57
-
58
- .popover_contents {
59
- display: block;
60
- background-color: #FFF;
61
- border: solid 1px darken($primary-color, 10%);
62
- box-shadow: lighten($primary-color, 5%) 0px 1px 0px 0px;
63
- border-radius: 3px;
64
- margin: 0;
65
- overflow: hidden;
66
- padding: 8px;
67
- }
68
-
69
- }
70
-
71
- //-------------------------------------- Popover with action list
72
-
73
- .popover {
74
- ul.popover_contents {
75
- list-style-type: none;
76
- padding: 0;
77
-
78
- li {
79
- display: block;
80
- border-bottom: solid 1px #ebebeb;
81
- box-sizing: border-box;
82
-
83
- a {
84
- display: block;
85
- box-sizing: padding-box;
86
- font-size: 0.95em;
87
- font-weight: bold;
88
- padding: 7px 16px 5px;
89
- text-decoration: none;
90
- text-align: center;
91
-
92
- &:hover {
93
- @include highlight-gradient;
94
- @include text-shadow(#5a83aa);
95
- color: #FFF;
96
- }
97
-
98
- &:active {
99
- @include reverse-highlight-gradient;
100
- color: #FFF;
101
- }
102
-
103
- }
104
-
105
- &:first-child {
106
- a {
107
- border-top-left-radius: 2px;
108
- border-top-right-radius: 2px;
109
- }
110
-
111
- }
112
-
113
- &:last-child {
114
- a {
115
- border-bottom-left-radius: 2px;
116
- border-bottom-right-radius: 2px;
117
- }
118
- border: none;
119
- }
120
- }
121
- }
122
- }