trestle 0.8.9 → 0.8.10

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

@@ -1,3 +1,17 @@
+@mixin table-container-background($background) {
+  background-image: linear-gradient(to right, $background 30%, rgba($background, 0)),
+                    linear-gradient(to left, $background 30%, rgba($background, 0)),
+                    radial-gradient(at 0 50%, rgba(black, 0.2), rgba(black, 0) 70%),
+                    radial-gradient(at 100% 50%, rgba(black, 0.2), rgba(black, 0) 70%);
+
+  background-color: $background;
+
+  background-position: 0 0, 100% 0, 0 0, 100% 0;
+  background-repeat: no-repeat;
+  background-size: 50px 100%, 50px 100%, 15px 100%, 15px 100%;
+  background-attachment: local, local, scroll, scroll;
+}
+
 .table-container {
   overflow-x: auto;
 
@@ -5,15 +19,11 @@
   // scrolling background hints. Must be disabled explicitly.
   -webkit-overflow-scrolling: auto;
 
-  background-image: linear-gradient(to right, white 30%, rgba(white, 0)),
-                    linear-gradient(to left, white 30%, rgba(white, 0)),
-                    radial-gradient(at 0 50%, rgba(black, 0.2), rgba(black, 0) 70%),
-                    radial-gradient(at 100% 50%, rgba(black, 0.2), rgba(black, 0) 70%);
-  background-position: 0 0, 100% 0, 0 0, 100% 0;
-  background-repeat: no-repeat;
-  background-color: white;
-  background-size: 50px 100%, 50px 100%, 15px 100%, 15px 100%;
-  background-attachment: local, local, scroll, scroll;
+  @include table-container-background(white);
+
+  .main-content-sidebar & {
+    @include table-container-background($content-sidebar-background);
+  }
 }
 
 .trestle-table {
@@ -66,10 +76,24 @@
         text-align: center;
       }
 
-      & + .btn {
+      &.has-icon .btn-label {
+        @include sr-only;
+      }
+    }
+
+    .btn,
+    .btn-group {
+      + .btn,
+      + .btn-group {
         margin-left: 4px;
       }
     }
+
+    .btn-group {
+      .btn + .btn {
+        margin-left: -1px;
+      }
+    }
   }
 
   .avatar {

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

@@ -5,8 +5,11 @@
   small {
     display: block;
     color: #666;
+  }
 
-    .inline & {
+  &.timestamp-inline,
+  &.inline, {
+    small {
       display: inline;
     }
   }

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

@@ -0,0 +1,55 @@
+.btn-toolbar {
+  .btn,
+  .btn-group,
+  .input-group {
+    float: none;
+  }
+
+  > .btn,
+  > .btn-group,
+  > .input-group {
+    margin-left: 1px;
+  }
+
+  .btn-group {
+    .btn + .btn,
+    .btn + .btn-group,
+    .btn-group + .btn,
+    .btn-group + .btn-group {
+      margin-left: -4px;
+    }
+  }
+}
+
+.primary-toolbar {
+  .btn {
+    @extend .btn-lg;
+    font-size: 20px;
+    padding: 8px 16px;
+    border-radius: $border-radius-base;
+
+    @include mobile {
+      font-size: 18px;
+      padding: 7px 12px;
+    }
+  }
+}
+
+.secondary-toolbar {
+  .btn {
+    font-size: 12px;
+    padding: 4px 10px;
+
+    i {
+      font-size: 11px;
+    }
+
+    @include mobile {
+      font-size: 11px;
+
+      i {
+        font-size: 10px;
+      }
+    }
+  }
+}

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

@@ -32,7 +32,15 @@ $sidebar-toggle-color: rgba(white, 0.5) !default;
 $content-header-background: rgba(white, 0.6) !default;
 
 $content-sidebar-width:      285px !default;
-$content-sidebar-background: rgba(black, 0.025) !default;
+$content-sidebar-background: #f9f9f9 !default;
+
+$main-content-header-background: $content-sidebar-background !default;
+$main-content-header-padding:    12px 20px !default;
+$main-content-header-border:     1px solid rgba(black, 0.1) !default;
+
+$main-content-footer-background: $content-sidebar-background !default;
+$main-content-footer-padding:    12px 20px !default;
+$main-content-footer-border:     1px solid rgba(black, 0.1) !default;
 
 $sidebar-transition-duration: 250ms !default;
 
@@ -41,7 +49,7 @@ $footer-text: #888 !default;
 
 $headings-font-weight: 400 !default;
 
-$btn-default-bg:    #dbdbdb !default;
+$btn-default-bg:    #bbb !default;
 $btn-default-color: white !default;
 
 $state-success-bg: lighten(#dff0d8, 5%) !default;
@@ -83,4 +91,7 @@ $input-bg-disabled:  #fafafa !default;
 $modal-inner-padding: 20px !default;
 $modal-title-padding: 15px 20px !default;
 
+$modal-footer-background:   $content-sidebar-background !default;
+$modal-footer-border-color: rgba(black, 0.1) !default;
+
 $s2bs-btn-default-bg: #eee !default;

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

@@ -24,6 +24,17 @@
   right: 0;
 }
 
+@mixin sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  padding: 0;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+
 @mixin mobile {
   @media (max-width: $screen-xs-max) {
     @content;

data/app/helpers/trestle/form_helper.rb

@@ -5,7 +5,7 @@ module Trestle
       options[:as] ||= admin.parameter_name
 
       options[:data] ||= {}
-      options[:data].merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)
+      options[:data].reverse_merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)
 
       form_for(instance, options) do |f|
         with_form(f) { yield f }
@@ -23,10 +23,6 @@ module Trestle
       @_trestle_form
     end
 
-    def toolbar(name, &block)
-      content_for(:"#{name}_toolbar", &block)
-    end
-
     def sidebar(&block)
       content_for(:sidebar, &block)
     end

data/app/helpers/trestle/hook_helper.rb

@@ -1,18 +1,22 @@
 module Trestle
   module HookHelper
     def hook(name)
-      safe_join(hooks[name.to_s].map { |hook|
-        instance_exec(&hook)
-      }, "\n") if hook?(name)
+      if hook?(name)
+        safe_join(hooks(name).map { |hook|
+          hook.evaluate(self)
+        }, "\n")
+      elsif block_given?
+        yield
+      end
     end
 
     def hook?(name)
-      hooks.key?(name.to_s) && hooks[name.to_s].any?
+      Trestle.config.hooks.key?(name.to_s) && hooks(name).any?
     end
 
   protected
-    def hooks
-      Trestle.config.hooks
+    def hooks(name)
+      Trestle.config.hooks[name.to_s].select { |h| h.visible?(self) }
     end
   end
 end

data/app/helpers/trestle/timestamp_helper.rb

@@ -1,17 +1,59 @@
 module Trestle
   module TimestampHelper
-    def timestamp(time)
-      time_tag(time, class: "timestamp") do
+    # Renders a Time object as a formatted timestamp (using a <time> tag)
+    #
+    # time    - The Time object to format.
+    # options - Hash of options (default: {}):
+    #           :class       - Additional HTML classes to add to the <time> tag.
+    #           :precision   - Time precision, either :minutes or :seconds (default: :minutes).
+    #           :date_format - I18n date format to use for the date (default: :trestle_date).
+    #           :time_format - I18n time format to use for the time (default: :trestle_time).
+    #
+    # Examples
+    #
+    #   <%= timestamp(article.created_at) %>
+    #
+    #   <%= timestamp(Time.current, class: "timestamp-inline", precision: :seconds) %>
+    #
+    # Returns the HTML representation of the given Time.
+    def timestamp(time, options={})
+      return unless time
+
+      classes     = ["timestamp", options[:class]].compact
+      precision   = options.fetch(:precision) { Trestle.config.timestamp_precision }
+      date_format = options.fetch(:date_format) { :trestle_date }
+      time_format = options.fetch(:time_format) { precision == :seconds ? :trestle_time_with_seconds : :trestle_time }
+
+      time_tag(time, class: classes) do
         safe_join([
-          l(time, format: :trestle_date, default: proc { |date| "#{date.day.ordinalize} %b %Y" }),
-          content_tag(:small, l(time, format: :trestle_time_with_seconds, default: "%l:%M:%S %p"))
+          l(time, format: date_format, default: proc { |date| "#{date.day.ordinalize} %b %Y" }),
+          content_tag(:small, l(time, format: time_format, default: "%l:%M:%S %p"))
         ], "\n")
       end
     end
 
-    def datestamp(date)
-      time_tag(date, class: "datestamp") do
-        l(date, format: :trestle_calendar, default: "%-m/%-d/%Y")
+    # Renders a Date object as formatted datestamp (using a <time> tag)
+    #
+    # date    - The Date object to format.
+    # options - Hash of options (default: {}):
+    #           :class  - Additional HTML classes to add to the <time> tag.
+    #           :format - I18n date format to use (default: :trestle_calendar).
+    #
+    # Examples
+    #
+    #   <%= datestamp(Date.current) %>
+    #
+    #   <%= datestamp(article.created_at, format: :trestle_date, class: "custom-datestamp") %>
+    #
+    # Returns the HTML representation of the given Date.
+    def datestamp(date, options={})
+      return unless date
+
+      classes = ["datestamp", options[:class]].compact
+      format  = options.fetch(:format) { :trestle_calendar}
+
+      time_tag(date, class: classes) do
+        l(date, format: format, default: "%-m/%-d/%Y")
       end
     end
   end

data/app/helpers/trestle/toolbars_helper.rb

@@ -0,0 +1,34 @@
+module Trestle
+  module ToolbarsHelper
+    def toolbar(name, &block)
+      toolbar = (toolbars[name.to_s] ||= Toolbar.new)
+      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?
+          content_tag(:div, class: "btn-group", role: "group") do
+            safe_join(items, "\n")
+          end
+        else
+          items.first
+        end
+      end
+
+      safe_join(result, "\n")
+    end
+
+    def deprecated_toolbar(name)
+      if content_for?(:"#{name}_toolbar")
+        ActiveSupport::Deprecation.warn("Using content_for(:#{name}_toolbar) is deprecated. Please use toolbar(:#{name}) instead.")
+        content_for(:"#{name}_toolbar")
+      end
+    end
+  end
+end

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

@@ -36,14 +36,14 @@
     <%= hook :head %>
   </head>
 
-  <body<%= " class=\"sidebar-#{cookies["trestle:sidebar"]}\"" if cookies["trestle:sidebar"] %>>
+  <body<%=raw " class=\"sidebar-#{cookies["trestle:sidebar"]}\"" if cookies["trestle:sidebar"] %>>
     <div class="app-wrapper">
       <%= render "trestle/shared/sidebar" %>
 
       <div class="app-container">
         <%= render "trestle/shared/header" %>
 
-        <main class="app-main" data-context="<%= request.path %>">
+        <main class="app-main" data-context="<%= request.fullpath %>">
           <%= yield %>
         </main>
 

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

@@ -22,15 +22,13 @@
 </div>
 
 <div class="modal-footer">
-  <% if content_for?(:secondary_toolbar) %>
-    <div class="btn-toolbar secondary-toolbar">
-      <%= content_for(:secondary_toolbar) %>
-    </div>
-  <% end %>
+  <div class="btn-toolbar secondary-toolbar">
+    <%= render_toolbar(toolbar(:secondary)) %>
+    <%= deprecated_toolbar(:secondary) %>
+  </div>
 
-  <% if content_for?(:primary_toolbar) %>
-    <div class="btn-toolbar primary-toolbar">
-      <%= content_for(:primary_toolbar) %>
-    </div>
-  <% end %>
+  <div class="btn-toolbar primary-toolbar">
+    <%= render_toolbar(toolbar(:primary)) %>
+    <%= deprecated_toolbar(:primary) %>
+  </div>
 </div>

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

@@ -1,27 +1,29 @@
 <header class="content-header">
-  <% if content_for?(:primary_toolbar) %>
+  <div class="content-header-title">
+    <h1>
+      <%= content_for(:title) %>
+    </h1>
+
+    <% unless local_assigns.fetch(:hide_breadcrumbs, false) %>
+    <ol class="breadcrumb">
+      <% breadcrumbs.each do |breadcrumb| %>
+        <li class="breadcrumb-item<% if breadcrumb == breadcrumbs.last %> active<% end %>">
+          <%= link_to breadcrumb.label, breadcrumb.path %>
+        </li>
+      <% end %>
+    </ol>
+    <% end %>
+  </div>
+
+  <div class="content-header-toolbars">
     <div class="btn-toolbar primary-toolbar">
-      <%= content_for(:primary_toolbar) %>
+      <%= render_toolbar(toolbar(:primary)) %>
+      <%= deprecated_toolbar(:primary) %>
     </div>
-  <% end %>
 
-  <% if content_for?(:secondary_toolbar) %>
     <div class="btn-toolbar secondary-toolbar">
-      <%= content_for(:secondary_toolbar) %>
+      <%= render_toolbar(toolbar(:secondary)) %>
+      <%= deprecated_toolbar(:secondary) %>
     </div>
-  <% end %>
-
-  <h1>
-    <%= content_for(:title) %>
-  </h1>
-
-  <% unless local_assigns.fetch(:hide_breadcrumbs, false) %>
-  <ol class="breadcrumb">
-    <% breadcrumbs.each do |breadcrumb| %>
-      <li class="breadcrumb-item<% if breadcrumb == breadcrumbs.last %> active<% end %>">
-        <%= link_to breadcrumb.label, breadcrumb.path %>
-      </li>
-    <% end %>
-  </ol>
-  <% end %>
+  </div>
 </header>

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

@@ -3,14 +3,12 @@
 <% content_for(:title, title) %>
 <% breadcrumb(title) %>
 
-<% content_for(:primary_toolbar) do %>
-  <%= button_tag admin.t("buttons.save", default: "Save %{model_name}"), class: "btn btn-success btn-lg" if admin.actions.include?(:update) %>
+<% toolbar(:primary) do |t| %>
+  <%= t.button admin.t("buttons.save", default: "Save %{model_name}"), style: :success if admin.actions.include?(:update) %>
 <% end %>
 
-<% content_for(:secondary_toolbar) do %>
-  <%= admin_link_to instance, action: :destroy, method: :delete, class: "btn btn-danger", data: { toggle: "confirm-delete", placement: "bottom" } do %>
-    <%= icon("fa fa-trash") %> <%= admin.t("buttons.delete", default: "Delete %{model_name}") %>
-  <% end if admin.actions.include?(:destroy) %>
+<% 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) %>
 <% end %>
 
 <%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>