trestle 0.9.0 → 0.9.5

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

@@ -1,9 +1,18 @@
-<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 %>
-        <strong><%= scope.label %></strong> (<%= number_with_delimiter(scope.count(admin.collection(params))) %>)
-      <% end %>
-    <% end %>
+<%= content_tag(:dl, class: admin.scopes.classes) do %>
+  <% admin.scopes.grouped.each do |group, scopes| %>
+    <%= content_tag(:dt, group, class: ["scope-group", ("scope-group-empty" if group.blank?)]) if admin.scopes.grouped? %>
+
+    <dd>
+      <ul class="scope-list">
+        <% scopes.each do |scope| %>
+          <li>
+            <%= link_to persistent_params.merge(scope: (scope unless scope.active?(params))), class: ["scope", ("active" if scope.active?(params))] do %>
+              <strong><%= scope.label %></strong>
+              (<%= number_with_delimiter(scope.count(admin.collection(params))) %>)
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    </dd>
   <% end %>
-</ul>
+<% end %>

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,11 +1,11 @@
 <% 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 %>
 <% end %>
 
 <% content_for(:utilities) do %>
-  <%= render "scopes" if admin.scopes.any? %>
+  <%= render "scopes" %>
 <% end if admin.scopes.any? %>
 
 <%= render layout: "layout" 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

@@ -11,24 +11,23 @@
 
   <div class="app-sidebar-inner">
     <nav class="app-nav">
-      <% collapsed = cookies["trestle:navigation:collapsed"].try(:split, ",") || [] %>
       <% Trestle.navigation(self).each do |group, items| %>
-        <ul<% if group.present? && collapsed.include?(group.id) %> class="collapsed"<% end %>>
+        <%= content_tag(:ul, class: ("collapsed" if group.present? && navigation_group_collapsed?(group)), data: { group: group.id }) do %>
           <% if group.present? %>
             <li class="nav-header"><%= link_to group.label, "##{group.id}" %></li>
           <% end %>
 
           <% items.each do |item| %>
-            <li<% if current_navigation_item?(item) %> class="active"<% end %>>
-              <%= link_to item.path do %>
+            <%= content_tag(:li, class: ("active" if current_navigation_item?(item))) 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: ["badge", item.badge.html_class]) if item.badge? %>
               <% end %>
-            </li>
+            <% end %>
           <% end %>
-        </ul>
+        <% end %>
       <% end %>
     </nav>
 

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

data/frontend/css/components/_fields.scss

@@ -12,6 +12,11 @@
   }
 }
 
+ul.invalid-feedback {
+  list-style: none;
+  padding-left: 0;
+}
+
 .form-text {
   color: $form-text-color;
   font-size: 0.9rem;

data/frontend/css/components/_scopes.scss

@@ -1,44 +1,89 @@
 .scopes {
-  list-style: none;
-
-  margin-top: -0.25rem;
   margin-bottom: 0;
 
-  padding: 0;
+  dd {
+    margin-bottom: 0;
+  }
+
+  &.grouped {
+    @include media-breakpoint-up(md) {
+      display: grid;
+      grid-template-columns: auto 1fr;
+    }
+
+
+    @include media-breakpoint-down(sm) {
+      .scope-group-empty:first-child {
+        display: none;
+      }
+    }
+
+    background: #fafafa;
+
+    dd {
+      padding: 0.375rem 0.5rem 0.375rem;
+    }
+  }
+
+  &.columns {
+    grid-template-rows: auto 1fr;
+    grid-auto-flow: column;
+
+    overflow-x: auto;
+  }
+}
+
+.scope-group {
+  line-height: 2;
+  font-size: 0.85rem;
+  padding: 0.5rem 1rem 0.25rem 0.75rem;
+
+  background: #f7f7f7;
+}
+
+.scope-list {
+  list-style: none;
 
   display: flex;
   flex-wrap: wrap;
 
+  position: relative;
+  align-items: center;
+
+  margin-bottom: 0;
+  padding: 0;
+
   li {
-    margin-top: 0.25rem;
-    margin-right: 0.35rem;
+    margin: 0.125rem 0.35rem 0.125rem 0;
 
     &:last-child {
       margin-right: 0;
     }
   }
+}
 
-  a {
-    background-color: $scope-bg;
+.scope {
+  display: inline-block;
 
-    font-size: 0.8rem;
-    font-weight: normal;
-    white-space: nowrap;
+  background-color: $scope-bg;
 
-    border-radius: 50rem;
-    padding: $scope-padding;
+  font-size: 0.8rem;
+  font-weight: normal;
+  white-space: nowrap;
 
-    &, &:hover, &:focus {
-      color: $scope-color;
-    }
+  border-radius: 50rem;
+  padding: $scope-padding;
 
-    &:hover, &:focus {
-      background-color: $scope-hover-bg;
-      text-decoration: none;
-    }
+  &, &:hover, &:focus {
+    color: $scope-color;
+  }
+
+  &:hover, &:focus {
+    background-color: $scope-hover-bg;
+    text-decoration: none;
   }
 
-  li.active a {
+  &.active {
     &, &:hover, &:focus, strong {
       color: $scope-active-color;
     }