activeadmin 1.3.0 → 2.0.0.rc1

data/app/assets/javascripts/active_admin/lib/checkbox-toggler.es6

@@ -0,0 +1,49 @@
+ActiveAdmin.CheckboxToggler = class CheckboxToggler {
+  constructor(options, container){
+    this.options = options;
+    this.container = container;
+    this._init();
+    this._bind();
+  }
+
+  option(key, value) {
+  }
+
+  _init() {
+    if (!this.container) {
+      throw new Error('Container element not found');
+    } else {
+      this.$container = $(this.container);
+    }
+
+    if (!this.$container.find('.toggle_all').length) {
+      throw new Error('"toggle all" checkbox not found');
+    } else {
+      this.toggle_all_checkbox = this.$container.find('.toggle_all');
+    }
+
+    this.checkboxes = this.$container.find(':checkbox').not(this.toggle_all_checkbox);
+  }
+
+  _bind() {
+    this.checkboxes.change(event => this._didChangeCheckbox(event.target));
+    this.toggle_all_checkbox.change(() => this._didChangeToggleAllCheckbox());
+  }
+
+  _didChangeCheckbox(checkbox){
+    const numChecked = this.checkboxes.filter(':checked').length;
+
+    const allChecked = numChecked === this.checkboxes.length;
+    const someChecked = (numChecked > 0) && (numChecked < this.checkboxes.length);
+
+    this.toggle_all_checkbox.prop({ checked: allChecked, indeterminate: someChecked });
+  }
+
+  _didChangeToggleAllCheckbox() {
+    const setting = this.toggle_all_checkbox.prop('checked');
+    this.checkboxes.prop({ checked: setting });
+    return setting;
+  }
+};
+
+$.widget.bridge('checkboxToggler', ActiveAdmin.CheckboxToggler);

data/app/assets/javascripts/active_admin/lib/dropdown-menu.es6

@@ -0,0 +1,123 @@
+ActiveAdmin.DropdownMenu = class DropdownMenu {
+
+  constructor(options, element) {
+    this.options = options;
+    this.element = element;
+    this.$element = $(this.element);
+
+    const defaults = {
+      fadeInDuration: 20,
+      fadeOutDuration: 100,
+      onClickActionItemCallback: null
+    };
+
+    this.options = $.extend(defaults, this.options);
+    this.isOpen  = false;
+
+    this.$menuButton = this.$element.find('.dropdown_menu_button');
+    this.$menuList   = this.$element.find('.dropdown_menu_list_wrapper');
+
+    this._buildMenuList();
+    this._bind();
+  }
+
+  open() {
+    this.isOpen = true;
+    this.$menuList.fadeIn(this.options.fadeInDuration);
+
+    this._position();
+    return this;
+  }
+
+  close() {
+    this.isOpen = false;
+    this.$menuList.fadeOut(this.options.fadeOutDuration);
+    return this;
+  }
+
+  destroy() {
+    this.$element = null;
+    return this;
+  }
+
+  isDisabled() {
+    return this.$menuButton.hasClass('disabled');
+  }
+
+  disable() {
+    this.$menuButton.addClass('disabled');
+  }
+
+  enable() {
+    this.$menuButton.removeClass('disabled');
+  }
+
+  option(key, value) {
+    if ($.isPlainObject(key)) {
+      return this.options = $.extend(true, this.options, key);
+    } else if (key != null) {
+      return this.options[key];
+    } else {
+      return this.options[key] = value;
+    }
+  }
+
+  _buildMenuList() {
+    this.$nipple = $('<div class="dropdown_menu_nipple"></div>');
+    this.$menuList.prepend(this.$nipple);
+    this.$menuList.hide();
+  }
+
+  _bind() {
+    $('body').click(() => {
+      if (this.isOpen) { this.close(); }
+    });
+
+    this.$menuButton.click(() => {
+      if (!this.isDisabled()) {
+        if (this.isOpen) {
+          this.close();
+        } else {
+          this.open();
+        }
+      }
+      return false;
+    });
+  }
+
+  _position() {
+    this.$menuList.css('top', this.$menuButton.position().top + this.$menuButton.outerHeight() + 10);
+
+    const button_left = this.$menuButton.position().left;
+    const button_center =  this.$menuButton.outerWidth() / 2;
+    const button_right = button_left + (button_center * 2);
+    const menu_center = this.$menuList.outerWidth() / 2;
+    const nipple_center = this.$nipple.outerWidth() / 2;
+    const window_right = $(window).width();
+
+    const centered_menu_left = (button_left + button_center) - menu_center;
+    const centered_menu_right = button_left + button_center + menu_center;
+
+    if (centered_menu_left < 0) {
+      // Left align with button
+      this.$menuList.css('left', button_left);
+      this.$nipple.css('left', button_center - nipple_center);
+    } else if (centered_menu_right > window_right) {
+      // Right align with button
+      this.$menuList.css('right', window_right - button_right);
+      this.$nipple.css('right', button_center - nipple_center);
+    } else {
+      // Center align under button
+      this.$menuList.css('left', centered_menu_left);
+      this.$nipple.css('left', menu_center - nipple_center);
+    }
+  }
+};
+
+$.widget.bridge('aaDropdownMenu', ActiveAdmin.DropdownMenu);
+
+const onDOMReady = () => $('.dropdown_menu').aaDropdownMenu();
+
+$(document).
+  ready(onDOMReady).
+  on('page:load turbolinks:load', onDOMReady);

data/app/assets/javascripts/active_admin/lib/has_many.es6

@@ -0,0 +1,95 @@
+$(function() {
+  // Provides a before-removal hook:
+  // $ ->
+  //   # This is a good place to tear down JS plugins to prevent memory leaks.
+  //   $(document).on 'has_many_remove:before', '.has_many_container', (e, fieldset, container)->
+  //     fieldset.find('.select2').select2 'destroy'
+  //
+  //   # If you need to do anything after removing the items you can use the
+  //   has_many_remove:after hook
+  //   $(document).on 'has_many_remove:after', '.has_many_container', (e, fieldset, container)->
+  //     list_item_count = container.find('.has_many_fields').length
+  //     alert("There are now #{list_item_count} items in the list")
+  //
+  $(document).on('click', 'a.button.has_many_remove', function(event){
+    event.preventDefault();
+    const parent    = $(this).closest('.has_many_container');
+    const to_remove = $(this).closest('fieldset');
+    recompute_positions(parent);
+
+    parent.trigger('has_many_remove:before', [to_remove, parent]);
+    to_remove.remove();
+    return parent.trigger('has_many_remove:after', [to_remove, parent]);
+  });
+
+  // Provides before and after creation hooks:
+  // $ ->
+  //   # The before hook allows you to prevent the creation of new records.
+  //   $(document).on 'has_many_add:before', '.has_many_container', (e, container)->
+  //     if $(@).children('fieldset').length >= 3
+  //       alert "you've reached the maximum number of items"
+  //       e.preventDefault()
+  //
+  //   # The after hook is a good place to initialize JS plugins and the like.
+  //   $(document).on 'has_many_add:after', '.has_many_container', (e, fieldset, container)->
+  //     fieldset.find('select').chosen()
+  //
+  $(document).on('click', 'a.button.has_many_add', function(event){
+    let before_add;
+    event.preventDefault();
+    const parent = $(this).closest('.has_many_container');
+    parent.trigger((before_add = $.Event('has_many_add:before')), [parent]);
+
+    if (!before_add.isDefaultPrevented()) {
+      let index = parent.data('has_many_index') || (parent.children('fieldset').length - 1);
+      parent.data({has_many_index: ++index});
+
+      const regex = new RegExp($(this).data('placeholder'), 'g');
+      const html  = $(this).data('html').replace(regex, index);
+
+      const fieldset = $(html).insertBefore(this);
+      recompute_positions(parent);
+      return parent.trigger('has_many_add:after', [fieldset, parent]);
+    }
+  });
+
+  $(document).on('change', '.has_many_container[data-sortable] :input[name$="[_destroy]"]', function() {
+    recompute_positions($(this).closest('.has_many'));
+  });
+
+  init_sortable();
+  $(document).on('has_many_add:after', '.has_many_container', init_sortable);
+});
+
+var init_sortable = function() {
+  const elems = $('.has_many_container[data-sortable]:not(.ui-sortable)');
+  elems.sortable({
+    items: '> fieldset',
+    handle: '> ol > .handle',
+    start: (ev, ui) => {
+      ui.item.css({opacity: 0.3});
+    },
+    stop: function (ev, ui) {
+      ui.item.css({opacity: 1.0});
+      recompute_positions($(this));
+    }
+  });
+  elems.each(recompute_positions);
+};
+
+var recompute_positions = function(parent){
+  parent = parent instanceof jQuery ? parent : $(this);
+  const input_name = parent.data('sortable');
+  let position = parseInt(parent.data('sortable-start') || 0, 10);
+
+  parent.children('fieldset').each(function() {
+    // We ignore nested inputs, so when defining your has_many, be sure to keep
+    // your sortable input at the root of the has_many block.
+    const destroy_input  = $(this).find("> ol > .input > :input[name$='[_destroy]']");
+    const sortable_input = $(this).find(`> ol > .input > :input[name$='[${input_name}]']`);
+
+    if (sortable_input.length) {
+      sortable_input.val(destroy_input.is(':checked') ? '' : position++);
+    }
+  });
+};

data/app/assets/javascripts/active_admin/lib/modal_dialog.es6

@@ -0,0 +1,61 @@
+ActiveAdmin.modal_dialog = function(message, inputs, callback){
+  let html = `<form id="dialog_confirm" title="${message}"><ul>`;
+  for (let name in inputs) {
+    var elem, opts, wrapper;
+    let type = inputs[name];
+    if (/^(datepicker|checkbox|text|number)$/.test(type)) {
+      wrapper = 'input';
+    } else if (type === 'textarea') {
+      wrapper = 'textarea';
+    } else if ($.isArray(type)) {
+      [wrapper, elem, opts, type] = ['select', 'option', type, ''];
+    } else {
+      throw new Error(`Unsupported input type: {${name}: ${type}}`);
+    }
+
+    let klass = type === 'datepicker' ? type : '';
+    html += `<li>
+      <label>${name.charAt(0).toUpperCase() + name.slice(1)}</label>
+      <${wrapper} name="${name}" class="${klass}" type="${type}">` +
+        (opts ? ((() => {
+          const result = [];
+
+          opts.forEach(v => {
+            const $elem = $(`<${elem}/>`);
+            if ($.isArray(v)) {
+              $elem.text(v[0]).val(v[1]);
+            } else {
+              $elem.text(v);
+            }
+            result.push($elem.wrap('<div>').parent().html());
+          });
+
+          return result;
+        })()).join('') : '') +
+      `</${wrapper}>` +
+    "</li>";
+    [wrapper, elem, opts, type, klass] = []; // unset any temporary variables
+  }
+
+  html += "</ul></form>";
+
+  const form = $(html).appendTo('body');
+  $('body').trigger('modal_dialog:before_open', [form]);
+
+  form.dialog({
+    modal: true,
+    open(event, ui) {
+      $('body').trigger('modal_dialog:after_open', [form]);
+    },
+    dialogClass: 'active_admin_dialog',
+    buttons: {
+      OK() {
+        callback($(this).serializeObject());
+        $(this).dialog('close');
+      },
+      Cancel() {
+        $(this).dialog('close').remove();
+      }
+    }
+  });
+};

data/app/assets/javascripts/active_admin/lib/per_page.es6

@@ -0,0 +1,47 @@
+(($, ActiveAdmin) => {
+
+  class PerPage {
+    constructor(element) {
+      this.element = element;
+    }
+
+    update() {
+      const params = ActiveAdmin
+        .queryStringToParams()
+        .filter(({name}) => name != 'per_page' || name != 'page')
+
+      params.push({ name: 'per_page', value: this.element.value });
+
+      if (ActiveAdmin.turbolinks) {
+        ActiveAdmin.turbolinksVisit(params);
+      } else {
+        window.location.search = ActiveAdmin.toQueryString(params);
+      }
+    }
+
+    static _jQueryInterface(config) {
+      return this.each(function () {
+        const $this = $(this)
+        let data = $this.data('perPage')
+
+        if (!data) {
+          data = new PerPage(this)
+          $this.data('perPage', data)
+        }
+
+        if (config === 'update') {
+          data[config]()
+        }
+      })
+    }
+  };
+
+  $(document).
+    on('change', '.pagination_per_page > select', function(event) {
+      PerPage._jQueryInterface.call($(this), 'update')
+    });
+
+  $.fn['perPage'] = PerPage._jQueryInterface
+  $.fn['perPage'].Constructor = PerPage
+
+})(jQuery, window.activeadmin);

data/app/assets/javascripts/active_admin/lib/table-checkbox-toggler.es6

@@ -0,0 +1,36 @@
+ActiveAdmin.TableCheckboxToggler = class TableCheckboxToggler extends ActiveAdmin.CheckboxToggler {
+  _bind() {
+    super._bind(...arguments);
+
+    this.$container
+      .find('tbody td')
+      .click(event => {
+        if (event.target.type !== 'checkbox') {
+          this._didClickCell(event.target);
+        }
+      });
+  }
+
+  _didChangeCheckbox(checkbox) {
+    super._didChangeCheckbox(...arguments);
+
+    $(checkbox)
+      .parents('tr')
+      .toggleClass('selected', checkbox.checked);
+  }
+
+  _didChangeToggleAllCheckbox() {
+    this.$container
+      .find('tbody tr')
+      .toggleClass('selected', super._didChangeToggleAllCheckbox(...arguments));
+  }
+
+  _didClickCell(cell) {
+    $(cell)
+      .parent('tr')
+      .find(':checkbox')
+      .click();
+  }
+};
+
+$.widget.bridge('tableCheckboxToggler', ActiveAdmin.TableCheckboxToggler);

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

@@ -85,18 +85,7 @@ form {
       padding: 0;
       margin-bottom: 0;
 
-      legend {
-        position:absolute;
-        width:95%;
-        padding-top:0.1em;
-        left: 0px;
-        font-size: 100%;
-        font-weight: normal;
-        span { position:absolute; }
-        &.label label { position:absolute; }
-      }
-
-      &:not(.has_many_fields) ol {
+      &:not(.inputs) ol {
         float: left;
         width: 74%;
         margin: 0;
@@ -108,7 +97,7 @@ form {
         }
       }
 
-      &.has_many_fields ol {
+      &.inputs ol {
         float: left;
         width: 100%;
         margin: 0;
@@ -241,7 +230,7 @@ form {
     input[type=submit], input[type=button], button { margin-right: 10px; }
   }
 
-  .buttons .actions .create_another {
+  .actions .create_another {
     float: none;
     margin-bottom: 10px;
 
@@ -335,4 +324,3 @@ form.filter_form {
   }
   a.clear_filters_btn { @include light-button; }
 }
-

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

@@ -6,5 +6,8 @@
       font-size: 0.9em;
       line-height: 10px;
     }
+    &:first-child a {
+      margin-left: 10px;
+    }
   }
 }

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

@@ -6,11 +6,6 @@
   padding: 3px 5px 2px 5px;
   font-size: 0.8em;
 
-  // TODO: deprecated, remove in a v2 release
-  &.ok, &.published, &.complete, &.completed, &.green { background: #8daa92; }
-  &.warn, &.warning, &.orange { background: #e29b20; }
-  &.error, &.errored, &.red { background: #d45f53; }
-
   &.yes { background: #6090DB }
   &.no  { background: grey }
 

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

@@ -62,4 +62,4 @@
   padding: 15px;
   padding-top: 30px;
   text-align: left;
-}
+}

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

@@ -24,5 +24,5 @@ $secondary-gradient-stop: #dfe1e2 !default;
 }
 
 @mixin no-gradient {
-  background-color: none;
+  background: none;
 }

data/app/views/active_admin/devise/confirmations/new.html.erb

@@ -1,7 +1,7 @@
 <div id="login">
-  <h2><%= render_or_call_method_or_proc_on(self, active_admin_application.site_title) %> <%= title t('active_admin.devise.resend_confirmation_instructions.title') %></h2>
+  <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.resend_confirmation_instructions.title') %></h2>
 
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
     f.inputs do
       f.input :email

data/app/views/active_admin/devise/passwords/edit.html.erb

@@ -1,7 +1,7 @@
 <div id="login">
-  <h2><%= render_or_call_method_or_proc_on(self, active_admin_application.site_title) %> <%= title t('active_admin.devise.change_password.title') %></h2>
+  <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.change_password.title') %></h2>
 
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
     f.inputs do
       f.input :password

data/app/views/active_admin/devise/passwords/new.html.erb

@@ -1,7 +1,7 @@
 <div id="login">
-  <h2><%= render_or_call_method_or_proc_on(self, active_admin_application.site_title) %> <%= title t('active_admin.devise.reset_password.title') %></h2>
+  <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.reset_password.title') %></h2>
 
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
     f.inputs do
       f.input :email

data/app/views/active_admin/devise/registrations/new.html.erb

@@ -1,8 +1,8 @@
 <div id="login">
-  <h2><%= render_or_call_method_or_proc_on(self, active_admin_application.site_title) %> <%= title t('active_admin.devise.sign_up.title') %></h2>
+  <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.sign_up.title') %></h2>
 
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: send(:"#{scope}_registration_path"), html: { id: "registration_new" }) do |f|
     f.inputs do
       resource.class.authentication_keys.each_with_index { |key, index|
@@ -19,4 +19,3 @@
 
   <%= render partial: "active_admin/devise/shared/links" %>
 </div>
-

data/app/views/active_admin/devise/sessions/new.html.erb

@@ -1,5 +1,5 @@
 <div id="login">
-  <h2><%= render_or_call_method_or_proc_on(self, active_admin_application.site_title) %> <%= title t('active_admin.devise.login.title') %></h2>
+  <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.login.title') %></h2>
 
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
   <%= active_admin_form_for(resource, as: resource_name, url: send(:"#{scope}_session_path"), html: { id: "session_new" }) do |f|

data/app/views/active_admin/devise/shared/_error_messages.html.erb

@@ -0,0 +1,15 @@
+<% if resource.errors.any? %>
+  <div id="error_explanation">
+    <h2>
+      <%= I18n.t("errors.messages.not_saved",
+                 count: resource.errors.count,
+                 resource: resource.class.model_name.human.downcase)
+       %>
+    </h2>
+    <ul>
+      <% resource.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/active_admin/devise/unlocks/new.html.erb

@@ -1,7 +1,7 @@
 <div id="login">
-  <h2><%= render_or_call_method_or_proc_on(self, active_admin_application.site_title) %> <%= title t('active_admin.devise.unlock.title') %></h2>
+  <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.unlock.title') %></h2>
 
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
     f.inputs do
       f.input :email

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

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%=I18n.locale%>">
 <head>
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
 
-  <title><%= [@page_title, render_or_call_method_or_proc_on(self, ActiveAdmin.application.site_title)].compact.join(" | ") %></title>
+  <title><%= [@page_title, ActiveAdmin.application.site_title(self)].compact.join(" | ") %></title>
 
   <% ActiveAdmin.application.stylesheets.each do |style, options| %>
     <%= stylesheet_link_tag style, options %>

data/config/locales/bg.yml

@@ -116,4 +116,3 @@ bg:
       block: "Списък"
       grid: "Грид"
       blog: "Блог"
-

data/config/locales/de.yml

@@ -8,6 +8,7 @@ de:
     edit: "Bearbeiten"
     delete: "Löschen"
     delete_confirmation: "Wollen Sie dieses Element wirklich löschen?"
+    create_another: "Mehr %{model} erstellen"
     new_model: "%{model} erstellen"
     edit_model: "%{model} bearbeiten"
     delete_model: "%{model} löschen"
@@ -20,6 +21,7 @@ de:
     has_many_new: "%{model} hinzufügen"
     has_many_delete: "Löschen"
     has_many_remove: "Entfernen"
+    move: "Bewegen"
     filters:
       buttons:
         filter: "Filtern"
@@ -31,6 +33,10 @@ de:
         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"
     search_status:
       headline: "Filter"
       current_scope: "Anwendungsbereich:"
@@ -51,6 +57,7 @@ de:
       one_page: "Zeige <b>alle %{n}</b> %{model}"
       multiple: "Zeige %{model} <b>%{from}&nbsp;–&nbsp;%{to}</b> von <b>%{total}</b>"
       multiple_without_total: "Zeige %{model} <b>%{from}&nbsp;–&nbsp;%{to}</b>"
+      per_page: "Pro Seite: "
       entry:
         one: "Eintrag"
         other: "Einträge"
@@ -72,6 +79,7 @@ de:
       labels:
         destroy: "Lösche"
     comments:
+      created_at: "Erstellt"
       resource_type: "Res­sour­cen-Typ"
       author_type: "Autor-Typ"
       body: "Inhalt"
@@ -94,6 +102,8 @@ de:
         title: "Subdomain"
       password:
         title: "Passwort"
+      password_confirmation:
+        title: "Passwort Bestätigung"
       sign_up:
         title: "Registrieren"
         submit: "Registrieren"