trestle 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9c0345d2065a71ba7b11d5044f6cf0db55e08d8a9e0d5d3a83c715bf029f76f
-  data.tar.gz: 8ce2f2a003d051204d1ad0017be70a9fe220ed0e4bf47bc2f3e6234ad751c316
+  metadata.gz: 53abdb7410eddcbc8964772c60fb759385fd0cc94574234473d29613e3dc62ef
+  data.tar.gz: a204be909209b9d159d1c6939911ccd7b5cddaf8437d7e20158c68c2051e3528
 SHA512:
-  metadata.gz: 8638b5a1c9cd255fde7251ebb44d86f602523d5c6ef383044a033e2239973c6239ff4f7d018d9273fc232805b41bb7a4ad15f83110fd5e95d0cddcdf4c2fbca4
-  data.tar.gz: b4f2bcdb3835d26b81186b790952c602069e4bae7a59cf0791370c455a6488502943f426fc91505595761a6fc1f6b57718bda02a0fff638fdd154c2b7c8b0d7d
+  metadata.gz: 7542b845d75753fd65f9908674a9728977f11657babfdf4a59489f5c023778ae29ce0a38d423d6fff4dc2249cb264cbe541b5e530ca5d9f60bfe0d06b901c1f6
+  data.tar.gz: 4a16e94cc8a64ad8691f99243b137ea897258ac4fa2595d7ce45573e1cc2ffd96dcba6e801c2e587f910587e89713fe671fa62209f79cd6c3f1cda8f6964ce65

data/.travis.yml

@@ -10,4 +10,5 @@ gemfile:
   - gemfiles/rails-4.2.gemfile
   - gemfiles/rails-5.0.gemfile
   - gemfiles/rails-5.1.gemfile
+  - gemfiles/rails-5.2.gemfile
   - gemfiles/rails-edge.gemfile

data/app/assets/javascripts/trestle/components/_datepicker.js

@@ -1,15 +1,29 @@
+Trestle.setupDatePicker = function(selectedDates, dateStr, instance) {
+  if ($(instance.input).data('allow-clear')) {
+    $('<a href="#">')
+      .on('click', function(e) {
+        e.preventDefault();
+        instance.clear();
+      })
+      .addClass('clear-datepicker')
+      .insertBefore(instance.altInput);
+  }
+};
+
 Trestle.init(function(e, root) {
   $(root).find('input[type="date"][data-picker="true"]').flatpickr({
     allowInput: true,
     altInput:   true,
-    altFormat:  "m/d/Y",
+    altFormat:  Trestle.i18n["admin.datepicker.formats.date"] || "m/d/Y",
+    onReady:    Trestle.setupDatePicker
   });
 
   $(root).find('input[type="datetime"][data-picker="true"], input[type="datetime-local"][data-picker="true"]').flatpickr({
     enableTime: true,
     allowInput: true,
     altInput:   true,
-    altFormat:  "m/d/Y h:i K",
+    altFormat:  Trestle.i18n["admin.datepicker.formats.datetime"] || "m/d/Y h:i K",
+    onReady:    Trestle.setupDatePicker
   });
 
   $(root).find('input[type="time"][data-picker="true"]').flatpickr({
@@ -17,6 +31,7 @@ Trestle.init(function(e, root) {
     noCalendar: true,
     allowInput: true,
     altInput:   true,
-    altFormat:  "h:i K"
+    altFormat:  Trestle.i18n["admin.datepicker.formats.time"] || "h:i K",
+    onReady:    Trestle.setupDatePicker
   });
 });

data/app/assets/javascripts/trestle/components/_dialog.js

@@ -46,7 +46,7 @@ Trestle.Dialog.showError = function(title, errorText) {
   return dialog;
 };
 
-Trestle.Dialog.prototype.load = function(url) {
+Trestle.Dialog.prototype.load = function(url, callback) {
   var dialog = this;
 
   dialog.show();
@@ -63,6 +63,10 @@ Trestle.Dialog.prototype.load = function(url) {
     },
     success: function(content) {
       dialog.setContent(content);
+
+      if (callback) {
+        callback.apply(dialog);
+      }
     },
     error: function(xhr, status, error) {
       var errorMessage = Trestle.i18n['trestle.dialog.error'] || 'The request could not be completed.';

data/app/assets/javascripts/trestle/components/_form.js

@@ -63,7 +63,9 @@ Trestle.init(function(e, root) {
 
     // Delay to ensure form is still submitted
     setTimeout(function() {
-      button.prop('disabled', true).addClass('loading');
+      if (form[0].checkValidity()) {
+        button.prop('disabled', true).addClass('loading');
+      }
     }, 1);
   });
 });

data/app/assets/javascripts/trestle/core/_l10n.js

@@ -0,0 +1,23 @@
+(function() {
+
+// Some of Flatpickr's locale names differ from Rails. This maps the Rails I18n locale to their Flatpickr equivalent.
+var FlatpickrLocaleConversions = { ca: "cat", el: "gr", nb: "no", vi: "vn" };
+
+// Sets up localization for Trestle and its dependencies, in particular Flatpickr.
+// This method accepts a list of locales in descending order of priority.
+//
+//     Trestle.localize('es-MX', 'es', 'en');
+//
+Trestle.localize = function() {
+  for (var i = 0; i < arguments.length; ++i) {
+    var locale = arguments[i];
+    var flatpickrLocale = FlatpickrLocaleConversions[locale] || locale;
+
+    if (flatpickr.l10ns[flatpickrLocale]) {
+      flatpickr.localize(flatpickr.l10ns[flatpickrLocale]);
+      break;
+    }
+  }
+};
+
+})();

data/app/assets/stylesheets/trestle/components/_avatar.scss

@@ -1,5 +1,6 @@
 .avatar {
   display: inline-block;
+  position: relative;
 
   width: 40px;
   height: 40px;
@@ -14,5 +15,27 @@
     height: 100%;
     object-fit: cover;
     border-radius: 50%;
+
+    position: relative;
+    z-index: 1;
+  }
+
+  .avatar-fallback {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-radius: 50%;
+
+    background: #ccc;
+    color: white;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    font-size: 11px;
+    font-weight: 500;
   }
 }

data/app/assets/stylesheets/trestle/components/_datepicker.scss

@@ -1,3 +1,31 @@
+.clear-datepicker {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 4;
+
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+
+  color: #ccc;
+
+  &:hover, &:focus {
+    color: #aaa;
+  }
+
+  &::before {
+    @extend .fa;
+    content: $fa-var-times;
+  }
+
+  input[value=""] ~ &,
+  input:not([value]) ~ & {
+    display: none;
+  }
+}
+
 .flatpickr-calendar {
   background: $theme-bg;
 

data/app/assets/stylesheets/trestle/components/_input-group.scss

@@ -2,6 +2,24 @@
 
 .input-group {
   display: flex;
+
+  .field_with_errors {
+    flex: 1;
+
+    .form-control {
+      border-radius: $input-border-radius;
+    }
+
+    &:not(:last-child) .form-control {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+
+    &:not(:first-child) .form-control {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+    }
+  }
 }
 
 .input-group-addon {

data/app/helpers/trestle/avatar_helper.rb

@@ -1,10 +1,15 @@
 module Trestle
   module AvatarHelper
-    def avatar(&block)
-      content_tag(:div, class: "avatar", &block)
+    def avatar(options={})
+      content_tag(:div, class: "avatar") do
+        concat content_tag(:span, options[:fallback], class: "avatar-fallback") if options[:fallback]
+        concat yield if block_given?
+      end
     end
 
     def gravatar(email, options={})
+      options = { d: "mm" }.merge(options)
+
       url = "https://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s.downcase)}.png"
       url << "?#{options.to_query}" if options.any?
 

data/app/helpers/trestle/debug_helper.rb

@@ -5,7 +5,7 @@ module Trestle
     end
 
     def instance_has_errors?
-      @instance && @instance.respond_to?(:errors) && @instance.errors.any?
+      instance.errors.any? rescue false
     end
   end
 end

data/app/helpers/trestle/form_helper.rb

@@ -2,7 +2,7 @@ module Trestle
   module FormHelper
     def trestle_form_for(instance, options={}, &block)
       options[:builder] ||= Form::Builder
-      options[:as] ||= admin.admin_name.singularize
+      options[:as] ||= admin.parameter_name
 
       options[:data] ||= {}
       options[:data].merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)

data/app/helpers/trestle/i18n_helper.rb

@@ -0,0 +1,14 @@
+module Trestle
+  module I18nHelper
+    def i18n_fallbacks(locale=I18n.locale)
+      if I18n.respond_to?(:fallbacks)
+        I18n.fallbacks[locale]
+      elsif locale.to_s.include?("-")
+        fallback = locale.to_s.split("-").first
+        [locale, fallback]
+      else
+        [locale]
+      end
+    end
+  end
+end

data/app/helpers/trestle/tab_helper.rb

@@ -5,9 +5,9 @@ module Trestle
     end
 
     def tab(name, options={})
-      tabs[name] = Tab.new(name, options)
+      tabs[name] = tab = Tab.new(name, options)
 
-      content_tag(:div, id: "tab-#{name}", class: ["tab-pane", ('active' if name == tabs.keys.first)], role: "tabpanel") do
+      content_tag(:div, id: tab.id(("modal" if dialog_request?)), class: ["tab-pane", ('active' if name == tabs.keys.first)], role: "tabpanel") do
         if block_given?
           yield
         elsif options[:partial]

data/app/helpers/trestle/url_helper.rb

@@ -3,38 +3,51 @@ module Trestle
     DIALOG_ACTIONS = [:new, :show, :edit]
 
     def admin_link_to(content, instance_or_url=nil, options={}, &block)
+      # Block given - ignore content parameter and capture content from block
       if block_given?
         instance_or_url, options = content, instance_or_url || {}
         content = capture(&block)
       end
 
       if instance_or_url.is_a?(String)
+        # Treat string URL as regular link
         link_to(content, instance_or_url, options)
       else
+        # Normalize options if instance is not provided
         if instance_or_url.is_a?(Hash)
-          instance_or_url, options = nil, instance_or_url
+          instance, options = nil, instance_or_url
+        else
+          instance = instance_or_url
         end
 
+        # Determine admin
         if options.key?(:admin)
           admin = Trestle.lookup(options.delete(:admin))
-        elsif instance_or_url.respond_to?(:id)
-          admin = admin_for(instance_or_url)
+        elsif instance
+          admin = admin_for(instance)
         end
 
         admin ||= self.admin if respond_to?(:admin)
 
         if admin
+          # Generate path
           action = options.delete(:action) || :show
-
           params = options.delete(:params) || {}
-          params[:id] ||= admin.to_param(instance_or_url) if instance_or_url
 
+          if admin.respond_to?(:instance_path) && instance
+            path = admin.instance_path(instance, params.reverse_merge(action: action))
+          else
+            params[:id] ||= admin.to_param(instance) if instance
+            path = admin.path(action, params)
+          end
+
+          # Determine link data options
           if DIALOG_ACTIONS.include?(action) && admin.form.dialog?
             options[:data] ||= {}
             options[:data][:behavior] ||= "dialog"
           end
 
-          link_to(content, admin.path(action, params), options)
+          link_to(content, path, options)
         else
           raise ActionController::UrlGenerationError, "An admin could not be inferred. Please specify an admin using the :admin option."
         end
@@ -42,14 +55,29 @@ module Trestle
     end
 
     def admin_url_for(instance, options={})
-      admin = Trestle.lookup(options[:admin]) if options.key?(:admin)
+      admin = Trestle.lookup(options.delete(:admin)) if options.key?(:admin)
       admin ||= admin_for(instance)
+      return unless admin
 
-      admin.path(options[:action] || :show, id: admin.to_param(instance)) if admin
+      if admin.respond_to?(:instance_path)
+        admin.instance_path(instance, options)
+      else
+        admin.path(options[:action] || :show, id: admin.to_param(instance))
+      end
     end
 
     def admin_for(instance)
-      Trestle.admins[instance.class.name.underscore.pluralize]
+      klass = instance.class
+
+      while klass
+        admin = Trestle.admins[klass.name.underscore.pluralize]
+        return admin if admin
+
+        klass = klass.superclass
+      end
+
+      # No admin found
+      nil
     end
   end
 end

data/app/views/layouts/trestle/admin.html.erb

@@ -26,9 +26,7 @@
       Trestle.i18n['<%= key %>'] = "<%= escape_javascript(t(key, default: t(key, locale: :en))) %>";
       <% end %>
 
-      if (flatpickr.l10ns['<%= I18n.locale %>']) {
-        flatpickr.localize(flatpickr.l10ns['<%= I18n.locale %>']);
-      }
+      Trestle.localize(<%= i18n_fallbacks.map { |l| "'#{l}'" }.join(", ").html_safe %>);
     </script>
 
     <%= hook :javascripts %>

data/app/views/trestle/application/_layout.html.erb

@@ -1,7 +1,7 @@
 <%= render "header", hide_breadcrumbs: local_assigns.fetch(:hide_breadcrumbs, false) if local_assigns.fetch(:header, true) %>
 
 <div class="main-content-area">
-  <%= render "flash" %>
+  <%= render "trestle/flash/flash" %>
   <%= render "utilities" %>
   <%= render "tabs" %>
 

data/app/views/trestle/application/_tabs.html.erb

@@ -2,7 +2,7 @@
   <ul class="nav nav-tabs">
     <% tabs.each do |name, tab| %>
       <li<% if name == tabs.keys.first %> class="active"<% end %>>
-        <%= link_to tab.label, "#tab-#{name}", role: "tab", data: { toggle: "tab" } %>
+        <%= link_to tab.label, "##{tab.id(("modal" if dialog_request?))}", role: "tab", data: { toggle: "tab" } %>
       </li>
     <% end %>
 

data/app/views/trestle/{application → flash}/_alert.html.erb

@@ -4,8 +4,8 @@
   <%= icon %>
 
   <div class="alert-content">
-    <h3><%= title %></h3>
-    <p><%= message %></p>
+    <h3><%= alert[:title] %></h3>
+    <p><%= alert[:message] %></p>
 
     <%= yield if block_given? %>
   </div>

data/app/views/trestle/flash/_debug.html.erb

@@ -0,0 +1,8 @@
+<%= link_to "Debug errors", "#debug-errors", class: "toggle-debug-errors small", data: { toggle: "collapse" } %>
+<div id="debug-errors" class="debug-errors collapse">
+  <ul>
+    <% instance.errors.each do |key, message| %>
+      <li class="small"><tt><%= key %>:</tt> <%= message %></li>
+    <% end %>
+  </ul>
+</div>

data/app/views/trestle/flash/_flash.html.erb

@@ -0,0 +1,7 @@
+<% if flash[:message] -%>
+  <%= render "trestle/flash/alert", html_class: "alert-success", icon: icon("alert-icon ion-ios-checkmark-outline"), alert: flash[:message].with_indifferent_access %>
+<% elsif flash[:error] -%>
+  <%= render layout: "trestle/flash/alert", locals: { html_class: "alert-danger", icon: icon("alert-icon ion-ios-close-outline"), alert: flash[:error].with_indifferent_access } do %>
+    <%= render "trestle/flash/debug" if debug_form_errors? %>
+  <% end %>
+<% end -%>

data/app/views/trestle/resource/edit.html.erb

@@ -1,18 +1,18 @@
-<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name.titleize, pluralized_model_name: admin.model_name.plural.titleize) %>
+<% title = admin.t("titles.edit", default: "Editing %{model_name}") %>
 
 <% content_for(:title, title) %>
-<% breadcrumb title %>
+<% breadcrumb(title) %>
 
 <% content_for(:primary_toolbar) do %>
-  <%= button_tag t("admin.buttons.save", default: "Save %{model_name}", model_name: admin.model_name), class: "btn btn-success btn-lg" if admin.actions.include?(:update) %>
+  <%= button_tag admin.t("buttons.save", default: "Save %{model_name}"), class: "btn btn-success btn-lg" if admin.actions.include?(:update) %>
 <% end %>
 
 <% content_for(:secondary_toolbar) do %>
   <%= admin_link_to instance, action: :destroy, method: :delete, class: "btn btn-danger", data: { toggle: "confirm-delete", placement: "bottom" } do %>
-    <%= icon("fa fa-trash") %> <%= t("admin.buttons.delete", default: "Delete %{model_name}", model_name: admin.model_name) %>
+    <%= icon("fa fa-trash") %> <%= admin.t("buttons.delete", default: "Delete %{model_name}") %>
   <% end if admin.actions.include?(:destroy) %>
 <% end %>
 
-<%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.path(:update, id: admin.to_param(instance)) : "#", method: :patch do |f| %>
+<%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>
   <%= render partial: "form", layout: dialog_request? ? "dialog" : "layout" %>
 <% end %>