activeadmin 2.9.0 → 3.2.0

data/app/assets/stylesheets/active_admin/_forms.scss

@@ -171,7 +171,7 @@ form {
     &.boolean {
       min-height: 1.1em;
       label {
-        width: 80%;
+        width: 100%;
         padding-left:20%;
         padding-right: 10px;
         text-transform: none !important;
@@ -250,8 +250,6 @@ form {
 
 // -------------------------------------- Sidebar Forms
 
-$sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
-
 .sidebar_section {
 
   label {
@@ -274,13 +272,6 @@ $sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
 
 // -------------------------------------- Filter Forms
 
-$filter-field-seperator-width: 12px;
-
-$side-by-side-filter-input-width: ($sidebar-inner-content-width / 2) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
-$side-by-side-filter-select-width: ($sidebar-inner-content-width / 2) - $filter-field-seperator-width;
-
-$date-range-filter-input-width: ($sidebar-inner-content-width / 2) - ($filter-field-seperator-width / 2);
-
 form.filter_form {
   .filter_form_field {
     margin-bottom: 10px;
@@ -313,7 +304,6 @@ form.filter_form {
 
     &.filter_date_range {
       input[type=text] {
-        box-sizing: border-box;
         width: $date-range-filter-input-width;
 
         + input {

data/app/assets/stylesheets/active_admin/_normalize.scss

@@ -1,17 +1,15 @@
-/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 
 /* Document
    ========================================================================== */
 
 /**
  * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in
- *    IE on Windows Phone and in iOS.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
  */
 
 html {
   line-height: 1.15; /* 1 */
-  -ms-text-size-adjust: 100%; /* 2 */
   -webkit-text-size-adjust: 100%; /* 2 */
 }
 
@@ -19,7 +17,7 @@ html {
    ========================================================================== */
 
 /**
- * Remove the margin in all browsers (opinionated).
+ * Remove the margin in all browsers.
  */
 
 body {
@@ -27,15 +25,10 @@ body {
 }
 
 /**
- * Add the correct display in IE 9-.
+ * Render the `main` element consistently in IE.
  */
 
-article,
-aside,
-footer,
-header,
-nav,
-section {
+main {
   display: block;
 }
 
@@ -52,25 +45,6 @@ h1 {
 /* Grouping content
    ========================================================================== */
 
-/**
- * Add the correct display in IE 9-.
- * 1. Add the correct display in IE.
- */
-
-figcaption,
-figure,
-main { /* 1 */
-  display: block;
-}
-
-/**
- * Add the correct margin in IE 8.
- */
-
-figure {
-  margin: 1em 40px;
-}
-
 /**
  * 1. Add the correct box sizing in Firefox.
  * 2. Show the overflow in Edge and IE.
@@ -96,17 +70,15 @@ pre {
    ========================================================================== */
 
 /**
- * 1. Remove the gray background on active links in IE 10.
- * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
+ * Remove the gray background on active links in IE 10.
  */
 
 a {
-  background-color: transparent; /* 1 */
-  -webkit-text-decoration-skip: objects; /* 2 */
+  background-color: transparent;
 }
 
 /**
- * 1. Remove the bottom border in Chrome 57- and Firefox 39-.
+ * 1. Remove the bottom border in Chrome 57-
  * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
  */
 
@@ -116,15 +88,6 @@ abbr[title] {
   text-decoration: underline dotted; /* 2 */
 }
 
-/**
- * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
- */
-
-b,
-strong {
-  font-weight: inherit;
-}
-
 /**
  * Add the correct font weight in Chrome, Edge, and Safari.
  */
@@ -146,23 +109,6 @@ samp {
   font-size: 1em; /* 2 */
 }
 
-/**
- * Add the correct font style in Android 4.3-.
- */
-
-dfn {
-  font-style: italic;
-}
-
-/**
- * Add the correct background and color in IE 9-.
- */
-
-mark {
-  background-color: #ff0;
-  color: #000;
-}
-
 /**
  * Add the correct font size in all browsers.
  */
@@ -196,44 +142,18 @@ sup {
    ========================================================================== */
 
 /**
- * Add the correct display in IE 9-.
- */
-
-audio,
-video {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in iOS 4-7.
- */
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-/**
- * Remove the border on images inside links in IE 10-.
+ * Remove the border on images inside links in IE 10.
  */
 
 img {
   border-style: none;
 }
 
-/**
- * Hide the overflow in IE.
- */
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
 /* Forms
    ========================================================================== */
 
 /**
- * 1. Change the font styles in all browsers (opinionated).
+ * 1. Change the font styles in all browsers.
  * 2. Remove the margin in Firefox and Safari.
  */
 
@@ -242,7 +162,7 @@ input,
 optgroup,
 select,
 textarea {
-  font-family: sans-serif; /* 1 */
+  font-family: inherit; /* 1 */
   font-size: 100%; /* 1 */
   line-height: 1.15; /* 1 */
   margin: 0; /* 2 */
@@ -269,16 +189,14 @@ select { /* 1 */
 }
 
 /**
- * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
- *    controls in Android 4.
- * 2. Correct the inability to style clickable types in iOS and Safari.
+ * Correct the inability to style clickable types in iOS and Safari.
  */
 
 button,
-html [type="button"], /* 1 */
+[type="button"],
 [type="reset"],
 [type="submit"] {
-  -webkit-appearance: button; /* 2 */
+  -webkit-appearance: button;
 }
 
 /**
@@ -329,17 +247,15 @@ legend {
 }
 
 /**
- * 1. Add the correct display in IE 9-.
- * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
  */
 
 progress {
-  display: inline-block; /* 1 */
-  vertical-align: baseline; /* 2 */
+  vertical-align: baseline;
 }
 
 /**
- * Remove the default vertical scrollbar in IE.
+ * Remove the default vertical scrollbar in IE 10+.
  */
 
 textarea {
@@ -347,8 +263,8 @@ textarea {
 }
 
 /**
- * 1. Add the correct box sizing in IE 10-.
- * 2. Remove the padding in IE 10-.
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
  */
 
 [type="checkbox"],
@@ -377,10 +293,9 @@ textarea {
 }
 
 /**
- * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
+ * Remove the inner padding in Chrome and Safari on macOS.
  */
 
-[type="search"]::-webkit-search-cancel-button,
 [type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
@@ -399,12 +314,10 @@ textarea {
    ========================================================================== */
 
 /*
- * Add the correct display in IE 9-.
- * 1. Add the correct display in Edge, IE, and Firefox.
+ * Add the correct display in Edge, IE 10+, and Firefox.
  */
 
-details, /* 1 */
-menu {
+details {
   display: block;
 }
 
@@ -416,30 +329,19 @@ summary {
   display: list-item;
 }
 
-/* Scripting
+/* Misc
    ========================================================================== */
 
 /**
- * Add the correct display in IE 9-.
- */
-
-canvas {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in IE.
+ * Add the correct display in IE 10+.
  */
 
 template {
   display: none;
 }
 
-/* Hidden
-   ========================================================================== */
-
 /**
- * Add the correct display in IE 10-.
+ * Add the correct display in IE 10.
  */
 
 [hidden] {

data/app/assets/stylesheets/active_admin/components/_date_picker.scss

@@ -17,11 +17,10 @@
   }
 
   .ui-datepicker-header {
-    height: 14px;
     @include primary-gradient;
     padding: 12px 5px 7px 4px;
     margin: 0px 0px 2px 2px;
-    width: 147px;
+    width: 156px;
     border-top-left-radius: 7px;
     border-top-right-radius: 7px;
     position: relative;

data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss

@@ -106,7 +106,6 @@
       li {
         display: block;
         border-bottom: solid 1px #ebebeb;
-        box-sizing: border-box;
 
         a {
           display: block;

data/app/assets/stylesheets/active_admin/mixins/_variables.scss

@@ -40,3 +40,12 @@ $text-input-horizontal-padding: 10px !default;
 $text-input-total-padding: $text-input-horizontal-padding * 2 + $border-width * 2;
 
 $blank-slate-border: 1px dashed #DADADA !default;
+
+// Sidebar Forms
+$sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
+
+// Filter Forms
+$filter-field-seperator-width: 12px !default;
+$side-by-side-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
+$side-by-side-filter-select-width: ($sidebar-inner-content-width * 0.5) - $filter-field-seperator-width;
+$date-range-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($filter-field-seperator-width * 0.5);

data/app/assets/stylesheets/active_admin/structure/_footer.scss

@@ -9,6 +9,11 @@
 }
 
 // -------------------------------------- Index Footer (Under Table)
-#index_footer { padding-top: 5px; text-align: right; font-size: 0.85em; }
+#index_footer {
+  @include clearfix;
+  padding-top: 5px;
+  text-align: right;
+  font-size: 0.85em;
+}
 
 .index_content { clear: both; }

data/app/assets/stylesheets/active_admin/structure/_title_bar.scss

@@ -1,7 +1,6 @@
 #title_bar {
   @include section-header;
   @include clearfix;
-  box-sizing: border-box;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.37);
   display: table;
   border-bottom-color: #EEE;

data/app/javascript/active_admin/initializers/has-many.js

@@ -57,7 +57,6 @@ $(function() {
     recompute_positions($(this).closest('.has_many'));
   });
 
-  init_sortable();
   $(document).on('has_many_add:after', '.has_many_container', init_sortable);
 });
 
@@ -93,3 +92,7 @@ var recompute_positions = function(parent){
     }
   });
 };
+
+$(document).
+  ready(init_sortable).
+  on('page:load turbolinks:load', init_sortable);

data/app/views/active_admin/devise/shared/_links.erb

@@ -27,7 +27,7 @@
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
     <%= link_to t('active_admin.devise.links.sign_in_with_omniauth_provider', provider: provider.to_s.titleize),
-          omniauth_authorize_path(resource_name, provider) %>
+          omniauth_authorize_path(resource_name, provider), method: :post %>
     <br>
   <% end -%>
 <% end -%>

data/app/views/active_admin/page/index.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag active_admin_application.view_factory["page"]

data/app/views/active_admin/resource/edit.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:edit)

data/app/views/active_admin/resource/index.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:index)

data/app/views/active_admin/resource/new.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:new)

data/app/views/active_admin/resource/show.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:show)

data/app/views/layouts/active_admin.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag view_factory.layout

data/app/views/layouts/active_admin_logged_out.html.erb

@@ -12,11 +12,11 @@
       <%= stylesheet_link_tag style, **options %>
     <% end %>
   <% end %>
-  <% ActiveAdmin.application.javascripts.each do |path| %>
+  <% ActiveAdmin.application.javascripts.each do |path, options| %>
     <% if ActiveAdmin.application.use_webpacker %>
-      <%= javascript_pack_tag path %>
+      <%= javascript_pack_tag path, **options %>
     <% else %>
-      <%= javascript_include_tag path %>
+      <%= javascript_include_tag path, **options %>
     <% end %>
   <% end %>
 
@@ -26,7 +26,8 @@
     <%= tag(:meta, name: name, content: content) %>
   <% end %>
 
-  <%= csrf_meta_tag %>
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
 </head>
 <body class="active_admin logged_out <%= controller.action_name %>">
 <div id="wrapper">

data/config/locales/ar.yml

@@ -24,13 +24,6 @@ ar:
       buttons:
         filter: "تصفية"
         clear: "تفريغ التصفية"
-      predicates:
-        contains: "يحتوي"
-        equals: "متساوي"
-        starts_with: "يبدأ بـ"
-        ends_with: "ينتهي بـ"
-        greater_than: "أكبر من"
-        less_than: "أقل من"
     search_status:
       headline: "حالات البحث:"
       current_scope: "المجال:"

data/config/locales/az.yml

@@ -24,13 +24,6 @@ az:
       buttons:
         filter: "Filtrlə"
         clear: "Təmizlə"
-      predicates:
-        contains: "Yerləşir"
-        equals: "Bərabərdir"
-        starts_with: "Başlayır"
-        ends_with: "Bitir"
-        greater_than: "böyük"
-        less_than: "kiçik"
     search_status:
       headline: "Axtarışın statusu:"
       current_scope: "Sahə:"

data/config/locales/bg.yml

@@ -24,13 +24,6 @@ bg:
       buttons:
         filter: "Филтриране"
         clear: "Изчистване"
-      predicates:
-        contains: "съдържа"
-        equals: "равно на"
-        starts_with: "Започва с"
-        ends_with: "Завършва с"
-        greater_than: "по-голямо от"
-        less_than: "по-малко от"
     status_tag:
       "yes": "Да"
       "no": "не"

data/config/locales/bs.yml

@@ -24,13 +24,6 @@ bs:
       buttons:
         filter: "Filtriraj"
         clear: "Ukloni filtere"
-      predicates:
-        contains: "Sadrži"
-        equals: "Jednako"
-        starts_with: "počinje s"
-        ends_with: "Završava sa"
-        greater_than: "Veće od"
-        less_than: "Manje od"
     status_tag:
       "yes": "Da"
       "no": "Nema"

data/config/locales/ca.yml

@@ -24,13 +24,6 @@ ca:
       buttons:
         filter: "Filtrar"
         clear: "Treure filtres"
-      predicates:
-        contains: "Conté"
-        equals: "Igual a"
-        starts_with: "Comença amb"
-        ends_with: "Acaba amb"
-        greater_than: "Més gran que"
-        less_than: "Més petit que"
     status_tag:
       "yes": "Sí"
       "no": "No"

data/config/locales/cs.yml

@@ -24,13 +24,6 @@ cs:
       buttons:
         filter: "Filtrovat"
         clear: "Vyčistit filtry"
-      predicates:
-        contains: "Obsahuje"
-        equals: "Odpovídá"
-        starts_with: "Začíná na"
-        ends_with: "Končí na"
-        greater_than: "Větší než"
-        less_than: "Menší než"
     status_tag:
       "yes": "Ano"
       "no": "Ne"

data/config/locales/da.yml

@@ -25,13 +25,6 @@ da:
       buttons:
         filter: "Filtrer"
         clear: "Ryd filtre"
-      predicates:
-        contains: "Indeholder"
-        equals: "Lig"
-        starts_with: "Begynder med"
-        ends_with: "Slutter med"
-        greater_than: "Større end"
-        less_than: "Mindre end"
     search_status:
       headline: "Søgestatus:"
       current_scope: "Perspektiv:"

data/config/locales/de-CH.yml

@@ -24,13 +24,6 @@
       buttons:
         filter: "Filtern"
         clear: "Filter entfernen"
-      predicates:
-        contains: "Enthält"
-        equals: "Gleich"
-        starts_with: "Beginnt mit"
-        ends_with: "Endet mit"
-        greater_than: "Grösser als"
-        less_than: "Kleiner als"
     status_tag:
       "yes": "Ja"
       "no": "Nicht"

data/config/locales/de.yml

@@ -43,14 +43,6 @@ de:
         filter: "Filtern"
         clear: "Filter entfernen"
       predicates:
-        contains: "Enthält"
-        equals: "Gleich"
-        starts_with: "Beginnt mit"
-        ends_with: "Endet mit"
-        greater_than: "Größer als"
-        less_than: "Kleiner als"
-        gteq_datetime: "Größer gleich"
-        lteq_datetime: "Kleiner gleich"
         from: "Von"
         to: "Bis"
     scopes:

data/config/locales/el.yml

@@ -24,13 +24,6 @@ el:
       buttons:
         filter: "Φίλτρα"
         clear: "Καθαρισμός Φίλτρων"
-      predicates:
-        contains: "Περιέχει"
-        equals: "Είναι ίσο με"
-        starts_with: "Αρχίζει με"
-        ends_with: "Καταλήγει σε"
-        greater_than: "Μεγαλύτερο από"
-        less_than: "Μικρότερο από"
     status_tag:
       "yes": "Ναι"
       "no": "Όχι"

data/config/locales/en-CA.yml

@@ -25,13 +25,6 @@
       buttons:
         filter: "Filter"
         clear: "Clear Filters"
-      predicates:
-        contains: "Contains"
-        equals: "Equals"
-        starts_with: "Starts with"
-        ends_with: "Ends with"
-        greater_than: "Greater than"
-        less_than: "Less than"
     search_status:
       headline: "Search status:"
       current_scope: "Scope:"

data/config/locales/en-GB.yml

@@ -25,13 +25,6 @@
       buttons:
         filter: "Filter"
         clear: "Clear Filters"
-      predicates:
-        contains: "Contains"
-        equals: "Equals"
-        starts_with: "Starts with"
-        ends_with: "Ends with"
-        greater_than: "Greater than"
-        less_than: "Less than"
     search_status:
       headline: "Search status:"
       current_scope: "Scope:"

data/config/locales/en.yml

@@ -43,14 +43,6 @@ en:
         filter: "Filter"
         clear: "Clear Filters"
       predicates:
-        contains: "Contains"
-        equals: "Equals"
-        starts_with: "Starts with"
-        ends_with: "Ends with"
-        greater_than: "Greater than"
-        less_than: "Less than"
-        gteq_datetime: "Greater or equal to"
-        lteq_datetime: "Lesser or equal to"
         from: "From"
         to: "To"
     scopes: