trestle 0.8.8 → 0.8.10

data/app/helpers/trestle/{debug_helper.rb → flash_helper.rb}

@@ -1,5 +1,9 @@
 module Trestle
-  module DebugHelper
+  module FlashHelper
+    def normalize_flash_alert(flash)
+      flash.is_a?(Hash) ? flash.with_indifferent_access : { message: flash }
+    end
+
     def debug_form_errors?
       Trestle.config.debug_form_errors && instance_has_errors?
     end

data/app/helpers/trestle/form_helper.rb

@@ -5,7 +5,7 @@ module Trestle
       options[:as] ||= admin.parameter_name
 
       options[:data] ||= {}
-      options[:data].merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)
+      options[:data].reverse_merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)
 
       form_for(instance, options) do |f|
         with_form(f) { yield f }
@@ -23,10 +23,6 @@ module Trestle
       @_trestle_form
     end
 
-    def toolbar(name, &block)
-      content_for(:"#{name}_toolbar", &block)
-    end
-
     def sidebar(&block)
       content_for(:sidebar, &block)
     end

data/app/helpers/trestle/hook_helper.rb

@@ -1,18 +1,22 @@
 module Trestle
   module HookHelper
     def hook(name)
-      safe_join(hooks[name.to_s].map { |hook|
-        instance_exec(&hook)
-      }, "\n") if hook?(name)
+      if hook?(name)
+        safe_join(hooks(name).map { |hook|
+          hook.evaluate(self)
+        }, "\n")
+      elsif block_given?
+        yield
+      end
     end
 
     def hook?(name)
-      hooks.key?(name.to_s) && hooks[name.to_s].any?
+      Trestle.config.hooks.key?(name.to_s) && hooks(name).any?
     end
 
   protected
-    def hooks
-      Trestle.config.hooks
+    def hooks(name)
+      Trestle.config.hooks[name.to_s].select { |h| h.visible?(self) }
     end
   end
 end

data/app/helpers/trestle/timestamp_helper.rb

@@ -1,17 +1,59 @@
 module Trestle
   module TimestampHelper
-    def timestamp(time)
-      time_tag(time, class: "timestamp") do
+    # Renders a Time object as a formatted timestamp (using a <time> tag)
+    #
+    # time    - The Time object to format.
+    # options - Hash of options (default: {}):
+    #           :class       - Additional HTML classes to add to the <time> tag.
+    #           :precision   - Time precision, either :minutes or :seconds (default: :minutes).
+    #           :date_format - I18n date format to use for the date (default: :trestle_date).
+    #           :time_format - I18n time format to use for the time (default: :trestle_time).
+    #
+    # Examples
+    #
+    #   <%= timestamp(article.created_at) %>
+    #
+    #   <%= timestamp(Time.current, class: "timestamp-inline", precision: :seconds) %>
+    #
+    # Returns the HTML representation of the given Time.
+    def timestamp(time, options={})
+      return unless time
+
+      classes     = ["timestamp", options[:class]].compact
+      precision   = options.fetch(:precision) { Trestle.config.timestamp_precision }
+      date_format = options.fetch(:date_format) { :trestle_date }
+      time_format = options.fetch(:time_format) { precision == :seconds ? :trestle_time_with_seconds : :trestle_time }
+
+      time_tag(time, class: classes) do
         safe_join([
-          l(time, format: :trestle_date, default: proc { |date| "#{date.day.ordinalize} %b %Y" }),
-          content_tag(:small, l(time, format: :trestle_time_with_seconds, default: "%l:%M:%S %p"))
+          l(time, format: date_format, default: proc { |date| "#{date.day.ordinalize} %b %Y" }),
+          content_tag(:small, l(time, format: time_format, default: "%l:%M:%S %p"))
         ], "\n")
       end
     end
 
-    def datestamp(date)
-      time_tag(date, class: "datestamp") do
-        l(date, format: :trestle_calendar, default: "%-m/%-d/%Y")
+    # Renders a Date object as formatted datestamp (using a <time> tag)
+    #
+    # date    - The Date object to format.
+    # options - Hash of options (default: {}):
+    #           :class  - Additional HTML classes to add to the <time> tag.
+    #           :format - I18n date format to use (default: :trestle_calendar).
+    #
+    # Examples
+    #
+    #   <%= datestamp(Date.current) %>
+    #
+    #   <%= datestamp(article.created_at, format: :trestle_date, class: "custom-datestamp") %>
+    #
+    # Returns the HTML representation of the given Date.
+    def datestamp(date, options={})
+      return unless date
+
+      classes = ["datestamp", options[:class]].compact
+      format  = options.fetch(:format) { :trestle_calendar}
+
+      time_tag(date, class: classes) do
+        l(date, format: format, default: "%-m/%-d/%Y")
       end
     end
   end

data/app/helpers/trestle/toolbars_helper.rb

@@ -0,0 +1,34 @@
+module Trestle
+  module ToolbarsHelper
+    def toolbar(name, &block)
+      toolbar = (toolbars[name.to_s] ||= Toolbar.new)
+      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?
+          content_tag(:div, class: "btn-group", role: "group") do
+            safe_join(items, "\n")
+          end
+        else
+          items.first
+        end
+      end
+
+      safe_join(result, "\n")
+    end
+
+    def deprecated_toolbar(name)
+      if content_for?(:"#{name}_toolbar")
+        ActiveSupport::Deprecation.warn("Using content_for(:#{name}_toolbar) is deprecated. Please use toolbar(:#{name}) instead.")
+        content_for(:"#{name}_toolbar")
+      end
+    end
+  end
+end

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

@@ -36,14 +36,14 @@
     <%= hook :head %>
   </head>
 
-  <body<%= " class=\"sidebar-#{cookies["trestle:sidebar"]}\"" if cookies["trestle:sidebar"] %>>
+  <body<%=raw " class=\"sidebar-#{cookies["trestle:sidebar"]}\"" if cookies["trestle:sidebar"] %>>
     <div class="app-wrapper">
       <%= render "trestle/shared/sidebar" %>
 
       <div class="app-container">
         <%= render "trestle/shared/header" %>
 
-        <main class="app-main" data-context="<%= request.path %>">
+        <main class="app-main" data-context="<%= request.fullpath %>">
           <%= yield %>
         </main>
 

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

@@ -4,7 +4,7 @@
 </div>
 
 <div class="modal-flash">
-  <%= render "flash" %>
+  <%= render "trestle/flash/flash" %>
 </div>
 
 <div class="modal-tabs">
@@ -22,15 +22,13 @@
 </div>
 
 <div class="modal-footer">
-  <% if content_for?(:secondary_toolbar) %>
-    <div class="btn-toolbar secondary-toolbar">
-      <%= content_for(:secondary_toolbar) %>
-    </div>
-  <% end %>
+  <div class="btn-toolbar secondary-toolbar">
+    <%= render_toolbar(toolbar(:secondary)) %>
+    <%= deprecated_toolbar(:secondary) %>
+  </div>
 
-  <% if content_for?(:primary_toolbar) %>
-    <div class="btn-toolbar primary-toolbar">
-      <%= content_for(:primary_toolbar) %>
-    </div>
-  <% end %>
+  <div class="btn-toolbar primary-toolbar">
+    <%= render_toolbar(toolbar(:primary)) %>
+    <%= deprecated_toolbar(:primary) %>
+  </div>
 </div>

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

@@ -1,27 +1,29 @@
 <header class="content-header">
-  <% if content_for?(:primary_toolbar) %>
+  <div class="content-header-title">
+    <h1>
+      <%= content_for(:title) %>
+    </h1>
+
+    <% unless local_assigns.fetch(:hide_breadcrumbs, false) %>
+    <ol class="breadcrumb">
+      <% breadcrumbs.each do |breadcrumb| %>
+        <li class="breadcrumb-item<% if breadcrumb == breadcrumbs.last %> active<% end %>">
+          <%= link_to breadcrumb.label, breadcrumb.path %>
+        </li>
+      <% end %>
+    </ol>
+    <% end %>
+  </div>
+
+  <div class="content-header-toolbars">
     <div class="btn-toolbar primary-toolbar">
-      <%= content_for(:primary_toolbar) %>
+      <%= render_toolbar(toolbar(:primary)) %>
+      <%= deprecated_toolbar(:primary) %>
     </div>
-  <% end %>
 
-  <% if content_for?(:secondary_toolbar) %>
     <div class="btn-toolbar secondary-toolbar">
-      <%= content_for(:secondary_toolbar) %>
+      <%= render_toolbar(toolbar(:secondary)) %>
+      <%= deprecated_toolbar(:secondary) %>
     </div>
-  <% end %>
-
-  <h1>
-    <%= content_for(:title) %>
-  </h1>
-
-  <% unless local_assigns.fetch(:hide_breadcrumbs, false) %>
-  <ol class="breadcrumb">
-    <% breadcrumbs.each do |breadcrumb| %>
-      <li class="breadcrumb-item<% if breadcrumb == breadcrumbs.last %> active<% end %>">
-        <%= link_to breadcrumb.label, breadcrumb.path %>
-      </li>
-    <% end %>
-  </ol>
-  <% end %>
+  </div>
 </header>

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

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

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

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

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

@@ -3,14 +3,12 @@
 <% content_for(:title, title) %>
 <% breadcrumb(title) %>
 
-<% content_for(:primary_toolbar) do %>
-  <%= button_tag admin.t("buttons.save", default: "Save %{model_name}"), class: "btn btn-success btn-lg" if admin.actions.include?(:update) %>
+<% toolbar(:primary) do |t| %>
+  <%= t.button admin.t("buttons.save", default: "Save %{model_name}"), style: :success 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") %> <%= admin.t("buttons.delete", default: "Delete %{model_name}") %>
-  <% end if admin.actions.include?(:destroy) %>
+<% 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) %>
 <% 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,10 +1,7 @@
 <% content_for(:title, admin.t("titles.index", default: "Listing %{pluralized_model_name}")) %>
 
-<% content_for(:primary_toolbar) do %>
-  <%= admin_link_to action: :new, class: "btn btn-default btn-lg" do %>
-    <%= icon("fa fa-plus") %>
-    <span class="sr-only"><%= admin.t("buttons.new", default: "New %{model_name}") %></span>
-  <% end if admin.actions.include?(:new) %>
+<% toolbar(:primary) do |t| %>
+  <%= t.link admin.t("buttons.new", default: "New %{model_name}"), action: :new, icon: "fa fa-plus", class: "btn-new-resource" if admin.actions.include?(:new) %>
 <% end %>
 
 <% content_for(:utilities) do %>
@@ -12,5 +9,17 @@
 <% end if admin.scopes.any? %>
 
 <%= render layout: "layout" do %>
-  <%= render "table" %>
+  <% if hook?("resource.index.header") %>
+    <header class="main-content-header">
+      <%= hook("resource.index.header") %>
+    </header>
+  <% end %>
+
+  <%= render "trestle/table/table", table: admin.table, collection: collection %>
+
+  <footer class="main-content-footer">
+    <%= hook("resource.index.footer") %>
+
+    <%= render "trestle/table/pagination", collection: collection, entry_name: admin.model_name %>
+  </footer>
 <% end %>

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

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

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

@@ -3,14 +3,12 @@
 <% content_for(:title, title) %>
 <% breadcrumb(title) unless admin.singular? %>
 
-<% content_for(:primary_toolbar) do %>
-  <%= button_tag admin.t("buttons.save", default: "Save %{model_name}"), class: "btn btn-success btn-lg" if admin.actions.include?(:update) %>
+<% toolbar(:primary) do |t| %>
+  <%= t.button admin.t("buttons.save", default: "Save %{model_name}"), style: :success 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") %> <%= admin.t("buttons.delete", default: "Delete %{model_name}") %>
-  <% end if admin.actions.include?(:destroy) %>
+<% 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) %>
 <% 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

@@ -7,7 +7,9 @@
       <span class="icon-bar"></span>
     </button>
 
-    <%= link_to trestle_title, Trestle.config.path, class: "navbar-brand" %>
+    <%= link_to Trestle.config.root, class: "navbar-brand" do %>
+      <%= hook("view.title") { render "trestle/shared/title" } %>
+    <% end %>
   </header>
 
   <div class="app-sidebar-inner">

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

@@ -0,0 +1,14 @@
+<% if Trestle.config.site_logo %>
+  <% if Trestle.config.site_logo_small %>
+    <%= image_tag(Trestle.config.site_logo, class: "visible-xs-inline visible-lg-inline", alt: Trestle.config.site_title) %>
+    <%= image_tag(Trestle.config.site_logo_small, class: "visible-sm-inline visible-md-inline", alt: Trestle.config.site_title) %>
+  <% else %>
+    <%= image_tag(Trestle.config.site_logo) %>
+  <% end %>
+<% elsif Trestle.config.site_logo_small %>
+  <%= image_tag(Trestle.config.site_logo_small, alt: "") %>
+  <span class="visible-xs-inline visible-lg-inline"><%= Trestle.config.site_title %></span>
+<% else %>
+  <span class="visible-xs-inline visible-lg-inline"><%= Trestle.config.site_title %></span>
+  <span class="visible-sm-inline visible-md-inline"><%= Trestle.config.site_title.split(/ /).map(&:first).first(3).join %></span>
+<% end %>

data/config/locales/en.yml

@@ -43,6 +43,8 @@ en:
       new: "New %{model_name}"
       save: "Save %{model_name}"
       delete: "Delete %{model_name}"
+      show: "Show %{model_name}"
+      edit: "Edit %{model_name}"
       ok: "OK"
 
     breadcrumbs:

data/config/locales/es-MX.yml

@@ -0,0 +1,94 @@
+es-MX:
+  trestle:
+    title: "Trestle Administrador"
+    footer: "Impulsado por Trestle"
+    version: "Version"
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "No %{entry_name} encontrado"
+            one: "Mostrando <strong>1</strong> %{entry_name}"
+            other: "Mostrando <strong>total %{count}</strong> %{entry_name}"
+
+        more_pages:
+          display_entries: "Mostrando %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> of <b>%{total}</b>"
+
+    onboarding:
+      welcome: "Bienvenido a Trestle"
+      no_admins: "Para poder ingresar, por favor crea una cuenta de administrador en <code>app/admin</code>."
+      no_template: "Para personalizar esta plantilla, por favor crea en <code>%{path}</code>."
+      no_form: "Por favor define una forma de bloque o crea un parcial <code>_form.html</code>."
+
+    ui:
+      toggle_navigation: "Cambiar (modo de) navegación"
+      toggle_sidebar: "Alternar la barra lateral"
+
+    dialog:
+      error: "La solicitud no pudo ser completada."
+
+    confirmation:
+      title: "¿Estás seguro?"
+      delete: "Borrar"
+      cancel: "Cancelar"
+
+  admin:
+    titles:
+      index: "Listado de %{pluralized_model_name}"
+      new: "Nuevo %{model_name}"
+      edit: "Editando %{model_name}"
+
+    buttons:
+      new: "Nuevo %{model_name}"
+      save: "Guardar %{model_name}"
+      delete: "Borrar %{model_name}"
+      ok: "Aceptar"
+
+    breadcrumbs:
+      home: "Inicio"
+
+    flash:
+      create:
+        success:
+          title: "¡Exitosamente!"
+          message: "El %{lowercase_model_name} fue creado exitosamente."
+
+        failure:
+          title: "¡Advertencia!"
+          message: "Por favor corrige los siguientes errores."
+
+      update:
+        success:
+          title: "¡Exitosamente!"
+          message: "El %{lowercase_model_name} se actualizo exitosamente."
+
+        failure:
+          title: "¡Advertencia!"
+          message: "Por favor corrige los siguientes errores."
+
+      destroy:
+        success:
+          title: "¡Exitosamente!"
+          message: "El %{lowercase_model_name} fue borrado exitosamente."
+
+        failure:
+          title: "¡Advertencia!"
+          message: "%{lowercase_model_name} no pudo ser borrado."
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- Selecciona %{attribute_name} -"
+
+    format:
+      blank: "Ninguno"
+
+    datepicker:
+      formats:
+        date: "m/d/Y"
+        datetime: "m/d/Y h:i K"
+        time: "h:i K"

data/config/locales/es.yml

@@ -0,0 +1,94 @@
+es:
+  trestle:
+    title: "Trestle Administrador"
+    footer: "Patrocinado por Trestle"
+    version: "Version"
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "No %{entry_name} encontrado"
+            one: "Mostrando <strong>1</strong> %{entry_name}"
+            other: "Mostrando <strong>total %{count}</strong> %{entry_name}"
+
+        more_pages:
+          display_entries: "Mostrando %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> of <b>%{total}</b>"
+
+    onboarding:
+      welcome: "Bienvenido a Trestle"
+      no_admins: "Para poder ingresar, por favor crea una cuenta de administrador en <code>app/admin</code>."
+      no_template: "Para personalizar esta plantilla, por favor crea <code>%{path}</code>."
+      no_form: "Por favor define una forma de bloque o crea un parcial <code>_form.html</code>."
+
+    ui:
+      toggle_navigation: "Cambiar (modo de) navegación"
+      toggle_sidebar: "Alternar la barra lateral"
+
+    dialog:
+      error: "La solicitud no pudo ser completada."
+
+    confirmation:
+      title: "¿Estás seguro?"
+      delete: "Borrar"
+      cancel: "Cancelar"
+
+  admin:
+    titles:
+      index: "Listado de %{pluralized_model_name}"
+      new: "Nuevo %{model_name}"
+      edit: "Editando %{model_name}"
+
+    buttons:
+      new: "Nuevo %{model_name}"
+      save: "Guardar %{model_name}"
+      delete: "Borrar %{model_name}"
+      ok: "Aceptar"
+
+    breadcrumbs:
+      home: "Inicio"
+
+    flash:
+      create:
+        success:
+          title: "¡Exito!"
+          message: "El %{lowercase_model_name} fue creado exitosamente."
+
+        failure:
+          title: "¡Advertencia!"
+          message: "Por favor corrige los siguientes errores."
+
+      update:
+        success:
+          title: "¡Exito!"
+          message: "El %{lowercase_model_name} se actualizo exitosamente."
+
+        failure:
+          title: "¡Advertencia!"
+          message: "Por favor corrige los siguientes errores."
+
+      destroy:
+        success:
+          title: "¡Exito!"
+          message: "El %{lowercase_model_name} fue borrado exitosamente."
+
+        failure:
+          title: "¡Advertencia!"
+          message: "%{lowercase_model_name} no pudo ser borrado."
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- Selecciona %{attribute_name} -"
+
+    format:
+      blank: "Ninguno"
+
+    datepicker:
+      formats:
+        date: "m/d/Y"
+        datetime: "m/d/Y h:i K"
+        time: "h:i K"

data/config/locales/lv.rb

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