activeadmin 2.7.0 → 2.10.0
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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +166 -9
- data/CONTRIBUTING.md +7 -23
- data/README.md +3 -3
- data/app/assets/javascripts/active_admin/base.js +26 -21
- data/app/assets/stylesheets/active_admin/_base.scss +43 -37
- data/app/assets/stylesheets/active_admin/_forms.scss +3 -3
- data/app/assets/stylesheets/active_admin/{print.scss → _print.scss} +0 -0
- data/app/assets/stylesheets/active_admin/components/_comments.scss +2 -2
- data/app/javascript/active_admin/initializers/per-page.js +1 -1
- data/app/javascript/active_admin/lib/checkbox-toggler.js +3 -3
- data/app/javascript/active_admin/lib/dropdown-menu.js +1 -1
- data/app/javascript/active_admin/lib/modal-dialog.js +7 -7
- data/app/javascript/active_admin/lib/per-page.js +1 -1
- data/app/javascript/active_admin/lib/table-checkbox-toggler.js +1 -1
- data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb +1 -1
- data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb +2 -2
- data/app/views/active_admin/devise/shared/_links.erb +1 -1
- data/app/views/active_admin/page/index.html.arb +1 -0
- data/app/views/active_admin/resource/edit.html.arb +1 -0
- data/app/views/active_admin/resource/index.html.arb +1 -0
- data/app/views/active_admin/resource/new.html.arb +1 -0
- data/app/views/active_admin/resource/show.html.arb +1 -0
- data/app/views/layouts/active_admin.html.arb +1 -0
- data/app/views/layouts/active_admin_logged_out.html.erb +2 -2
- data/config/locales/ar.yml +6 -6
- data/config/locales/es-MX.yml +2 -1
- data/config/locales/es.yml +2 -2
- data/config/locales/it.yml +18 -0
- data/config/locales/ja.yml +3 -3
- data/config/locales/ko.yml +1 -1
- data/config/locales/nl.yml +1 -1
- data/config/locales/ro.yml +3 -2
- data/docs/0-installation.md +1 -1
- data/docs/11-decorators.md +16 -5
- data/docs/5-forms.md +6 -1
- data/docs/6-show-pages.md +12 -0
- data/docs/8-custom-actions.md +1 -1
- data/docs/Gemfile +3 -2
- data/docs/Gemfile.lock +127 -93
- data/lib/active_admin/abstract_view_factory.rb +1 -0
- data/lib/active_admin/application.rb +17 -17
- data/lib/active_admin/application_settings.rb +4 -3
- data/lib/active_admin/asset_registration.rb +1 -0
- data/lib/active_admin/authorization_adapter.rb +4 -3
- data/lib/active_admin/base_controller/authorization.rb +14 -12
- data/lib/active_admin/base_controller/menu.rb +1 -0
- data/lib/active_admin/base_controller.rb +5 -5
- data/lib/active_admin/batch_actions/controller.rb +4 -3
- data/lib/active_admin/batch_actions/resource_extension.rb +10 -8
- data/lib/active_admin/batch_actions/views/batch_action_form.rb +4 -3
- data/lib/active_admin/batch_actions/views/batch_action_selector.rb +7 -6
- data/lib/active_admin/batch_actions/views/selection_cells.rb +4 -3
- data/lib/active_admin/batch_actions.rb +1 -0
- data/lib/active_admin/callbacks.rb +1 -0
- data/lib/active_admin/cancan_adapter.rb +2 -1
- data/lib/active_admin/collection_decorator.rb +32 -0
- data/lib/active_admin/component.rb +1 -0
- data/lib/active_admin/controller_action.rb +1 -0
- data/lib/active_admin/csv_builder.rb +5 -4
- data/lib/active_admin/dependency.rb +13 -12
- data/lib/active_admin/deprecation.rb +1 -0
- data/lib/active_admin/devise.rb +6 -5
- data/lib/active_admin/dsl.rb +2 -1
- data/lib/active_admin/dynamic_setting.rb +1 -0
- data/lib/active_admin/dynamic_settings_node.rb +3 -2
- data/lib/active_admin/engine.rb +11 -8
- data/lib/active_admin/error.rb +1 -2
- data/lib/active_admin/filters/active.rb +2 -1
- data/lib/active_admin/filters/active_filter.rb +6 -6
- data/lib/active_admin/filters/active_sidebar.rb +4 -30
- data/lib/active_admin/filters/dsl.rb +1 -0
- data/lib/active_admin/filters/forms.rb +7 -6
- data/lib/active_admin/filters/formtastic_addons.rb +2 -6
- data/lib/active_admin/filters/resource_extension.rb +2 -1
- data/lib/active_admin/filters.rb +8 -7
- data/lib/active_admin/form_builder.rb +25 -20
- data/lib/active_admin/generators/boilerplate.rb +2 -1
- data/lib/active_admin/helpers/collection.rb +2 -0
- data/lib/active_admin/helpers/i18n.rb +1 -0
- data/lib/active_admin/helpers/optional_display.rb +3 -2
- data/lib/active_admin/helpers/routes/url_helpers.rb +1 -0
- data/lib/active_admin/helpers/scope_chain.rb +1 -0
- data/lib/active_admin/inputs/datepicker_input.rb +2 -1
- data/lib/active_admin/inputs/filters/base/search_method_select.rb +5 -4
- data/lib/active_admin/inputs/filters/base.rb +2 -1
- data/lib/active_admin/inputs/filters/boolean_input.rb +2 -1
- data/lib/active_admin/inputs/filters/check_boxes_input.rb +2 -1
- data/lib/active_admin/inputs/filters/date_picker_input.rb +1 -0
- data/lib/active_admin/inputs/filters/date_range_input.rb +1 -0
- data/lib/active_admin/inputs/filters/numeric_input.rb +1 -0
- data/lib/active_admin/inputs/filters/select_input.rb +3 -2
- data/lib/active_admin/inputs/filters/string_input.rb +1 -0
- data/lib/active_admin/inputs/filters/text_input.rb +1 -0
- data/lib/active_admin/inputs.rb +1 -0
- data/lib/active_admin/localizers/resource_localizer.rb +4 -3
- data/lib/active_admin/localizers.rb +2 -1
- data/lib/active_admin/menu.rb +2 -1
- data/lib/active_admin/menu_collection.rb +1 -0
- data/lib/active_admin/menu_item.rb +8 -7
- data/lib/active_admin/namespace.rb +14 -13
- data/lib/active_admin/namespace_settings.rb +6 -5
- data/lib/active_admin/order_clause.rb +2 -1
- data/lib/active_admin/orm/active_record/comments/comment.rb +4 -3
- data/lib/active_admin/orm/active_record/comments/namespace_helper.rb +1 -0
- data/lib/active_admin/orm/active_record/comments/resource_helper.rb +1 -0
- data/lib/active_admin/orm/active_record/comments/show_page_helper.rb +1 -0
- data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +20 -19
- data/lib/active_admin/orm/active_record/comments/views.rb +3 -2
- data/lib/active_admin/orm/active_record/comments.rb +20 -19
- data/lib/active_admin/orm/active_record.rb +2 -1
- data/lib/active_admin/orm/mongoid.rb +1 -0
- data/lib/active_admin/page.rb +2 -1
- data/lib/active_admin/page_controller.rb +1 -0
- data/lib/active_admin/page_dsl.rb +1 -0
- data/lib/active_admin/page_presenter.rb +1 -0
- data/lib/active_admin/pundit_adapter.rb +6 -5
- data/lib/active_admin/resource/action_items.rb +6 -5
- data/lib/active_admin/resource/attributes.rb +2 -1
- data/lib/active_admin/resource/belongs_to.rb +3 -2
- data/lib/active_admin/resource/controllers.rb +2 -1
- data/lib/active_admin/resource/includes.rb +1 -0
- data/lib/active_admin/resource/menu.rb +5 -4
- data/lib/active_admin/resource/model.rb +1 -0
- data/lib/active_admin/resource/naming.rb +5 -4
- data/lib/active_admin/resource/ordering.rb +1 -0
- data/lib/active_admin/resource/page_presenters.rb +1 -0
- data/lib/active_admin/resource/pagination.rb +1 -0
- data/lib/active_admin/resource/routes.rb +6 -7
- data/lib/active_admin/resource/scope_to.rb +8 -7
- data/lib/active_admin/resource/scopes.rb +1 -0
- data/lib/active_admin/resource/sidebars.rb +2 -1
- data/lib/active_admin/resource.rb +18 -17
- data/lib/active_admin/resource_collection.rb +1 -0
- data/lib/active_admin/resource_controller/action_builder.rb +1 -0
- data/lib/active_admin/resource_controller/data_access.rb +4 -3
- data/lib/active_admin/resource_controller/decorators.rb +7 -28
- data/lib/active_admin/resource_controller/polymorphic_routes.rb +1 -0
- data/lib/active_admin/resource_controller/resource_class_methods.rb +1 -0
- data/lib/active_admin/resource_controller/scoping.rb +1 -0
- data/lib/active_admin/resource_controller/sidebars.rb +1 -0
- data/lib/active_admin/resource_controller/streaming.rb +8 -6
- data/lib/active_admin/resource_controller.rb +13 -11
- data/lib/active_admin/resource_dsl.rb +11 -25
- data/lib/active_admin/router.rb +1 -0
- data/lib/active_admin/scope.rb +7 -6
- data/lib/active_admin/settings_node.rb +1 -0
- data/lib/active_admin/sidebar_section.rb +1 -0
- data/lib/active_admin/version.rb +2 -1
- data/lib/active_admin/view_factory.rb +18 -17
- data/lib/active_admin/view_helpers/active_admin_application_helper.rb +1 -0
- data/lib/active_admin/view_helpers/auto_link_helper.rb +1 -0
- data/lib/active_admin/view_helpers/breadcrumb_helper.rb +4 -3
- data/lib/active_admin/view_helpers/display_helper.rb +15 -7
- data/lib/active_admin/view_helpers/download_format_links_helper.rb +2 -1
- data/lib/active_admin/view_helpers/fields_for.rb +3 -2
- data/lib/active_admin/view_helpers/flash_helper.rb +1 -0
- data/lib/active_admin/view_helpers/form_helper.rb +1 -0
- data/lib/active_admin/view_helpers/method_or_proc_helper.rb +1 -0
- data/lib/active_admin/view_helpers/scope_name_helper.rb +1 -0
- data/lib/active_admin/view_helpers/sidebar_helper.rb +1 -0
- data/lib/active_admin/view_helpers/title_helper.rb +1 -0
- data/lib/active_admin/view_helpers/view_factory_helper.rb +1 -0
- data/lib/active_admin/view_helpers.rb +2 -1
- data/lib/active_admin/views/action_items.rb +1 -0
- data/lib/active_admin/views/components/active_admin_form.rb +7 -6
- data/lib/active_admin/views/components/active_filters_sidebar_content.rb +59 -0
- data/lib/active_admin/views/components/attributes_table.rb +6 -5
- data/lib/active_admin/views/components/blank_slate.rb +2 -1
- data/lib/active_admin/views/components/columns.rb +1 -0
- data/lib/active_admin/views/components/dropdown_menu.rb +7 -9
- data/lib/active_admin/views/components/index_list.rb +4 -3
- data/lib/active_admin/views/components/menu.rb +2 -1
- data/lib/active_admin/views/components/menu_item.rb +5 -4
- data/lib/active_admin/views/components/paginated_collection.rb +19 -18
- data/lib/active_admin/views/components/panel.rb +2 -1
- data/lib/active_admin/views/components/scopes.rb +6 -5
- data/lib/active_admin/views/components/sidebar.rb +1 -0
- data/lib/active_admin/views/components/sidebar_section.rb +1 -0
- data/lib/active_admin/views/components/site_title.rb +2 -1
- data/lib/active_admin/views/components/status_tag.rb +12 -11
- data/lib/active_admin/views/components/table_for.rb +17 -16
- data/lib/active_admin/views/components/tabs.rb +4 -3
- data/lib/active_admin/views/components/unsupported_browser.rb +1 -0
- data/lib/active_admin/views/footer.rb +3 -1
- data/lib/active_admin/views/header.rb +3 -2
- data/lib/active_admin/views/index_as_block.rb +1 -0
- data/lib/active_admin/views/index_as_blog.rb +2 -1
- data/lib/active_admin/views/index_as_grid.rb +2 -1
- data/lib/active_admin/views/index_as_table.rb +17 -16
- data/lib/active_admin/views/pages/base.rb +11 -8
- data/lib/active_admin/views/pages/form.rb +1 -0
- data/lib/active_admin/views/pages/index.rb +15 -13
- data/lib/active_admin/views/pages/layout.rb +1 -0
- data/lib/active_admin/views/pages/page.rb +1 -0
- data/lib/active_admin/views/pages/show.rb +1 -0
- data/lib/active_admin/views/tabbed_navigation.rb +3 -2
- data/lib/active_admin/views/title_bar.rb +2 -1
- data/lib/active_admin/views.rb +2 -1
- data/lib/active_admin.rb +61 -61
- data/lib/activeadmin.rb +2 -1
- data/lib/generators/active_admin/assets/assets_generator.rb +3 -2
- data/lib/generators/active_admin/assets/templates/active_admin.scss +2 -2
- data/lib/generators/active_admin/devise/devise_generator.rb +6 -5
- data/lib/generators/active_admin/install/install_generator.rb +8 -7
- data/lib/generators/active_admin/install/templates/active_admin.rb.erb +2 -2
- data/lib/generators/active_admin/install/templates/dashboard.rb +1 -0
- data/lib/generators/active_admin/page/page_generator.rb +2 -1
- data/lib/generators/active_admin/page/templates/page.rb +1 -0
- data/lib/generators/active_admin/resource/resource_generator.rb +4 -3
- data/lib/generators/active_admin/webpacker/templates/active_admin.scss +2 -2
- data/lib/generators/active_admin/webpacker/webpacker_generator.rb +8 -7
- data/lib/ransack_ext.rb +9 -8
- metadata +24 -50
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2475b735a56270b5b9421b1caaf3a29309db304fa4cb8d177e81feaddd4c8ce3
|
4
|
+
data.tar.gz: a54450d0ceee48a534ac77886151f4c089d89b9d56d3f3429f8eea110a11ee09
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: df19f0ebb54934855aaa741b836ecfe6298f696b7f522d116c5f5f30a6585804c88eb361d546f4515f36881638481cd644a63b5e1e8d9c848d8b9b2974acbf7f
|
7
|
+
data.tar.gz: ead38adf2aaf33eddef91a863518ba3ad67b2d9cb3cd32573e65d3538f4d3140d5ee44697a4e3d2578aaf1fc20571b7a4da01d00ea3a1c4888a8f4599b7f2c9d
|
data/CHANGELOG.md
CHANGED
@@ -2,6 +2,98 @@
|
|
2
2
|
|
3
3
|
## Unreleased
|
4
4
|
|
5
|
+
## 2.10.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.9.0..v2.10.0)
|
6
|
+
|
7
|
+
### Enhancements
|
8
|
+
|
9
|
+
* Load favicon from Webpacker assets when use_webpacker is set to true. [#6954] by [@Fs00]
|
10
|
+
* Don't apply sorting to collection until after scoping. [#7205] by [@agrobbin]
|
11
|
+
* Resolve dart sass deprecation warning for division. [#7095] by [@tordans]
|
12
|
+
* Use `instrument` from the Notifications API instead of low level `publish`. [#7262] by [@sprql]
|
13
|
+
* Avoid mutating string literals. [#6936] by [@tomgilligan]
|
14
|
+
* Include print styles in main stylesheet. [#6922] by [@deivid-rodriguez]
|
15
|
+
* Use `POST` for OmniAuth links. [#6916] by [@deivid-rodriguez]
|
16
|
+
* Scope new record instantiation by authorization scope. [#6884] by [@ngouy]
|
17
|
+
* Make `permit_params` and `belongs_to` order independent. [#6906] by [@deivid-rodriguez]
|
18
|
+
* Use collection length instead of running COUNTs for limited collections. [#5660] by [@MmKolodziej]
|
19
|
+
|
20
|
+
### Bug Fixes
|
21
|
+
|
22
|
+
* Show ransackable_scopes filters in search results. [#7127] by [@vlad-psh]
|
23
|
+
|
24
|
+
### Translation Improvements
|
25
|
+
|
26
|
+
* Fix Dutch translation for password reset button. [#7181] by [@mvz]
|
27
|
+
* Add few key to RO pagination.entry. [#6915] by [@lubosch]
|
28
|
+
* Change misleading Korean translation. [#6873] by [@1000ship]
|
29
|
+
|
30
|
+
### Documentation
|
31
|
+
|
32
|
+
* Replace deprecated update_attributes! with update!. [#6959] by [@sergey-alekseev]
|
33
|
+
* Clarify docs on user setup. [#6872] by [@javawizard]
|
34
|
+
|
35
|
+
### Dependency Changes
|
36
|
+
|
37
|
+
* Drop rails 5.2 support. [#7293] by [@deivid-rodriguez]
|
38
|
+
* Drop support for Ruby 2.5. [#7236] by [@alejandroperea]
|
39
|
+
|
40
|
+
## 2.9.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.1..v2.9.0)
|
41
|
+
|
42
|
+
### Enhancements
|
43
|
+
|
44
|
+
* Support for Rails 6.1. [#6548] by [@deivid-rodriguez]
|
45
|
+
* Add ability to override "Remove" button text on has_many forms. [#6523] by [@littleforest]
|
46
|
+
* Drop git in gemspec. [#6462] by [@utkarsh2102]
|
47
|
+
|
48
|
+
### Bug Fixes
|
49
|
+
|
50
|
+
* Pick up upstream fixes in devise templates. [#6536] by [@munen]
|
51
|
+
|
52
|
+
### Documentation
|
53
|
+
|
54
|
+
* Fix `has_many` syntax in forms documentation. [#6583] by [@krzcho]
|
55
|
+
* Add example of using `default_main_content` in show pages. [#6487] by [@sjieg]
|
56
|
+
|
57
|
+
### Dependency Changes
|
58
|
+
|
59
|
+
* Remove sassc and sprockets runtime dependencies. [#6584] by [@deivid-rodriguez]
|
60
|
+
|
61
|
+
## 2.8.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.0..v2.8.1)
|
62
|
+
|
63
|
+
### Bug Fixes
|
64
|
+
|
65
|
+
* Fix `permitted_param` generation for `belongs_to` when `:param` is used. [#6460] by [@deivid-rodriguez]
|
66
|
+
* Fix streaming CSV export. [#6451] by [@deivid-rodriguez]
|
67
|
+
* Fix input string filter no rendering dropdown input when its column name ends with a ransack predicate. [#6422] by [@Fivell]
|
68
|
+
|
69
|
+
## 2.8.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.7.0..v2.8.0)
|
70
|
+
|
71
|
+
### Enhancements
|
72
|
+
|
73
|
+
* Allow using PORO decorators. [#6249] by [@brunvez]
|
74
|
+
* Make sure `ActiveAdmin.routes` provides routes in a consistent order. [#6124] by [@jiikko]
|
75
|
+
* Use proper closing tags for HTML in ModalDialog component. [#6221] by [@javierjulio]
|
76
|
+
|
77
|
+
### Bug Fixes
|
78
|
+
|
79
|
+
* Fix comment layout so regardless of size, each is aligned and spaced evenly. [#6393] by [@Ivanov-Anton]
|
80
|
+
|
81
|
+
### Translation Improvements
|
82
|
+
|
83
|
+
* Fix several Arabic translations. [#6368] by [@mshalaby]
|
84
|
+
* Add missing `scope/all` italian translation. [#6341] by [@fuzziness]
|
85
|
+
* Improve Japanese translation. [#6315] by [@rn0rno]
|
86
|
+
* Fix es and es-MX sign_in and sign_up translation. [#6210] by [@roramirez]
|
87
|
+
|
88
|
+
### Documentation
|
89
|
+
|
90
|
+
* Fix filter_columns_for_large_association and filter_method_for_large_association examples. [#6232] by [@ndbroadbent]
|
91
|
+
|
92
|
+
### Dependency Changes
|
93
|
+
|
94
|
+
* Allow formtastic 4. [#6318] by [@deivid-rodriguez]
|
95
|
+
* Drop Ruby 2.4 support. [#6198] by [@deivid-rodriguez]
|
96
|
+
|
5
97
|
## 2.7.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.1..v2.7.0)
|
6
98
|
|
7
99
|
### Enhancements
|
@@ -520,15 +612,17 @@ Please check [0-6-stable] for previous changes.
|
|
520
612
|
[#5504]: https://github.com/activeadmin/activeadmin/pull/5504
|
521
613
|
[#5517]: https://github.com/activeadmin/activeadmin/pull/5517
|
522
614
|
[#5537]: https://github.com/activeadmin/activeadmin/pull/5537
|
615
|
+
[#5548]: https://github.com/activeadmin/activeadmin/pull/5548
|
523
616
|
[#5555]: https://github.com/activeadmin/activeadmin/pull/5555
|
524
617
|
[#5583]: https://github.com/activeadmin/activeadmin/pull/5583
|
618
|
+
[#5590]: https://github.com/activeadmin/activeadmin/pull/5590
|
525
619
|
[#5608]: https://github.com/activeadmin/activeadmin/pull/5608
|
526
620
|
[#5611]: https://github.com/activeadmin/activeadmin/pull/5611
|
527
621
|
[#5627]: https://github.com/activeadmin/activeadmin/pull/5627
|
528
622
|
[#5631]: https://github.com/activeadmin/activeadmin/pull/5631
|
529
623
|
[#5632]: https://github.com/activeadmin/activeadmin/pull/5632
|
530
624
|
[#5650]: https://github.com/activeadmin/activeadmin/pull/5650
|
531
|
-
[#
|
625
|
+
[#5660]: https://github.com/activeadmin/activeadmin/pull/5660
|
532
626
|
[#5662]: https://github.com/activeadmin/activeadmin/pull/5662
|
533
627
|
[#5710]: https://github.com/activeadmin/activeadmin/pull/5710
|
534
628
|
[#5726]: https://github.com/activeadmin/activeadmin/pull/5726
|
@@ -546,37 +640,77 @@ Please check [0-6-stable] for previous changes.
|
|
546
640
|
[#5822]: https://github.com/activeadmin/activeadmin/pull/5822
|
547
641
|
[#5826]: https://github.com/activeadmin/activeadmin/pull/5826
|
548
642
|
[#5831]: https://github.com/activeadmin/activeadmin/pull/5831
|
549
|
-
[#5548]: https://github.com/activeadmin/activeadmin/pull/5548
|
550
643
|
[#5842]: https://github.com/activeadmin/activeadmin/pull/5842
|
551
644
|
[#5854]: https://github.com/activeadmin/activeadmin/pull/5854
|
552
645
|
[#5855]: https://github.com/activeadmin/activeadmin/pull/5855
|
646
|
+
[#5867]: https://github.com/activeadmin/activeadmin/pull/5867
|
647
|
+
[#5870]: https://github.com/activeadmin/activeadmin/pull/5870
|
553
648
|
[#5874]: https://github.com/activeadmin/activeadmin/pull/5874
|
554
649
|
[#5877]: https://github.com/activeadmin/activeadmin/pull/5877
|
555
650
|
[#5886]: https://github.com/activeadmin/activeadmin/pull/5886
|
556
|
-
[#
|
651
|
+
[#5887]: https://github.com/activeadmin/activeadmin/pull/5887
|
557
652
|
[#5894]: https://github.com/activeadmin/activeadmin/pull/5894
|
558
653
|
[#5895]: https://github.com/activeadmin/activeadmin/pull/5895
|
559
|
-
[#
|
560
|
-
[#5887]: https://github.com/activeadmin/activeadmin/pull/5887
|
654
|
+
[#5929]: https://github.com/activeadmin/activeadmin/pull/5929
|
561
655
|
[#5931]: https://github.com/activeadmin/activeadmin/pull/5931
|
562
656
|
[#5938]: https://github.com/activeadmin/activeadmin/pull/5938
|
563
|
-
[#5929]: https://github.com/activeadmin/activeadmin/pull/5929
|
564
657
|
[#5943]: https://github.com/activeadmin/activeadmin/pull/5943
|
565
658
|
[#5946]: https://github.com/activeadmin/activeadmin/pull/5946
|
566
659
|
[#5956]: https://github.com/activeadmin/activeadmin/pull/5956
|
567
660
|
[#5957]: https://github.com/activeadmin/activeadmin/pull/5957
|
661
|
+
[#5994]: https://github.com/activeadmin/activeadmin/pull/5994
|
568
662
|
[#6000]: https://github.com/activeadmin/activeadmin/pull/6000
|
569
663
|
[#6002]: https://github.com/activeadmin/activeadmin/pull/6002
|
570
664
|
[#6047]: https://github.com/activeadmin/activeadmin/pull/6047
|
571
|
-
[#5994]: https://github.com/activeadmin/activeadmin/pull/5994
|
572
|
-
[#6149]: https://github.com/activeadmin/activeadmin/pull/6149
|
573
665
|
[#6086]: https://github.com/activeadmin/activeadmin/pull/6086
|
574
666
|
[#6099]: https://github.com/activeadmin/activeadmin/pull/6099
|
575
|
-
|
667
|
+
[#6124]: https://github.com/activeadmin/activeadmin/pull/6124
|
668
|
+
[#6149]: https://github.com/activeadmin/activeadmin/pull/6149
|
669
|
+
[#6198]: https://github.com/activeadmin/activeadmin/pull/6198
|
670
|
+
[#6210]: https://github.com/activeadmin/activeadmin/pull/6210
|
671
|
+
[#6221]: https://github.com/activeadmin/activeadmin/pull/6221
|
672
|
+
[#6232]: https://github.com/activeadmin/activeadmin/pull/6232
|
673
|
+
[#6249]: https://github.com/activeadmin/activeadmin/pull/6249
|
674
|
+
[#6315]: https://github.com/activeadmin/activeadmin/pull/6315
|
675
|
+
[#6318]: https://github.com/activeadmin/activeadmin/pull/6318
|
676
|
+
[#6341]: https://github.com/activeadmin/activeadmin/pull/6341
|
677
|
+
[#6368]: https://github.com/activeadmin/activeadmin/pull/6368
|
678
|
+
[#6393]: https://github.com/activeadmin/activeadmin/pull/6393
|
679
|
+
[#6422]: https://github.com/activeadmin/activeadmin/pull/6422
|
680
|
+
[#6451]: https://github.com/activeadmin/activeadmin/pull/6451
|
681
|
+
[#6460]: https://github.com/activeadmin/activeadmin/pull/6460
|
682
|
+
[#6462]: https://github.com/activeadmin/activeadmin/pull/6462
|
683
|
+
[#6487]: https://github.com/activeadmin/activeadmin/pull/6487
|
684
|
+
[#6523]: https://github.com/activeadmin/activeadmin/pull/6523
|
685
|
+
[#6536]: https://github.com/activeadmin/activeadmin/pull/6536
|
686
|
+
[#6548]: https://github.com/activeadmin/activeadmin/pull/6548
|
687
|
+
[#6583]: https://github.com/activeadmin/activeadmin/pull/6583
|
688
|
+
[#6584]: https://github.com/activeadmin/activeadmin/pull/6584
|
689
|
+
[#6872]: https://github.com/activeadmin/activeadmin/pull/6872
|
690
|
+
[#6873]: https://github.com/activeadmin/activeadmin/pull/6873
|
691
|
+
[#6884]: https://github.com/activeadmin/activeadmin/pull/6884
|
692
|
+
[#6906]: https://github.com/activeadmin/activeadmin/pull/6906
|
693
|
+
[#6915]: https://github.com/activeadmin/activeadmin/pull/6915
|
694
|
+
[#6916]: https://github.com/activeadmin/activeadmin/pull/6916
|
695
|
+
[#6922]: https://github.com/activeadmin/activeadmin/pull/6922
|
696
|
+
[#6936]: https://github.com/activeadmin/activeadmin/pull/6936
|
697
|
+
[#6954]: https://github.com/activeadmin/activeadmin/pull/6954
|
698
|
+
[#6959]: https://github.com/activeadmin/activeadmin/pull/6959
|
699
|
+
[#7095]: https://github.com/activeadmin/activeadmin/pull/7095
|
700
|
+
[#7127]: https://github.com/activeadmin/activeadmin/pull/7127
|
701
|
+
[#7181]: https://github.com/activeadmin/activeadmin/pull/7181
|
702
|
+
[#7205]: https://github.com/activeadmin/activeadmin/pull/7205
|
703
|
+
[#7236]: https://github.com/activeadmin/activeadmin/pull/7236
|
704
|
+
[#7262]: https://github.com/activeadmin/activeadmin/pull/7262
|
705
|
+
[#7293]: https://github.com/activeadmin/activeadmin/pull/7293
|
706
|
+
|
707
|
+
[@1000ship]: https://github.com/1000ship
|
576
708
|
[@5t111111]: https://github.com/5t111111
|
577
709
|
[@aarek]: https://github.com/aarek
|
578
710
|
[@adler99]: https://github.com/adler99
|
711
|
+
[@agrobbin]: https://github.com/agrobbin
|
579
712
|
[@ajw725]: https://github.com/ajw725
|
713
|
+
[@alejandroperea]: https://github.com/alejandroperea
|
580
714
|
[@alex-bogomolov]: https://github.com/alex-bogomolov
|
581
715
|
[@amiel]: https://github.com/amiel
|
582
716
|
[@amiuhle]: https://github.com/amiuhle
|
@@ -584,6 +718,7 @@ Please check [0-6-stable] for previous changes.
|
|
584
718
|
[@bartoszkopinski]: https://github.com/bartoszkopinski
|
585
719
|
[@blocknotes]: https://github.com/blocknotes
|
586
720
|
[@bolshakov]: https://github.com/bolshakov
|
721
|
+
[@brunvez]: https://github.com/brunvez
|
587
722
|
[@buren]: https://github.com/buren
|
588
723
|
[@chancancode]: https://github.com/chancancode
|
589
724
|
[@chrp]: https://github.com/chrp
|
@@ -602,6 +737,8 @@ Please check [0-6-stable] for previous changes.
|
|
602
737
|
[@FabioRos]: https://github.com/FabioRos
|
603
738
|
[@faucct]: https://github.com/faucct
|
604
739
|
[@Fivell]: https://github.com/Fivell
|
740
|
+
[@Fs00]: https://github.com/Fs00
|
741
|
+
[@fuzziness]: https://github.com/fuzziness
|
605
742
|
[@giapnhdev]: https://github.com/giapnhdev
|
606
743
|
[@glebtv]: https://github.com/glebtv
|
607
744
|
[@gonzedge]: https://github.com/gonzedge
|
@@ -611,10 +748,13 @@ Please check [0-6-stable] for previous changes.
|
|
611
748
|
[@innparusu95]: https://github.com/innparusu95
|
612
749
|
[@ionut998]: https://github.com/ionut998
|
613
750
|
[@irmela]: https://github.com/irmela
|
751
|
+
[@Ivanov-Anton]: https://github.com/Ivanov-Anton
|
614
752
|
[@jasl]: https://github.com/jasl
|
753
|
+
[@javawizard]: https://github.com/javawizard
|
615
754
|
[@javierjulio]: https://github.com/javierjulio
|
616
755
|
[@jawa]: https://github.com/jawa
|
617
756
|
[@JiiHu]: https://github.com/JiiHu
|
757
|
+
[@jiikko]: https://github.com/jiikko
|
618
758
|
[@johnnyshields]: https://github.com/johnnyshields
|
619
759
|
[@jscheid]: https://github.com/jscheid
|
620
760
|
[@juril33t]: https://github.com/juril33t
|
@@ -623,15 +763,23 @@ Please check [0-6-stable] for previous changes.
|
|
623
763
|
[@ko-lem]: https://github.com/ko-lem
|
624
764
|
[@kobeumut]: https://github.com/kobeumut
|
625
765
|
[@Kris-LIBIS]: https://github.com/Kris-LIBIS
|
766
|
+
[@krzcho]: https://github.com/krzcho
|
626
767
|
[@kwent]: https://github.com/kwent
|
627
768
|
[@leio10]: https://github.com/leio10
|
769
|
+
[@littleforest]: https://github.com/littleforest
|
628
770
|
[@Looooong]: https://github.com/Looooong
|
771
|
+
[@lubosch]: https://github.com/lubosch
|
629
772
|
[@markstory]: https://github.com/markstory
|
630
773
|
[@mauriciopasquier]: https://github.com/mauriciopasquier
|
631
774
|
[@mconiglio]: https://github.com/mconiglio
|
632
775
|
[@micred]: https://github.com/micred
|
633
776
|
[@mirelon]: https://github.com/mirelon
|
777
|
+
[@MmKolodziej]: https://github.com/MmKolodziej
|
778
|
+
[@mshalaby]: https://github.com/mshalaby
|
779
|
+
[@munen]: https://github.com/munen
|
780
|
+
[@mvz]: https://github.com/mvz
|
634
781
|
[@ndbroadbent]: https://github.com/ndbroadbent
|
782
|
+
[@ngouy]: https://github.com/ngouy
|
635
783
|
[@Nguyenanh]: https://github.com/Nguyenanh
|
636
784
|
[@orkhan]: https://github.com/orkhan
|
637
785
|
[@panasyuk]: https://github.com/panasyuk
|
@@ -639,23 +787,32 @@ Please check [0-6-stable] for previous changes.
|
|
639
787
|
[@potatosalad]: https://github.com/potatosalad
|
640
788
|
[@pranas]: https://github.com/pranas
|
641
789
|
[@renotocn]: https://github.com/renotocn
|
790
|
+
[@rn0rno]: https://github.com/rn0rno
|
642
791
|
[@RobinvanderVliet]: https://github.com/RobinvanderVliet
|
643
792
|
[@rogerkk]: https://github.com/rogerkk
|
793
|
+
[@roramirez]: https://github.com/roramirez
|
644
794
|
[@seanlinsley]: https://github.com/seanlinsley
|
795
|
+
[@sergey-alekseev]: https://github.com/sergey-alekseev
|
645
796
|
[@sgara]: https://github.com/sgara
|
646
797
|
[@ShallmentMo]: https://github.com/ShallmentMo
|
647
798
|
[@shekibobo]: https://github.com/shekibobo
|
648
799
|
[@shouya]: https://github.com/shouya
|
800
|
+
[@sjieg]: https://github.com/sjieg
|
801
|
+
[@sprql]: https://github.com/sprql
|
649
802
|
[@stefsava]: https://github.com/stefsava
|
650
803
|
[@stereoscott]: https://github.com/stereoscott
|
651
804
|
[@taralbass]: https://github.com/taralbass
|
652
805
|
[@tiagotex]: https://github.com/tiagotex
|
653
806
|
[@timoschilling]: https://github.com/timoschilling
|
654
807
|
[@TimPetricola]: https://github.com/TimPetricola
|
808
|
+
[@tomgilligan]: https://github.com/tomgilligan
|
809
|
+
[@tordans]: https://github.com/tordans
|
810
|
+
[@utkarsh2102]: https://github.com/utkarsh2102
|
655
811
|
[@varyonic]: https://github.com/varyonic
|
656
812
|
[@vcsjones]: https://github.com/vcsjones
|
657
813
|
[@vfonic]: https://github.com/vfonic
|
658
814
|
[@violeta-p]: https://github.com/violeta-p
|
815
|
+
[@vlad-psh]: https://github.com/vlad-psh
|
659
816
|
[@WaKeMaTTa]: https://github.com/WaKeMaTTa
|
660
817
|
[@wasifhossain]: https://github.com/wasifhossain
|
661
818
|
[@westonganger]: https://github.com/westonganger
|
data/CONTRIBUTING.md
CHANGED
@@ -115,22 +115,6 @@ checks as the rest of the project. `bin/rake lint` will give you feedback in
|
|
115
115
|
this regard. You can check & fix style issues by running each linter
|
116
116
|
individually. Run `bin/rake -T lint` to see the available linters.
|
117
117
|
|
118
|
-
### Add a changelog entry
|
119
|
-
|
120
|
-
If your PR includes user-observable changes, you'll be asked to add a changelog
|
121
|
-
entry following the existing changelog format.
|
122
|
-
|
123
|
-
The changelog format is the following:
|
124
|
-
|
125
|
-
* One line per PR describing your fix or enhancement.
|
126
|
-
* Entries end with a dot, followed by "[#pr-number] by [@github-username]".
|
127
|
-
* Entries are added under the "Unreleased" section at the top of the file, under
|
128
|
-
the "Bug Fixes" or "Enhancements" subsection.
|
129
|
-
* References to github usernames and pull requests use [shortcut reference
|
130
|
-
links].
|
131
|
-
* Your github username reference definition is included in the correct
|
132
|
-
alphabetical position at the bottom of the file.
|
133
|
-
|
134
118
|
### Make a Pull Request
|
135
119
|
|
136
120
|
At this point, you should switch back to your master branch and make sure it's
|
@@ -152,12 +136,12 @@ git push --set-upstream origin 325-add-japanese-translations
|
|
152
136
|
|
153
137
|
Finally, go to GitHub and [make a Pull Request][] :D
|
154
138
|
|
155
|
-
|
156
|
-
about quality, so your PR won't be merged until all tests pass. It's
|
157
|
-
but it's possible that your changes pass tests in one Rails version
|
158
|
-
another. In that case, you'll have to setup your development
|
159
|
-
explained in step 3) to use the problematic Rails version, and
|
160
|
-
what's going on!
|
139
|
+
Github Actions will run our test suite against all supported Rails versions. We
|
140
|
+
care about quality, so your PR won't be merged until all tests pass. It's
|
141
|
+
unlikely, but it's possible that your changes pass tests in one Rails version
|
142
|
+
but fail in another. In that case, you'll have to setup your development
|
143
|
+
environment (as explained in step 3) to use the problematic Rails version, and
|
144
|
+
investigate what's going on!
|
161
145
|
|
162
146
|
### Keeping your Pull Request updated
|
163
147
|
|
@@ -190,12 +174,12 @@ met.
|
|
190
174
|
|
191
175
|
Maintainers need to do the following to push out a release:
|
192
176
|
|
193
|
-
* Make sure all pull requests are in and that changelog is current
|
194
177
|
* Switch to the master branch and make sure it's up to date.
|
195
178
|
* Make sure you have [chandler] properly configured. Chandler is used to
|
196
179
|
automatically submit github release notes from the changelog right after
|
197
180
|
pushing the gem to rubygems.
|
198
181
|
* Run one of `bin/rake release:prepare_{prerelease,prepatch,patch,preminor,minor,premajor,major}`, push the result and create a PR.
|
182
|
+
* Review and merge the PR. The generated changelog in the PR should include all user visible changes you intend to ship.
|
199
183
|
* Run `bin/rake release` from the target branch once the PR is merged.
|
200
184
|
|
201
185
|
[chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
|
data/README.md
CHANGED
@@ -4,7 +4,7 @@
|
|
4
4
|
creating elegant backends for website administration.
|
5
5
|
|
6
6
|
[![Version ][rubygems_badge]][rubygems]
|
7
|
-
[![
|
7
|
+
[![Github Actions ][actions_badge]][actions]
|
8
8
|
[![Coverage ][coverage_badge]][coverage]
|
9
9
|
[![Tidelift ][tidelift_badge]][tidelift]
|
10
10
|
[![Inch CI ][inch_badge]][inch]
|
@@ -93,8 +93,8 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
|
|
93
93
|
|
94
94
|
[rubygems_badge]: http://img.shields.io/gem/v/activeadmin.svg
|
95
95
|
[rubygems]: https://rubygems.org/gems/activeadmin
|
96
|
-
[
|
97
|
-
[
|
96
|
+
[actions_badge]: https://github.com/activeadmin/activeadmin/workflows/ci/badge.svg
|
97
|
+
[actions]: https://github.com/activeadmin/activeadmin/actions
|
98
98
|
[coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
|
99
99
|
[coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
|
100
100
|
[inch_badge]: http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master
|
@@ -11,7 +11,7 @@
|
|
11
11
|
//= require_self
|
12
12
|
|
13
13
|
(function(global, factory) {
|
14
|
-
typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("jquery"), require("jquery-ui/ui/widgets/datepicker"), require("jquery-ui/ui/widgets/dialog"), require("jquery-ui/ui/widgets/sortable"), require("jquery-ui/ui/widgets/tabs"), require("jquery-ui/ui/widget"), require("jquery-ujs")) : typeof define === "function" && define.amd ? define([ "exports", "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : (global = global || self,
|
14
|
+
typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("jquery"), require("jquery-ui/ui/widgets/datepicker"), require("jquery-ui/ui/widgets/dialog"), require("jquery-ui/ui/widgets/sortable"), require("jquery-ui/ui/widgets/tabs"), require("jquery-ui/ui/widget"), require("jquery-ujs")) : typeof define === "function" && define.amd ? define([ "exports", "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self,
|
15
15
|
factory(global.ActiveAdmin = {}));
|
16
16
|
})(this, function(exports) {
|
17
17
|
"use strict";
|
@@ -27,18 +27,17 @@
|
|
27
27
|
function ModalDialog(message, inputs, callback) {
|
28
28
|
var html = '<form id="dialog_confirm" title="' + message + '"><ul>';
|
29
29
|
for (var name in inputs) {
|
30
|
-
var
|
30
|
+
var opts, wrapper;
|
31
31
|
var type = inputs[name];
|
32
32
|
if (/^(datepicker|checkbox|text|number)$/.test(type)) {
|
33
33
|
wrapper = "input";
|
34
34
|
} else if (type === "textarea") {
|
35
35
|
wrapper = "textarea";
|
36
36
|
} else if ($.isArray(type)) {
|
37
|
-
var _ref = [ "select",
|
37
|
+
var _ref = [ "select", type, "" ];
|
38
38
|
wrapper = _ref[0];
|
39
|
-
|
40
|
-
|
41
|
-
type = _ref[3];
|
39
|
+
opts = _ref[1];
|
40
|
+
type = _ref[2];
|
42
41
|
} else {
|
43
42
|
throw new Error("Unsupported input type: {" + name + ": " + type + "}");
|
44
43
|
}
|
@@ -46,29 +45,28 @@
|
|
46
45
|
html += "<li>\n <label>" + (name.charAt(0).toUpperCase() + name.slice(1)) + "</label>\n <" + wrapper + ' name="' + name + '" class="' + klass + '" type="' + type + '">' + (opts ? function() {
|
47
46
|
var result = [];
|
48
47
|
opts.forEach(function(v) {
|
49
|
-
var $elem = $("<"
|
48
|
+
var $elem = $("<option></option>");
|
50
49
|
if ($.isArray(v)) {
|
51
50
|
$elem.text(v[0]).val(v[1]);
|
52
51
|
} else {
|
53
52
|
$elem.text(v);
|
54
53
|
}
|
55
|
-
result.push($elem.wrap("<div>").parent().html());
|
54
|
+
result.push($elem.wrap("<div></div>").parent().html());
|
56
55
|
});
|
57
56
|
return result;
|
58
57
|
}().join("") : "") + ("</" + wrapper + ">") + "</li>";
|
59
58
|
var _ref2 = [];
|
60
59
|
wrapper = _ref2[0];
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
klass = _ref2[4];
|
60
|
+
opts = _ref2[1];
|
61
|
+
type = _ref2[2];
|
62
|
+
klass = _ref2[3];
|
65
63
|
}
|
66
64
|
html += "</ul></form>";
|
67
65
|
var form = $(html).appendTo("body");
|
68
66
|
$("body").trigger("modal_dialog:before_open", [ form ]);
|
69
67
|
form.dialog({
|
70
68
|
modal: true,
|
71
|
-
open: function open(
|
69
|
+
open: function open(_event, _ui) {
|
72
70
|
$("body").trigger("modal_dialog:after_open", [ form ]);
|
73
71
|
},
|
74
72
|
dialogClass: "active_admin_dialog",
|
@@ -83,7 +81,7 @@
|
|
83
81
|
}
|
84
82
|
});
|
85
83
|
}
|
86
|
-
var onDOMReady = function onDOMReady() {
|
84
|
+
var onDOMReady$2 = function onDOMReady() {
|
87
85
|
$(".batch_actions_selector li a").off("click confirm:complete");
|
88
86
|
$(".batch_actions_selector li a").on("click", function(event) {
|
89
87
|
var _this = this;
|
@@ -127,7 +125,7 @@
|
|
127
125
|
});
|
128
126
|
}
|
129
127
|
};
|
130
|
-
$(document).ready(onDOMReady).on("page:load turbolinks:load", onDOMReady);
|
128
|
+
$(document).ready(onDOMReady$2).on("page:load turbolinks:load", onDOMReady$2);
|
131
129
|
var CheckboxToggler = function() {
|
132
130
|
function CheckboxToggler(options, container) {
|
133
131
|
this.options = options;
|
@@ -136,7 +134,7 @@
|
|
136
134
|
this._bind();
|
137
135
|
}
|
138
136
|
var _proto = CheckboxToggler.prototype;
|
139
|
-
_proto.option = function option(
|
137
|
+
_proto.option = function option(_key, _value) {};
|
140
138
|
_proto._init = function _init() {
|
141
139
|
if (!this.container) {
|
142
140
|
throw new Error("Container element not found");
|
@@ -159,7 +157,7 @@
|
|
159
157
|
return _this._didChangeToggleAllCheckbox();
|
160
158
|
});
|
161
159
|
};
|
162
|
-
_proto._didChangeCheckbox = function _didChangeCheckbox(
|
160
|
+
_proto._didChangeCheckbox = function _didChangeCheckbox(_checkbox) {
|
163
161
|
var numChecked = this.checkboxes.filter(":checked").length;
|
164
162
|
var allChecked = numChecked === this.checkboxes.length;
|
165
163
|
var someChecked = numChecked > 0 && numChecked < this.checkboxes.length;
|
@@ -464,7 +462,7 @@
|
|
464
462
|
return PerPage;
|
465
463
|
}();
|
466
464
|
(function($) {
|
467
|
-
$(document).on("change", ".pagination_per_page > select", function(
|
465
|
+
$(document).on("change", ".pagination_per_page > select", function(_event) {
|
468
466
|
PerPage._jQueryInterface.call($(this), "update");
|
469
467
|
});
|
470
468
|
$.fn["perPage"] = PerPage._jQueryInterface;
|
@@ -473,7 +471,14 @@
|
|
473
471
|
function _inheritsLoose(subClass, superClass) {
|
474
472
|
subClass.prototype = Object.create(superClass.prototype);
|
475
473
|
subClass.prototype.constructor = subClass;
|
476
|
-
subClass
|
474
|
+
_setPrototypeOf(subClass, superClass);
|
475
|
+
}
|
476
|
+
function _setPrototypeOf(o, p) {
|
477
|
+
_setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
|
478
|
+
o.__proto__ = p;
|
479
|
+
return o;
|
480
|
+
};
|
481
|
+
return _setPrototypeOf(o, p);
|
477
482
|
}
|
478
483
|
var TableCheckboxToggler = function(_CheckboxToggler) {
|
479
484
|
_inheritsLoose(TableCheckboxToggler, _CheckboxToggler);
|
@@ -503,10 +508,10 @@
|
|
503
508
|
return TableCheckboxToggler;
|
504
509
|
}(CheckboxToggler);
|
505
510
|
$.widget.bridge("tableCheckboxToggler", TableCheckboxToggler);
|
506
|
-
var onDOMReady
|
511
|
+
var onDOMReady = function onDOMReady() {
|
507
512
|
return $("#active_admin_content .tabs").tabs();
|
508
513
|
};
|
509
|
-
$(document).ready(onDOMReady
|
514
|
+
$(document).ready(onDOMReady).on("page:load turbolinks:load", onDOMReady);
|
510
515
|
function modal_dialog(message, inputs, callback) {
|
511
516
|
console.warn("ActiveAdmin.modal_dialog is deprecated in favor of ActiveAdmin.ModalDialog, please update usage.");
|
512
517
|
return ModalDialog(message, inputs, callback);
|
@@ -1,41 +1,47 @@
|
|
1
1
|
/* Active Admin CSS */
|
2
|
-
|
3
|
-
|
2
|
+
@media screen {
|
3
|
+
// Normalize
|
4
|
+
@import "./normalize";
|
4
5
|
|
5
|
-
// Partials
|
6
|
-
@import "./typography";
|
7
|
-
@import "./header";
|
8
|
-
@import "./forms";
|
9
|
-
@import "./components/comments";
|
10
|
-
@import "./components/flash_messages";
|
11
|
-
@import "./components/date_picker";
|
12
|
-
@import "./components/tables";
|
13
|
-
@import "./components/batch_actions";
|
14
|
-
@import "./components/modal_dialog";
|
15
|
-
@import "./components/blank_slates";
|
16
|
-
@import "./components/breadcrumbs";
|
17
|
-
@import "./components/dropdown_menu";
|
18
|
-
@import "./components/buttons";
|
19
|
-
@import "./components/grid";
|
20
|
-
@import "./components/links";
|
21
|
-
@import "./components/pagination";
|
22
|
-
@import "./components/panels";
|
23
|
-
@import "./components/columns";
|
24
|
-
@import "./components/scopes";
|
25
|
-
@import "./components/status_tags";
|
26
|
-
@import "./components/table_tools";
|
27
|
-
@import "./components/index_list";
|
28
|
-
@import "./components/unsupported_browser";
|
29
|
-
@import "./components/tabs";
|
30
|
-
@import "./pages/logged_out";
|
31
|
-
@import "./structure/footer";
|
32
|
-
@import "./structure/main_structure";
|
33
|
-
@import "./structure/title_bar";
|
6
|
+
// Partials
|
7
|
+
@import "./typography";
|
8
|
+
@import "./header";
|
9
|
+
@import "./forms";
|
10
|
+
@import "./components/comments";
|
11
|
+
@import "./components/flash_messages";
|
12
|
+
@import "./components/date_picker";
|
13
|
+
@import "./components/tables";
|
14
|
+
@import "./components/batch_actions";
|
15
|
+
@import "./components/modal_dialog";
|
16
|
+
@import "./components/blank_slates";
|
17
|
+
@import "./components/breadcrumbs";
|
18
|
+
@import "./components/dropdown_menu";
|
19
|
+
@import "./components/buttons";
|
20
|
+
@import "./components/grid";
|
21
|
+
@import "./components/links";
|
22
|
+
@import "./components/pagination";
|
23
|
+
@import "./components/panels";
|
24
|
+
@import "./components/columns";
|
25
|
+
@import "./components/scopes";
|
26
|
+
@import "./components/status_tags";
|
27
|
+
@import "./components/table_tools";
|
28
|
+
@import "./components/index_list";
|
29
|
+
@import "./components/unsupported_browser";
|
30
|
+
@import "./components/tabs";
|
31
|
+
@import "./pages/logged_out";
|
32
|
+
@import "./structure/footer";
|
33
|
+
@import "./structure/main_structure";
|
34
|
+
@import "./structure/title_bar";
|
34
35
|
|
35
|
-
body {
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
36
|
+
body {
|
37
|
+
@include sans-family;
|
38
|
+
line-height: 1.5;
|
39
|
+
font-size: 72%;
|
40
|
+
background: $body-background-color;
|
41
|
+
color: $text-color;
|
42
|
+
}
|
43
|
+
}
|
44
|
+
|
45
|
+
@media print {
|
46
|
+
@import "./print";
|
41
47
|
}
|
@@ -276,10 +276,10 @@ $sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
|
|
276
276
|
|
277
277
|
$filter-field-seperator-width: 12px;
|
278
278
|
|
279
|
-
$side-by-side-filter-input-width: ($sidebar-inner-content-width
|
280
|
-
$side-by-side-filter-select-width: ($sidebar-inner-content-width
|
279
|
+
$side-by-side-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
|
280
|
+
$side-by-side-filter-select-width: ($sidebar-inner-content-width * 0.5) - $filter-field-seperator-width;
|
281
281
|
|
282
|
-
$date-range-filter-input-width: ($sidebar-inner-content-width
|
282
|
+
$date-range-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($filter-field-seperator-width * 0.5);
|
283
283
|
|
284
284
|
form.filter_form {
|
285
285
|
.filter_form_field {
|
File without changes
|