activeadmin 2.2.0 → 2.12.0

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

@@ -1,5 +1,3 @@
-//= depend_on_asset "active_admin/nested_menu_arrow.gif"
-//= depend_on_asset "active_admin/nested_menu_arrow_dark.gif"
 // ----------------------------------- Header
 #header {
   @include primary-gradient;
@@ -54,6 +52,11 @@
     margin: 0;
     padding: 0;
 
+    li {
+      /* Hover on li, display the ul */
+      &:hover > ul { display: block;}
+    }
+
     & > li {
       display: inline-block;
       margin-right: 4px;
@@ -75,12 +78,12 @@
       }
 
       &.has_nested > a {
-        background: image-url('active_admin/nested_menu_arrow.gif') no-repeat calc(100% - 7px) 50%;
+        background: url($menu-arrow-light-icon-url) no-repeat calc(100% - 7px) 50%;
         padding-right: 20px;
       }
 
       &.has_nested.current > a {
-        background: $current-menu-item-background image-url('active_admin/nested_menu_arrow_dark.gif') no-repeat calc(100% - 7px) 50%;
+        background: $current-menu-item-background url($menu-arrow-dark-icon-url) no-repeat calc(100% - 7px) 50%;
         padding-right: 20px;
       }
 
@@ -92,13 +95,11 @@
       &.has_nested:hover > a {
         @include rounded-top(10px);
         border-bottom: 5px solid $hover-menu-item-background;
-        background: $hover-menu-item-background image-url('active_admin/nested_menu_arrow_dark.gif') no-repeat calc(100% - 7px) 50%;
+        background: $hover-menu-item-background url($menu-arrow-dark-icon-url) no-repeat calc(100% - 7px) 50%;
         z-index: 1020;
       }
 
 
-      /* Hover on li, display the ul */
-      &:hover ul { display: block;}
       /* Drop down menus */
       ul {
         background: $hover-menu-item-background;
@@ -116,6 +117,7 @@
         z-index: 1010;
 
         li {
+          position: relative;
           margin: 0px;
           a {
             background: none;
@@ -126,10 +128,40 @@
           &.current {
             a { @include rounded(0) }
           }
+
+          &.has_nested > a {
+            background: url($menu-arrow-right-light-icon-url) no-repeat calc(100% - 7px) 55%;
+            padding-right: 20px;
+          }
+
+          &.has_nested:hover > a {
+            background: url($menu-arrow-right-dark-icon-url) no-repeat calc(100% - 7px) 55%;
+            color: #fff;
+          }
+
+          ul {
+            @include rounded-all(10px,10px,10px,10px);
+            margin-top: 0;
+            top: -3px;
+            left: 100%;
+
+            /* Create an invisible backdrop that adds 8px margin around the dropdown menu or submenu
+               that maintains the hover. This makes it much easier to navigate to submenus in
+               particular without losing hover accientally, especially near rounded corners. */
+            &:after {
+              content: "";
+              display: block;
+              position: absolute;
+              top: -8px;
+              left: -8px;
+              height: calc(100% + 16px);
+              width: calc(100% + 16px);
+              z-index: -2;
+            }
+          }
         }
       }
     }
-
   }
 
   #tabs {

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

@@ -1 +1 @@
-@import "active_admin/mixins/all";
+@import "./mixins/all";

data/{vendor → 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/{print.scss → _print.scss}

@@ -5,10 +5,10 @@ $primary-color: black;
 $text-color: black;
 
 // Normalize
-@import "active_admin/normalize";
+@import "./normalize";
 
 // Partials
-@import "active_admin/typography";
+@import "./typography";
 
 body {
   font-family: Helvetica, Arial, sans-serif;

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

@@ -2,9 +2,9 @@
 .comments {
 
   .active_admin_comment {
-    clear: both;
+    @include clearfix;
     margin-top: 10px;
-    margin-bottom: 40px;
+    margin-bottom: 20px;
     max-width: 700px;
 
     .active_admin_comment_meta {

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/components/_tables.scss

@@ -1,4 +1,3 @@
-//= depend_on_asset "active_admin/orderable.png"
 // ----------------------------------- Tables
 
 table tr {
@@ -33,7 +32,7 @@ table.index_table {
     }
 
     &.sortable a {
-      background: image-url('active_admin/orderable.png') no-repeat 0 4px; padding-left: 13px;
+      background: url($orderable-icon-url) no-repeat 0 4px; padding-left: 13px;
     }
 
     &.sorted-asc a { background-position: 0 -27px; }

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

@@ -1,8 +1,8 @@
-@import "active_admin/mixins/variables";
-@import "active_admin/mixins/gradients";
-@import "active_admin/mixins/shadows";
-@import "active_admin/mixins/rounded";
-@import "active_admin/mixins/buttons";
-@import "active_admin/mixins/sections";
-@import "active_admin/mixins/utilities";
-@import "active_admin/mixins/typography";
+@import "./variables";
+@import "./gradients";
+@import "./shadows";
+@import "./rounded";
+@import "./buttons";
+@import "./sections";
+@import "./utilities";
+@import "./typography";

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

@@ -2,6 +2,14 @@
 // They can be overridden by prepending your own
 // to 'app/assets/stylesheets/active_admin.scss'.
 
+// Images
+$menu-arrow-light-icon-url: 'data:image/png;base64,R0lGODlhBwAEAKIAAL6+vry8vIiIiJWVlf///3t7ewAAAAAAACH5BAEAAAUALAAAAAAHAAQAAAMLWLol80MoF5mQKgEAOw==' !default;
+$menu-arrow-dark-icon-url: 'data:image/png;base64,R0lGODlhBwAEAKIAAG1tbWxsbElJSVBQUP///0JCQgAAAAAAACH5BAEAAAUALAAAAAAHAAQAAAMLWLol80MoF5mQKgEAOw==' !default;
+$menu-arrow-right-light-icon-url: 'data:image/gif;base64,R0lGODlhBAAHAKECAKqqqszMzPkVFfkVFSH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAAIALAAAAAAEAAcAAAIJlA0XKbH9nmAFADs=' !default;
+$menu-arrow-right-dark-icon-url: 'data:image/gif;base64,R0lGODlhBAAHAMIEAG1tbWxsbElJSVBQUPkVFfkVFfkVFfkVFSH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAAEALAAAAAAEAAcAAAMKGKqy02G8OGeACQA7' !default;
+
+$orderable-icon-url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAABGCAYAAAAAVo4aAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAH5JREFUeNpi3LhlOwMU1AExGxDXwARYoHQLEFdD2cxAXAliMKFJgEAFEHfBJEHGMKLhMpgkTsAEdch/NNwCk2xCdiEQtML4LEgCf6EubUX3Cgh0oNvJ+P//f7wOGpUclRwYSZb41CyidNbB8giNM+9oXhmVHHm5bJjUSAABBgDKKiwMMUxPwgAAAABJRU5ErkJggg==' !default;
+
 // Colors
 $body-background-color: #FFF !default;
 $primary-color: #5E6469 !default;
@@ -32,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/_main_structure.scss

@@ -15,7 +15,7 @@
     width: 100%;
 
     #main_content{
-      margin-right: 300px;
+      margin-right: $sidebar-width + ($section-padding * 2);
     }
   }
 

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/base.js

@@ -0,0 +1,28 @@
+import "jquery"
+import "jquery-ui/ui/widgets/datepicker"
+import "jquery-ui/ui/widgets/dialog"
+import "jquery-ui/ui/widgets/sortable"
+import "jquery-ui/ui/widgets/tabs"
+import "jquery-ui/ui/widget"
+import "jquery-ujs"
+
+import "./ext/jquery"
+import "./ext/jquery-ui"
+import "./initializers/batch-actions"
+import "./initializers/checkbox-toggler"
+import "./initializers/datepicker"
+import "./initializers/dropdown-menu"
+import "./initializers/filters"
+import "./initializers/has-many"
+import "./initializers/per-page"
+import "./initializers/table-checkbox-toggler"
+import "./initializers/tabs"
+
+import ModalDialog from "./lib/modal-dialog";
+
+function modal_dialog(message, inputs, callback) {
+  console.warn("ActiveAdmin.modal_dialog is deprecated in favor of ActiveAdmin.ModalDialog, please update usage.");
+  return ModalDialog(message, inputs, callback);
+}
+
+export { ModalDialog, modal_dialog };

data/app/{assets/javascripts/active_admin/lib/batch_actions.es6 → javascript/active_admin/initializers/batch-actions.js}

@@ -1,14 +1,20 @@
+import ModalDialog from "../lib/modal-dialog";
+
 const onDOMReady = function() {
+  // Detach any previously attached handlers before re-attaching them.
+  // This avoids double-registered handlers when Turbolinks is enabled
+  $('.batch_actions_selector li a').off('click confirm:complete');
+
   //
-  // Use ActiveAdmin.modal_dialog to prompt user if
+  // Use ModalDialog to prompt user if
   // confirmation is required for current Batch Action
   //
-  $('.batch_actions_selector li a').click(function(event){
+  $('.batch_actions_selector li a').on('click', function(event){
     let message;
     event.stopPropagation(); // prevent Rails UJS click event
     event.preventDefault();
     if ((message = $(this).data('confirm'))) {
-      ActiveAdmin.modal_dialog(message, $(this).data('inputs'), inputs => {
+      ModalDialog(message, $(this).data('inputs'), inputs => {
         $(this).trigger('confirm:complete', inputs);
       });
     } else {

data/app/javascript/active_admin/initializers/checkbox-toggler.js

@@ -0,0 +1,3 @@
+import CheckboxToggler from "../lib/checkbox-toggler";
+
+$.widget.bridge('checkboxToggler', CheckboxToggler);

data/app/javascript/active_admin/initializers/dropdown-menu.js

@@ -0,0 +1,9 @@
+import DropdownMenu from "../lib/dropdown-menu";
+
+$.widget.bridge('aaDropdownMenu', DropdownMenu);
+
+const onDOMReady = () => $('.dropdown_menu').aaDropdownMenu();
+
+$(document).
+  ready(onDOMReady).
+  on('page:load turbolinks:load', onDOMReady);

data/app/javascript/active_admin/initializers/filters.js

@@ -0,0 +1,10 @@
+import Filters from '../lib/filters';
+
+(($) => {
+
+  $(document).
+    on('click', '.clear_filters_btn', Filters._clearForm).
+    on('submit', '.filter_form', Filters._disableEmptyInputFields).
+    on('change', '.filter_form_field.select_and_search select', Filters._setSearchType);
+
+})(jQuery);

data/app/{assets/javascripts/active_admin/lib/has_many.es6 → 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/javascript/active_admin/initializers/per-page.js

@@ -0,0 +1,13 @@
+import PerPage from "../lib/per-page";
+
+(($) => {
+
+  $(document).
+    on('change', '.pagination_per_page > select', function(_event) {
+      PerPage._jQueryInterface.call($(this), 'update')
+    });
+
+  $.fn['perPage'] = PerPage._jQueryInterface
+  $.fn['perPage'].Constructor = PerPage
+
+})(jQuery);

data/app/javascript/active_admin/initializers/table-checkbox-toggler.js

@@ -0,0 +1,3 @@
+import TableCheckboxToggler from "../lib/table-checkbox-toggler";
+
+$.widget.bridge('tableCheckboxToggler', TableCheckboxToggler);

data/app/{assets/javascripts/active_admin/lib/checkbox-toggler.es6 → javascript/active_admin/lib/checkbox-toggler.js}

@@ -1,4 +1,4 @@
-ActiveAdmin.CheckboxToggler = class CheckboxToggler {
+class CheckboxToggler {
   constructor(options, container){
     this.options = options;
     this.container = container;
@@ -6,7 +6,7 @@ ActiveAdmin.CheckboxToggler = class CheckboxToggler {
     this._bind();
   }
 
-  option(key, value) {
+  option(_key, _value) {
   }
 
   _init() {
@@ -30,7 +30,7 @@ ActiveAdmin.CheckboxToggler = class CheckboxToggler {
     this.toggle_all_checkbox.change(() => this._didChangeToggleAllCheckbox());
   }
 
-  _didChangeCheckbox(checkbox){
+  _didChangeCheckbox(_checkbox){
     const numChecked = this.checkboxes.filter(':checked').length;
 
     const allChecked = numChecked === this.checkboxes.length;
@@ -44,6 +44,6 @@ ActiveAdmin.CheckboxToggler = class CheckboxToggler {
     this.checkboxes.prop({ checked: setting });
     return setting;
   }
-};
+}
 
-$.widget.bridge('checkboxToggler', ActiveAdmin.CheckboxToggler);
+export default CheckboxToggler;