waiter 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4d2f680fc70be78d002e4226d7691156cc8636c
-  data.tar.gz: add2d246198843ee695aa4cc8f1924bd9c685e3e
+  metadata.gz: f3e58f7bdbd2922ea052ab0c23c895520a241e1a
+  data.tar.gz: 6ba519cb637f4b2e7c25e984c8dd7a8650f89a19
 SHA512:
-  metadata.gz: 6730406ac7a9262963fddd461ea1f0ee7370dd5c34878cd728e8b03b479d8f5bd93ef64fabcd35af7751cce74cdf5151ec35289d33723bc3ffea8a21aba85bb6
-  data.tar.gz: 81bc0c9480cd9098c24a17ebcf5b55ea318443891a14d2d0cd0f00f381acd2dbca81905915c87946a63e9ff25bd9f70e50b9cc36c4363ee180108e1d8540ea61
+  metadata.gz: c5d028f8175b04b91580262ac7c5b0a212f75bb78433d0a4079ad722ea1582f89858e84273bbbc5be1b4cfb28a01218fdbe0e23d3a4ddb8646a70e6f93c60858
+  data.tar.gz: 37de015b017b0b9893c585e76b6ae00abbcd60c0ef6b7c24e0e5df21dba7ff02c2ce962f83f35fdfd91ff3a1b633a67e1b3a43fe273b20533a0f13bd826a1213

data/app/assets/stylesheets/waiter/menu.css.scss

@@ -51,18 +51,45 @@
     $submenu-border-color: #888;
     $submenu-item-border-color: #CCC;
     $submenu-item-height: 20px;
+    $submenu-item-bgcolor: #E6E9EF;
+    $submenu-item-hover: #006EB6;
 
     ul.submenu
     {
       position: absolute;
       top: 30px;
       left: 0;
-      background-color: #ffffff;
+      background-color: $submenu-item-bgcolor;
       display: none;
       z-index: 10500;
       margin: 0;
       padding: 0;
       border: 2px solid $submenu-border-color;
+      border-collapse: collapse;
+
+      div.column
+      {
+        border: 2px solid $submenu-border-color;
+        border-collapse: collapse;
+      }
+
+      div.section
+      {
+        & + div.section
+        {
+          border-top: 2px solid $submenu-border-color;
+        }
+
+        li:last-of-type
+        {
+          border-bottom: none;
+        }
+      }
+
+      div.column
+      {
+        display: table-cell;
+      }
 
       li
       {
@@ -70,20 +97,19 @@
         min-height: $submenu-item-height;
         line-height: $submenu-item-height;
         vertical-align: middle;
-        background-color: #e6e9ef;
-        border-top: 1px solid $submenu-item-border-color;
+        background-color: $submenu-item-bgcolor;
+        border-bottom: 1px solid $submenu-item-border-color;
         min-width: 150px;
         text-align: left;
         white-space: nowrap;
-        color: #000000;
+        color: #000;
         border-collapse: collapse;
-
         font-weight: normal;
         font-size: 12px;
 
-        a, a:hover
+        a, a:hover, &.heading
         {
-          color: #000000;
+          color: inherit;
           font-weight: normal;
           padding-left: 8px;
           padding-right: 8px;
@@ -91,14 +117,22 @@
           height: $submenu-item-height + 12px;
         }
 
+        &.heading
+        {
+          font-weight: bold;
+          font-size: 14px;
+          color: #000;
+        }
+
         &:first-child
         {
           border-top: 0;
         }
 
-        &:hover
+        &:not(.heading):hover
         {
-          background-color: #ff9900;
+          background-color: $submenu-item-hover;
+          color: white;
         }
 
         &.separator
@@ -123,9 +157,7 @@
 
     &:hover ul.submenu
     {
-      background-color: #333333;
-      /*border:1px solid #333333;*/
-      display: block;
+      display: table;
     }
   }
 }

data/app/views/waiter/_column.haml

@@ -0,0 +1,7 @@
+.column
+  - if column.heading
+    %li.heading= column.heading
+
+  - count = column.items.count
+  - column.items(true).each.with_index do |subitem, idx|
+    = render 'waiter/sub_item', parent: parent, subitem: subitem, idx: idx, count: count

data/app/views/waiter/_section.haml

@@ -1,5 +1,6 @@
-- section.items(true).each do |subitem|
-  = render 'waiter/sub_item', item: item, subitem: subitem
+.section
+  - if section.heading
+    %li.heading= section.heading
 
-- unless last
-  %li.separator
+  - section.items(true).each do |subitem|
+    = render 'waiter/submenu_item', item: item, subitem: subitem

data/app/views/waiter/_sub_item.haml

@@ -1,2 +1,6 @@
-%li
-  = link_to subitem.item_title, subitem.path
+- if subitem.column?
+  = render 'waiter/column', parent: parent, column: subitem
+- elsif subitem.section?
+  = render 'waiter/section', item: parent, section: subitem, last: idx == count - 1
+- else
+  = render 'waiter/submenu_item', item: parent, subitem: subitem

data/app/views/waiter/_submenu.haml

@@ -1,6 +1,3 @@
 %ul.submenu
   - items.each.with_index do |subitem, idx|
-    - if subitem.section?
-      = render 'waiter/section', item: parent, section: subitem, last: idx == items.count - 1
-    - else
-      = render 'waiter/sub_item', item: parent, subitem: subitem
+    = render 'waiter/sub_item', parent: parent, subitem: subitem, idx: idx, count: items.count

data/app/views/waiter/_submenu_item.haml

@@ -0,0 +1,2 @@
+%li
+  = link_to subitem.item_title, subitem.path

data/lib/waiter/dsl.rb

@@ -6,6 +6,10 @@ module Waiter
       add_section(options, &block)
     end
 
+    def column(options = {}, &block)
+      add_column(options, &block)
+    end
+
     def method_missing(name, *args, &block)
       return context.send(name, *args, &block) if context.respond_to?(name)
 
@@ -21,4 +25,4 @@ module Waiter
       return nil
     end
   end
-end
+end

data/lib/waiter/menu.rb

@@ -2,6 +2,7 @@ require 'waiter/dsl'
 require 'waiter/menu/item_list'
 require 'waiter/menu/item'
 require 'waiter/menu/section'
+require 'waiter/menu/column'
 require 'waiter/menu/drawer'
 require 'active_support/core_ext/hash/slice'
 
@@ -38,7 +39,12 @@ module Waiter
 
     def add_section(options = {}, &block)
       section = Section.new(self, options, &block)
-      items << section if section.items.any?
+      items << section unless section.empty?
+    end
+
+    def add_column(options = {}, &block)
+      column = Column.new(self, options, &block)
+      items << column unless column.empty?
     end
 
     def sections
@@ -62,4 +68,4 @@ module Waiter
       "#<#{self.class.name}:#{'0x%x' % (36971870 << 1)} name=#{name.inspect} options=#{options.inspect}>"
     end
   end
-end
+end

data/lib/waiter/menu/column.rb

@@ -0,0 +1,15 @@
+require 'waiter/menu/section'
+
+module Waiter
+  class Menu
+    class Column < Section
+      def column?
+        true
+      end
+
+      def section?
+        false
+      end
+    end
+  end
+end

data/lib/waiter/menu/drawer.rb

@@ -18,7 +18,8 @@ module Waiter
         render partial: 'waiter/menu_bar', locals: { menu: menu }
       end
 
-      protected
+    protected
+
       def menu_selected?(name, controller, action = nil, controllers = [])
         controllers = [] unless controllers
 
@@ -40,4 +41,4 @@ module Waiter
       end
     end
   end
-end
+end

data/lib/waiter/menu/item.rb

@@ -31,10 +31,18 @@ module Waiter
         false
       end
 
+      def column?
+        false
+      end
+
       def items
         @submenu.try(:items) || []
       end
 
+      def empty?
+        items.empty?
+      end
+
       def [](name)
         return nil if items.empty?
         items[name]
@@ -134,4 +142,4 @@ module Waiter
       end
     end
   end
-end
+end

data/lib/waiter/menu/section.rb

@@ -11,6 +11,10 @@ module Waiter
         true
       end
 
+      def heading
+        options[:heading]
+      end
+
       def items(sorted = false)
         return super() unless sorted
         ItemList.new(super(), options.slice(:sort, :reverse))
@@ -23,4 +27,4 @@ module Waiter
       end
     end
   end
-end
+end

data/lib/waiter/version.rb

@@ -1,3 +1,3 @@
 module Waiter
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waiter
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -96,14 +96,17 @@ files:
 - app/assets/images/waiter/bg.gif
 - app/assets/images/waiter/selected-bg.gif
 - app/assets/stylesheets/waiter/menu.css.scss
+- app/views/waiter/_column.haml
 - app/views/waiter/_item.haml
 - app/views/waiter/_menu_bar.haml
 - app/views/waiter/_section.haml
 - app/views/waiter/_sub_item.haml
 - app/views/waiter/_submenu.haml
+- app/views/waiter/_submenu_item.haml
 - lib/waiter.rb
 - lib/waiter/dsl.rb
 - lib/waiter/menu.rb
+- lib/waiter/menu/column.rb
 - lib/waiter/menu/drawer.rb
 - lib/waiter/menu/item.rb
 - lib/waiter/menu/item_list.rb