activeadmin 1.4.3 → 2.3.1

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;
@@ -335,4 +324,3 @@ form.filter_form {
   }
   a.clear_filters_btn { @include light-button; }
 }
-

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><%= 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><%= 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><%= 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

@@ -2,7 +2,7 @@
   <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/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><%= 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/kaminari/active_admin_countless/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="first">
+  <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote %>
+</span>

data/app/views/kaminari/active_admin_countless/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page gap"><%= t('views.pagination.truncate').html_safe %></span>

data/app/views/kaminari/active_admin_countless/_next_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="next">
+  <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote %>
+</span>

data/app/views/kaminari/active_admin_countless/_page.html.erb

@@ -0,0 +1,12 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page<%= ' current' if page.current? %>">
+  <%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel} %>
+</span>

data/app/views/kaminari/active_admin_countless/_paginator.html.erb

@@ -0,0 +1,24 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <nav class="pagination">
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| -%>
+      <% if page.display_tag? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <% unless current_page.out_of_range? %>
+      <%= next_page_tag unless current_page.last? %>
+    <% end %>
+  </nav>
+<% end -%>

data/app/views/kaminari/active_admin_countless/_prev_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="prev">
+  <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, rel: 'prev', remote: remote %>
+</span>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%=I18n.locale%>">
 <head>
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
 

data/config/locales/ar.yml

@@ -37,8 +37,9 @@ ar:
       current_filters: "المُرشحات الحاليّة:"
       no_current_filters: "بدون"
     status_tag:
-      'yes': "نعم"
-      'no': "لا"
+      "yes": "نعم"
+      "no": "لا"
+      "unset": "لا"
     main_content: "الرجاء تنفيذ %{model}#main_content لعرض المحتوى."
     logout: "تسجيل الخروج"
     powered_by: "تنفيذ %{active_admin} %{version}"

data/config/locales/bg.yml

@@ -34,6 +34,7 @@ bg:
     status_tag:
       "yes": "Да"
       "no": "не"
+      "unset": "не"
     main_content: "Добавете %{model}#main_content за да видите съдържание."
     logout: "Изход"
     powered_by: "Задвижва се от %{active_admin} %{version}"
@@ -116,4 +117,3 @@ bg:
       block: "Списък"
       grid: "Грид"
       blog: "Блог"
-

data/config/locales/bs.yml

@@ -34,6 +34,7 @@ bs:
     status_tag:
       "yes": "Da"
       "no": "Nema"
+      "unset": "Nema"
     main_content: "Molim Vas, implementirajte %{model}#main_content da biste prikazali sadržaj."
     logout: "Odjavi se"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/ca.yml

@@ -1,4 +1,3 @@
-#encoding: utf-8
 ca:
   active_admin:
     dashboard: Tauler
@@ -35,6 +34,7 @@ ca:
     status_tag:
       "yes": "Sí"
       "no": "No"
+      "unset": "No"
     main_content: "Implementa %{model}#main_content per mostrar contingut."
     logout: "Desconnecta't"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/cs.yml

@@ -34,6 +34,7 @@ cs:
     status_tag:
       "yes": "Ano"
       "no": "Ne"
+      "unset": "Ne"
     main_content: "Implementujte prosím %{model}#main_content pro zobrazení obsahu."
     logout: "Odhlásit"
     powered_by: "%{active_admin} %{version}"

data/config/locales/da.yml

@@ -40,6 +40,7 @@ da:
     status_tag:
       "yes": "Ja"
       "no": "Nej"
+      "unset": "Nej"
     main_content: "Implementer venligst %{model}#main_content for at vise noget indhold."
     logout: "Log ud"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/de-CH.yml

@@ -34,6 +34,7 @@
     status_tag:
       "yes": "Ja"
       "no": "Nicht"
+      "unset": "Nicht"
     main_content: "Bitte implementieren Sie %{model}#main_content, um Inhalte anzuzeigen."
     logout: "Abmelden"
     powered_by: "Powered by %{active_admin} %{version}"