express_admin 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb2a9cf8ada844b82e6985aa04ba62459fa55abe
-  data.tar.gz: a5daac5f4438d062802e21c33bc4d018e410d4f7
+  metadata.gz: 6caf18ad0e0a5bcaff019d04c1d779b092296ede
+  data.tar.gz: e3403d4ca031945262d85b1c47bfdc0a91b4b084
 SHA512:
-  metadata.gz: 2defacf4587cae2d0009bfd4dc23213d5073fdc8e4ce2a898fa55106ee1747bfdcfe0fb5b58e0e9815ff75047fd7411dcfb0b25feaa3ff7d55ab8a0567ea0068
-  data.tar.gz: 8624c91cabbc239fb53399f17824f56ab4c48f4d7940fb047e18acbe4d5bedf4e1e47c939bf3be984611ef5d64715e9d4ebff9b044b4b7b6007eb90ad641dbb3
+  metadata.gz: f194a499ee9bf6dc47b1d002332dd2e57446d385c50ebc1f4b6d8a59f764dcd116dd26564af5aa23cc60e2868ec8973f38850512ca9d9ea173bfcceaeaab4f56
+  data.tar.gz: 55bb88dfc1fbe9db21648f144cc2aedb7897ca6c2ebe1b59aa9b3fe0d3f4d230d69378cf0e61df1dc7d6f80f7463e7ddfff2d35359d31a6b467808bffd0c874e

data/app/assets/javascripts/express_admin/sub_menu.js

@@ -0,0 +1,10 @@
+$( document ).ready(function() {
+  $(document).
+    on('click', '.sub-menu-expander', function(e) {
+      $(this).parent().find('.sub-menu').removeClass('hidden');
+    }).
+    on('click', '.main-page', function(e) {
+      // quick hack for now
+      $('.sub-menu').addClass('hidden');
+    });
+})

data/app/assets/stylesheets/express_admin/components/_main_menu.sass

@@ -3,3 +3,7 @@
     @extend .menu-bar
     @include menu-bar-icons($position: left)
     @include menu-bar-style($dark-color, $autocolor: true)
+    overflow: visible // for sub-menu visibility
+
+  .item
+    padding-right: 0.5rem

data/app/assets/stylesheets/express_admin/components/_pane.sass

@@ -3,7 +3,11 @@
   @include clearfix
   border:
     right: 1px solid $border-color
+    bottom: 1px solid $border-color
 
   .status
-    @extend .label
-    @include label-style($background: $dark-blue)
+    @extend .float-right
+    font:
+      size: 1rem
+      weight: normal
+    padding: 1rem 0

data/app/assets/stylesheets/express_admin/components/_sub_menu.sass

@@ -0,0 +1,29 @@
+.has-sub-menu
+  position: relative
+
+.sub-menu
+  @include grid_block
+  position: absolute
+  top: 3.5rem
+  left: 0
+  background: $sub-menu-background
+  width: 500px
+  height: 200px
+  z-index: 9999
+  border: 2px solid $border-color
+  padding: 1rem
+
+  > .sub-menu-items
+    @include grid_content
+    list-style:
+      type: none
+    margin-left: 0
+
+  .title
+    font:
+      weight: bold
+      size: 1.5rem
+    padding:
+      bottom: 1rem
+
+

data/app/assets/stylesheets/express_admin/globals/_variables.sass

@@ -20,3 +20,4 @@ $error-color: #cc0000
 $title-background: #f4f4f4
 
 $light-blue-background: rgba($light-blue, .1)
+$sub-menu-background: #fff

data/app/assets/stylesheets/express_admin/screen.sass

@@ -14,6 +14,7 @@
 @import 'sections/sidebar_region'
 
 @import 'components/main_menu'
+@import 'components/sub_menu'
 @import 'components/module_sidebar'
 @import 'components/widget_box'
 @import 'components/pane'
@@ -30,7 +31,6 @@
 @import 'shared/alerts'
 @import 'shared/progress'
 @import 'shared/reveal'
-@import 'shared/layout_components'
 
 @import 'components/empty_state'
 @import 'components/megadropdown'
@@ -49,6 +49,3 @@
 
   &:read-only
     background-color: #f0f0f0
-
-.hide
-  display: none !important

data/app/assets/stylesheets/express_admin/shared/_forms.sass

@@ -3,3 +3,6 @@ form
 
   textarea
     height: 12rem
+
+  select[multiple]
+    height: 6rem

data/app/assets/stylesheets/express_admin/shared/_tables.sass

@@ -18,3 +18,15 @@
     tbody
       > tr:nth-of-type(odd)
         background: $light-blue-background
+
+// Still a bit hacky. Need to polish this more
+// This was done to contain the giant table in rbac's routes#index
+.large-table-container
+  @include breakpoint(small)
+    height: 500px
+
+  @include breakpoint(medium)
+    height: 800px
+
+  @include breakpoint(large)
+    height: 1000px

data/app/components/express_admin/flash_message_component.rb

@@ -2,7 +2,7 @@ module ExpressAdmin
   class FlashMessageComponent < ExpressTemplates::Components::Base
 
     helper(:safe_message) {|message| message[1] }
-    helper(:classes) {|message| "flash nav-alert alert-box #{flash_class(message[0])}" }
+    helper(:classes) {|message| "flash nav-alert alert-box " }
 
     emits -> {
       div {

data/app/components/express_admin/mega_menu_component.rb

@@ -32,29 +32,22 @@ module ExpressAdmin
                       },
 
               empty_state: -> {
-                div._empty_state_wrapper {
-                  p.lead._text_muted "No modules added yet."
-                }
+                p.lead._text_muted "No modules added yet."
               },
 
               menu_wrapper: -> {
-                li.megamenu._has_dropdown {
-                  a("Manage", href: '#', onClick: 'return false;')
-                  ul.dropdown._dropdown_wrapper {
-                    li._megamenu_overlay {
-                      div._megamenu_container {
-                        div.main {
-                          h1 "Modules"
-                          nav {
-                            ul {
-                              _yield
-                            }
-                          }
-                        }
-                        div.extra {
-                          extra_menu
-                        }
-                      }
+                li._has_sub_menu {
+                  a._sub_menu_expander(href: '#', onClick: 'return false;') {
+                    span.item { 'Manage' }
+                    i._ion_arrow_down_b
+                  }
+                  div._sub_menu.hidden {
+                    ul._sub_menu_items {
+                      li.title { 'Modules' }
+                      _yield
+                    }
+                    ul._sub_menu_items {
+                      extra_menu
                     }
                   }
                 }

data/app/components/express_admin/smart_table.rb

@@ -8,7 +8,7 @@ module ExpressAdmin
     attr :columns
 
     emits -> {
-      table(my[:id], options).table.striped {
+      table(my[:id]).table.striped {
         thead {
           tr {
             display_columns.each do |column|
@@ -34,28 +34,6 @@ module ExpressAdmin
           }
         }
       }
-      if @config[:show_on_click]
-        if is_permanent?
-          script {
-            %Q(
-              $(document).on('click', 'tr', function(e){
-                e.preventDefault();
-                Turbolinks.visit($(this).attr('data-resource-url'), { cacheRequest: false });
-              })
-            )
-          }
-        else
-          script {
-            %Q(
-              $(document).on('click', 'tr', function(e){
-                e.preventDefault();
-                Turbolinks.visit($(this).attr('data-resource-url'), { cacheRequest: false, change: 'main' });
-              })
-            )
-          }
-        end
-
-      end
 
       scroll_table if !!@config[:scroll_table]
     }
@@ -66,12 +44,6 @@ module ExpressAdmin
       }
     end
 
-    def options
-      if is_permanent?
-        {'data-turbolinks-permanent' => nil}
-      end
-    end
-
     def actions_header
       th.actions { 'Actions' }
     end
@@ -101,16 +73,14 @@ module ExpressAdmin
     end
 
     def row_args
-      row_args = {id: row_id, class: row_class}
-      row_args.merge!('data-resource-url': "{{#{resource_path}}}") if !!@config[:show_on_click]
-      row_args
+      {id: row_id, class: row_class}
     end
 
     def cell_value(accessor)
       if accessor.respond_to?(:call)
         value = "(begin #{accessor.source}.call(#{collection_member_name}).to_s rescue 'Error: '+$!.to_s ; end)"
       elsif attrib = accessor.to_s.match(/(\w+)_link$/).try(:[], 1)
-        value = "(link_to #{collection_member_name}.#{attrib}, #{collection_member_name}_path(#{collection_member_name}))"
+        value = "(link_to #{collection_member_name}.#{attrib}, #{collection_member_name}_path(#{collection_member_name}.id))"
       elsif attrib = accessor.to_s.match(/(\w+)_in_words/).try(:[], 1)
         value = "(#{collection_member_name}.#{attrib} ? time_ago_in_words(#{collection_member_name}.#{attrib})+' ago' : 'never')"
       else

data/app/views/shared/express_admin/_navigation_bar.html.et

@@ -6,8 +6,8 @@ nav._top_bar {
           image_tag 'express_admin/appexpress_logo_dark.png', class: 'nav-logo'
         }
       }
-      li { link_to 'Manage', '#' }
-      li { link_to 'View Site', '/' }
+      mega_menu_component
+      li { link_to 'View Site', '/', target: '_blank' }
     }
   }
   div._secondary_menu {

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/dummy/log/test.log

@@ -37273,3 +37273,244 @@ ExpressAdmin::Generators::InstallGeneratorTest: test_install_on_revoke
 ExpressAdmin::Generators::InstallGeneratorTest: test_install_on_invoke
 ----------------------------------------------------------------------
    (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+  Fixture Delete (0.3ms)  DELETE FROM "widgets"
+  Fixture Insert (0.1ms)  INSERT INTO "widgets" ("column2", "column3", "column4", "column5", "column6", "column7", "created_at", "updated_at", "id", "category_id") VALUES ('Lego', 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.', '2015-05-25 15:12:06.000000', 't', 'MyString', 1, '2015-06-18 12:26:31', '2015-06-18 12:26:31', 980190962, 828606197)
+  Fixture Insert (0.1ms)  INSERT INTO "widgets" ("column2", "column3", "column4", "column5", "column6", "column7", "created_at", "updated_at", "id", "category_id") VALUES ('Hammer', 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.', '2015-05-25 15:12:06.000000', 'f', 'MyString', 1, '2015-06-18 12:26:31', '2015-06-18 12:26:31', 298486374, 721084026)
+   (1.0ms)  commit transaction
+   (0.0ms)  begin transaction
+------------------------
+CategoryTest: test_valid
+------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------
+WidgetTagTest: test_valid
+-------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------
+ExpressAdmin::Generators::InstallGeneratorTest: test_install_on_revoke
+----------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------
+ExpressAdmin::Generators::InstallGeneratorTest: test_install_on_invoke
+----------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------
+TagTest: test_valid
+-------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------
+DemoControllerTest: test_should_get_show
+----------------------------------------
+Processing by DemoController#show as HTML
+  Rendered /Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/views/demo/show.html.et within layouts/application (18.9ms)
+Completed 200 OK in 179ms (Views: 179.1ms | ActiveRecord: 0.0ms)
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_collection_select_with_collection_ids_is_used_for_has_many_through_associations
+-----------------------------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_path_prefix_is_provided
+---------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_category_field_is_a_select
+------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_virtual_attributes_may_be_included
+--------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_integer_column_is_a_number_field
+------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_boolean_field_column4_is_a_checkbox
+---------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_text_field_column3_is_a_text_area
+-------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_uses_inherited_resources_path_helpers_to_set_correct_action
+---------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_datetime_field_column4_is_a_datetime_field
+----------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_excluded_fields_are_excluded
+--------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+------------------------------------------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_options_from_collection_for_select_use_when_a_namespace_is_specified
+------------------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+---------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_action_path_can_be_overridden
+---------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_fields_are_wrapped_in_a_div
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_options_from_collection_for_select_used_for_the_related_collection
+----------------------------------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_string_field_column2_is_an_input
+------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------
+ExpressAdmin::SmartFormTest: test_fields_have_labels
+----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_timestamps_are_not_editable
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------
+ExpressAdmin::SmartFormTest: test_renders_a_form_correct_id
+-----------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------------------------
+ExpressAdmin::Generators::ScaffoldGeneratorTest: test_scaffold_twice
+--------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------
+ExpressAdmin::Generators::ScaffoldGeneratorTest: test_scaffold_on_revoke
+------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------
+ExpressAdmin::Generators::ScaffoldGeneratorTest: test_scaffold_on_invoke
+------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------
+Components::SmartTableTest: test_table_column_titles_may_be_customized
+----------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------------------------
+Components::SmartTableTest: test_does_not_include_show_on_click_js_handler_by_default
+-------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------------
+Components::SmartTableTest: test_renders_cell_contents_within_a_substitution
+----------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------
+Components::SmartTableTest: test_resource_path_option_respected
+---------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------
+Components::SmartTableTest: test_should_have_hidden_columns
+-----------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------------
+Components::SmartTableTest: test_renders_5_column_headers_with_wrapping_divs
+----------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------------------------------------------------------
+Components::SmartTableTest: test_table_cell_contains_result_of_proc.call_if_no_exception_is_raised
+--------------------------------------------------------------------------------------------------
+  Widget Load (0.2ms)  SELECT "widgets".* FROM "widgets"
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------------------------------------------
+Components::SmartTableTest: test_table_cell_has_'Error'_if_a_value_specified_as_a_proc_throws_an_exception
+----------------------------------------------------------------------------------------------------------
+  Widget Load (0.2ms)  SELECT "widgets".* FROM "widgets"
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------------------------------------------------
+Components::SmartTableTest: test_timestamp_accessor_appeneded_with__in_words_generates_code_that_uses_time_ago_in_words
+-----------------------------------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------------
+Components::SmartTableTest: test_table_cell_values_may_be_specified_as_procs
+----------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------------------------
+Components::SmartTableTest: test_iterates_over_collection_setting_local_var_correctly
+-------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------------
+Components::SmartTableTest: test_table_cell_class_is_valid_when_proc_is_used
+----------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------------
+Components::SmartTableTest: test_table_cell_shows_related_item_name_or_display_name
+-----------------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------------
+Components::SmartTableTest: test_show_on_click_option_adds_some_javascript_and_attrs
+------------------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------------
+Components::SmartTableTest: test_namespace_option_prepends_namespace_to_path_helper
+-----------------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------------------------------
+Components::SmartTableTest: test_table_displays_only_columns_specified_if_columns_option_provided
+-------------------------------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------------------------
+Components::SmartTableTest: test_attribute_accessor_appended_with__link_generates_a_link
+----------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------
+WidgetTest: test_valid
+----------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------------------------------------------------
+ExpressAdmin::MenuTest: test_Menu.from()_accepts_path_and_returns_a_menu_from_the_yaml
+--------------------------------------------------------------------------------------
+   (0.0ms)  rollback transaction

data/test/dummy/test/components/smart_table_test.rb

@@ -10,11 +10,6 @@ module Components
       ExpressAdmin::SmartTable.new(:widgets, *args).compile
     end
 
-    test "renders 5 column headers with wrapping divs" do
-      matches = compiled_widget_table.scan /<th class=\\"\w+\\">\s*<div>\s*\w+/
-      assert_equal 5, matches.length
-    end
-
     test "should have hidden columns" do
       assert_match 'more-columns-indicator', compiled_widget_table
       assert_no_match 'column7', compiled_widget_table
@@ -33,28 +28,6 @@ module Components
     #   assert_match /\{\{\(widget.column3\).to_s.truncate\(27\)\}\}/, compiled_widget_table
     # end
 
-    SHOW_ON_CLICK_JS = "$(document).on('click', 'tr', function(e){"
-    SHOW_ON_CLICK_ATTR = 'data-resource-url=\"{{widget_path(widget)}}\"'
-
-    test "does not include show_on_click js handler by default" do
-      assert_no_match SHOW_ON_CLICK_JS, compiled_widget_table
-    end
-
-    test "show_on_click option adds some javascript and attrs" do
-      assert_match SHOW_ON_CLICK_JS, compiled_widget_table(show_on_click: true)
-      assert_match SHOW_ON_CLICK_ATTR, compiled_widget_table(show_on_click: true)
-    end
-
-    test "resource_path option respected" do
-      assert_match 'data-resource-url=\"{{other_path_helper}}\"', 
-                    compiled_widget_table(resource_path: "other_path_helper", show_on_click: true)
-    end
-
-    test "namespace option prepends namespace to path helper" do
-      assert_match 'data-resource-url=\"{{widget_path(widget)}}\"',
-                    compiled_widget_table(namespace: "example_engine", show_on_click: true)
-    end
-
     test "table cell shows related item name or display name" do
       # note this will move to a helper that will intelligently look
       # for decorated methods such as name or display_name
@@ -73,7 +46,7 @@ module Components
 
     test "table column titles may be customized" do
       compiled = compiled_widget_table(columns: {"Column3 is the Best" => :column3})
-      assert_match /<th class=\\"column3\\">\s+<div>Column3 is the Best/, compiled
+      assert_match /<th class=\\"column3\\">Column3 is the Best/, compiled
     end
 
     def widget_table_with_proc_column
@@ -120,7 +93,7 @@ module Components
               'A link column' => :column3_link
             })
         }
-      assert_match 'link_to widget.column3, widget_path(widget)', ExpressTemplates.compile(&fragment)
+      assert_match 'link_to widget.column3, widget_path(widget.id)', ExpressTemplates.compile(&fragment)
     end
 
     test "timestamp accessor appeneded with _in_words generates code that uses time_ago_in_words" do

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/0zehLcbCZ34CdyBVctEOnsyyyFlqjtTI-VkIje9xdCQ.cache

@@ -0,0 +1 @@
+"%Y6�w�99o����}R����4ng���C

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/89d4LukQv0MLDc35wfIlQZps-IyoMSdlaSZjBF4U5Qs.cache

@@ -0,0 +1 @@
+"%5�AxIާ<�5!_]���l!.(�w%Ϊ|�

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/BoKdGhgi5NHfGTc42p9nltpEIYj_BBUxVdv7YhpBmmA.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/KLD96-U_D5wyyJMO4CJwhXydNwVp3GnQ_Pcu9fqMWwk.cache

@@ -0,0 +1 @@
+I"
�file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/application.js?type=application/javascript&id=638180f825e479837a605bdc561c86d277abf8e3d34aeb6cffd3fa02ee65c557:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/Po8q4NrWy9Kymnz_HbOk-WbdGY_KuuXc6urGogTHe7U.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{I"environment-version:ETTI"environment-paths;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/application.js;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/demo.js;TT

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/WhePtBvZPmF1Jhdcc4glsjhxBJQo9Qw0CDgy_F8lClY.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{I"environment-version:ETTI"environment-paths;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets/application.css;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets/demo.css.scss;TT

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/X2i4W-0ADnY8zQKnn3oh3P61cDw_n1B26D2JPcgWBTY.cache

@@ -0,0 +1,2 @@
+"%����͹mm�
+a�l�|a56���v�6}��(&5

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/Y7zGDJM6L5VhKbRWRU6vonJVe-DGxBuOhE_qGM8zJ0o.cache

@@ -0,0 +1 @@
+"%]!�K��X�K�֓�ޖ���';�����4x��

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/ZAIAu3UIaGRI3RknA2lbuZ8Y6AZ12VB84mQRg-q0vFs.cache

@@ -0,0 +1 @@
+I"

file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/demo.js?type=application/javascript&pipeline=self&id=3c232c6aac6b5ed427a639739c1a1e607ae76ddc1d8c9c34adb72569d60dd29a:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/dVokuKbK8HbOtvPIksKGBAYE8x44l372dQ0gEISqbdo.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{	I"environment-version:ETTI"environment-paths;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/demo.js;TT

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/nk1B0AsQ24ck-r1vlAmaG2ZkDkzOfoIi6b5u-5BNFTQ.cache

@@ -0,0 +1 @@
+I"
�file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets/demo.css.scss?type=text/css&pipeline=self&id=0aa9dc57fdbc7e424e5bf2ca6a8e8831154db109c1af9517fb9684f7d3c7f457:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/oN1zSGeSEz4KhkAuUF_yFDsCVPkulfFjomEAjFzGdPc.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{I"environment-version:ETTI"environment-paths;TTI"Lprocessors:type=application/javascript&file_type=application/javascript;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/application.js;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/demo.js;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts;TT

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/orzlNSAVLprBGJNkJc1USpGtVMhktfj0hR1igXbs5fA.cache

@@ -0,0 +1 @@
+I"
�file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets/application.css?type=text/css&id=b235537a30ffadb799079e66241b75ec85970a9cf83cebffbd4ab5d0ffd91024:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/pWOcH5cfG1n9XqxJljnSwciDeLoaTkoUxp1zlOo0WTk.cache

@@ -0,0 +1 @@
+I"
file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=b000d35e738dbd58cfe049a21bba24388b930927cfdb9bd5963418bdac5918b3:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/yfh4w2OYe-sHC9BwdeUb4FtXVEH59KeRr6P7V_lJ7Uc.cache

@@ -0,0 +1 @@
+I"
�file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets/application.css?type=text/css&pipeline=self&id=5ffbdcdd945f4a5baaccca8175bc426e1c31549569712cbdb7fcab501bec304f:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/ypZCDLo54Pz2ZoUxrxSEUjT5FYMAq8Ozp8OTOYDRdAE.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{	I"environment-version:ETTI"environment-paths;TTI"Lprocessors:type=text/css&file_type=text/css&engines=.scss&pipeline=self;TTI"
�file-digest:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets/demo.css.scss;TT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -245,6 +245,7 @@ files:
 - app/assets/javascripts/express_admin/dataTables/dataTables.foundation.js
 - app/assets/javascripts/express_admin/dataTables/jquery.dataTables.js
 - app/assets/javascripts/express_admin/scrollTableBody.js
+- app/assets/javascripts/express_admin/sub_menu.js
 - app/assets/javascripts/express_admin/utility.js
 - app/assets/stylesheets/dataTables/dataTables.foundation.css.erb
 - app/assets/stylesheets/express_admin.css
@@ -253,6 +254,7 @@ files:
 - app/assets/stylesheets/express_admin/components/_megadropdown.sass
 - app/assets/stylesheets/express_admin/components/_module_sidebar.sass
 - app/assets/stylesheets/express_admin/components/_pane.sass
+- app/assets/stylesheets/express_admin/components/_sub_menu.sass
 - app/assets/stylesheets/express_admin/components/_widget_box.sass
 - app/assets/stylesheets/express_admin/express_icons.sass
 - app/assets/stylesheets/express_admin/globals/_foundation_overrides.sass
@@ -272,7 +274,6 @@ files:
 - app/assets/stylesheets/express_admin/shared/_breadcrumbs.sass
 - app/assets/stylesheets/express_admin/shared/_buttons.sass
 - app/assets/stylesheets/express_admin/shared/_forms.sass
-- app/assets/stylesheets/express_admin/shared/_layout_components.sass
 - app/assets/stylesheets/express_admin/shared/_loading.sass
 - app/assets/stylesheets/express_admin/shared/_media_object.sass
 - app/assets/stylesheets/express_admin/shared/_messages.sass
@@ -285,7 +286,6 @@ files:
 - app/assets/stylesheets/ionicons/ionicons.css.sass
 - app/components/express_admin/addon_sidebar_component.rb
 - app/components/express_admin/flash_message_component.rb
-- app/components/express_admin/h_box.rb
 - app/components/express_admin/layout_component.rb
 - app/components/express_admin/main_region.rb
 - app/components/express_admin/mega_menu_component.rb
@@ -295,7 +295,6 @@ files:
 - app/components/express_admin/sidebar_region.rb
 - app/components/express_admin/smart_form.rb
 - app/components/express_admin/smart_table.rb
-- app/components/express_admin/v_box.rb
 - app/components/express_admin/widget_box.rb
 - app/helpers/express_admin/admin_helper.rb
 - app/helpers/express_admin/module_settings_helper.rb
@@ -395,6 +394,7 @@ files:
 - test/dummy/test/models/widget_tag_test.rb
 - test/dummy/test/models/widget_test.rb
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/0fNukwCUjSC_GRsVIMtSMVdZkd5bq5eShMcGCrCVolc.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/0zehLcbCZ34CdyBVctEOnsyyyFlqjtTI-VkIje9xdCQ.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/1c4REJHKdQH9bwZhZ7Ixshmy_1jAzXc3-9OiDCDyRlk.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/1rKHSaJsgLcnfIJRWYdYy7IimMCKcdI-I_ABekUargk.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/2kMk5s4FKAOWE1z_MvFIKHmdvNDzyoknoi39xL7KwJw.cache
@@ -405,6 +405,8 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/4a7epNa5R1jeKCtFsJKTdVqMEQm5p0clABRPIiKegMo.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/57pjjkzReNE1L9yodewGebfd0AwnfQb33rtJjSTNpLc.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/7vpDV8GyXVfyuFIkRrrkOwUXyIaCmf22tBPDpvhCUUc.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/89d4LukQv0MLDc35wfIlQZps-IyoMSdlaSZjBF4U5Qs.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/BoKdGhgi5NHfGTc42p9nltpEIYj_BBUxVdv7YhpBmmA.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/Cpj6WyqdggDUkeQl_Ut3P9sUtPHPXXwkmZ92TfIJGJ8.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/DwepgSdLiEklsJWIJItEY_ZW-nOjjeHqcdQwBtu0mus.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/FOJpwMQCx9V9wfhJQKFa2f7BjfP7vyS7M3o6VX0nAI0.cache
@@ -413,10 +415,14 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/HY86Fwn8VPlIysY56uV-wu90bISxrXeiCtwDXg94Glg.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/IcNDN_pmsAcLAMv6CST75OwOucmYm3q2099jn4tB0H8.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/JpdfSFVzivQn6TFSivlys3nV3VzD8cT0ET8uqbptxV4.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/KLD96-U_D5wyyJMO4CJwhXydNwVp3GnQ_Pcu9fqMWwk.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/KRkc9MoVFNfI2aJI6sncnC92a1RmZyYM_CbJoa01saw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/KYe0_GIi-cNX0eRteBB0aixVATrVRo7Z3BaWFCgc7yg.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/LsiO4sLQfM0GvyEYhaC2E54rCurTkewg7YJX-sWBctI.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/MczkmkaXLyXg8mAnmpTt-Rhvlf_OGFUEr-Ut9BuWo6g.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/NDViKg4-yspkY1tX9IQWnh1-LkiKqIohBqtRlYZZQcs.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/OXsmreTQ3MNzGsrV1eEoW72VZQ52hQ0HiuTr0ImnqHA.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/Po8q4NrWy9Kymnz_HbOk-WbdGY_KuuXc6urGogTHe7U.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/PuMvTyv89E8wfRqbWNMhTH3PAE61uCCHgpEsgdOzMXQ.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/Pvp8CVIKYjspNrgzEvgleujifrrdfATzWbwALDzQNE4.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/PzcOUndLc-O-VBR2SDM2rFkiqh-iqknTEgEAXDLKfdc.cache
@@ -427,18 +433,27 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/UruI7_ZpuzDnmNir9hzUa_r8oiuuIfVTco19ACdxwRw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/VQ2-2HlkGd1XVIHlwRGcgDsjto3oE-50-4E3HGdt8uU.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/VezioHwyk87G6TWkkYX88tBHC6QToVGOU5geZ54Ts5A.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/WG06sI8kg0TrFKDQh2slScD0xqYK5UF0gPF1Ri6APG0.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/WfQ-xKbnwqaKy-UQa8spczc9qocIL_jZE4cyRZftjfA.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/WhePtBvZPmF1Jhdcc4glsjhxBJQo9Qw0CDgy_F8lClY.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/X2i4W-0ADnY8zQKnn3oh3P61cDw_n1B26D2JPcgWBTY.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/XPpCqlT8yHTnQNHKRxjnilUBvAs6klpgWXneFU15U78.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/XXTM8o6vkSxhxxm8P_orbeCZvxb8nMk7cjdwvUNL1io.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/XyRQXY_oj8GLw9z8lj2dknGu45jbX5lK8ko7TePosPE.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/Y7zGDJM6L5VhKbRWRU6vonJVe-DGxBuOhE_qGM8zJ0o.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/YDMOayx363vI7odbkHMVI-_RxkOoVP2Hb7FX0mFVFE0.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/Z88gJS67lNABJgUB18JzXrnGkVbYfXQvjqm7mSJIv3o.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/ZAIAu3UIaGRI3RknA2lbuZ8Y6AZ12VB84mQRg-q0vFs.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/_2bn753sv7A0CDBODs7rO8SWdQ1OMi2vbzSas5co4TE.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/_FyeE-ad3bA2IH6ZwZOn6J4qaW857Rjv4FBs_HIPiqM.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/_k4X14Cc-2Y4gc47s7PaWtAaG_zcq1ICJInTYNp6bI4.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/_kr_dP4VVnM8s8ZMdiNBSpuPqkQVx46FUdCTDH4XR70.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/_y-BPEZTh3iXcaPJkcP9-krjw-V8LMhop4VGxUEUDsY.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/afi__XQzjsqMT3svcCGlVD_YrHEWQZAEbJt4CgYaCkw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/bdqS7lHa0nBN-mqdSomfMK-S6ct2TAn0z9kVzFBwQPM.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/c4lC2GnsHBJ0BpWF3Nlgfk2FLPkhA7GCIiMMjnMTWE8.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/csH89NDps1_QU4E0p0HHZti2XLd_etKYDqM9cPsNpps.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/dVokuKbK8HbOtvPIksKGBAYE8x44l372dQ0gEISqbdo.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/ePtEu-AuU0iZ2J02ZafF9yOJVd8VVdV2KSheiJYlXzA.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/eTRff0YXBw-Tx9VEMxb-Es8NwqjHCXiaosBLxijl3I8.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/fRkrxaDYzRDIvxEUGZBFbW5ocAlmDQNg8_LRcOJJOzI.cache
@@ -452,13 +467,19 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/ipTot5AshDPhFtCBNfXROxutQlCrYkvsXsy3fcVT0Nw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/j5CxYBAeuD-bGDZUBh-pA0mEPCSVFDZsJm3x7QED4g0.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/jr4uhEONyFYm0QhfEOMqv05S-BeUP7gw1gQl3GIFyAI.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/kDj0mxTRTc51sKL3YhP09H-N_wvNoeTMq4ZZXxWk00U.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/kGO7_IQtBwpe93nSTKj6cCWGm0fZ_NoXltdw8E_74CQ.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/le9WohG3eSGbBMySdKkdvkHXW8yipO8w4iQZCCCQb3M.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/mtmR_XlvnlYbOPmP1EkOj96q2Z5OQNv4HkeFj9DwEXQ.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/nU1obIDVHUhN-3yRA6B9U5aO8wsd6zh1tyVtSROJewk.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/nk1B0AsQ24ck-r1vlAmaG2ZkDkzOfoIi6b5u-5BNFTQ.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/oN1zSGeSEz4KhkAuUF_yFDsCVPkulfFjomEAjFzGdPc.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/oZ6SMNNft5SCbvNtWXkGQwKQPVwXoJRMV7VUJfWHc2k.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/orzlNSAVLprBGJNkJc1USpGtVMhktfj0hR1igXbs5fA.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/oygs10cGTBBo7Mj97CjFRTrSrFR7Qi3MnHNR_WQvIps.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/p0Gnpai0VYzEsAXH_5t9huZ3dO0v6JKRH0PIH--q-XA.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/p0VpILMLAmqpH1IIuA6MfyLrqT7ltiDJqYqZSLr_k3I.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/pWOcH5cfG1n9XqxJljnSwciDeLoaTkoUxp1zlOo0WTk.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/pu9xM8T2O07hU3PafxbOLjg2vJxbbHE3qnIK9JHqVhA.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/qEHftZrJ-Da_nsvX4UOaALyIt0mwnOuE2TdtBPGAWEw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/rtdpq5fxIYMKM43QyOIluEECg2NP5OA-7Zi8yuowZSI.cache
@@ -468,10 +489,13 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/v50nc5cuqpLxjepk7XsBmomcmFARYlHQRtq8yOv8AY0.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/vAh5eTPxI929yxRCyXgbKTWat5cZiVSOyX0UeTveXGE.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/vKiuNu1fQitE151bh0Tr2Ufkc80jWzchPjxaHkpjQL8.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/vZBxpTbv5C70_MrcmWyk0z6yDwcZ-yjr7fo16bQaLhY.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/x-3lyh5i4qS-Q9E3X2uj2LthTOxsndFTrFXBsPPo6hI.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/x3xQgAyjbrGTXy2FX2UzGG77agJgt_xsyNBuofrvY_E.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/xQqBwKYWFPxZm5tidxsRKk23Z3q-OLRmKQUlMjRev_c.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/yZNo-6dzWGUNCJDnmqm7X5YB5FOxjYp_l8aKS6KaZOg.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/yfh4w2OYe-sHC9BwdeUb4FtXVEH59KeRr6P7V_lJ7Uc.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/ypZCDLo54Pz2ZoUxrxSEUjT5FYMAq8Ozp8OTOYDRdAE.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zV58Nou0R2EJG875wLND6wF9ES4diVi1fP7B_B6eCzw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zxPFYKpkfNJtui1ekitdNMaGAo39fefm-oJCnILEEQ8.cache
 - test/fixtures/engine.rb
@@ -505,7 +529,6 @@ files:
 - vendor/gems/express_templates/diagrams/diagram.graffle
 - vendor/gems/express_templates/diagrams/diagram_express_templates.png
 - vendor/gems/express_templates/diagrams/diagram_haml_erb.png
-- vendor/gems/express_templates/express_templates-0.5.0.gem
 - vendor/gems/express_templates/express_templates.gemspec
 - vendor/gems/express_templates/lib/core_extensions/proc.rb
 - vendor/gems/express_templates/lib/core_extensions/string.rb
@@ -818,6 +841,7 @@ test_files:
 - test/dummy/test/models/widget_tag_test.rb
 - test/dummy/test/models/widget_test.rb
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/0fNukwCUjSC_GRsVIMtSMVdZkd5bq5eShMcGCrCVolc.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/0zehLcbCZ34CdyBVctEOnsyyyFlqjtTI-VkIje9xdCQ.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/1c4REJHKdQH9bwZhZ7Ixshmy_1jAzXc3-9OiDCDyRlk.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/1rKHSaJsgLcnfIJRWYdYy7IimMCKcdI-I_ABekUargk.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/2kMk5s4FKAOWE1z_MvFIKHmdvNDzyoknoi39xL7KwJw.cache
@@ -828,13 +852,19 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/4WErFdugnc8uWYwUE9vVfw4xxCgknECdpWhn8teZbLk.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/57pjjkzReNE1L9yodewGebfd0AwnfQb33rtJjSTNpLc.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/7vpDV8GyXVfyuFIkRrrkOwUXyIaCmf22tBPDpvhCUUc.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/89d4LukQv0MLDc35wfIlQZps-IyoMSdlaSZjBF4U5Qs.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/_2bn753sv7A0CDBODs7rO8SWdQ1OMi2vbzSas5co4TE.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/_FyeE-ad3bA2IH6ZwZOn6J4qaW857Rjv4FBs_HIPiqM.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/_k4X14Cc-2Y4gc47s7PaWtAaG_zcq1ICJInTYNp6bI4.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/_kr_dP4VVnM8s8ZMdiNBSpuPqkQVx46FUdCTDH4XR70.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/_y-BPEZTh3iXcaPJkcP9-krjw-V8LMhop4VGxUEUDsY.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/afi__XQzjsqMT3svcCGlVD_YrHEWQZAEbJt4CgYaCkw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/bdqS7lHa0nBN-mqdSomfMK-S6ct2TAn0z9kVzFBwQPM.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/BoKdGhgi5NHfGTc42p9nltpEIYj_BBUxVdv7YhpBmmA.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/c4lC2GnsHBJ0BpWF3Nlgfk2FLPkhA7GCIiMMjnMTWE8.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/Cpj6WyqdggDUkeQl_Ut3P9sUtPHPXXwkmZ92TfIJGJ8.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/csH89NDps1_QU4E0p0HHZti2XLd_etKYDqM9cPsNpps.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/dVokuKbK8HbOtvPIksKGBAYE8x44l372dQ0gEISqbdo.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/DwepgSdLiEklsJWIJItEY_ZW-nOjjeHqcdQwBtu0mus.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/ePtEu-AuU0iZ2J02ZafF9yOJVd8VVdV2KSheiJYlXzA.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/eTRff0YXBw-Tx9VEMxb-Es8NwqjHCXiaosBLxijl3I8.cache
@@ -855,20 +885,30 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/j5CxYBAeuD-bGDZUBh-pA0mEPCSVFDZsJm3x7QED4g0.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/JpdfSFVzivQn6TFSivlys3nV3VzD8cT0ET8uqbptxV4.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/jr4uhEONyFYm0QhfEOMqv05S-BeUP7gw1gQl3GIFyAI.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/kDj0mxTRTc51sKL3YhP09H-N_wvNoeTMq4ZZXxWk00U.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/kGO7_IQtBwpe93nSTKj6cCWGm0fZ_NoXltdw8E_74CQ.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/KLD96-U_D5wyyJMO4CJwhXydNwVp3GnQ_Pcu9fqMWwk.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/KRkc9MoVFNfI2aJI6sncnC92a1RmZyYM_CbJoa01saw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/KYe0_GIi-cNX0eRteBB0aixVATrVRo7Z3BaWFCgc7yg.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/le9WohG3eSGbBMySdKkdvkHXW8yipO8w4iQZCCCQb3M.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/LsiO4sLQfM0GvyEYhaC2E54rCurTkewg7YJX-sWBctI.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/MczkmkaXLyXg8mAnmpTt-Rhvlf_OGFUEr-Ut9BuWo6g.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/mtmR_XlvnlYbOPmP1EkOj96q2Z5OQNv4HkeFj9DwEXQ.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/NDViKg4-yspkY1tX9IQWnh1-LkiKqIohBqtRlYZZQcs.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/nk1B0AsQ24ck-r1vlAmaG2ZkDkzOfoIi6b5u-5BNFTQ.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/nU1obIDVHUhN-3yRA6B9U5aO8wsd6zh1tyVtSROJewk.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/oN1zSGeSEz4KhkAuUF_yFDsCVPkulfFjomEAjFzGdPc.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/orzlNSAVLprBGJNkJc1USpGtVMhktfj0hR1igXbs5fA.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/OXsmreTQ3MNzGsrV1eEoW72VZQ52hQ0HiuTr0ImnqHA.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/oygs10cGTBBo7Mj97CjFRTrSrFR7Qi3MnHNR_WQvIps.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/oZ6SMNNft5SCbvNtWXkGQwKQPVwXoJRMV7VUJfWHc2k.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/p0Gnpai0VYzEsAXH_5t9huZ3dO0v6JKRH0PIH--q-XA.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/p0VpILMLAmqpH1IIuA6MfyLrqT7ltiDJqYqZSLr_k3I.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/Po8q4NrWy9Kymnz_HbOk-WbdGY_KuuXc6urGogTHe7U.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/pu9xM8T2O07hU3PafxbOLjg2vJxbbHE3qnIK9JHqVhA.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/PuMvTyv89E8wfRqbWNMhTH3PAE61uCCHgpEsgdOzMXQ.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/Pvp8CVIKYjspNrgzEvgleujifrrdfATzWbwALDzQNE4.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/pWOcH5cfG1n9XqxJljnSwciDeLoaTkoUxp1zlOo0WTk.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/PzcOUndLc-O-VBR2SDM2rFkiqh-iqknTEgEAXDLKfdc.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/QbX1HRM7KX85_PeVHcd6VJM6sqzUCWXEEYZX7CAG0eA.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/qEHftZrJ-Da_nsvX4UOaALyIt0mwnOuE2TdtBPGAWEw.cache
@@ -885,16 +925,24 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/VezioHwyk87G6TWkkYX88tBHC6QToVGOU5geZ54Ts5A.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/vKiuNu1fQitE151bh0Tr2Ufkc80jWzchPjxaHkpjQL8.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/VQ2-2HlkGd1XVIHlwRGcgDsjto3oE-50-4E3HGdt8uU.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/vZBxpTbv5C70_MrcmWyk0z6yDwcZ-yjr7fo16bQaLhY.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/WfQ-xKbnwqaKy-UQa8spczc9qocIL_jZE4cyRZftjfA.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/WG06sI8kg0TrFKDQh2slScD0xqYK5UF0gPF1Ri6APG0.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/WhePtBvZPmF1Jhdcc4glsjhxBJQo9Qw0CDgy_F8lClY.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/x-3lyh5i4qS-Q9E3X2uj2LthTOxsndFTrFXBsPPo6hI.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/X2i4W-0ADnY8zQKnn3oh3P61cDw_n1B26D2JPcgWBTY.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/x3xQgAyjbrGTXy2FX2UzGG77agJgt_xsyNBuofrvY_E.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/XPpCqlT8yHTnQNHKRxjnilUBvAs6klpgWXneFU15U78.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/xQqBwKYWFPxZm5tidxsRKk23Z3q-OLRmKQUlMjRev_c.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/XXTM8o6vkSxhxxm8P_orbeCZvxb8nMk7cjdwvUNL1io.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/XyRQXY_oj8GLw9z8lj2dknGu45jbX5lK8ko7TePosPE.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/Y7zGDJM6L5VhKbRWRU6vonJVe-DGxBuOhE_qGM8zJ0o.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/YDMOayx363vI7odbkHMVI-_RxkOoVP2Hb7FX0mFVFE0.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/yfh4w2OYe-sHC9BwdeUb4FtXVEH59KeRr6P7V_lJ7Uc.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/ypZCDLo54Pz2ZoUxrxSEUjT5FYMAq8Ozp8OTOYDRdAE.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/yZNo-6dzWGUNCJDnmqm7X5YB5FOxjYp_l8aKS6KaZOg.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/Z88gJS67lNABJgUB18JzXrnGkVbYfXQvjqm7mSJIv3o.cache
+- test/dummy/tmp/cache/assets/test/sprockets/v3.0/ZAIAu3UIaGRI3RknA2lbuZ8Y6AZ12VB84mQRg-q0vFs.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zV58Nou0R2EJG875wLND6wF9ES4diVi1fP7B_B6eCzw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zxPFYKpkfNJtui1ekitdNMaGAo39fefm-oJCnILEEQ8.cache
 - test/fixtures/engine.rb

data/app/assets/stylesheets/express_admin/shared/_layout_components.sass

@@ -1,60 +0,0 @@
-.h_box
-  flex-direction: row
-  top-margin: 1em
-  bottom-margin: 1em
-
-.v_box
-  flex-direction: column
-
-.container
-  flex-wrap: wrap
-  display: flex
-  justify-content: flex-start
-  align-content: flex-start
-
-  .pane
-    &.half_width, &.one_half
-      min-width: 50%
-      max-width: 50%
-
-    &.full_width
-      min-width: 100%
-      max-width: 100%
-
-    &.one_third
-      min-width: 33.33%
-      max-width: 33.33%
-
-    &.two_thirds
-      min-width: 66.66%
-      max-width: 66.66%
-
-    max-height: 50em
-
-    margin-right: 0em
-    margin-bottom: 0em
-
-    background: #F8F8F8
-
-
-    table:
-      overflow: scroll
-
-    .header
-      display: flex
-      justify-content: space-between
-      padding-right: 1em
-
-    dd
-      min-width: 70%
-    dt
-      min-width: 12em
-      overflow: wrap
-    dl
-      display: flex
-      flex-wrap: wrap
-
-
-
-.space-between
-  justify-content: space-between

data/app/components/express_admin/h_box.rb

@@ -1,16 +0,0 @@
-require File.join(File.dirname(__FILE__), 'layout_component')
-module ExpressAdmin
-  class HBox < LayoutComponent
-
-    emits -> {
-      div(dom_id, class: classes) {
-        _yield
-      }
-    }
-
-    def classes
-      super + ' container'
-    end
-
-  end
-end

data/app/components/express_admin/v_box.rb

@@ -1,16 +0,0 @@
-require File.join(File.dirname(__FILE__), 'layout_component')
-module ExpressAdmin
-  class VBox < LayoutComponent
-
-    emits -> {
-      div(dom_id, class: classes) {
-        _yield
-      }
-    }
-
-    def classes
-      super + ' container'
-    end
-
-  end
-end