trestle 0.8.3 → 0.8.6

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

@@ -1,18 +1,18 @@
-<% title = I18n.t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name.titleize, pluralized_model_name: admin.model_name.plural.titleize) %>
 
 <% content_for(:title, 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? %>
+  <%= button_tag t("admin.buttons.save", default: "Save %{model_name}", model_name: admin.model_name), class: "btn btn-success btn-lg" 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 %>
+  <%= admin_link_to instance, action: :destroy, 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? %>
+  <% end if admin.actions.include?(:destroy) %>
 <% end %>
 
-<%= trestle_form_for instance, url: admin.readonly? ? "#" : admin.path(:update, id: admin.to_param(instance)) do |f| %>
-  <%= render partial: "form", layout: "layout" %>
+<%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.path(:update, id: admin.to_param(instance)) : "#", method: :patch do |f| %>
+  <%= render partial: "form", layout: dialog_request? ? "dialog" : "layout" %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <aside class="app-sidebar<%= " #{cookies["trestle:sidebar"]}" if cookies["trestle:sidebar"] %>">
   <header class="app-sidebar-header">
     <button class="navbar-toggle">
-      <span class="sr-only">Toggle navigation</span>
+      <span class="sr-only"><%= t("admin.ui.toggle_navigation", default: "Toggle navigation") %></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
@@ -12,10 +12,11 @@
 
   <div class="app-sidebar-inner">
     <nav class="app-nav">
+      <% collapsed = cookies["trestle:navigation:collapsed"].try(:split, ",") || [] %>
       <% Trestle.navigation.each do |group, items| %>
-        <ul>
+        <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| %>
@@ -32,6 +33,8 @@
       <% end %>
     </nav>
 
-    <button class="toggle-sidebar"></button>
+    <button class="toggle-sidebar">
+      <span class="sr-only"><%= t("admin.ui.toggle_sidebar", default: "Toggle sidebar") %></span>
+    </button>
   </div>
 </aside>

data/bower.json

@@ -8,8 +8,8 @@
       "ionicons":                "~2.0.1",
       "magnific-popup":          "~1.1.0",
       "bootstrap-confirmation2": "~2.4.0",
-      "flatpickr":               "~2.6.1",
-      "select2":                 "~4.0.3",
+      "flatpickr":               "~3.0.7",
+      "select2":                 "~4.0.5",
       "select2-bootstrap-theme": "~0.1.0"
   }
 }

data/config/locales/en.yml

@@ -1,21 +1,21 @@
 en:
   trestle:
-    title: Trestle Admin
-    footer: Powered by Trestle
-    version: Version
+    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."
+        create: "The %{lowercase_model_name} was successfully created."
+        update: "The %{lowercase_model_name} was successfully updated."
+        destroy: "The %{lowercase_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}."
+        destroy: "Could not delete %{lowercase_model_name}."
 
     helpers:
       page_entries_info:
@@ -28,26 +28,46 @@ en:
         more_pages:
           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."
+
+    dialog:
+      error: "The request could not be completed."
+
   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}"
+      ok: "OK"
 
     breadcrumbs:
-      home: Home
+      home: "Home"
 
     table:
       headers:
-        id: ID
+        id: "ID"
 
-      column:
-        blank: None
+    form:
+      select:
+        prompt: "- Select %{attribute_name} -"
 
     confirmation:
-      title: Are you sure?
-      delete: Delete
-      cancel: Cancel
+      title: "Are you sure?"
+      delete: "Delete"
+      cancel: "Cancel"
+
+    ui:
+      toggle_navigation: "Toggle navigation"
+      toggle_sidebar: "Toggle sidebar"
+
+    format:
+      blank: "None"

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

data/config/locales/fr.yml

@@ -0,0 +1,69 @@
+fr:
+  trestle:
+    title: "Trestle Admin"
+    footer: "Fourni par Trestle"
+    version: "Version"
+
+    flash:
+      success:
+        title: "Opération réussie"
+        create: "%{model_name} créé(e)."
+        update: "%{model_name} mis(e) à jour."
+        destroy: "%{model_name} supprimé(e)."
+
+      failure:
+        title: "Attention!"
+        create: "Veuillez corriger les erreurs ci-après."
+        update: "Veuillez corriger les erreurs ci-après."
+        destroy: "Suppression impossible."
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Aucun(e) '%{entry_name}'"
+            one: "<strong>1</strong> %{entry_name}"
+            other: "<strong>%{count}</strong> %{entry_name}"
+
+        more_pages:
+          display_entries: "%{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> sur <b>%{total}</b>"
+
+    onboarding:
+      welcome: "Bienvenue sur Trestle"
+      no_admins: "Pour commencer, créez le répertoire <code>app/admin</code>."
+      no_template: "Pour personnaliser ce modèle, veuillez créer <code>%{path}</code>."
+      no_form: "Veuillez déclarer un block 'form' ou créer un modèle partiel <code>_form.html</code>."
+
+  admin:
+    titles:
+      index: "Liste des %{pluralized_model_name}"
+      new: "%{model_name} (ajout)"
+      edit: "%{model_name} (modification)"
+
+    buttons:
+      new: "Nouveau"
+      save: "Enregistrer"
+      delete: "Supprimer"
+
+    breadcrumbs:
+      home: "Acceuil"
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- Choisir le/la %{attribute_name} -"
+
+    confirmation:
+      title: "Voulez-vous supprimer?"
+      delete: "Oui"
+      cancel: "Non"
+
+    ui:
+      toggle_navigation: "Basculer navigation"
+      toggle_sidebar: "Basculer vue latérale"
+
+    format:
+      blank: "Aucun"

data/config/locales/nl.rb

@@ -0,0 +1,18 @@
+{
+  nl: {
+    date: {
+      formats: {
+        trestle_date: proc { |date| "#{date.day} %b %Y" },
+        trestle_calendar: "%-d-%-m-%Y"
+      }
+    },
+
+    time: {
+      formats: {
+        trestle_date: proc { |time| "#{time.day} %b %Y" },
+        trestle_time: "%R %p",
+        trestle_time_with_seconds: "%T %p"
+      }
+    }
+  }
+}

data/config/locales/nl.yml

@@ -0,0 +1,67 @@
+nl:
+  trestle:
+    title: "Trestle Admin"
+    footer: "Powered by Trestle"
+    version: "Versie"
+
+    flash:
+      success:
+        title: "Gelukt!"
+        create: "De %{model_name} succesvol toegevoegd."
+        update: "De %{model_name} is succesvol gewijzigd."
+        destroy: "De %{model_name} is succesvol verwijderd."
+
+      failure:
+        title: "Waarschuwing!"
+        create: "Kon niet toevoegen om de volgende redenen."
+        update: "Kon niet aanpassen om de volgende redenen."
+        destroy: "Kon %{model_name} niet verwijderen."
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Geen %{entry_name} gevonden"
+            one: "<strong>1</strong> %{entry_name} wordt weergeven"
+            other: "<strong>Alle %{count}</strong> %{entry_name} worden weergeven"
+
+        more_pages:
+          display_entries: "%{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> van de <b>%{total}</b> worden weergeven"
+
+    onboarding:
+      welcome: "Welkom bij Trestle"
+      no_admins: "Voeg een admin toe in <code>app/admin</code> om te beginnen."
+      no_template: "Maak <code>%{path}</code> aan om dit template aan te passen."
+      no_form: "Definieer een form block of maak een <code>_form.html</code> partial."
+
+  admin:
+    titles:
+      index: "Lijst van %{pluralized_model_name}"
+      edit: "%{model_name} aanpassen"
+
+    buttons:
+      save: "%{model_name} opslaan"
+      delete: "%{model_name} verwijderen"
+
+    breadcrumbs:
+      home: "Home"
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- Selecteer %{attribute_name} -"
+
+    confirmation:
+      title: "Weer je het zeker?"
+      delete: "Verwijderen"
+      cancel: "Annuleren"
+
+    ui:
+      toggle_navigation: "Navigation tonen/verbergen"
+      toggle_sidebar: "Sidebar tonen/verbergen"
+
+    format:
+      blank: "Geen"

data/config/locales/pl.rb

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

data/config/locales/pl.yml

@@ -0,0 +1,70 @@
+pl:
+  trestle:
+    title: "Trestle Admin"
+    footer: "Powered by Trestle"
+    version: "Wersja"
+
+    flash:
+      success:
+        title: "Sukces!"
+        create: "%{lowercase_model_name} został pomyślnie utworzony."
+        update: "%{lowercase_model_name} został pomyślnie zaktualizowany."
+        destroy: "%{lowercase_model_name} został pomyślnie usunięty."
+
+      failure:
+        title: "Uwaga!"
+        create: "Popraw poniższe błędy."
+        update: "Popraw poniższe błędy."
+        destroy: "Nie można usunąć %{lowercase_model_name}."
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Nie znaleziono %{entry_name}"
+            one: "Wyświetla <strong>1</strong> %{entry_name}"
+            few: "Wyświetla <strong>wszystkie %{count}</strong> %{entry_name}"
+            other: "Wyświetla <strong>wszystkie %{count}</strong> %{entry_name}"
+
+        more_pages:
+          display_entries: "Wyświetla %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> z <b>%{total}</b> łącznie"
+
+    onboarding:
+      welcome: "Witamy w Trestle"
+      no_admins: "Aby rozpocząć, utwórz administratora w zasięgu <code>app/admin</code>."
+      no_template: "Aby dostosować ten szablon, utwórz <code>%{path}</code>."
+      no_form: "Proszę zdefiniować blok formularza lub utworzyć podszablon <code>_form.html</code>."
+
+  admin:
+    titles:
+      index: "Lista %{pluralized_model_name}"
+      new: "Nowy %{model_name}"
+      edit: "Edycja %{model_name}"
+
+    buttons:
+      new: "Nowy %{model_name}"
+      save: "Zachowaj %{model_name}"
+      delete: "Usuń %{model_name}"
+
+    breadcrumbs:
+      home: "Start"
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- Wybierz %{attribute_name} -"
+
+    confirmation:
+      title: "Jesteś pewny?"
+      delete: "Usuń"
+      cancel: "Anuluj"
+
+    ui:
+      toggle_navigation: "Przełącz nawigację"
+      toggle_sidebar: "Przełącz pasek boczny"
+
+    format:
+      blank: "Żaden"

data/config/locales/pt-BR.rb

@@ -0,0 +1,18 @@
+{
+  'pt-BR': {
+    date: {
+      formats: {
+        trestle_date: proc { |date| "#{date.day}º %b %Y" },
+        trestle_calendar: "%-m/%-d/%Y"
+      }
+    },
+
+    time: {
+      formats: {
+        trestle_date: proc { |time| "#{time.day}º %b %Y" },
+        trestle_time: "%-l:%M %p",
+        trestle_time_with_seconds: "%l:%M:%S %p"
+      }
+    }
+  }
+}

data/config/locales/pt-BR.yml

@@ -0,0 +1,69 @@
+pt-BR:
+  trestle:
+    title: "Trestle Admin"
+    footer: "Powered by Trestle"
+    version: "Versão"
+
+    flash:
+      success:
+        title: "Sucesso!"
+        create: "O %{model_name} foi criado com sucesso."
+        update: "O %{model_name} foi atualizado com sucesso."
+        destroy: "O %{model_name} foi deletado com sucesso."
+
+      failure:
+        title: "Atenção!"
+        create: "Por favor corrija os erros abaixo."
+        update: "Por favor corrija os erros abaixo."
+        destroy: "Falha ao excluir %{model_name}."
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "Nenhum %{entry_name} encontrado"
+            one: "Mostrando <strong>1</strong> %{entry_name}"
+            other: "Mostrando <strong>all %{count}</strong> %{entry_name}"
+
+        more_pages:
+          display_entries: "Mostrando %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> de <b>%{total}</b>"
+
+    onboarding:
+      welcome: "Bem-vindo ao Trestle"
+      no_admins: "Para começar, crie um admin dentro de <code>app/admin</code>."
+      no_template: "Para personalizar este template, crie <code>%{path}</code>."
+      no_form: "Defina um bloco de formulário ou crie um <code>_form.html</code> parcial."
+
+  admin:
+    titles:
+      index: "Listando %{pluralized_model_name}"
+      new: "Novo %{model_name}"
+      edit: "Editando %{model_name}"
+
+    buttons:
+      new: "Novo %{model_name}"
+      save: "Salvar %{model_name}"
+      delete: "Excluir %{model_name}"
+
+    breadcrumbs:
+      home: "Home"
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- Selecione %{attribute_name} -"
+
+    confirmation:
+      title: "Você tem certeza?"
+      delete: "Excluir"
+      cancel: "Cancelar"
+
+    ui:
+      toggle_navigation: "Alternar naveção"
+      toggle_sidebar: "Alternar barra lateral"
+
+    format:
+      blank: "Nenhum"

data/gemfiles/rails-4.2.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
+end
+
+gem 'rails', '~> 4.2.0'
+
+gemspec :path => "../"

data/gemfiles/rails-5.0.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
+end
+
+gem 'rails', '~> 5.0.0'
+
+gemspec :path => "../"

data/gemfiles/rails-5.1.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
+end
+
+gem 'rails', '~> 5.1.0'
+
+gemspec :path => "../"

data/gemfiles/rails-edge.gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
+end
+
+gem 'rails', github: 'rails/rails'
+gem 'arel', github: 'rails/arel'
+
+gemspec :path => "../"

data/lib/generators/trestle/install/install_generator.rb

@@ -10,10 +10,10 @@ module Trestle
       end
 
       def create_assets
-        template "_variables.scss",   "app/assets/stylesheets/trestle/_variables.scss"
-        template "_custom.scss",      "app/assets/stylesheets/trestle/_custom.scss"
+        template "_variables.scss", "app/assets/stylesheets/trestle/_variables.scss"
+        template "_custom.scss",    "app/assets/stylesheets/trestle/_custom.scss"
 
-        template "custom.js.coffee",  "app/assets/javascripts/trestle/custom.js.coffee"
+        template "custom.js",       "app/assets/javascripts/trestle/custom.js"
       end
 
       def create_directory

data/lib/generators/trestle/install/templates/custom.js

@@ -0,0 +1,7 @@
+// This file may be used for providing additional customizations to the Trestle
+// admin. It will be automatically included within all admin pages.
+//
+// For organizational purposes, you may wish to define your customizations
+// within individual partials and `require` them here.
+//
+//  e.g. //= require "trestle/custom/my_custom_js"

data/lib/generators/trestle/install/templates/trestle.rb.erb

@@ -70,7 +70,7 @@ Trestle.configure do |config|
   # config.around_action do |controller, block|
   #   Rails.logger.debug("Around action (before)")
   #   block.call
-  #   Rails.logger.debug("Around ation (after)")
+  #   Rails.logger.debug("Around action (after)")
   # end
 
   # Specify a custom hook to be injected into the admin.
@@ -93,7 +93,8 @@ Trestle.configure do |config|
   # See the documentation on Trestle::Adapters::Adapter for details on
   # the adapter methods that can be customized.
   #
-  # config.default_adapter.extend MyAdapterExtensions
+  # config.default_adapter = Trestle::Adapters.compose(Trestle::Adapters::SequelAdapter)
+  # config.default_adapter.include MyAdapterExtensions
 
   # Register a form field type to be made available to the Trestle form builder.
   # Field types should conform to the following method definition:
@@ -104,4 +105,10 @@ Trestle.configure do |config|
   # end
   #
   # config.form_field :custom, CustomFormField
+
+  # == Debugging Options
+  #
+  # Enable debugging of form errors. Defaults to true in development mode.
+  #
+  # config.debug_form_errors = true
 end

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

@@ -30,6 +30,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_name %>).require(:name, ...)
+  #   params.require(:<%= singular_name %>).permit(:name, ...)
   # end
 end