trestle 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3ae26567281306d04d1da21b166f39c068cfa459bcc29c9eaa883637707a762
-  data.tar.gz: 6d3cf1573074b377051afcb03639f468f2346913bc05ac44020981a7292e066d
+  metadata.gz: 8ec0dcceb14b2184fb07724245272ba57926c91058ed554cb19653149aa5a61d
+  data.tar.gz: ec4b694ff3649bb301dffad74fba26fce2dc222c52ffeb48ff205fcda95c1e98
 SHA512:
-  metadata.gz: 59b8c63538cfbe37b17530821cb908d288523ff0706b3cfdcb377a14037aa8dd961b7187846fe501ece13989646c19a41c751381ef2b2f90568f22e703d04e48
-  data.tar.gz: c4d3ac261e2e754e942ec02be90cb4c4eff03be3ea6167a0ef1075d2c54bab5e5214bba15997703bc3cd4f99169881cba493cb7f27e38e0a4c630a778dda8cfb
+  metadata.gz: e07e61553b61a4f0ed93efc32178290de7623a37fb58e8caf4ce170e8b09cf1d15b1765b7cd28544e99c841fa5de25bd78d02220308da2ce98cc02fb2af36938
+  data.tar.gz: 58eb9ad54d778ace1d86fc8e7f39b069604d15049af4f3bd05b6cef8c629b9eec0b11589e44e5f63a371632d1f45396873eb3ac9c395c4ae002108c47f77e2b5

data/app/assets/javascripts/trestle/admin.js

@@ -1,2 +1,3 @@
 //= require trestle/bundle
+//= require trestle/i18n
 //= require trestle/custom

data/app/assets/javascripts/trestle/i18n.js.erb

@@ -0,0 +1,8 @@
+<% flatpickr_locale_conversions = { ca: "cat", el: "gr", nb: "no", vi: "vn" } %>
+
+<% I18n.available_locales.each do |locale| %>
+  <% Trestle.i18n_fallbacks(locale).each do |candidate| %>
+    <% candidate = flatpickr_locale_conversions[candidate] || candidate %>
+    <% require_asset("trestle/flatpickr/#{candidate}") rescue nil %>
+  <% end %>
+<% end %>

data/app/helpers/trestle/grid_helper.rb

@@ -1,9 +1,44 @@
 module Trestle
   module GridHelper
-    def row
-      content_tag(:div, class: "row") { yield }
+    # Renders a row div, one of the building blocks of Bootstrap's grid system.
+    # https://getbootstrap.com/docs/4.4/layout/grid/
+    #
+    # attrs - Hash of attributes that will be passed to the tag (e.g. id, data, class).
+    #
+    # Examples
+    #
+    #   <%= row do %>
+    #     <%= col do %>Column content<% end %>
+    #   <% end %>
+    #
+    #   <%= row class: "row-cols-2", id: "my-row" do %> ...
+    #
+    # Returns a HTML-safe String.
+    def row(attrs={})
+      defaults = Trestle::Options.new(class: ["row"])
+      options = defaults.merge(attrs)
+
+      content_tag(:div, options) { yield }
     end
 
+    # Renders a column div, one of the building blocks of Bootstrap's grid system.
+    # https://getbootstrap.com/docs/4.4/layout/grid/
+    #
+    # Column divs should always be rendered inside of a row div.
+    #
+    # Examples
+    #
+    #   # Standard column - evenly fills available space
+    #   <%= col do %>...<% end %>
+    #
+    #   # Column spans 4 (out of 12) grid columns (i.e. 1/3 width) at all breakpoints
+    #   <%= col 4 do %> ...
+    #
+    #   # Column spans 6 grid columns at smallest breakpoint, 4 at md breakpoint
+    #   # and above (portrait tablet) and 3 at xl breakpoint and above (desktop)
+    #   <%= col 6, md: 4, xl: 3 do %> ...
+    #
+    # Returns a HTML-safe String.
     def col(columns=nil, breakpoints={})
       if columns.is_a?(Hash)
         breakpoints = columns
@@ -17,8 +52,13 @@ module Trestle
       content_tag(:div, class: classes) { yield }
     end
 
-    def divider
-      content_tag(:hr)
+    # Renders an <HR> (horizontal rule) HTML tag.
+    #
+    # attrs - Hash of attributes that will be passed to the tag (e.g. id, data, class).
+    #
+    # Returns a HTML-safe String.
+    def divider(attrs={})
+      tag(:hr, attrs)
     end
   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/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]

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/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 %>

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

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 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

@@ -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 if admin.actions.include?(: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 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

@@ -20,7 +20,7 @@
 
           <% 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>
 

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/frontend/js/components/tabs.js

@@ -2,7 +2,7 @@
 
 import $ from 'jquery'
 
-import { init, ready } from '../core/events'
+import { init } from '../core/events'
 
 const TAB_SELECTOR = 'a[data-toggle="tab"]'
 const TAB_PANE_SELECTOR = '.tab-pane'
@@ -21,7 +21,7 @@ init(function (root) {
 })
 
 // Restore active tab when loading
-ready(function () {
+init(function () {
   focusActiveTab()
 })
 

data/lib/generators/trestle/resource/resource_generator.rb

@@ -3,10 +3,24 @@ module Trestle
     class ResourceGenerator < ::Rails::Generators::NamedBase
       desc "Creates a Trestle admin resource"
 
+      class_option :singular, type: :boolean, default: false, desc: "Generate a singular resource"
+
       source_root File.expand_path("../templates", __FILE__)
 
       def create_admin
-        template "admin.rb.erb", File.join("app/admin", class_path, "#{plural_name}_admin.rb")
+        template "admin.rb.erb", File.join("app/admin", class_path, "#{admin_name}_admin.rb")
+      end
+
+      def admin_name
+        singular? ? singular_name : plural_name
+      end
+
+      def parameter_name
+        singular_name.singularize
+      end
+
+      def singular?
+        options[:singular]
       end
 
     protected

data/lib/generators/trestle/resource/templates/admin.rb.erb

@@ -1,8 +1,14 @@
-Trestle.resource(:<%= plural_name %><% if module? %>, scope: <%= module_name %><% end %>) do
+Trestle.resource(:<%= admin_name %><% if module? %>, scope: <%= module_name %><% end %><% if singular? %>, singular: true<% end %>) do
   menu do
-    item :<%= plural_name %>, icon: "fa fa-star"
+    item :<%= admin_name %>, icon: "fa fa-star"
   end
 
+<%- if singular? -%>
+  instance do
+    # Override this block to define the instance that this resource represents.
+    raise NotImplementedError, "Singular resources must define an instance block."
+  end
+<%- else -%>
   # Customize the table columns shown on the index view.
   #
   # table do
@@ -10,19 +16,20 @@ Trestle.resource(:<%= plural_name %><% if module? %>, scope: <%= module_name %><
   #   column :created_at, align: :center
   #   actions
   # end
+<%- end -%>
 
-  # Customize the form fields shown on the new/edit views.
+  # Customize the form fields shown on the <% if singular? %>edit view<% else %>new/edit views<% end %>.
   #
-  # form do |<%= singular_table_name %>|
+  # form do |<%= parameter_name %>|
   #   text_field :name
   #
   #   row do
-  #     col(xs: 6) { datetime_field :updated_at }
-  #     col(xs: 6) { datetime_field :created_at }
+  #     col { datetime_field :updated_at }
+  #     col { datetime_field :created_at }
   #   end
   # end
 
-  # By default, all parameters passed to the update and create actions will be
+  # By default, all parameters passed to the <% if singular? %>update action<% else %>update and create actions<% end %> will be
   # permitted. If you do not have full trust in your users, you should explicitly
   # define the list of permitted parameters.
   #
@@ -30,6 +37,6 @@ Trestle.resource(:<%= plural_name %><% if module? %>, scope: <%= module_name %><
   #   http://guides.rubyonrails.org/action_controller_overview.html#strong-parameters
   #
   # params do |params|
-  #   params.require(:<%= singular_table_name %>).permit(:name, ...)
+  #   params.require(:<%= parameter_name %>).permit(:name, ...)
   # end
 end