trestle 0.8.3 → 0.8.6

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

@@ -0,0 +1,92 @@
+.modal-content {
+  border: none;
+  border-radius: 0;
+
+  .modal.loading & {
+    min-height: 100px;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    &:after {
+      @extend .fa;
+      @extend .fa-spin;
+      content: $fa-var-spinner;
+
+      font-size: 32px;
+      opacity: 0.25;
+    }
+  }
+}
+
+.modal-header {
+  background: $theme-bg;
+  border-bottom: none;
+
+  .close {
+    opacity: 0.75;
+
+    &, &:hover, &:focus {
+      color: white;
+    }
+
+    &:hover, &:focus {
+      opacity: 1;
+    }
+  }
+
+  .modal.error & {
+    background: $error-bg;
+  }
+}
+
+.modal-title {
+  font-size: 18px;
+  font-weight: 500;
+  text-shadow: rgba(black, 0.5) 0 1px 1px;
+  color: white;
+}
+
+.modal-tabs .nav-tabs {
+  background: $body-bg;
+  padding: 10px 15px 0 15px;
+}
+
+.modal-flash {
+  .alert {
+    margin-bottom: 0;
+    border-radius: 0;
+    border-width: 0 0 1px 0;
+
+    padding-top: 10px;
+    padding-bottom: 10px;
+
+    .alert-icon {
+      font-size: 40px;
+      margin-right: 15px;
+    }
+
+    h3 {
+      font-size: 18px;
+    }
+
+    p {
+      font-size: 13px;
+    }
+  }
+}
+
+.modal-body {
+  @extend .tab-content;
+}
+
+.modal-footer {
+  .primary-toolbar {
+    float: right;
+  }
+
+  .secondary-toolbar {
+    float: left;
+  }
+}

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

@@ -38,7 +38,8 @@
     vertical-align: 0;
   }
 
-  .nav-header {
+  .nav-header a {
+    position: relative;
     color: rgba(white, 0.25);
 
     text-transform: uppercase;
@@ -46,6 +47,24 @@
     font-size: 11px;
 
     padding: 5px 20px;
+
+    &::after {
+      @extend .ion;
+      content: $ionicon-var-arrow-down-b;
+
+      float: right;
+      margin-top: 2px;
+
+      opacity: 0.75;
+    }
+
+    &:hover, &:focus {
+      background: none;
+
+      &::before, &::after {
+        opacity: 1 !important;
+      }
+    }
   }
 
   .active a {
@@ -62,14 +81,46 @@
     position: relative;
     top: 1px;
   }
+
+  .collapsed {
+    li {
+      display: none;
+
+      &.nav-header {
+        display: block;
+      }
+    }
+  }
 }
 
 @mixin collapsed-nav-header {
-  border-bottom: 1px solid rgba(white, 0.1);
   height: 0;
-  margin: 0 15px 14px;
-  padding: 5px 0;
+  padding: 10px 15px 15px;
   text-indent: -99999px;
+
+  &::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;
+  }
 }
 
 @include tablet {
@@ -78,18 +129,31 @@
       display: none;
     }
 
-    .nav-header {
+    .nav-header a {
       @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; }
@@ -104,8 +168,14 @@
       display: none;
     }
 
-    .nav-header {
+    .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/components/_table.scss

@@ -77,4 +77,10 @@
     height: 32px;
     vertical-align: middle;
   }
+
+  ul, ol {
+    margin-bottom: 0;
+    padding-left: 0;
+    list-style-position: inside;
+  }
 }

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,8 +4,11 @@ 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 }
+        with_form(f) { yield f }
       end
     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/format_helper.rb

@@ -0,0 +1,48 @@
+module Trestle
+  module FormatHelper
+    def format_value(value, options={})
+      if options.key?(:format)
+        format_value_from_options(value, options)
+      else
+        autoformat_value(value, options)
+      end
+    end
+
+    def format_value_from_options(value, options={})
+      case options[:format]
+      when :currency
+        number_to_currency(value)
+      when :tags
+        safe_join(value.map { |tag| content_tag(:span, tag, class: "tag") })
+      else
+        value
+      end
+    end
+
+    def autoformat_value(value, options={})
+      case value
+      when Array
+        content_tag(:ol, safe_join(value.map { |v| content_tag(:li, autoformat_value(v, options)) }, "\n"))
+      when Time, DateTime
+        timestamp(value)
+      when Date
+        datestamp(value)
+      when TrueClass, FalseClass
+        status_tag(icon("fa fa-check"), :success) if value
+      when NilClass
+        text = options.key?(:blank) ? options[:blank] : I18n.t("admin.format.blank")
+        content_tag(:span, text, class: "blank")
+      when String
+        if value.html_safe? || options[:truncate] == false
+          value
+        else
+          truncate(value, options[:truncate] || {})
+        end
+      when ->(value) { value.respond_to?(:id) }
+        display(value)
+      else
+        value
+      end
+    end
+  end
+end

data/app/helpers/trestle/hook_helper.rb

@@ -1,13 +1,18 @@
 module Trestle
   module HookHelper
     def hook(name)
-      safe_join(Trestle.config.hooks[name.to_s].map { |hook|
+      safe_join(hooks[name.to_s].map { |hook|
         instance_exec(&hook)
-      }, "\n")
+      }, "\n") if hook?(name)
     end
 
     def hook?(name)
-      Trestle.config.hooks[name.to_s].any?
+      hooks.key?(name.to_s) && hooks[name.to_s].any?
+    end
+
+  protected
+    def hooks
+      Trestle.config.hooks
     end
   end
 end

data/app/helpers/trestle/url_helper.rb

@@ -1,26 +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 options.key?(:admin)
-        admin = Trestle.lookup(options.delete(:admin))
+      if instance_or_url.is_a?(String)
+        link_to(content, instance_or_url, options)
       else
-        admin = admin_for(instance) || self.admin
-      end
+        if instance_or_url.is_a?(Hash)
+          instance_or_url, options = nil, instance_or_url
+        end
 
-      if admin
-        link_to(content, admin_url_for(instance, admin: admin), options)
-      else
-        content
+        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 = Trestle.lookup(options[:admin] || self.admin)
+      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

@@ -23,11 +23,11 @@
 
     <script type="text/javascript">
       <% Trestle.config.javascript_i18n_keys.each do |key| %>
-        Trestle.i18n['<%= key %>'] = "<%= escape_javascript(t(key, default: t(key, locale: :en))) %>";
+      Trestle.i18n['<%= key %>'] = "<%= escape_javascript(t(key, default: t(key, locale: :en))) %>";
       <% end %>
 
-      if (Flatpickr.l10ns['<%= I18n.locale %>']) {
-        Flatpickr.localize(Flatpickr.l10ns['<%= I18n.locale %>']);
+      if (flatpickr.l10ns['<%= I18n.locale %>']) {
+        flatpickr.localize(flatpickr.l10ns['<%= I18n.locale %>']);
       }
     </script>
 
@@ -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/admin/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for(:title, admin.admin_name.titleize) %>
 
 <%= render layout: "layout" do %>
-  To customize this template, please create <code>app/views/<%= admin.controller_path %>/index.html.erb</code>.
+  <p><%= t("trestle.onboarding.no_template", path: "app/views/#{admin.controller_path}/index.html.erb", default: "To customize this template, please create <code>%{path}</code>.").html_safe %></p>
 <% end %>

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

@@ -6,5 +6,7 @@
   <div class="alert-content">
     <h3><%= title %></h3>
     <p><%= message %></p>
+
+    <%= yield if block_given? %>
   </div>
 </div>

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

@@ -4,8 +4,22 @@
                       title: t("trestle.flash.success.title", default: "Success!"),
                       message: flash[:message] %>
 <% elsif flash[:error] -%>
-  <%= render "alert", html_class: "alert-danger",
-                      icon: icon("alert-icon ion-ios-close-outline"),
-                      title: t("trestle.flash.failure.title", default: "Warning!"),
-                      message: flash[:error] %>
+  <%= render layout: "alert",
+             locals: {
+               html_class: "alert-danger",
+               icon: icon("alert-icon ion-ios-close-outline"),
+               title: t("trestle.flash.failure.title", default: "Warning!"),
+               message: flash[:error]
+             } do %>
+    <%- if Trestle.config.debug_form_errors && instance && instance.errors.any? -%>
+      <%= link_to "Debug errors", "#debug-errors", class: "toggle-debug-errors small", data: { toggle: "collapse" } %>
+      <div id="debug-errors" class="debug-errors collapse">
+        <ul>
+          <% instance.errors.each do |key, message| %>
+            <li class="small"><tt><%= key %>:</tt> <%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <%- end -%>
+  <% end %>
 <% end -%>

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

@@ -1,5 +1,5 @@
-<% content_for(:title, "Welcome to Trestle") %>
+<% content_for(:title, t("trestle.onboarding.welcome", default: "Welcome to Trestle")) %>
 
 <%= render layout: "layout" do %>
-  <p>To begin, please create an admin within <code>app/admin</code>.</p>
+  <p><%= t("trestle.onboarding.no_admins", default: "To begin, please create an admin within <code>app/admin</code>.").html_safe %></p>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% if admin.form -%>
   <%= admin.form.render(self, instance) %>
 <% else %>
-  <p>Please define a form block or create a <code>_form.html</code> partial.</p>
+  <p><%= t("trestle.onboarding.no_form", default: "Please define a form block or create a <code>_form.html</code> partial.").html_safe %></p>
 <% end %>

data/app/views/trestle/resource/edit.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/resource/index.html.erb

@@ -1,7 +1,10 @@
-<% content_for(:title, I18n.t("admin.titles.index", default: "Listing %{pluralized_model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize)) %>
+<% 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 icon("fa fa-plus"), admin.path(:new), class: "btn btn-default btn-lg" unless admin.readonly? %>
+  <%= 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 if admin.actions.include?(:new) %>
 <% end %>
 
 <% content_for(:utilities) do %>

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

@@ -1,12 +1,12 @@
-<% title = t("admin.titles.new", default: "New %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% title = t("admin.titles.new", default: "New %{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" %>
+  <%= 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 do |f| %>
-  <%= render partial: "form", layout: "layout" %>
+<%= trestle_form_for instance, url: admin.path, method: :post do |f| %>
+  <%= render partial: "form", layout: dialog_request? ? "dialog" : "layout" %>
 <% end %>