activeadmin 2.6.1 → 3.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (326) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +438 -9
  3. data/CONTRIBUTING.md +12 -36
  4. data/README.md +8 -8
  5. data/app/assets/javascripts/active_admin/base.js +27 -25
  6. data/app/assets/stylesheets/active_admin/_base.scss +53 -37
  7. data/app/assets/stylesheets/active_admin/_forms.scss +2 -13
  8. data/app/assets/stylesheets/active_admin/_header.scss +37 -3
  9. data/app/assets/stylesheets/active_admin/_normalize.scss +25 -123
  10. data/app/assets/stylesheets/active_admin/components/_comments.scss +2 -2
  11. data/app/assets/stylesheets/active_admin/components/_date_picker.scss +1 -2
  12. data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss +7 -5
  13. data/app/assets/stylesheets/active_admin/components/_pagination.scss +5 -2
  14. data/app/assets/stylesheets/active_admin/components/_table_tools.scss +9 -6
  15. data/app/assets/stylesheets/active_admin/components/_tabs.scss +10 -7
  16. data/app/assets/stylesheets/active_admin/mixins/_buttons.scss +2 -2
  17. data/app/assets/stylesheets/active_admin/mixins/_variables.scss +12 -0
  18. data/app/assets/stylesheets/active_admin/pages/_logged_out.scss +1 -1
  19. data/app/assets/stylesheets/active_admin/structure/_footer.scss +6 -1
  20. data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +6 -4
  21. data/app/javascript/active_admin/initializers/has-many.js +4 -1
  22. data/app/javascript/active_admin/initializers/per-page.js +1 -1
  23. data/app/javascript/active_admin/lib/checkbox-toggler.js +3 -3
  24. data/app/javascript/active_admin/lib/dropdown-menu.js +1 -1
  25. data/app/javascript/active_admin/lib/modal-dialog.js +7 -7
  26. data/app/javascript/active_admin/lib/per-page.js +1 -1
  27. data/app/javascript/active_admin/lib/table-checkbox-toggler.js +1 -1
  28. data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb +1 -1
  29. data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb +2 -2
  30. data/app/views/active_admin/devise/shared/_links.erb +1 -1
  31. data/app/views/active_admin/page/index.html.arb +1 -0
  32. data/app/views/active_admin/resource/edit.html.arb +1 -0
  33. data/app/views/active_admin/resource/index.html.arb +1 -0
  34. data/app/views/active_admin/resource/new.html.arb +1 -0
  35. data/app/views/active_admin/resource/show.html.arb +1 -0
  36. data/app/views/layouts/active_admin.html.arb +1 -0
  37. data/app/views/layouts/active_admin_logged_out.html.erb +18 -7
  38. data/config/locales/ar.yml +6 -13
  39. data/config/locales/az.yml +0 -7
  40. data/config/locales/bg.yml +0 -7
  41. data/config/locales/bs.yml +0 -7
  42. data/config/locales/ca.yml +0 -7
  43. data/config/locales/cs.yml +0 -7
  44. data/config/locales/da.yml +0 -7
  45. data/config/locales/de-CH.yml +0 -7
  46. data/config/locales/de.yml +0 -8
  47. data/config/locales/el.yml +0 -7
  48. data/config/locales/en-CA.yml +0 -7
  49. data/config/locales/en-GB.yml +0 -7
  50. data/config/locales/en.yml +0 -8
  51. data/config/locales/eo.yml +0 -8
  52. data/config/locales/es-MX.yml +2 -8
  53. data/config/locales/es.yml +2 -10
  54. data/config/locales/fa.yml +0 -7
  55. data/config/locales/fi.yml +0 -7
  56. data/config/locales/fr.yml +3 -11
  57. data/config/locales/he.yml +0 -9
  58. data/config/locales/hr.yml +0 -7
  59. data/config/locales/hu.yml +0 -8
  60. data/config/locales/id.yml +0 -7
  61. data/config/locales/it.yml +18 -8
  62. data/config/locales/ja.yml +2 -10
  63. data/config/locales/ko.yml +1 -8
  64. data/config/locales/lt.yml +0 -8
  65. data/config/locales/lv.yml +0 -7
  66. data/config/locales/mk.yml +0 -8
  67. data/config/locales/nb.yml +0 -8
  68. data/config/locales/nl.yml +1 -9
  69. data/config/locales/pl.yml +0 -8
  70. data/config/locales/pt-BR.yml +0 -8
  71. data/config/locales/pt-PT.yml +0 -7
  72. data/config/locales/ro.yml +3 -9
  73. data/config/locales/ru.yml +0 -6
  74. data/config/locales/sk.yml +0 -8
  75. data/config/locales/sv-SE.yml +58 -39
  76. data/config/locales/tr.yml +0 -11
  77. data/config/locales/uk.yml +0 -6
  78. data/config/locales/vi.yml +38 -19
  79. data/config/locales/zh-CN.yml +34 -23
  80. data/config/locales/zh-TW.yml +0 -7
  81. data/lib/active_admin/abstract_view_factory.rb +1 -0
  82. data/lib/active_admin/application.rb +19 -19
  83. data/lib/active_admin/application_settings.rb +4 -3
  84. data/lib/active_admin/asset_registration.rb +4 -3
  85. data/lib/active_admin/authorization_adapter.rb +6 -3
  86. data/lib/active_admin/base_controller/authorization.rb +15 -13
  87. data/lib/active_admin/base_controller/menu.rb +1 -0
  88. data/lib/active_admin/base_controller.rb +6 -5
  89. data/lib/active_admin/batch_actions/controller.rb +4 -3
  90. data/lib/active_admin/batch_actions/resource_extension.rb +10 -8
  91. data/lib/active_admin/batch_actions/views/batch_action_form.rb +4 -3
  92. data/lib/active_admin/batch_actions/views/batch_action_selector.rb +7 -6
  93. data/lib/active_admin/batch_actions/views/selection_cells.rb +4 -3
  94. data/lib/active_admin/batch_actions.rb +1 -0
  95. data/lib/active_admin/callbacks.rb +1 -0
  96. data/lib/active_admin/cancan_adapter.rb +2 -1
  97. data/lib/active_admin/collection_decorator.rb +32 -0
  98. data/lib/active_admin/component.rb +1 -0
  99. data/lib/active_admin/controller_action.rb +1 -0
  100. data/lib/active_admin/csv_builder.rb +25 -17
  101. data/lib/active_admin/dependency.rb +12 -15
  102. data/lib/active_admin/devise.rb +16 -5
  103. data/lib/active_admin/dsl.rb +2 -1
  104. data/lib/active_admin/dynamic_setting.rb +1 -0
  105. data/lib/active_admin/dynamic_settings_node.rb +3 -2
  106. data/lib/active_admin/engine.rb +17 -9
  107. data/lib/active_admin/error.rb +1 -2
  108. data/lib/active_admin/filters/active.rb +2 -1
  109. data/lib/active_admin/filters/active_filter.rb +6 -6
  110. data/lib/active_admin/filters/active_sidebar.rb +4 -30
  111. data/lib/active_admin/filters/dsl.rb +1 -0
  112. data/lib/active_admin/filters/forms.rb +9 -8
  113. data/lib/active_admin/filters/formtastic_addons.rb +3 -7
  114. data/lib/active_admin/filters/resource_extension.rb +6 -5
  115. data/lib/active_admin/filters.rb +8 -7
  116. data/lib/active_admin/form_builder.rb +25 -20
  117. data/lib/active_admin/generators/boilerplate.rb +2 -1
  118. data/lib/active_admin/helpers/collection.rb +2 -0
  119. data/lib/active_admin/helpers/i18n.rb +1 -0
  120. data/lib/active_admin/helpers/optional_display.rb +3 -2
  121. data/lib/active_admin/helpers/routes/url_helpers.rb +1 -0
  122. data/lib/active_admin/helpers/scope_chain.rb +1 -0
  123. data/lib/active_admin/inputs/datepicker_input.rb +2 -1
  124. data/lib/active_admin/inputs/filters/base/search_method_select.rb +7 -6
  125. data/lib/active_admin/inputs/filters/base.rb +2 -1
  126. data/lib/active_admin/inputs/filters/boolean_input.rb +2 -1
  127. data/lib/active_admin/inputs/filters/check_boxes_input.rb +2 -1
  128. data/lib/active_admin/inputs/filters/date_picker_input.rb +1 -0
  129. data/lib/active_admin/inputs/filters/date_range_input.rb +3 -2
  130. data/lib/active_admin/inputs/filters/numeric_input.rb +2 -1
  131. data/lib/active_admin/inputs/filters/select_input.rb +5 -2
  132. data/lib/active_admin/inputs/filters/string_input.rb +2 -1
  133. data/lib/active_admin/inputs/filters/text_input.rb +1 -0
  134. data/lib/active_admin/inputs.rb +1 -0
  135. data/lib/active_admin/localizers/resource_localizer.rb +4 -3
  136. data/lib/active_admin/localizers.rb +2 -1
  137. data/lib/active_admin/menu.rb +8 -3
  138. data/lib/active_admin/menu_collection.rb +1 -0
  139. data/lib/active_admin/menu_item.rb +8 -7
  140. data/lib/active_admin/namespace.rb +16 -15
  141. data/lib/active_admin/namespace_settings.rb +9 -5
  142. data/lib/active_admin/order_clause.rb +2 -1
  143. data/lib/active_admin/orm/active_record/comments/comment.rb +12 -3
  144. data/lib/active_admin/orm/active_record/comments/namespace_helper.rb +1 -0
  145. data/lib/active_admin/orm/active_record/comments/resource_helper.rb +1 -0
  146. data/lib/active_admin/orm/active_record/comments/show_page_helper.rb +1 -0
  147. data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +21 -20
  148. data/lib/active_admin/orm/active_record/comments/views.rb +3 -2
  149. data/lib/active_admin/orm/active_record/comments.rb +28 -27
  150. data/lib/active_admin/orm/active_record.rb +2 -1
  151. data/lib/active_admin/orm/mongoid.rb +1 -0
  152. data/lib/active_admin/page.rb +2 -1
  153. data/lib/active_admin/page_controller.rb +1 -0
  154. data/lib/active_admin/page_dsl.rb +1 -0
  155. data/lib/active_admin/page_presenter.rb +1 -0
  156. data/lib/active_admin/pundit_adapter.rb +58 -16
  157. data/lib/active_admin/resource/action_items.rb +6 -5
  158. data/lib/active_admin/resource/attributes.rb +9 -1
  159. data/lib/active_admin/resource/belongs_to.rb +3 -2
  160. data/lib/active_admin/resource/controllers.rb +2 -1
  161. data/lib/active_admin/resource/includes.rb +1 -0
  162. data/lib/active_admin/resource/menu.rb +5 -4
  163. data/lib/active_admin/resource/model.rb +1 -0
  164. data/lib/active_admin/resource/naming.rb +5 -4
  165. data/lib/active_admin/resource/ordering.rb +1 -0
  166. data/lib/active_admin/resource/page_presenters.rb +1 -0
  167. data/lib/active_admin/resource/pagination.rb +1 -0
  168. data/lib/active_admin/resource/routes.rb +6 -7
  169. data/lib/active_admin/resource/scope_to.rb +8 -7
  170. data/lib/active_admin/resource/scopes.rb +1 -0
  171. data/lib/active_admin/resource/sidebars.rb +2 -1
  172. data/lib/active_admin/resource.rb +20 -19
  173. data/lib/active_admin/resource_collection.rb +1 -0
  174. data/lib/active_admin/resource_controller/action_builder.rb +1 -0
  175. data/lib/active_admin/resource_controller/data_access.rb +31 -5
  176. data/lib/active_admin/resource_controller/decorators.rb +7 -28
  177. data/lib/active_admin/resource_controller/polymorphic_routes.rb +1 -0
  178. data/lib/active_admin/resource_controller/resource_class_methods.rb +1 -0
  179. data/lib/active_admin/resource_controller/scoping.rb +1 -0
  180. data/lib/active_admin/resource_controller/sidebars.rb +1 -0
  181. data/lib/active_admin/resource_controller/streaming.rb +9 -7
  182. data/lib/active_admin/resource_controller.rb +13 -11
  183. data/lib/active_admin/resource_dsl.rb +11 -25
  184. data/lib/active_admin/router.rb +1 -0
  185. data/lib/active_admin/scope.rb +7 -6
  186. data/lib/active_admin/settings_node.rb +1 -0
  187. data/lib/active_admin/sidebar_section.rb +1 -0
  188. data/lib/active_admin/version.rb +2 -1
  189. data/lib/active_admin/view_factory.rb +18 -17
  190. data/lib/active_admin/view_helpers/active_admin_application_helper.rb +1 -0
  191. data/lib/active_admin/view_helpers/auto_link_helper.rb +2 -1
  192. data/lib/active_admin/view_helpers/breadcrumb_helper.rb +4 -3
  193. data/lib/active_admin/view_helpers/display_helper.rb +23 -8
  194. data/lib/active_admin/view_helpers/download_format_links_helper.rb +2 -1
  195. data/lib/active_admin/view_helpers/fields_for.rb +3 -2
  196. data/lib/active_admin/view_helpers/flash_helper.rb +1 -0
  197. data/lib/active_admin/view_helpers/form_helper.rb +1 -0
  198. data/lib/active_admin/view_helpers/method_or_proc_helper.rb +1 -0
  199. data/lib/active_admin/view_helpers/scope_name_helper.rb +1 -0
  200. data/lib/active_admin/view_helpers/sidebar_helper.rb +1 -0
  201. data/lib/active_admin/view_helpers/title_helper.rb +1 -0
  202. data/lib/active_admin/view_helpers/view_factory_helper.rb +1 -0
  203. data/lib/active_admin/view_helpers.rb +2 -1
  204. data/lib/active_admin/views/action_items.rb +1 -0
  205. data/lib/active_admin/views/components/active_admin_form.rb +8 -11
  206. data/lib/active_admin/views/components/active_filters_sidebar_content.rb +59 -0
  207. data/lib/active_admin/views/components/attributes_table.rb +6 -5
  208. data/lib/active_admin/views/components/blank_slate.rb +2 -1
  209. data/lib/active_admin/views/components/columns.rb +1 -0
  210. data/lib/active_admin/views/components/dropdown_menu.rb +7 -9
  211. data/lib/active_admin/views/components/index_list.rb +4 -3
  212. data/lib/active_admin/views/components/menu.rb +2 -1
  213. data/lib/active_admin/views/components/menu_item.rb +5 -4
  214. data/lib/active_admin/views/components/paginated_collection.rb +19 -18
  215. data/lib/active_admin/views/components/panel.rb +2 -1
  216. data/lib/active_admin/views/components/scopes.rb +8 -5
  217. data/lib/active_admin/views/components/sidebar.rb +1 -0
  218. data/lib/active_admin/views/components/sidebar_section.rb +1 -0
  219. data/lib/active_admin/views/components/site_title.rb +2 -1
  220. data/lib/active_admin/views/components/status_tag.rb +12 -11
  221. data/lib/active_admin/views/components/table_for.rb +18 -17
  222. data/lib/active_admin/views/components/tabs.rb +4 -3
  223. data/lib/active_admin/views/components/unsupported_browser.rb +1 -0
  224. data/lib/active_admin/views/footer.rb +3 -1
  225. data/lib/active_admin/views/header.rb +3 -2
  226. data/lib/active_admin/views/index_as_block.rb +1 -0
  227. data/lib/active_admin/views/index_as_blog.rb +2 -1
  228. data/lib/active_admin/views/index_as_grid.rb +2 -1
  229. data/lib/active_admin/views/index_as_table.rb +16 -19
  230. data/lib/active_admin/views/pages/base.rb +17 -11
  231. data/lib/active_admin/views/pages/form.rb +1 -0
  232. data/lib/active_admin/views/pages/index.rb +15 -13
  233. data/lib/active_admin/views/pages/layout.rb +1 -0
  234. data/lib/active_admin/views/pages/page.rb +1 -0
  235. data/lib/active_admin/views/pages/show.rb +2 -7
  236. data/lib/active_admin/views/tabbed_navigation.rb +3 -2
  237. data/lib/active_admin/views/title_bar.rb +2 -1
  238. data/lib/active_admin/views.rb +2 -1
  239. data/lib/active_admin.rb +63 -61
  240. data/lib/activeadmin.rb +2 -1
  241. data/lib/generators/active_admin/assets/assets_generator.rb +3 -2
  242. data/lib/generators/active_admin/assets/templates/active_admin.scss +2 -2
  243. data/lib/generators/active_admin/devise/devise_generator.rb +6 -5
  244. data/lib/generators/active_admin/install/install_generator.rb +15 -8
  245. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +27 -3
  246. data/lib/generators/active_admin/install/templates/dashboard.rb +1 -0
  247. data/lib/generators/active_admin/page/page_generator.rb +2 -1
  248. data/lib/generators/active_admin/page/templates/page.rb +1 -0
  249. data/lib/generators/active_admin/resource/resource_generator.rb +4 -3
  250. data/lib/generators/active_admin/webpacker/plugins/jquery.js +7 -0
  251. data/lib/generators/active_admin/webpacker/templates/active_admin.js +5 -0
  252. data/lib/generators/active_admin/webpacker/templates/active_admin.scss +17 -0
  253. data/lib/generators/active_admin/webpacker/templates/print.scss +2 -0
  254. data/lib/generators/active_admin/webpacker/webpacker_generator.rb +27 -0
  255. data/vendor/assets/javascripts/jquery-ui/data.js +12 -8
  256. data/vendor/assets/javascripts/jquery-ui/disable-selection.js +10 -7
  257. data/vendor/assets/javascripts/jquery-ui/focusable.js +12 -9
  258. data/vendor/assets/javascripts/jquery-ui/form-reset-mixin.js +60 -57
  259. data/vendor/assets/javascripts/jquery-ui/form.js +15 -12
  260. data/vendor/assets/javascripts/jquery-ui/ie.js +5 -2
  261. data/vendor/assets/javascripts/jquery-ui/keycode.js +11 -7
  262. data/vendor/assets/javascripts/jquery-ui/labels.js +46 -40
  263. data/vendor/assets/javascripts/jquery-ui/plugin.js +5 -2
  264. data/vendor/assets/javascripts/jquery-ui/position.js +30 -17
  265. data/vendor/assets/javascripts/jquery-ui/safe-active-element.js +6 -2
  266. data/vendor/assets/javascripts/jquery-ui/safe-blur.js +6 -2
  267. data/vendor/assets/javascripts/jquery-ui/scroll-parent.js +10 -7
  268. data/vendor/assets/javascripts/jquery-ui/tabbable.js +11 -8
  269. data/vendor/assets/javascripts/jquery-ui/unique-id.js +10 -7
  270. data/vendor/assets/javascripts/jquery-ui/version.js +6 -3
  271. data/vendor/assets/javascripts/jquery-ui/widget.js +53 -30
  272. data/vendor/assets/javascripts/jquery-ui/widgets/button.js +87 -24
  273. data/vendor/assets/javascripts/jquery-ui/widgets/checkboxradio.js +276 -273
  274. data/vendor/assets/javascripts/jquery-ui/widgets/controlgroup.js +15 -11
  275. data/vendor/assets/javascripts/jquery-ui/widgets/datepicker.js +182 -62
  276. data/vendor/assets/javascripts/jquery-ui/widgets/dialog.js +53 -36
  277. data/vendor/assets/javascripts/jquery-ui/widgets/draggable.js +28 -19
  278. data/vendor/assets/javascripts/jquery-ui/widgets/mouse.js +22 -11
  279. data/vendor/assets/javascripts/jquery-ui/widgets/resizable.js +47 -26
  280. data/vendor/assets/javascripts/jquery-ui/widgets/sortable.js +186 -125
  281. data/vendor/assets/javascripts/jquery-ui/widgets/tabs.js +20 -20
  282. metadata +48 -114
  283. data/docs/.gitignore +0 -1
  284. data/docs/0-installation.md +0 -118
  285. data/docs/1-general-configuration.md +0 -224
  286. data/docs/10-custom-pages.md +0 -150
  287. data/docs/11-decorators.md +0 -59
  288. data/docs/12-arbre-components.md +0 -214
  289. data/docs/13-authorization-adapter.md +0 -285
  290. data/docs/14-gotchas.md +0 -138
  291. data/docs/2-resource-customization.md +0 -466
  292. data/docs/3-index-pages/custom-index.md +0 -35
  293. data/docs/3-index-pages/index-as-block.md +0 -19
  294. data/docs/3-index-pages/index-as-blog.md +0 -69
  295. data/docs/3-index-pages/index-as-grid.md +0 -27
  296. data/docs/3-index-pages/index-as-table.md +0 -234
  297. data/docs/3-index-pages.md +0 -328
  298. data/docs/4-csv-format.md +0 -74
  299. data/docs/5-forms.md +0 -232
  300. data/docs/6-show-pages.md +0 -81
  301. data/docs/7-sidebars.md +0 -75
  302. data/docs/8-custom-actions.md +0 -177
  303. data/docs/9-batch-actions.md +0 -237
  304. data/docs/CNAME +0 -1
  305. data/docs/Gemfile +0 -3
  306. data/docs/Gemfile.lock +0 -248
  307. data/docs/README.md +0 -24
  308. data/docs/_config.yml +0 -4
  309. data/docs/_includes/footer.html +0 -8
  310. data/docs/_includes/google-analytics.html +0 -16
  311. data/docs/_includes/head.html +0 -7
  312. data/docs/_includes/toc.html +0 -98
  313. data/docs/_includes/top-menu.html +0 -17
  314. data/docs/_layouts/default.html +0 -21
  315. data/docs/documentation.md +0 -60
  316. data/docs/images/activeadmin.png +0 -0
  317. data/docs/images/code-header.png +0 -0
  318. data/docs/images/divider.png +0 -0
  319. data/docs/images/features.png +0 -0
  320. data/docs/images/tidelift.svg +0 -14
  321. data/docs/index.html +0 -226
  322. data/docs/stylesheets/main.css +0 -1205
  323. data/lib/active_admin/deprecation.rb +0 -10
  324. data/lib/ransack_ext.rb +0 -20
  325. data/vendor/assets/javascripts/jquery-ui/escape-selector.js +0 -23
  326. /data/app/assets/stylesheets/active_admin/{print.scss → _print.scss} +0 -0
data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb CHANGED
@@ -1,7 +1,7 @@
1
1
  <p>Hello <%= @resource.email %>!</p>
2
2
 
3
- <p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
3
+ <p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
4
4
 
5
5
  <p>Click the link below to unlock your account:</p>
6
6
 
7
- <p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @resource.unlock_token) %></p>
7
+ <p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
data/app/views/active_admin/devise/shared/_links.erb CHANGED
@@ -27,7 +27,7 @@
27
27
  <%- if devise_mapping.omniauthable? %>
28
28
  <%- resource_class.omniauth_providers.each do |provider| %>
29
29
  <%= link_to t('active_admin.devise.links.sign_in_with_omniauth_provider', provider: provider.to_s.titleize),
30
- omniauth_authorize_path(resource_name, provider) %>
30
+ omniauth_authorize_path(resource_name, provider), method: :post %>
31
31
  <br>
32
32
  <% end -%>
33
33
  <% end -%>
data/app/views/active_admin/page/index.html.arb CHANGED
@@ -1 +1,2 @@
1
+ # frozen_string_literal: true
1
2
  insert_tag active_admin_application.view_factory["page"]
data/app/views/active_admin/resource/edit.html.arb CHANGED
@@ -1 +1,2 @@
1
+ # frozen_string_literal: true
1
2
  insert_tag renderer_for(:edit)
data/app/views/active_admin/resource/index.html.arb CHANGED
@@ -1 +1,2 @@
1
+ # frozen_string_literal: true
1
2
  insert_tag renderer_for(:index)
data/app/views/active_admin/resource/new.html.arb CHANGED
@@ -1 +1,2 @@
1
+ # frozen_string_literal: true
1
2
  insert_tag renderer_for(:new)
data/app/views/active_admin/resource/show.html.arb CHANGED
@@ -1 +1,2 @@
1
+ # frozen_string_literal: true
1
2
  insert_tag renderer_for(:show)
data/app/views/layouts/active_admin.html.arb CHANGED
@@ -1 +1,2 @@
1
+ # frozen_string_literal: true
1
2
  insert_tag view_factory.layout
data/app/views/layouts/active_admin_logged_out.html.erb CHANGED
@@ -6,10 +6,18 @@
6
6
  <title><%= [@page_title, ActiveAdmin.application.site_title(self)].compact.join(" | ") %></title>
7
7
 
8
8
  <% ActiveAdmin.application.stylesheets.each do |style, options| %>
9
- <%= stylesheet_link_tag style, options %>
9
+ <% if ActiveAdmin.application.use_webpacker %>
10
+ <%= stylesheet_pack_tag style, **options %>
11
+ <% else %>
12
+ <%= stylesheet_link_tag style, **options %>
13
+ <% end %>
10
14
  <% end %>
11
- <% ActiveAdmin.application.javascripts.each do |path| %>
12
- <%= javascript_include_tag path %>
15
+ <% ActiveAdmin.application.javascripts.each do |path, options| %>
16
+ <% if ActiveAdmin.application.use_webpacker %>
17
+ <%= javascript_pack_tag path, **options %>
18
+ <% else %>
19
+ <%= javascript_include_tag path, **options %>
20
+ <% end %>
13
21
  <% end %>
14
22
 
15
23
  <%= favicon_link_tag ActiveAdmin.application.favicon if ActiveAdmin.application.favicon %>
@@ -18,15 +26,18 @@
18
26
  <%= tag(:meta, name: name, content: content) %>
19
27
  <% end %>
20
28
 
21
- <%= csrf_meta_tag %>
29
+ <%= csrf_meta_tags %>
30
+ <%= csp_meta_tag %>
22
31
  </head>
23
32
  <body class="active_admin logged_out <%= controller.action_name %>">
24
33
  <div id="wrapper">
25
34
 
26
35
  <div id="content_wrapper">
27
- <% flash_messages.each do |type, message| %>
28
- <%= content_tag :div, message, class: "flash flash_#{type}" %>
29
- <% end %>
36
+ <div class="flashes">
37
+ <% flash_messages.each do |type, message| %>
38
+ <%= content_tag :div, message, class: "flash flash_#{type}" %>
39
+ <% end %>
40
+ </div>
30
41
  <div id="active_admin_content">
31
42
  <%= yield %>
32
43
  </div>
data/config/locales/ar.yml CHANGED
@@ -8,7 +8,7 @@ ar:
8
8
  edit: "تعديل"
9
9
  delete: "حذف"
10
10
  delete_confirmation: "هل تريد تأكيد الحذف؟"
11
- new_model: "جديد %{model}"
11
+ new_model: "%{model} جديد"
12
12
  edit_model: "تعديل %{model}"
13
13
  delete_model: "حذف %{model}"
14
14
  details: "تفاصيل %{model}"
@@ -24,13 +24,6 @@ ar:
24
24
  buttons:
25
25
  filter: "تصفية"
26
26
  clear: "تفريغ التصفية"
27
- predicates:
28
- contains: "يحتوي"
29
- equals: "متساوي"
30
- starts_with: "يبدأ بـ"
31
- ends_with: "ينتهي بـ"
32
- greater_than: "أكبر من"
33
- less_than: "أقل من"
34
27
  search_status:
35
28
  headline: "حالات البحث:"
36
29
  current_scope: "المجال:"
@@ -97,12 +90,12 @@ ar:
97
90
  password:
98
91
  title: "كلمة المرور"
99
92
  sign_up:
100
- title: "تسجيل الدخول"
101
- submit: "تسجيل الدخول"
93
+ title: "تسجيل"
94
+ submit: "تسجيل"
102
95
  login:
103
- title: "دخول"
96
+ title: "تسجيل الدخول"
104
97
  remember_me: "تذكرني"
105
- submit: "تسحيل"
98
+ submit: "تسجيل الدخول"
106
99
  reset_password:
107
100
  title: "هل نسيت كلمة المرور؟"
108
101
  submit: "استرجاع كلمة المرور"
@@ -117,7 +110,7 @@ ar:
117
110
  submit: "إعادة ارسال تعليمات التأكيد"
118
111
  links:
119
112
  sign_up: "التسجيل"
120
- sign_in: "دخول"
113
+ sign_in: "تسجيل الدخول"
121
114
  forgot_your_password: "هل نسيت كلمة المرور؟"
122
115
  sign_in_with_omniauth_provider: "تسجيل الدخول بـ %{provider}"
123
116
  resend_unlock_instructions: "إعادة إرسال تعليمات تنشيط الحساب"
data/config/locales/az.yml CHANGED
@@ -24,13 +24,6 @@ az:
24
24
  buttons:
25
25
  filter: "Filtrlə"
26
26
  clear: "Təmizlə"
27
- predicates:
28
- contains: "Yerləşir"
29
- equals: "Bərabərdir"
30
- starts_with: "Başlayır"
31
- ends_with: "Bitir"
32
- greater_than: "böyük"
33
- less_than: "kiçik"
34
27
  search_status:
35
28
  headline: "Axtarışın statusu:"
36
29
  current_scope: "Sahə:"
data/config/locales/bg.yml CHANGED
@@ -24,13 +24,6 @@ bg:
24
24
  buttons:
25
25
  filter: "Филтриране"
26
26
  clear: "Изчистване"
27
- predicates:
28
- contains: "съдържа"
29
- equals: "равно на"
30
- starts_with: "Започва с"
31
- ends_with: "Завършва с"
32
- greater_than: "по-голямо от"
33
- less_than: "по-малко от"
34
27
  status_tag:
35
28
  "yes": "Да"
36
29
  "no": "не"
data/config/locales/bs.yml CHANGED
@@ -24,13 +24,6 @@ bs:
24
24
  buttons:
25
25
  filter: "Filtriraj"
26
26
  clear: "Ukloni filtere"
27
- predicates:
28
- contains: "Sadrži"
29
- equals: "Jednako"
30
- starts_with: "počinje s"
31
- ends_with: "Završava sa"
32
- greater_than: "Veće od"
33
- less_than: "Manje od"
34
27
  status_tag:
35
28
  "yes": "Da"
36
29
  "no": "Nema"
data/config/locales/ca.yml CHANGED
@@ -24,13 +24,6 @@ ca:
24
24
  buttons:
25
25
  filter: "Filtrar"
26
26
  clear: "Treure filtres"
27
- predicates:
28
- contains: "Conté"
29
- equals: "Igual a"
30
- starts_with: "Comença amb"
31
- ends_with: "Acaba amb"
32
- greater_than: "Més gran que"
33
- less_than: "Més petit que"
34
27
  status_tag:
35
28
  "yes": "Sí"
36
29
  "no": "No"
data/config/locales/cs.yml CHANGED
@@ -24,13 +24,6 @@ cs:
24
24
  buttons:
25
25
  filter: "Filtrovat"
26
26
  clear: "Vyčistit filtry"
27
- predicates:
28
- contains: "Obsahuje"
29
- equals: "Odpovídá"
30
- starts_with: "Začíná na"
31
- ends_with: "Končí na"
32
- greater_than: "Větší než"
33
- less_than: "Menší než"
34
27
  status_tag:
35
28
  "yes": "Ano"
36
29
  "no": "Ne"
data/config/locales/da.yml CHANGED
@@ -25,13 +25,6 @@ da:
25
25
  buttons:
26
26
  filter: "Filtrer"
27
27
  clear: "Ryd filtre"
28
- predicates:
29
- contains: "Indeholder"
30
- equals: "Lig"
31
- starts_with: "Begynder med"
32
- ends_with: "Slutter med"
33
- greater_than: "Større end"
34
- less_than: "Mindre end"
35
28
  search_status:
36
29
  headline: "Søgestatus:"
37
30
  current_scope: "Perspektiv:"
data/config/locales/de-CH.yml CHANGED
@@ -24,13 +24,6 @@
24
24
  buttons:
25
25
  filter: "Filtern"
26
26
  clear: "Filter entfernen"
27
- predicates:
28
- contains: "Enthält"
29
- equals: "Gleich"
30
- starts_with: "Beginnt mit"
31
- ends_with: "Endet mit"
32
- greater_than: "Grösser als"
33
- less_than: "Kleiner als"
34
27
  status_tag:
35
28
  "yes": "Ja"
36
29
  "no": "Nicht"
data/config/locales/de.yml CHANGED
@@ -43,14 +43,6 @@ de:
43
43
  filter: "Filtern"
44
44
  clear: "Filter entfernen"
45
45
  predicates:
46
- contains: "Enthält"
47
- equals: "Gleich"
48
- starts_with: "Beginnt mit"
49
- ends_with: "Endet mit"
50
- greater_than: "Größer als"
51
- less_than: "Kleiner als"
52
- gteq_datetime: "Größer gleich"
53
- lteq_datetime: "Kleiner gleich"
54
46
  from: "Von"
55
47
  to: "Bis"
56
48
  scopes:
data/config/locales/el.yml CHANGED
@@ -24,13 +24,6 @@ el:
24
24
  buttons:
25
25
  filter: "Φίλτρα"
26
26
  clear: "Καθαρισμός Φίλτρων"
27
- predicates:
28
- contains: "Περιέχει"
29
- equals: "Είναι ίσο με"
30
- starts_with: "Αρχίζει με"
31
- ends_with: "Καταλήγει σε"
32
- greater_than: "Μεγαλύτερο από"
33
- less_than: "Μικρότερο από"
34
27
  status_tag:
35
28
  "yes": "Ναι"
36
29
  "no": "Όχι"
data/config/locales/en-CA.yml CHANGED
@@ -25,13 +25,6 @@
25
25
  buttons:
26
26
  filter: "Filter"
27
27
  clear: "Clear Filters"
28
- predicates:
29
- contains: "Contains"
30
- equals: "Equals"
31
- starts_with: "Starts with"
32
- ends_with: "Ends with"
33
- greater_than: "Greater than"
34
- less_than: "Less than"
35
28
  search_status:
36
29
  headline: "Search status:"
37
30
  current_scope: "Scope:"
data/config/locales/en-GB.yml CHANGED
@@ -25,13 +25,6 @@
25
25
  buttons:
26
26
  filter: "Filter"
27
27
  clear: "Clear Filters"
28
- predicates:
29
- contains: "Contains"
30
- equals: "Equals"
31
- starts_with: "Starts with"
32
- ends_with: "Ends with"
33
- greater_than: "Greater than"
34
- less_than: "Less than"
35
28
  search_status:
36
29
  headline: "Search status:"
37
30
  current_scope: "Scope:"
data/config/locales/en.yml CHANGED
@@ -43,14 +43,6 @@ en:
43
43
  filter: "Filter"
44
44
  clear: "Clear Filters"
45
45
  predicates:
46
- contains: "Contains"
47
- equals: "Equals"
48
- starts_with: "Starts with"
49
- ends_with: "Ends with"
50
- greater_than: "Greater than"
51
- less_than: "Less than"
52
- gteq_datetime: "Greater or equal to"
53
- lteq_datetime: "Lesser or equal to"
54
46
  from: "From"
55
47
  to: "To"
56
48
  scopes:
data/config/locales/eo.yml CHANGED
@@ -27,14 +27,6 @@ eo:
27
27
  filter: "Filtri"
28
28
  clear: "Viŝi filtrilojn"
29
29
  predicates:
30
- contains: "Enhavas"
31
- equals: "Egalas al"
32
- starts_with: "Komenciĝas per"
33
- ends_with: "Finiĝas per"
34
- greater_than: "Pli grandas ol"
35
- less_than: "Malpli grandas ol"
36
- gteq_datetime: "Pli grandas ol aŭ egalas al"
37
- lteq_datetime: "Malpli grandas ol aŭ egalas al"
38
30
  from: "De"
39
31
  to: "Al"
40
32
  search_status:
data/config/locales/es-MX.yml CHANGED
@@ -24,13 +24,6 @@ es-MX:
24
24
  buttons:
25
25
  filter: "Filtrar"
26
26
  clear: "Quitar Filtros"
27
- predicates:
28
- contains: "Contiene"
29
- equals: "Igual a"
30
- starts_with: "Empieza con"
31
- ends_with: "Termina con"
32
- greater_than: "Mayor que"
33
- less_than: "Menor que"
34
27
  status_tag:
35
28
  "yes": "Sí"
36
29
  "no": "No"
@@ -86,7 +79,8 @@ es-MX:
86
79
  title: "Cambie su contraseña"
87
80
  submit: "Cambiar mi contraseña"
88
81
  links:
89
- sign_in: "Registrarse"
82
+ sign_in: "Iniciar Sesión"
83
+ sign_up: "Registrarse"
90
84
  forgot_your_password: "¿Olvidó su contraseña?"
91
85
  sign_in_with_omniauth_provider: "Conéctate con %{provider}"
92
86
  index_list:
data/config/locales/es.yml CHANGED
@@ -43,14 +43,6 @@ es:
43
43
  filter: "Filtrar"
44
44
  clear: "Quitar Filtros"
45
45
  predicates:
46
- contains: "Contiene"
47
- equals: "Igual a"
48
- starts_with: "Empieza con"
49
- ends_with: "Termina con"
50
- greater_than: "Mayor que"
51
- less_than: "Menor que"
52
- gteq_datetime: "Mayor o igual que"
53
- lteq_datetime: "Menor o igual que"
54
46
  from: "Desde"
55
47
  to: "Hasta"
56
48
  scopes:
@@ -143,8 +135,8 @@ es:
143
135
  title: "Reenviar instrucciones de confirmación"
144
136
  submit: "Reenviar instrucciones de confirmación"
145
137
  links:
146
- sign_up: "Ingresar"
147
- sign_in: "Registrarse"
138
+ sign_up: "Registrarse"
139
+ sign_in: "Iniciar Sesión"
148
140
  forgot_your_password: "¿Olvidó su contraseña?"
149
141
  sign_in_with_omniauth_provider: "Conéctate con %{provider}"
150
142
  resend_unlock_instructions: "Reenviar instrucciones de desbloqueo"
data/config/locales/fa.yml CHANGED
@@ -24,13 +24,6 @@ fa:
24
24
  buttons:
25
25
  filter: "فیلتر"
26
26
  clear: "پاک کردن فیلتر"
27
- predicates:
28
- contains: "شامل"
29
- equals: "برابر با"
30
- starts_with: "شروع با"
31
- ends_with: "پایان با"
32
- greater_than: "بزرگتر از"
33
- less_than: "کوچکتر از"
34
27
  status_tag:
35
28
  "yes": "بله"
36
29
  "no": "بدون"
data/config/locales/fi.yml CHANGED
@@ -24,13 +24,6 @@ fi:
24
24
  buttons:
25
25
  filter: "Hae"
26
26
  clear: "Tyhjennä valinnat"
27
- predicates:
28
- contains: "Sisältää"
29
- equals: "On yhtä kuin"
30
- starts_with: "Alkaa"
31
- ends_with: "Päättyy"
32
- greater_than: "Suurempi kuin"
33
- less_than: "Pienempi kuin"
34
27
  status_tag:
35
28
  "yes": "Kyllä"
36
29
  "no": "Ei"
data/config/locales/fr.yml CHANGED
@@ -26,21 +26,13 @@ fr:
26
26
  filter: "Filtrer"
27
27
  clear: "Supprimer les filtres"
28
28
  predicates:
29
- contains: "Contient"
30
- equals: "Égal à"
31
- starts_with: "Commence par"
32
- ends_with: "Se termine par"
33
- greater_than: "Plus grand que"
34
- less_than: "Plus petit que"
35
- gteq_datetime: "Ultérieur ou égal à"
36
- lteq_datetime: "Antérieur ou égal à"
37
29
  from: "De"
38
30
  to: "À"
39
31
  search_status:
40
32
  headline: "Statut de la recherche :"
41
- current_scope: "Etendu du filtre :"
33
+ current_scope: "Périmètre :"
42
34
  current_filters: "Filtres actuels :"
43
- no_current_filters: "Aucun filtres"
35
+ no_current_filters: "Aucun filtre"
44
36
  status_tag:
45
37
  "yes": "Oui"
46
38
  "no": "Non"
@@ -52,7 +44,7 @@ fr:
52
44
  filters: "Filtres"
53
45
  search_status: "Statut de la recherche"
54
46
  pagination:
55
- empty: "Aucun %{model} trouvé"
47
+ empty: "Aucun(e) %{model} trouvé(e)"
56
48
  one: "Affichage de <b>1</b> %{model}"
57
49
  one_page: "Affichage des <b>%{n}</b> %{model}"
58
50
  multiple: "Affichage de %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> sur un total de <b>%{total}</b>"
data/config/locales/he.yml CHANGED
@@ -25,15 +25,6 @@ he:
25
25
  buttons:
26
26
  filter: "סינון"
27
27
  clear: "איפוס שדות"
28
- predicates:
29
- contains: "מכיל"
30
- equals: "שווה ל"
31
- starts_with: "מתחיל עם"
32
- ends_with: "מסתיים ב"
33
- greater_than: "גדול מ"
34
- less_than: "פחות מ"
35
- gteq_datetime: "אחרי או בתאריך"
36
- lteq_datetime: "לפני או בתאריך"
37
28
  search_status:
38
29
  headline: "תוצאות חיפוש:"
39
30
  current_scope: "תחום:"
data/config/locales/hr.yml CHANGED
@@ -24,13 +24,6 @@ hr:
24
24
  buttons:
25
25
  filter: "Filtriraj"
26
26
  clear: "Očisti filtere"
27
- predicates:
28
- contains: "Sadrži"
29
- equals: "Jednako"
30
- starts_with: "počinje s"
31
- ends_with: "Završava sa"
32
- greater_than: "Veće od"
33
- less_than: "Manje od"
34
27
  status_tag:
35
28
  "yes": "Da"
36
29
  "no": "Nema"
data/config/locales/hu.yml CHANGED
@@ -25,14 +25,6 @@ hu:
25
25
  filter: "Szűrés"
26
26
  clear: "Feltételek törlése"
27
27
  predicates:
28
- contains: "Tartalmazza"
29
- equals: "Pontosan"
30
- starts_with: "kezdődik"
31
- ends_with: "végződik"
32
- greater_than: "Nagyobb, mint"
33
- less_than: "Kisebb, mint"
34
- gteq_datetime: "Nagyobb vagy egyenlő, mint"
35
- lteq_datetime: "Kisebb vagy egyenlő, mint"
36
28
  from: "-tól"
37
29
  to: "-ig"
38
30
  status_tag:
data/config/locales/id.yml CHANGED
@@ -24,13 +24,6 @@ id:
24
24
  buttons:
25
25
  filter: "Filter"
26
26
  clear: "Hapus Filters"
27
- predicates:
28
- contains: "Mengandung"
29
- equals: "Sama dengan"
30
- starts_with: "Diawali dengan"
31
- ends_with: "Diakhiri dengan"
32
- greater_than: "Lebih besar dari"
33
- less_than: "Lebih kecil dari"
34
27
  search_status:
35
28
  headline: "Status Pencarian:"
36
29
  current_scope: "Scope:"
data/config/locales/it.yml CHANGED
@@ -1,4 +1,20 @@
1
1
  it:
2
+ activerecord:
3
+ models:
4
+ comment:
5
+ one: "Commento"
6
+ other: "Commenti"
7
+ active_admin/comment:
8
+ one: "Commento"
9
+ other: "Commenti"
10
+ attributes:
11
+ active_admin/comment:
12
+ author_type: "Tipo di Autore"
13
+ body: "Corpo"
14
+ created_at: "Creato il"
15
+ namespace: "Namespace"
16
+ resource_type: "Tipo di risorsa"
17
+ updated_at: "Aggiornato il"
2
18
  active_admin:
3
19
  dashboard: Dashboard
4
20
  dashboard_welcome:
@@ -27,16 +43,10 @@ it:
27
43
  filter: "Filtra"
28
44
  clear: "Rimuovi filtri"
29
45
  predicates:
30
- contains: "Contiene"
31
- equals: "Uguale a"
32
- starts_with: "Inizia con"
33
- ends_with: "Finisce con"
34
- greater_than: "Maggiore di"
35
- less_than: "Minore di"
36
- gteq_datetime: "Maggiore o uguale a"
37
- lteq_datetime: "Minore o uguale a"
38
46
  from: "Da"
39
47
  to: "A"
48
+ scopes:
49
+ all: "Tutti"
40
50
  search_status:
41
51
  headline: "Situazione filtri:"
42
52
  current_scope: "Contesto selezionato:"
data/config/locales/ja.yml CHANGED
@@ -8,7 +8,7 @@ ja:
8
8
  edit: "編集"
9
9
  delete: "削除"
10
10
  delete_confirmation: "本当に削除しますか？"
11
- create_another: "%{model} を追加する"
11
+ create_another: "%{model} を続けて作成する"
12
12
  new_model: "%{model} を作成する"
13
13
  edit_model: "%{model} を編集する"
14
14
  delete_model: "%{model} を削除する"
@@ -18,7 +18,7 @@ ja:
18
18
  previous: "前"
19
19
  next: "次"
20
20
  download: "ダウンロード:"
21
- has_many_new: "新規に %{model} を追加する"
21
+ has_many_new: "%{model} を追加する"
22
22
  has_many_delete: "削除する"
23
23
  has_many_remove: "削除する"
24
24
  filters:
@@ -26,14 +26,6 @@ ja:
26
26
  filter: "絞り込む"
27
27
  clear: "条件を削除する"
28
28
  predicates:
29
- contains: "含まれています"
30
- equals: "等しい"
31
- starts_with: "で始まる"
32
- ends_with: "で終わる"
33
- greater_than: "より大きい"
34
- less_than: "より小さい"
35
- gteq_datetime: "以上"
36
- lteq_datetime: "以下"
37
29
  from: "開始"
38
30
  to: "終了"
39
31
  search_status:
data/config/locales/ko.yml CHANGED
@@ -24,13 +24,6 @@ ko:
24
24
  buttons:
25
25
  filter: "필터"
26
26
  clear: "필터 초기화"
27
- predicates:
28
- contains: "포함하는 문구"
29
- equals: "일치하는 문구"
30
- starts_with: "시작하는 문구"
31
- ends_with: "종료하는 문구"
32
- greater_than: "초과"
33
- less_than: "미만"
34
27
  search_status:
35
28
  headline: "검색 상태:"
36
29
  current_scope: "검색 범위:"
@@ -69,7 +62,7 @@ ko:
69
62
  one: "성공적으로 1개 %{model}을/를 삭제하였습니다"
70
63
  other: "성공적으로 %{count}개의 %{plural_model}을/를 삭제하였습니다"
71
64
  selection_toggle_explanation: "(선택 항목 바꾸기)"
72
- action_label: "%{title} 선택됨"
65
+ action_label: "선택한 항목 %{title}"
73
66
  labels:
74
67
  destroy: "삭제"
75
68
  comments:
data/config/locales/lt.yml CHANGED
@@ -25,14 +25,6 @@ lt:
25
25
  filter: 'Filtras'
26
26
  clear: 'Išvalyti filtrus'
27
27
  predicates:
28
- contains: "Sudėtyje yra"
29
- equals: 'lygus'
30
- starts_with: "Prasideda nuo"
31
- ends_with: "Baigiasi"
32
- greater_than: 'didesnis nei'
33
- less_than: 'mažiau nei'
34
- gteq_datetime: "daugiau arba lygu nei"
35
- lteq_datetime: "mažiau arba lygu nei"
36
28
  from: "Nuo"
37
29
  to: "Iki"
38
30
  search_status:
data/config/locales/lv.yml CHANGED
@@ -24,13 +24,6 @@ lv:
24
24
  buttons:
25
25
  filter: "Filtrēt"
26
26
  clear: "Novākt filtrus"
27
- predicates:
28
- contains: "Satur"
29
- equals: "Vienāds ar"
30
- starts_with: "Sākas ar"
31
- ends_with: "Beidzas ar"
32
- greater_than: "Lielāks par"
33
- less_than: "Mazāks par"
34
27
  status_tag:
35
28
  "yes": "Jā"
36
29
  "no": "Nē"
data/config/locales/mk.yml CHANGED
@@ -35,14 +35,6 @@ mk:
35
35
  filter: "Пребарај"
36
36
  clear: "Исчисти филтри"
37
37
  predicates:
38
- contains: "Содржи"
39
- equals: "Е еднакво со"
40
- starts_with: "Започнува со"
41
- ends_with: "Завршува сo"
42
- greater_than: "Е поголемо од"
43
- less_than: "Е помало од"
44
- gteq_datetime: "Е поголемо или еднакво со"
45
- lteq_datetime: "Е помало или еднакво со"
46
38
  from: "Од"
47
39
  to: "До"
48
40
  search_status: