trestle 0.9.0 → 0.9.8

data/app/helpers/trestle/hook_helper.rb

@@ -1,29 +1,5 @@
 module Trestle
   module HookHelper
-    def hook(name)
-      if hook?(name)
-        safe_join(hooks(name).map { |hook|
-          hook.evaluate(self)
-        }, "\n")
-      elsif block_given?
-        capture(&Proc.new)
-      end
-    end
-
-    def hook?(name)
-      hook_sets.any? { |set| set.any?(name) }
-    end
-
-  protected
-    def hooks(name)
-      hook_sets.map { |set| set.for(name) }.inject(&:+).select { |h| h.visible?(self) }
-    end
-
-    def hook_sets
-      @_hook_sets ||= [
-        (admin.hooks if defined?(admin) && admin),
-        Trestle.config.hooks
-      ].compact
-    end
+    include Trestle::Hook::Helpers
   end
 end

data/app/helpers/trestle/i18n_helper.rb

@@ -1,20 +1,13 @@
 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
-
-    def default_translation(key)
-      translate(key, locale: :en)
-    rescue I18n::InvalidLocale
-      key.split(".").last.humanize
+    def i18n_javascript_translations
+      Trestle.config.javascript_i18n_keys.map { |key|
+        begin
+          [key, t(key, raise: true)]
+        rescue I18n::MissingTranslationData
+          nil
+        end
+      }.compact
     end
   end
 end

data/app/helpers/trestle/layout_helper.rb

@@ -0,0 +1,20 @@
+module Trestle
+  module LayoutHelper
+    SIDEBAR_CLASSES = {
+      "expanded"  => "sidebar-expanded",
+      "collapsed" => "sidebar-collapsed"
+    }
+
+    def body_attributes
+      {
+        class: body_classes
+      }.reject { |k, v| v.blank? }
+    end
+
+    def body_classes
+      [
+        SIDEBAR_CLASSES[cookies["trestle:sidebar"]]
+      ].compact
+    end
+  end
+end

data/app/helpers/trestle/navigation_helper.rb

@@ -7,5 +7,28 @@ module Trestle
     def current_admin?(admin)
       respond_to?(:admin) && self.admin && self.admin.name == admin.name
     end
+
+    def navigation_group_collapsed?(group)
+      if collapsed_navigation_groups.include?(group.id)
+        # Explicitly collapsed by user
+        true
+      elsif group.collapse?
+        # Default to collapsed unless expanded by user
+        !expanded_navigation_groups.include?(group.id)
+      end
+    end
+
+  private
+    def collapsed_navigation_groups
+      @collapsed_navigation_groups ||= navigation_groups(:collapsed)
+    end
+
+    def expanded_navigation_groups
+      @expanded_navigation_groups ||= navigation_groups(:expanded)
+    end
+
+    def navigation_groups(state)
+      cookies["trestle:navigation:#{state}"].try(:split, ",") || []
+    end
   end
 end

data/app/helpers/trestle/params_helper.rb

@@ -1,7 +1,10 @@
 module Trestle
   module ParamsHelper
     def persistent_params
-      params.slice(*Trestle.config.persistent_params).permit(*Trestle.config.persistent_params)
+      flat, nested = Trestle.config.persistent_params.partition { |p| !p.is_a?(Hash) }
+      nested = nested.inject({}) { |result, param| result.merge(param) }
+
+      params.slice(*(flat + nested.keys)).permit(*(flat << nested))
     end
   end
 end

data/app/helpers/trestle/table_helper.rb

@@ -32,10 +32,14 @@ module Trestle
         end
 
         table = Table::Builder.build(options, &block)
-      elsif name.is_a?(Trestle::Table)
-        table = name
       else
-        table = admin.tables.fetch(name) { raise ArgumentError, "Unable to find table named #{name.inspect}" }
+        if name.is_a?(Trestle::Table)
+          table = name
+        else
+          table = admin.tables.fetch(name) { raise ArgumentError, "Unable to find table named #{name.inspect}" }
+        end
+
+        table = table.with_options(options.reverse_merge(sortable: false))
       end
 
       collection ||= options[:collection] || table.options[:collection]
@@ -43,5 +47,20 @@ module Trestle
 
       render "trestle/table/table", table: table, collection: collection
     end
+
+    # Renders the pagination controls for a collection.
+    #
+    # collection - The paginated Kaminari collection to render controls for (required).
+    # options    - Hash of options that will be passed to the Kaminari #paginate method (default: {}):
+    #
+    # Examples
+    #
+    #   <%= pagination collection: Account.page(params[:page]), remote: true %>
+    #
+    # Returns the HTML representation of the pagination controls as a HTML-safe String.
+    def pagination(collection:, entry_name: nil, **options)
+      collection = collection.call if collection.respond_to?(:call)
+      render "trestle/table/pagination", collection: collection, entry_name: entry_name, options: options
+    end
   end
 end

data/app/helpers/trestle/title_helper.rb

@@ -0,0 +1,11 @@
+module Trestle
+  module TitleHelper
+    def title
+      content_for(:title) || default_title
+    end
+
+    def default_title
+      action_name.titleize
+    end
+  end
+end

data/app/helpers/trestle/toolbars_helper.rb

@@ -1,16 +1,5 @@
 module Trestle
   module ToolbarsHelper
-    def toolbar(name, options={}, &block)
-      toolbar = (toolbars[name.to_s] ||= Toolbar.new)
-      toolbar.clear! if options[:clear]
-      toolbar.prepend(&block) if block_given?
-      toolbar
-    end
-
-    def toolbars
-      @_toolbars ||= {}
-    end
-
     def render_toolbar(toolbar, *args)
       result = toolbar.groups(self, *args).map do |items|
         if items.many?

data/app/helpers/trestle/url_helper.rb

@@ -73,17 +73,7 @@ module Trestle
     end
 
     def admin_for(instance)
-      klass = instance.class
-
-      while klass
-        admin = Trestle.admins[klass.name.underscore.pluralize]
-        return admin if admin
-
-        klass = klass.superclass
-      end
-
-      # No admin found
-      nil
+      Trestle.lookup_model(instance.class)
     end
   end
 end

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

@@ -12,7 +12,7 @@
 
     <%= csrf_meta_tags %>
 
-    <title><%= [yield(:title), Trestle.config.site_title].join(' :: ') %></title>
+    <title><%= [title, Trestle.config.site_title].join(' :: ') %></title>
 
     <%= favicon_link_tag Trestle.config.favicon if Trestle.config.favicon %>
 
@@ -26,11 +26,11 @@
     <%= javascript_include_tag "trestle/admin", 'data-turbolinks-track': 'reload' %>
 
     <%= javascript_tag nonce: true do %>
-      <% Trestle.config.javascript_i18n_keys.each do |key| %>
-      Trestle.i18n['<%= key %>'] = "<%= escape_javascript(t(key, default: default_translation(key))) %>";
+      <% i18n_javascript_translations.each do |key, value| %>
+      Trestle.i18n['<%= key %>'] = "<%= escape_javascript(value) %>";
       <% end %>
 
-      Trestle.localize(<%= i18n_fallbacks.map { |l| "'#{l}'" }.join(", ").html_safe %>);
+      Trestle.localize(<%= Trestle.i18n_fallbacks.map { |l| "'#{l}'" }.join(", ").html_safe %>);
     <% end %>
 
     <%= hook :javascripts %>
@@ -40,7 +40,7 @@
     <%= hook :head %>
   </head>
 
-  <body<%=raw " class=\"sidebar-#{cookies["trestle:sidebar"]}\"" if cookies["trestle:sidebar"] %>>
+  <%= content_tag :body, body_attributes do %>
     <div class="app-wrapper">
       <%= render "trestle/shared/sidebar" %>
 
@@ -54,5 +54,5 @@
         <%= render "trestle/shared/footer" %>
       </div>
     </div>
-  </body>
+  <% end %>
 </html>

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

@@ -1,5 +1,5 @@
 <div class="modal-header">
-  <h4 class="modal-title"><%= content_for(:title) %></h4>
+  <h4 class="modal-title"><%= title %></h4>
   <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
 </div>
 

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

@@ -1,8 +1,6 @@
 <header class="content-header">
   <div class="content-header-title">
-    <h1>
-      <%= content_for(:title) %>
-    </h1>
+    <h1><%= title %></h1>
 
     <% unless local_assigns.fetch(:hide_breadcrumbs, false) %>
     <ol class="breadcrumb">

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

@@ -8,7 +8,9 @@
       <h3><%= alert[:title] %></h3>
     <% end %>
 
-    <p><%= alert[:message] %></p>
+    <% if alert[:message] %>
+      <p><%= alert[:message] %></p>
+    <% end %>
 
     <%= yield if block_given? %>
   </div>

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

@@ -1,8 +1,13 @@
-<%= 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>
+<% errors = local_assigns.fetch(:errors, {}) %>
+
+<% if errors.any? %>
+  <%= link_to "Debug errors", "#debug-errors", class: "toggle-debug-errors small", data: { toggle: "collapse" } %>
+
+  <div id="debug-errors" class="debug-errors collapse">
+    <ul>
+      <% errors.each do |key, message| %>
+        <li class="small"><tt><%= key %>:</tt> <%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

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

@@ -2,6 +2,6 @@
   <%= render "trestle/flash/alert", html_class: "alert-success", icon: icon("alert-icon far fa-check-circle"), alert: normalize_flash_alert(flash[:message]) %>
 <% elsif flash[:error] -%>
   <%= render layout: "trestle/flash/alert", locals: { html_class: "alert-danger", icon: icon("alert-icon far fa-times-circle"), alert: normalize_flash_alert(flash[:error]) } do %>
-    <%= render "trestle/flash/debug" if debug_form_errors? %>
+    <%= render "trestle/flash/debug", errors: Trestle::DebugErrors.new(instance.errors) if debug_form_errors? %>
   <% end %>
 <% end -%>

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

@@ -1,9 +1,18 @@
-<ul class="scopes">
-  <% admin.scopes.each do |name, scope| %>
-    <%= content_tag(:li, class: ("active" if scope.active?(params))) do %>
-      <%= link_to persistent_params.merge(scope: (name unless scope.active?(params))) do %>
-        <strong><%= scope.label %></strong> (<%= number_with_delimiter(scope.count(admin.collection(params))) %>)
-      <% end %>
-    <% end %>
+<%= content_tag(:dl, class: admin.scopes.classes) do %>
+  <% admin.scopes.grouped.each do |group, scopes| %>
+    <%= content_tag(:dt, group, class: ["scope-group", ("scope-group-empty" if group.blank?)]) if admin.scopes.grouped? %>
+
+    <dd>
+      <ul class="scope-list">
+        <% scopes.each do |scope| %>
+          <li>
+            <%= link_to persistent_params.merge(scope: (scope unless scope.active?(params))), class: ["scope", ("active" if scope.active?(params))] do %>
+              <strong><%= scope.label %></strong>
+              (<%= number_with_delimiter(scope.count(admin.collection(params))) %>)
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    </dd>
   <% end %>
-</ul>
+<% end %>

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

@@ -4,11 +4,11 @@
 <% breadcrumb(title) %>
 
 <% toolbar(:primary) do |t| %>
-  <%= t.button admin.t("buttons.save", default: "Save %{model_name}"), style: :success if admin.actions.include?(:update) %>
+  <%= t.save_or_dismiss(:update) %>
 <% end %>
 
 <% toolbar(:secondary) do |t| %>
-  <%= t.link admin.t("buttons.delete", default: "Delete %{model_name}"), instance, action: :destroy, method: :delete, style: :danger, icon: "fa fa-trash", data: { toggle: "confirm-delete", placement: "bottom" } if admin.actions.include?(:destroy) %>
+  <%= t.delete %>
 <% end %>
 
 <%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>

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

@@ -1,11 +1,11 @@
 <% content_for(:title, admin.t("titles.index", default: "Listing %{pluralized_model_name}")) %>
 
 <% toolbar(:primary) do |t| %>
-  <%= t.link admin.t("buttons.new", default: "New %{model_name}"), action: :new, style: :light, icon: "fa fa-plus", class: "btn-new-resource" if admin.actions.include?(:new) %>
+  <%= t.new %>
 <% end %>
 
 <% content_for(:utilities) do %>
-  <%= render "scopes" if admin.scopes.any? %>
+  <%= render "scopes" %>
 <% end if admin.scopes.any? %>
 
 <%= render layout: "layout" do %>
@@ -20,6 +20,6 @@
   <footer class="main-content-footer">
     <%= hook("resource.index.footer") %>
 
-    <%= render "trestle/table/pagination", collection: collection, entry_name: admin.model_name %>
+    <%= pagination collection: collection, entry_name: admin.model_name, remote: admin.pagination_options[:ajax] %>
   </footer>
 <% end %>

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

@@ -4,7 +4,7 @@
 <% breadcrumb(title) %>
 
 <% toolbar(:primary) do |t| %>
-  <%= t.button admin.t("buttons.save", default: "Save %{model_name}"), style: :success if admin.actions.include?(:create) %>
+  <%= t.save_or_dismiss(:create) %>
 <% end %>
 
 <%= trestle_form_for instance, url: admin.path(:create), method: :post do |f| %>

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

@@ -4,11 +4,11 @@
 <% breadcrumb(title) unless admin.singular? %>
 
 <% toolbar(:primary) do |t| %>
-  <%= t.button admin.t("buttons.save", default: "Save %{model_name}"), style: :success if admin.actions.include?(:update) %>
+  <%= t.save_or_dismiss(:update) %>
 <% end %>
 
 <% toolbar(:secondary) do |t| %>
-  <%= t.link admin.t("buttons.delete", default: "Delete %{model_name}"), instance, action: :destroy, method: :delete, style: :danger, icon: "fa fa-trash", data: { toggle: "confirm-delete", placement: "bottom" } if admin.actions.include?(:destroy) %>
+  <%= t.delete %>
 <% end %>
 
 <%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>

data/app/views/trestle/shared/_sidebar.html.erb

@@ -11,24 +11,23 @@
 
   <div class="app-sidebar-inner">
     <nav class="app-nav">
-      <% collapsed = cookies["trestle:navigation:collapsed"].try(:split, ",") || [] %>
       <% Trestle.navigation(self).each do |group, items| %>
-        <ul<% if group.present? && collapsed.include?(group.id) %> class="collapsed"<% end %>>
+        <%= content_tag(:ul, class: ("collapsed" if group.present? && navigation_group_collapsed?(group)), data: { group: group.id }) do %>
           <% if group.present? %>
             <li class="nav-header"><%= link_to group.label, "##{group.id}" %></li>
           <% end %>
 
           <% items.each do |item| %>
-            <li<% if current_navigation_item?(item) %> class="active"<% end %>>
-              <%= link_to item.path do %>
+            <%= content_tag(:li, class: ("active" if current_navigation_item?(item))) do %>
+              <%= link_to item.path, item.html_options do %>
                 <%= icon("nav-icon", item.icon) %>
                 <span class="nav-label"><%= item.label %></span>
 
                 <%= content_tag(:span, item.badge.text, class: ["badge", item.badge.html_class]) if item.badge? %>
               <% end %>
-            </li>
+            <% end %>
           <% end %>
-        </ul>
+        <% end %>
       <% end %>
     </nav>
 

data/app/views/trestle/table/_pagination.html.erb

@@ -1,5 +1,5 @@
 <nav class="pagination-container">
   <p><%= page_entries_info(collection, entry_name: (entry_name if local_assigns.has_key?(:entry_name))) %>
 
-  <%= paginate(collection, theme: "trestle") %>
+  <%= paginate(collection, **{ theme: "trestle" }.reverse_merge(local_assigns.has_key?(:options) ? options : {})) %>
 </nav>

data/config/locales/de.rb

@@ -0,0 +1,18 @@
+{
+  de: {
+    date: {
+      formats: {
+        trestle_date: "%-d. %b. %Y",
+        trestle_calendar: "%d.%m.%Y"
+      }
+    },
+
+    time: {
+      formats: {
+        trestle_date: "%-d. %b. %Y",
+        trestle_time: "%H:%M",
+        trestle_time_with_seconds: "%H:%M:%S"
+      }
+    }
+  }
+}

data/config/locales/de.yml

@@ -0,0 +1,101 @@
+de:
+  trestle:
+    title: "Trestle Admin"
+    footer: "Powered by Trestle"
+    version: "Version"
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Kein %{entry_name} vorhanden"
+            one: "<strong>1</strong> %{entry_name}"
+            other: "<strong>%{count}</strong> %{entry_name}"
+
+        more_pages:
+          display_entries: "%{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> von <b>%{total}</b>"
+
+    onboarding:
+      welcome: "Willkommen bei Trestle"
+      no_admins: "Um zu beginnen, erstelle eine Trestle.resource in <code>app/admin</code>."
+      no_template: "Um dieses Tempalte anzupassen, erstelle <code>%{path}</code>."
+      no_form: "Definiere einen form block oder erstelle ein Partial <code>_form.html</code>."
+
+    ui:
+      toggle_navigation: "Navigation ein-/ausblenden"
+      toggle_sidebar: "Seitenleiste ein-/ausblenden"
+      toggle_dropdown: "Menü ein-/ausblenden"
+
+    dialog:
+      error: "Fehler: Die Aktion konnte nicht erfolgreich ausgeführt werden."
+
+    confirmation:
+      title: "Sind Sie sicher?"
+      delete: "Löschen"
+      cancel: "Abbrechen"
+
+    file:
+      choose_file: "Datei wählen..."
+      browse: "Durchsuchen"
+
+  admin:
+    titles:
+      index: "Liste von %{pluralized_model_name}"
+      new: "%{model_name} (neu)"
+      edit: "%{model_name} (bearbeiten)"
+
+    buttons:
+      new: "Neu"
+      save: "Speichern"
+      delete: "Löschen"
+      show: "Details"
+      edit: "Bearbeiten"
+      ok: "OK"
+
+    breadcrumbs:
+      home: "Home"
+
+    flash:
+      create:
+        success:
+          title: "Erfolgreich erstellt"
+          message: "%{model_name} wurde erfolgreich erstellt."
+
+        failure:
+          title: "Warnung: %{model_name} nicht erstellt"
+          message: "Bitte korrigieren Sie die unten angezeigten Fehler."
+
+      update:
+        success:
+          title: "Erfolgreich bearbeitet"
+          message: "%{model_name} wurde erfolgreich gespeichert."
+
+        failure:
+          title: "Warnung: %{model_name} nicht gespeichert"
+          message: "Bitte korrigieren Sie die unten angezeigten Fehler."
+
+      destroy:
+        success:
+          title: "Erfolgreich gelöscht"
+          message: "%{model_name} wurde erfolgreich gelöscht."
+
+        failure:
+          title: "Warnung: Nicht gelöscht"
+          message: "%{model_name} konnte nicht gelöscht werden."
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- %{attribute_name} auswählen -"
+
+    format:
+      blank: "n. a."
+
+    datepicker:
+      formats:
+        date: "d.m.Y"
+        datetime: "d.m.Y H:i"
+        time: "H:i"

data/config/locales/vi.rb

@@ -0,0 +1,18 @@
+{
+  vi: {
+    date: {
+      formats: {
+        trestle_date: proc { |date| "%d/%m/%Y" },
+        trestle_calendar: "%d/%m/%Y"
+      }
+    },
+
+    time: {
+      formats: {
+        trestle_date: proc { |time| "%d/%m/%Y" },
+        trestle_time: "%H:%M",
+        trestle_time_with_seconds: "%H:%M:%S"
+      }
+    }
+  }
+}