trestle 0.8.5 → 0.8.6

data/app/assets/stylesheets/trestle/components/_navigation.scss

@@ -48,7 +48,7 @@
 
     padding: 5px 20px;
 
-    &:after {
+    &::after {
       @extend .ion;
       content: $ionicon-var-arrow-down-b;
 
@@ -61,8 +61,8 @@
     &:hover, &:focus {
       background: none;
 
-      &:after {
-        opacity: 1.0;
+      &::before, &::after {
+        opacity: 1 !important;
       }
     }
   }
@@ -98,12 +98,28 @@
   padding: 10px 15px 15px;
   text-indent: -99999px;
 
-  &:after {
-    display: block;
-    float: none;
-    margin-top: -12px;
-    content: '';
+  &::after {
+    display: none;
+
+    position: absolute;
+    top: 4px;
+    left: 50%;
+    margin-left: -3px;
+
+    text-indent: 0;
+  }
+
+  &::before {
+    content: "";
+
+    position: absolute;
+    left: 15px;
+    right: 15px;
+    top: 50%;
+    margin-top: -4px;
+
     border-bottom: 1px solid rgba(white, 0.1);
+    opacity: 0.75;
   }
 }
 
@@ -117,14 +133,27 @@
       @include collapsed-nav-header;
     }
 
-    .expanded & {
-      .nav-header {
+    .collapsed .nav-header a {
+      &::after {
         display: block;
-        border-bottom: none;
+      }
+    }
+
+    .expanded & {
+      .nav-header a {
         height: auto;
-        margin: 0;
         padding: 5px 20px;
         text-indent: 0;
+
+        &::before {
+          display: none;
+        }
+
+        &::after {
+          display: block;
+          position: static;
+          margin-left: 0;
+        }
       }
 
       .nav-label  { display: inline; }
@@ -142,5 +171,11 @@
     .nav-header a {
       @include collapsed-nav-header;
     }
+
+    .collapsed .nav-header a {
+      &::after {
+        display: block;
+      }
+    }
   }
 }

data/app/assets/stylesheets/trestle/components/_sidebar.scss

@@ -15,6 +15,7 @@
     display: flex;
     flex-direction: column;
 
+    overflow-x: hidden;
     overflow-y: auto;
 
     &::-webkit-scrollbar {

data/app/assets/stylesheets/trestle/core/_defaults.scss

@@ -11,6 +11,7 @@ $theme-bg-gradient:          linear-gradient(rgba(white, $theme-bg-gradient-stre
 $theme-bg-color:             darken($brand-primary, 15%) !default;
 
 $theme-bg: $theme-bg-texture-url, $theme-bg-gradient, $theme-bg-color !default;
+$error-bg: $theme-bg-texture-url, $theme-bg-gradient, $brand-danger !default;
 
 $body-bg: #f3f3f3 !default;
 
@@ -45,7 +46,7 @@ $btn-default-color: white !default;
 
 $state-success-bg: lighten(#dff0d8, 5%) !default;
 $state-info-bg:    lighten(#d9edf7, 5%) !default;
-$state-warning-bg: lighten(#fcf8e3, 5%) !default;
+$state-warning-bg: lighten(#fcf8e3, 2.5%) !default;
 $state-danger-bg:  lighten(#f2dede, 5%) !default;
 
 $alert-padding:       20px !default;
@@ -79,4 +80,7 @@ $input-border:       #ccc !default;
 $input-border-focus: mix($brand-primary, $input-border) !default;
 $input-bg-disabled:  #fafafa !default;
 
+$modal-inner-padding: 20px !default;
+$modal-title-padding: 15px 20px !default;
+
 $s2bs-btn-default-bg: #eee !default;

data/app/controllers/trestle/application_controller.rb

@@ -1,7 +1,7 @@
 class Trestle::ApplicationController < ActionController::Base
   protect_from_forgery
 
-  layout 'trestle/admin'
+  layout :choose_layout
 
   # Global helpers
   self.helpers_path += Rails.application.helpers_paths
@@ -31,4 +31,8 @@ protected
     breadcrumbs.append(label, path)
   end
   helper_method :breadcrumb
+
+  def choose_layout
+    request.xhr? ? false : "trestle/admin"
+  end
 end

data/app/helpers/trestle/dialog_helper.rb

@@ -0,0 +1,7 @@
+module Trestle
+  module DialogHelper
+    def dialog_request?
+      request.headers["X-Trestle-Dialog"]
+    end
+  end
+end

data/app/helpers/trestle/form_helper.rb

@@ -4,6 +4,9 @@ module Trestle
       options[:builder] ||= Form::Builder
       options[:as] ||= admin.admin_name.singularize
 
+      options[:data] ||= {}
+      options[:data].merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)
+
       form_for(instance, options) do |f|
         with_form(f) { yield f }
       end
@@ -27,5 +30,9 @@ module Trestle
     def sidebar(&block)
       content_for(:sidebar, &block)
     end
+
+    def render_sidebar_as_tab?
+      dialog_request? && content_for?(:sidebar)
+    end
   end
 end

data/app/helpers/trestle/url_helper.rb

@@ -1,20 +1,48 @@
 module Trestle
   module UrlHelper
-    def admin_link_to(content, instance=nil, options={}, &block)
+    def admin_link_to(content, instance_or_url=nil, options={}, &block)
       if block_given?
-        instance, options = content, instance || {}
+        instance_or_url, options = content, instance_or_url || {}
         content = capture(&block)
       end
 
-      if admin = (options.key?(:admin) ? Trestle.lookup(options.delete(:admin)) : admin_for(instance))
-        link_to(content, admin_url_for(instance, admin: admin), options)
+      if instance_or_url.is_a?(String)
+        link_to(content, instance_or_url, options)
       else
-        content
+        if instance_or_url.is_a?(Hash)
+          instance_or_url, options = nil, instance_or_url
+        end
+
+        if options.key?(:admin)
+          admin = Trestle.lookup(options.delete(:admin))
+        elsif instance_or_url.respond_to?(:id)
+          admin = admin_for(instance_or_url)
+        end
+
+        admin ||= self.admin if respond_to?(:admin)
+
+        if admin
+          action = options.delete(:action) || :show
+
+          params = options.delete(:params) || {}
+          params[:id] ||= admin.to_param(instance_or_url) if instance_or_url
+
+          if [:show, :edit].include?(action) && admin.form.dialog?
+            options[:data] ||= {}
+            options[:data][:behavior] ||= "dialog"
+          end
+
+          link_to(content, admin.path(action, params), options)
+        else
+          raise ActionController::UrlGenerationError, "An admin could not be inferred. Please specify an admin using the :admin option."
+        end
       end
     end
 
     def admin_url_for(instance, options={})
-      admin = options.key?(:admin) ? Trestle.lookup(options[:admin]) : admin_for(instance)
+      admin = Trestle.lookup(options[:admin]) if options.key?(:admin)
+      admin ||= admin_for(instance)
+
       admin.path(options[:action] || :show, id: admin.to_param(instance)) if admin
     end
 

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

@@ -45,7 +45,7 @@
       <div class="app-container">
         <%= render "trestle/shared/header" %>
 
-        <main class="app-main">
+        <main class="app-main" data-context="<%= request.path %>">
           <%= yield %>
         </main>
 

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

@@ -0,0 +1,36 @@
+<div class="modal-header">
+  <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">
+  <%= render "flash" %>
+</div>
+
+<div class="modal-tabs">
+  <%= render "tabs" %>
+</div>
+
+<div class="modal-body">
+  <%= yield %>
+
+  <% if content_for?(:sidebar) %>
+    <div id="tab-sidebar" class="tab-pane" role="tabpanel">
+      <%= content_for(:sidebar) %>
+    </div>
+  <% end %>
+</div>
+
+<div class="modal-footer">
+  <% if content_for?(:secondary_toolbar) %>
+    <div class="btn-toolbar secondary-toolbar">
+      <%= content_for(:secondary_toolbar) %>
+    </div>
+  <% end %>
+
+  <% if content_for?(:primary_toolbar) %>
+    <div class="btn-toolbar primary-toolbar">
+      <%= content_for(:primary_toolbar) %>
+    </div>
+  <% end %>
+</div>

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

@@ -1,9 +1,15 @@
-<% if tabs.size > 1 -%>
+<% if tabs.size > 1 || 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-#{name}", 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>
+    <% end %>
   </ul>
 <% end %>

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

@@ -4,15 +4,15 @@
 <% 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)), method: :patch 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/resource/index.html.erb

@@ -1,10 +1,10 @@
 <% content_for(:title, t("admin.titles.index", default: "Listing %{pluralized_model_name}", model_name: admin.model_name.titleize, pluralized_model_name: admin.model_name.plural.titleize)) %>
 
 <% content_for(:primary_toolbar) do %>
-  <%= link_to admin.path(:new), class: "btn btn-default btn-lg" do %>
+  <%= admin_link_to action: :new, class: "btn btn-default btn-lg" do %>
     <%= icon("fa fa-plus") %>
     <span class="sr-only"><%= t("admin.buttons.new", default: "New %{model_name}", model_name: admin.model_name) %></span>
-  <% end unless admin.readonly? %>
+  <% end if admin.actions.include?(:new) %>
 <% end %>
 
 <% content_for(:utilities) do %>

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

@@ -4,9 +4,9 @@
 <% 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" %>
+  <%= 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?(:create) %>
 <% end %>
 
 <%= trestle_form_for instance, url: admin.path, method: :post do |f| %>
-  <%= render partial: "form", layout: "layout" %>
+  <%= render partial: "form", layout: dialog_request? ? "dialog" : "layout" %>
 <% end %>

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

@@ -4,15 +4,15 @@
 <% 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)), method: :patch 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/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/en.yml

@@ -1,8 +1,8 @@
 en:
   trestle:
-    title: Trestle Admin
-    footer: Powered by Trestle
-    version: Version
+    title: "Trestle Admin"
+    footer: "Powered by Trestle"
+    version: "Version"
 
     flash:
       success:
@@ -29,41 +29,45 @@ 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."
+
+    dialog:
+      error: "The request could not be completed."
 
   admin:
     titles:
-      index: Listing %{pluralized_model_name}
-      new: New %{model_name}
-      edit: Editing %{model_name}
+      index: "Listing %{pluralized_model_name}"
+      new: "New %{model_name}"
+      edit: "Editing %{model_name}"
 
     buttons:
-      new: New %{model_name}
-      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"
 
     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
+      toggle_navigation: "Toggle navigation"
+      toggle_sidebar: "Toggle sidebar"
 
     format:
-      blank: None
+      blank: "None"