trestle 0.8.4 → 0.8.11

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

@@ -2,7 +2,7 @@
   <% 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.initialize_collection(params))) %>)
+        <strong><%= scope.label %></strong> (<%= number_with_delimiter(scope.count(admin.collection(params))) %>)
       <% end %>
     <% end %>
   <% end %>

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

@@ -1,18 +1,16 @@
-<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% 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" unless admin.readonly? %>
+<% 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 %>
-  <%= link_to admin.path(:destroy, id: admin.to_param(instance)), 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) %>
-  <% end unless admin.readonly? %>
+<% 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.readonly? ? "#" : admin.path(:update, id: admin.to_param(instance)), method: :patch do |f| %>
-  <%= render partial: "form", layout: "layout" %>
+<%= 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 %>

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

@@ -1,7 +1,7 @@
-<% content_for(:title, t("admin.titles.index", default: "Listing %{pluralized_model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize)) %>
+<% content_for(:title, admin.t("titles.index", default: "Listing %{pluralized_model_name}")) %>
 
-<% content_for(:primary_toolbar) do %>
-  <%= link_to icon("fa fa-plus"), admin.path(:new), class: "btn btn-default btn-lg" unless admin.readonly? %>
+<% 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 %>
@@ -9,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

@@ -1,12 +1,12 @@
-<% title = t("admin.titles.new", default: "New %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% title = admin.t("titles.new", default: "New %{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" %>
+<% 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, method: :post do |f| %>
-  <%= render partial: "form", layout: "layout" %>
+<%= trestle_form_for instance, url: admin.path(:create), method: :post do |f| %>
+  <%= render partial: "form", layout: dialog_request? ? "dialog" : "layout" %>
 <% end %>

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

@@ -1,18 +1,16 @@
-<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% title = admin.t("titles.edit", default: "Editing %{model_name}") %>
 
 <% content_for(:title, title) %>
-<% breadcrumb title %>
+<% breadcrumb(title) unless admin.singular? %>
 
-<% 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" unless admin.readonly? %>
+<% 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 %>
-  <%= link_to admin.path(:destroy, id: admin.to_param(instance)), 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) %>
-  <% end unless admin.readonly? %>
+<% 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.readonly? ? "#" : admin.path(:update, id: admin.to_param(instance)), method: :patch do |f| %>
-  <%= render partial: "form", layout: "layout" %>
+<%= 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 %>

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

@@ -1,21 +1,24 @@
-<aside class="app-sidebar<%= " #{cookies["trestle:sidebar"]}" if cookies["trestle:sidebar"] %>">
+<aside class="app-sidebar">
   <header class="app-sidebar-header">
     <button class="navbar-toggle">
-      <span class="sr-only"><%= t("admin.ui.toggle_navigation", default: "Toggle navigation") %></span>
+      <span class="sr-only"><%= t("trestle.ui.toggle_navigation", default: "Toggle navigation") %></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <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">
     <nav class="app-nav">
-      <% Trestle.navigation.each do |group, items| %>
-        <ul>
+      <% collapsed = cookies["trestle:navigation:collapsed"].try(:split, ",") || [] %>
+      <% Trestle.navigation.visible(self).each do |group, items| %>
+        <ul<% if group.present? && collapsed.include?(group.id) %> class="collapsed"<% end %>>
           <% if group.present? %>
-            <li class="nav-header"><%= group.label %></li>
+            <li class="nav-header"><%= link_to group.label, "##{group.id}" %></li>
           <% end %>
 
           <% items.each do |item| %>
@@ -33,7 +36,7 @@
     </nav>
 
     <button class="toggle-sidebar">
-      <span class="sr-only"><%= t("admin.ui.toggle_sidebar", default: "Toggle sidebar") %></span>
+      <span class="sr-only"><%= t("trestle.ui.toggle_sidebar", default: "Toggle sidebar") %></span>
     </button>
   </div>
 </aside>

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/app/views/trestle/table/_table.html.erb

@@ -1,7 +1,8 @@
 <% table = table.renderer(self) %>
 
 <div class="table-container">
-  <%= content_tag(:table, class: table.classes, data: table.data) do %>
+  <%= content_tag(:table, id: table.id, class: table.classes, data: table.data) do %>
+    <% if table.header? %>
     <thead>
       <tr>
         <% table.columns.each do |column| %>
@@ -9,14 +10,11 @@
         <% end %>
       </tr>
     </thead>
+    <% end %>
 
     <tbody>
       <% collection.each do |instance| %>
-        <%= content_tag(:tr, table.row.options(instance)) do %>
-          <% table.columns.each do |column| %>
-            <%= content_tag(:td, column.content(instance), class: column.classes, data: column.data) %>
-          <% end %>
-        <% end %>
+        <%= table.row.render(instance) %>
       <% end %>
     </tbody>
   <% end %>

data/bower.json

@@ -9,7 +9,7 @@
       "magnific-popup":          "~1.1.0",
       "bootstrap-confirmation2": "~2.4.0",
       "flatpickr":               "~3.0.7",
-      "select2":                 "~4.0.3",
+      "select2":                 "~4.0.5",
       "select2-bootstrap-theme": "~0.1.0"
   }
 }

data/config/locales/cs.rb

@@ -0,0 +1,18 @@
+{
+  cs: {
+    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"
+      }
+    }
+  }
+}

data/config/locales/cs.yml

@@ -0,0 +1,95 @@
+cs:
+  trestle:
+    title: "Administrace Trestle"
+    footer: "Poháněno systémem Trestle"
+    version: "Verze"
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Nezobrazeny žádné položky"
+            one: "Zobrazena <strong>1</strong> položka"
+            other: "Zobrazeno <strong>%{count}</strong> položek"
+            few: "Zobrazeny <strong>%{count}</strong> položky"
+
+        more_pages:
+          display_entries: "Zobrazeny položky <strong>%{first}</strong> až <strong>%{last}</strong> z celkem <b>%{total}</b>"
+
+    onboarding:
+      welcome: "Vítejte v administraci Trestle"
+      no_admins: "Začněte přidáním souboru do <code>app/admin</code>."
+      no_template: "Pro přizpůsobení šablony vytvořte  <code>%{path}</code>."
+      no_form: "Pro přidání formuláře nadefinujte form blok, nebo vytvořte soubor <code>_form.html</code>."
+
+    ui:
+      toggle_navigation: "Přepnout navigaci"
+      toggle_sidebar: "Přepnout boční panel"
+
+    dialog:
+      error: "Požadavek nemohl být dokončen."
+
+    confirmation:
+      title: "Jste si jisti?"
+      delete: "Ano"
+      cancel: "Nemazat"
+
+  admin:
+    titles:
+      index: Přehled
+      edit: Upravit položku
+      new: Nová položka
+
+    buttons:
+      new: "Přidat"
+      save: Uložit
+      delete: Smazat
+      ok: "OK"
+
+    breadcrumbs:
+      home: "Úvod"
+
+    flash:
+      create:
+        success:
+          title: "Akce úspěšně dokončena!"
+          message: "Položka byla vytvořena."
+
+        failure:
+          title: "Nastala chyba!"
+          message: "Prosím opravte chyby zvýrazněné níže."
+
+      update:
+        success:
+          title: "Akce úspěšně dokončena!"
+          message: "Položka byla aktualizováná."
+
+        failure:
+          title: "Nastala chyba!"
+          message: "Prosím opravte chyby zvýrazněné níže."
+
+      destroy:
+        success:
+          title: "Akce úspěšně dokončena!"
+          message: "Položka byla smazána."
+
+        failure:
+          title: "Nastala chyba!"
+          message: "Položku nebylo možné smazat."
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- Prosím vyberte -"
+
+    format:
+      blank: "-"
+
+    datepicker:
+      formats:
+        date: "d/m/Y"
+        datetime: "d/m/Y H:i"
+        time: "H:i"

data/config/locales/en.yml

@@ -1,21 +1,8 @@
 en:
   trestle:
-    title: Trestle Admin
-    footer: Powered by Trestle
-    version: Version
-
-    flash:
-      success:
-        title: "Success!"
-        create: "The %{model_name} was successfully created."
-        update: "The %{model_name} was successfully updated."
-        destroy: "The %{model_name} was successfully deleted."
-
-      failure:
-        title: "Warning!"
-        create: "Please correct the errors below."
-        update: "Please correct the errors below."
-        destroy: "Could not delete %{model_name}."
+    title: "Trestle Admin"
+    footer: "Powered by Trestle"
+    version: "Version"
 
     helpers:
       page_entries_info:
@@ -29,39 +16,81 @@ en:
           display_entries: "Displaying %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> of <b>%{total}</b>"
 
     onboarding:
-      welcome: Welcome to Trestle
-      no_admins: To begin, please create an admin within <code>app/admin</code>.
-      no_template: To customize this template, please create <code>%{path}</code>.
-      no_form: Please define a form block or create a <code>_form.html</code> partial.
+      welcome: "Welcome to Trestle"
+      no_admins: "To begin, please create an admin within <code>app/admin</code>."
+      no_template: "To customize this template, please create <code>%{path}</code>."
+      no_form: "Please define a form block or create a <code>_form.html</code> partial."
+
+    ui:
+      toggle_navigation: "Toggle navigation"
+      toggle_sidebar: "Toggle sidebar"
+
+    dialog:
+      error: "The request could not be completed."
+
+    confirmation:
+      title: "Are you sure?"
+      delete: "Delete"
+      cancel: "Cancel"
 
   admin:
     titles:
-      index: Listing %{pluralized_model_name}
-      edit: Editing %{model_name}
+      index: "Listing %{pluralized_model_name}"
+      new: "New %{model_name}"
+      edit: "Editing %{model_name}"
 
     buttons:
-      save: Save %{model_name}
-      delete: Delete %{model_name}
+      new: "New %{model_name}"
+      save: "Save %{model_name}"
+      delete: "Delete %{model_name}"
+      show: "Show %{model_name}"
+      edit: "Edit %{model_name}"
+      ok: "OK"
 
     breadcrumbs:
-      home: Home
+      home: "Home"
+
+    flash:
+      create:
+        success:
+          title: "Success!"
+          message: "The %{lowercase_model_name} was successfully created."
+
+        failure:
+          title: "Warning!"
+          message: "Please correct the errors below."
+
+      update:
+        success:
+          title: "Success!"
+          message: "The %{lowercase_model_name} was successfully updated."
+
+        failure:
+          title: "Warning!"
+          message: "Please correct the errors below."
+
+      destroy:
+        success:
+          title: "Success!"
+          message: "The %{lowercase_model_name} was successfully deleted."
+
+        failure:
+          title: "Warning!"
+          message: "Could not delete %{lowercase_model_name}."
 
     table:
       headers:
-        id: ID
+        id: "ID"
 
     form:
       select:
         prompt: "- Select %{attribute_name} -"
 
-    confirmation:
-      title: Are you sure?
-      delete: Delete
-      cancel: Cancel
-
-    ui:
-      toggle_navigation: Toggle navigation
-      toggle_sidebar: Toggle sidebar
-
     format:
-      blank: None
+      blank: "None"
+
+    datepicker:
+      formats:
+        date: "m/d/Y"
+        datetime: "m/d/Y h:i K"
+        time: "h:i K"

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/fr.rb

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