activeadmin 1.0.0.pre1 → 2.9.0

data/app/javascript/active_admin/lib/modal-dialog.js

@@ -0,0 +1,63 @@
+function ModalDialog(message, inputs, callback){
+  let html = `<form id="dialog_confirm" title="${message}"><ul>`;
+  for (let name in inputs) {
+    var 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, opts, type] = ['select', 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 = $('<option></option>');
+            if ($.isArray(v)) {
+              $elem.text(v[0]).val(v[1]);
+            } else {
+              $elem.text(v);
+            }
+            result.push($elem.wrap('<div></div>').parent().html());
+          });
+
+          return result;
+        })()).join('') : '') +
+      `</${wrapper}>` +
+    "</li>";
+    [wrapper, 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();
+      }
+    }
+  });
+}
+
+export default ModalDialog;

data/app/javascript/active_admin/lib/per-page.js

@@ -0,0 +1,38 @@
+import { queryStringToParams, hasTurbolinks, turbolinksVisit, toQueryString } from './utils';
+
+class PerPage {
+  constructor(element) {
+    this.element = element;
+  }
+
+  update() {
+    const params = queryStringToParams()
+      .filter(({name}) => name != 'per_page' || name != 'page')
+
+    params.push({ name: 'per_page', value: this.element.value });
+
+    if (hasTurbolinks()) {
+      turbolinksVisit(params);
+    } else {
+      window.location.search = 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]()
+      }
+    })
+  }
+}
+
+export default PerPage;

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

@@ -0,0 +1,38 @@
+import CheckboxToggler from "./checkbox-toggler";
+
+class TableCheckboxToggler extends 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();
+  }
+}
+
+export default TableCheckboxToggler;

data/app/javascript/active_admin/lib/utils.js

@@ -0,0 +1,40 @@
+function hasTurbolinks() {
+  return (typeof Turbolinks !== 'undefined' && Turbolinks.supported);
+}
+
+function turbolinksVisit(params) {
+  const path = [window.location.pathname, '?', toQueryString(params)].join('')
+  Turbolinks.visit(path);
+}
+
+function queryString() {
+  return (window.location.search || '').replace(/^\?/, '');
+}
+
+function queryStringToParams() {
+  const decode = (value) => decodeURIComponent((value || '').replace(/\+/g, '%20'));
+
+  return queryString()
+    .split("&")
+    .map(pair => pair.split("="))
+    .map(([key, value]) => {
+      return { name: decode(key), value: decode(value) }
+    });
+}
+
+function toQueryString(params) {
+  const encode = (value) => encodeURIComponent(value || '');
+
+  return params
+    .map(({name, value}) => [ encode(name), encode(value) ])
+    .map(pair => pair.join('='))
+    .join('&')
+}
+
+export {
+  hasTurbolinks,
+  turbolinksVisit,
+  queryString,
+  queryStringToParams,
+  toQueryString
+};

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/mailer/reset_password_instructions.html.erb

@@ -2,7 +2,7 @@
 
 <p>Someone has requested a link to change your password, and you can do this through the link below.</p>
 
-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @resource.reset_password_token) %></p>
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
 
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb

@@ -1,7 +1,7 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
 
 <p>Click the link below to unlock your account:</p>
 
-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @resource.unlock_token) %></p>
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>

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,15 +1,15 @@
 <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|
         f.input key, label: t('active_admin.devise.'+key.to_s+'.title'), input_html: { autofocus: index.zero? }
       }
       f.input :password, label: t('active_admin.devise.password.title')
-      f.input :password_confirmation, lable: t('active_admin.devise.password_confirmation.title')
+      f.input :password_confirmation, label: t('active_admin.devise.password_confirmation.title')
     end
     f.actions do
       f.action :submit, label: t('active_admin.devise.login.submit'), button_html: { value: t('active_admin.devise.sign_up.submit') }
@@ -19,4 +19,3 @@
 
   <%= render partial: "active_admin/devise/shared/links" %>
 </div>
-

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

@@ -1,11 +1,11 @@
 <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|
     f.inputs do
       resource.class.authentication_keys.each_with_index { |key, index|
-        f.input key, label: t('active_admin.devise.'+key.to_s+'.title'), input_html: { autofocus: index.zero? }
+        f.input key, label: t("active_admin.devise.#{key}.title"), input_html: { autofocus: index.zero? }
       }
       f.input :password, label: t('active_admin.devise.password.title')
       f.input :remember_me, label: t('active_admin.devise.login.remember_me'), as: :boolean if devise_mapping.rememberable?

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/shared/_links.erb

@@ -1,27 +1,33 @@
 <%- if controller_name != 'sessions' %>
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
-  <%= link_to t('active_admin.devise.links.sign_in'), send(:"new_#{scope}_session_path") %><br />
+  <%= link_to t('active_admin.devise.links.sign_in'), send(:"new_#{scope}_session_path") %>
+  <br>
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to t('active_admin.devise.links.sign_up'), new_registration_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.sign_up'), new_registration_path(resource_name) %>
+  <br>
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-  <%= link_to t('active_admin.devise.links.forgot_your_password'), new_password_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.forgot_your_password'), new_password_path(resource_name) %>
+  <br>
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to t('active_admin.devise.links.resend_confirmation_instructions'), new_confirmation_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.resend_confirmation_instructions'), new_confirmation_path(resource_name) %>
+  <br>
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to t('active_admin.devise.links.resend_unlock_instructions'), new_unlock_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.resend_unlock_instructions'), new_unlock_path(resource_name) %>
+  <br>
 <% end -%>
 
 <%- 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) %><br />
+          omniauth_authorize_path(resource_name, provider) %>
+    <br>
   <% end -%>
 <% 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/kaminari/active_admin/_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/_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/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last 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="last">
+  <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote %>
+</span>

data/app/views/kaminari/active_admin/_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/_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/_paginator.html.erb

@@ -0,0 +1,25 @@
+<%# 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? %>
+      <%= last_page_tag unless current_page.last? %>
+    <% end %>
+  </nav>
+<% end -%>

data/app/views/kaminari/active_admin/_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/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,28 +1,42 @@
 <!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 %>
+    <% if ActiveAdmin.application.use_webpacker %>
+      <%= stylesheet_pack_tag style, **options %>
+    <% else %>
+      <%= stylesheet_link_tag style, **options %>
+    <% end %>
   <% end %>
   <% ActiveAdmin.application.javascripts.each do |path| %>
-    <%= javascript_include_tag path %>
+    <% if ActiveAdmin.application.use_webpacker %>
+      <%= javascript_pack_tag path %>
+    <% else %>
+      <%= javascript_include_tag path %>
+    <% end %>
   <% end %>
 
   <%= favicon_link_tag ActiveAdmin.application.favicon if ActiveAdmin.application.favicon %>
 
+  <% ActiveAdmin.application.meta_tags_for_logged_out_pages.each do |name, content| %>
+    <%= tag(:meta, name: name, content: content) %>
+  <% end %>
+
   <%= csrf_meta_tag %>
 </head>
 <body class="active_admin logged_out <%= controller.action_name %>">
 <div id="wrapper">
 
   <div id="content_wrapper">
-    <% flash_messages.each do |type, message| %>
-      <%= content_tag :div, message, class: "flash flash_#{type}" %>
-    <% end %>
+    <div class="flashes">
+      <% flash_messages.each do |type, message| %>
+        <%= content_tag :div, message, class: "flash flash_#{type}" %>
+      <% end %>
+    </div>
     <div id="active_admin_content">
       <%= yield %>
     </div>