trestle 0.8.13 → 0.9.4

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/views/kaminari/trestle/_first_page.html.erb

@@ -6,6 +6,10 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li<% if current_page.first? %> class="disabled"<% end %>>
-  <%= link_to_unless current_page.first?, content_tag(:span, "&laquo;".html_safe), url, remote: remote %>
+<li class="page-item<% if current_page.first? %> disabled<% end %>">
+  <% if current_page.first? %>
+    <span class="page-link">&laquo;</span>
+  <% else %>
+    <%= link_to content_tag(:span, "&laquo;".html_safe), url, class: "page-link", remote: remote %>
+  <% end %>
 </li>

data/app/views/kaminari/trestle/_gap.html.erb

@@ -5,6 +5,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="gap disabled">
-  <span><%= t('views.pagination.truncate').html_safe %></span>
+<li class="page-item gap disabled">
+  <span class="page-link"><%= t('views.pagination.truncate').html_safe %></span>
 </li>

data/app/views/kaminari/trestle/_last_page.html.erb

@@ -6,6 +6,10 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li<% if current_page.last? %> class="disabled"<% end %>>
-  <%= link_to_unless current_page.last?, content_tag(:span, "&raquo;".html_safe), url, remote: remote %>
+<li class="page-item<% if current_page.last? %> disabled<% end %>">
+  <% if current_page.last? %>
+    <span class="page-link">&raquo;</span>
+  <% else %>
+    <%= link_to content_tag(:span, "&raquo;".html_safe), url, class: "page-link", remote: remote %>
+  <% end %>
 </li>

data/app/views/kaminari/trestle/_page.html.erb

@@ -7,6 +7,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li<% if page.current? %> class="active"<% end %>>
-  <%= link_to_unless page.current?, content_tag(:span, page), url, remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil %>
+<li class="page-item<% if page.current? %> active<% end %>">
+  <%= link_to content_tag(:span, page), url, class: "page-link", remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil %>
 </li>

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

@@ -12,23 +12,25 @@
 
     <%= 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 %>
 
     <%= stylesheet_link_tag "trestle/admin", 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/theme", 'data-turbolinks-track': 'reload' if Trestle.config.theme %>
+    <%= stylesheet_link_tag "trestle/custom", 'data-turbolinks-track': 'reload' %>
 
     <%= hook :stylesheets %>
 
-    <%= javascript_include_tag "turbolinks" if Trestle.config.turbolinks %>
+    <%= javascript_include_tag "turbolinks" if Trestle.config.turbolinks rescue nil %>
     <%= 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 %>

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

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

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/application/_tabs.html.erb

@@ -1,14 +1,14 @@
-<% if tabs.size > 1 || render_sidebar_as_tab? -%>
+<% if tabs.any? || render_sidebar_as_tab? -%>
   <ul class="nav nav-tabs">
     <% tabs.each do |name, tab| %>
-      <li<% if name == tabs.keys.first %> class="active"<% end %>>
-        <%= link_to tab.label, "##{tab.id(("modal" if dialog_request?))}", role: "tab", data: { toggle: "tab" } %>
+      <li class="nav-item">
+        <%= link_to tab.label, "##{tab.id(("modal" if dialog_request?))}", class: ["nav-link", ("active" if name == tabs.keys.first)], role: "tab", data: { toggle: "tab" } %>
       </li>
     <% end %>
 
     <% if render_sidebar_as_tab? %>
-      <li class="pull-right">
-        <%= link_to icon("fa fa-list-alt"), "#tab-sidebar", role: "tab", data: { toggle: "tab" } %>
+      <li class="nav-item align-right">
+        <%= link_to icon("fa fa-list-alt"), "#tab-sidebar", class: "nav-link", role: "tab", data: { toggle: "tab" } %>
       </li>
     <% end %>
   </ul>

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: normalize_flash_alert(flash[:message]) %>
+  <%= 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 ion-ios-close-outline"), alert: normalize_flash_alert(flash[:error]) } do %>
+  <%= 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? %>
   <% end %>
 <% end -%>

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

@@ -1,4 +1,4 @@
-<ul class="scopes pull-left">
+<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 %>

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,7 +1,7 @@
 <% 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, icon: "fa fa-plus", class: "btn-new-resource" if admin.actions.include?(:new) %>
+  <%= t.new %>
 <% end %>
 
 <% content_for(:utilities) 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

@@ -1,13 +1,10 @@
-<aside class="app-sidebar">
+<aside class="app-sidebar navbar-expand-md" id="app-sidebar">
   <header class="app-sidebar-header">
-    <button class="navbar-toggle">
-      <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 class="navbar-toggler" type="button" aria-controls="app-sidebar" aria-expanded="false" aria-label="<%= t("trestle.ui.toggle_navigation", default: "Toggle navigation") %>">
+      <span class="navbar-toggler-icon"></span>
     </button>
 
-    <%= link_to Trestle.config.root, class: "navbar-brand" do %>
+    <%= link_to Trestle.config.root, class: "app-sidebar-title" do %>
       <%= hook("view.title") { render "trestle/shared/title" } %>
     <% end %>
   </header>
@@ -23,11 +20,11 @@
 
           <% items.each do |item| %>
             <li<% if current_navigation_item?(item) %> class="active"<% end %>>
-              <%= link_to item.path 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: ["nav-badge", item.badge.html_class]) if item.badge? %>
+                <%= content_tag(:span, item.badge.text, class: ["badge", item.badge.html_class]) if item.badge? %>
               <% end %>
             </li>
           <% end %>

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

@@ -1,14 +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) %>
+    <%= image_tag(Trestle.config.site_logo, class: "title-large", alt: Trestle.config.site_title) %>
+    <%= image_tag(Trestle.config.site_logo_small, class: "title-small", 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>
+  <span class="title-large"><%= 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>
+  <span class="title-large"><%= Trestle.config.site_title %></span>
+  <span class="title-small"><%= Trestle.config.site_title.split(/ /).map(&:first).first(3).join %></span>
 <% end %>

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/en.yml

@@ -34,6 +34,10 @@ en:
       delete: "Delete"
       cancel: "Cancel"
 
+    file:
+      choose_file: "Choose file..."
+      browse: "Browse"
+
   admin:
     titles:
       index: "Listing %{pluralized_model_name}"

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"
+      }
+    }
+  }
+}

data/config/locales/vi.yml

@@ -0,0 +1,101 @@
+vi:
+  trestle:
+    title: "Trestle Admin"
+    footer: "Powered by Trestle"
+    version: "Version"
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Không có %{entry_name} được tìm thấy"
+            one: "Hiển thị <strong>1</strong> %{entry_name}"
+            other: "Hiển thị <strong>tất cả %{count}</strong> %{entry_name}"
+
+        more_pages:
+          display_entries: "Hiển thị %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> của <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."
+
+    ui:
+      toggle_navigation: "Toggle navigation"
+      toggle_sidebar: "Toggle sidebar"
+      toggle_dropdown: "Toggle dropdown"
+
+    dialog:
+      error: "Yêu cầu chưa hoàn thành."
+
+    confirmation:
+      title: "Bạn có chắc?"
+      delete: "Xoá"
+      cancel: "Huỷ"
+
+    file:
+      choose_file: "Chọn tập tin..."
+      browse: "Tải lên"
+
+  admin:
+    titles:
+      index: "Danh sách %{pluralized_model_name}"
+      new: "Tạo mới %{model_name}"
+      edit: Chỉnh sửa %{model_name}"
+
+    buttons:
+      new: "Tạo mới %{model_name}"
+      save: "Lưu %{model_name}"
+      delete: "Xoá %{model_name}"
+      show: "Xem %{model_name}"
+      edit: "Chỉnh sửa %{model_name}"
+      ok: "Đồng ý"
+
+    breadcrumbs:
+      home: "Trang Chủ"
+
+    flash:
+      create:
+        success:
+          title: "Thành công!"
+          message: "%{lowercase_model_name} được tạo mới thành công!"
+
+        failure:
+          title: "Cảnh báo!"
+          message: "Vui lòng chính xác các thông tin bên dưới!"
+
+      update:
+        success:
+          title: "Thành công!"
+          message: "%{lowercase_model_name} đã được cập nhật thành công!"
+
+        failure:
+          title: "Cảnh báo!"
+          message: "Vui lòng chính xác các thông tin bên dưới!."
+
+      destroy:
+        success:
+          title: "Thành công!"
+          message: "%{lowercase_model_name} đã được xoá thành công!"
+
+        failure:
+          title: "Cảnh báo!"
+          message: "Không thể xoá %{lowercase_model_name}."
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- Chọn %{attribute_name} -"
+
+    format:
+      blank: "Chưa có"
+
+    datepicker:
+      formats:
+        date: "m/d/Y"
+        datetime: "m/d/Y h:i K"
+        time: "h:i K"