trestle 0.9.4 → 0.9.5

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

@@ -5,7 +5,7 @@
 <% end %>
 
 <% content_for(:utilities) do %>
-  <%= render "scopes" if admin.scopes.any? %>
+  <%= render "scopes" %>
 <% end if admin.scopes.any? %>
 
 <%= render layout: "layout" do %>

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 %>>
+            <%= 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/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,46 +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 {
-    display: inline-block;
+.scope {
+  display: inline-block;
 
-    background-color: $scope-bg;
+  background-color: $scope-bg;
 
-    font-size: 0.8rem;
-    font-weight: normal;
-    white-space: nowrap;
+  font-size: 0.8rem;
+  font-weight: normal;
+  white-space: nowrap;
 
-    border-radius: 50rem;
-    padding: $scope-padding;
+  border-radius: 50rem;
+  padding: $scope-padding;
 
-    &, &:hover, &:focus {
-      color: $scope-color;
-    }
+  &, &:hover, &:focus {
+    color: $scope-color;
+  }
 
-    &:hover, &:focus {
-      background-color: $scope-hover-bg;
-      text-decoration: none;
-    }
+  &:hover, &:focus {
+    background-color: $scope-hover-bg;
+    text-decoration: none;
   }
 
-  li.active a {
+  &.active {
     &, &:hover, &:focus, strong {
       color: $scope-active-color;
     }

data/frontend/css/layout/_content.scss

@@ -105,8 +105,7 @@
 
 .utilities {
   display: flex;
-  justify-content: space-between;
-
+  justify-content: flex-start;
   margin-bottom: 10px;
 }
 
@@ -146,6 +145,10 @@
     padding: 15px;
   }
 
+  .utilities {
+    margin-bottom: 10px;
+  }
+
   .main-content-header,
   .main-content-footer {
     flex-direction: column;

data/frontend/css/variables/_trestle.scss

@@ -77,14 +77,14 @@ $tag-hover-border: darken(theme-color("primary"), 10%);
 
 // Scopes
 
-$scope-padding:      0.25rem 0.5rem;
+$scope-padding:      0.25rem 0.675rem;
 
-$scope-color:        rgba(black, 0.3);
-$scope-bg:           rgba(black, 0.025);
+$scope-color:        rgba(black, 0.4);
+$scope-bg:           rgba(black, 0.035);
 
-$scope-label-color:  rgba(black, 0.4);
+$scope-label-color:  rgba(black, 0.5);
 
-$scope-hover-color:  rgba(black, 0.3);
+$scope-hover-color:  rgba(black, 0.5);
 $scope-hover-bg:     rgba(black, 0.05);
 
 $scope-active-color: white;

data/frontend/js/components/navigation.js

@@ -0,0 +1,63 @@
+import cookie from '../core/cookie'
+
+const PREFIX = 'trestle:navigation'
+const SEPARATOR = ','
+
+class NavigationCookieStore {
+  addGroup (id, state) {
+    this.updateState(state, (groups) => groups.add(id))
+  }
+
+  removeGroup (id, state) {
+    this.updateState(state, (groups) => groups.delete(id))
+  }
+
+  updateState (state, callback) {
+    const groups = this.getState(state)
+    callback(groups)
+    this.saveState(state, groups)
+  }
+
+  getState (state) {
+    const str = cookie.get(`${PREFIX}:${state}`)
+    return new Set(str.length ? str.split(SEPARATOR) : [])
+  }
+
+  saveState (state, groups) {
+    cookie.set(`${PREFIX}:${state}`, [...groups].join(SEPARATOR))
+  }
+}
+
+class Navigation {
+  constructor () {
+    this.store = new NavigationCookieStore()
+  }
+
+  toggle (list) {
+    if (list.hasClass('collapsed')) {
+      this.expand(list)
+    } else {
+      this.collapse(list)
+    }
+  }
+
+  expand (list) {
+    list.removeClass('collapsed')
+
+    const id = list.data('group')
+
+    this.store.addGroup(id, 'expanded')
+    this.store.removeGroup(id, 'collapsed')
+  }
+
+  collapse (list) {
+    list.addClass('collapsed')
+
+    const id = list.data('group')
+
+    this.store.addGroup(id, 'collapsed')
+    this.store.removeGroup(id, 'expanded')
+  }
+}
+
+export default new Navigation()

data/frontend/js/components/sidebar.js

@@ -3,6 +3,8 @@ import $ from 'jquery'
 import { ready } from '../core/events'
 import cookie from '../core/cookie'
 
+import Navigation from './navigation'
+
 ready(function () {
   const $body = $('body')
   const $wrapper = $('.app-wrapper')
@@ -60,13 +62,8 @@ ready(function () {
   $sidebar.find('.nav-header a').on('click', function (e) {
     e.preventDefault()
 
-    $(this).closest('ul').toggleClass('collapsed')
-
-    const collapsed = $sidebar.find('.collapsed .nav-header a').map(function () {
-      return $(this).attr('href').replace(/^#/, '')
-    }).toArray()
-
-    cookie.set('trestle:navigation:collapsed', collapsed.join(','))
+    const list = $(this).closest('ul')
+    Navigation.toggle(list)
   })
 
   // Scroll sidebar to active item

data/lib/trestle/evaluation_context.rb

@@ -5,12 +5,15 @@ module Trestle
   # both the Adapter/Navigation instance, as well as the controller/view from where they are invoked.
   module EvaluationContext
   protected
+    def self.ruby2_keywords(*)
+    end unless respond_to?(:ruby2_keywords, true)
+
     # Missing methods are called on the given context if available.
     #
     # We include private methods as methods such as current_user
     # are usually declared as private or protected.
-    def method_missing(name, *args, &block)
-      if @context && @context.respond_to?(name, true)
+    ruby2_keywords def method_missing(name, *args, &block)
+      if context_responds_to?(name)
         @context.send(name, *args, &block)
       else
         super
@@ -18,7 +21,12 @@ module Trestle
     end
 
     def respond_to_missing?(name, include_private=false)
-      (@context && @context.respond_to?(name, true)) || super
+      context_responds_to?(name) || super
+    end
+
+  private
+    def context_responds_to?(name)
+      @context && @context.respond_to?(name, true)
     end
   end
 end

data/lib/trestle/form/fields/form_group.rb

@@ -16,7 +16,7 @@ module Trestle
             concat label if name && options[:label] != false
             concat template.capture(&block) if block
             concat help_message if options[:help]
-            concat error_message if name && errors.any?
+            concat error_messages if name && errors.any?
           end
         end
 
@@ -33,9 +33,11 @@ module Trestle
           content_tag(:p, message, class: classes)
         end
 
-        def error_message
-          content_tag(:p, class: "invalid-feedback") do
-            safe_join([icon("fa fa-warning"), errors.first], " ")
+        def error_messages
+          content_tag(:ul, class: "invalid-feedback") do
+            safe_join(errors.map { |error|
+              content_tag(:li, safe_join([icon("fa fa-warning"), error], " "))
+            }, "\n")
           end
         end
 

data/lib/trestle/navigation/group.rb

@@ -41,6 +41,10 @@ module Trestle
         end
       end
 
+      def collapse?
+        options[:collapse]
+      end
+
       def label
         I18n.t("admin.navigation.groups.#{name}", default: name.to_s.titlecase)
       end

data/lib/trestle/resource.rb

@@ -51,7 +51,7 @@ module Trestle
     # Evaluates the admin's scope block(s) using the adapter context
     # and returns a hash of Scope objects keyed by the scope name.
     def scopes
-      @scopes ||= self.class.scopes.evaluate(adapter)
+      @scopes ||= Scopes.new(self.class.scopes, adapter)
     end
 
     class << self
@@ -61,7 +61,7 @@ module Trestle
       end
 
       def scopes
-        @scopes ||= Scopes.new
+        @scopes ||= Scopes::Definition.new
       end
 
       def column_sorts

data/lib/trestle/resource/builder.rb

@@ -83,8 +83,9 @@ module Trestle
         admin.define_adapter_method(:count, &block)
       end
 
-      def scopes(&block)
-        admin.scopes.append(&block)
+      def scopes(options={}, &block)
+        admin.scopes.options.merge!(options)
+        admin.scopes.append(&block) if block_given?
       end
 
       def scope(name, scope=nil, options={}, &block)

data/lib/trestle/resource/collection.rb

@@ -42,15 +42,11 @@ module Trestle
       def apply_scopes(collection, params)
         unscoped = collection(params)
 
-        active_scopes(params).reduce(collection) do |collection, scope|
+        scopes.active(params).reduce(collection) do |collection, scope|
           merge_scopes(collection, scope.apply(unscoped))
         end
       end
 
-      def active_scopes(params)
-        scopes.values.select { |s| s.active?(params) }
-      end
-
       def apply_sorting(collection, params)
         return collection unless params[:sort]
 

data/lib/trestle/scopes.rb

@@ -1,22 +1,50 @@
 module Trestle
   class Scopes
     require_relative "scopes/block"
+    require_relative "scopes/definition"
     require_relative "scopes/scope"
 
-    attr_reader :blocks
+    include Enumerable
 
-    def initialize
-      @blocks = []
+    delegate :options, to: :@definition
+
+    def initialize(definition, context)
+      @definition = definition
+      @scopes = @definition.evaluate(context)
+    end
+
+    def classes
+      [
+        'scopes',
+        ('grouped' if grouped?),
+        layout_class,
+        options[:class]
+      ].compact
+    end
+
+    def each(&block)
+      @scopes.values.each(&block)
+    end
+
+    def grouped?
+      options[:group] != false && any?(&:group)
+    end
+
+    def grouped
+      if grouped?
+        group_by(&:group)
+      else
+        { nil => @scopes.values.flatten }
+      end
     end
 
-    def append(&block)
-      @blocks << Block.new(&block)
+    def active(params)
+      select { |s| s.active?(params) }
     end
 
-    # Evaluates each of the scope blocks within the given admin context
-    # and returns a hash of Scope objects keyed by the scope name.
-    def evaluate(context)
-      @blocks.map { |block| block.scopes(context) }.flatten.index_by(&:name)
+  private
+    def layout_class
+      "columns" if %w(column columns).include?(options[:layout].to_s)
     end
   end
 end