app_frame 0.5.7 → 0.5.8

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/app/assets/stylesheets/app_frame/_forms.scss

@@ -18,3 +18,8 @@ select.date {
   width: auto;
 }
 
+.form-inline {
+  input[type=text], input[type=url] {
+    width: auto;
+  }
+}

data/app/assets/stylesheets/app_frame/_page_header.scss

@@ -6,6 +6,7 @@
   padding: 0 20px;
   background-color: white;
   z-index: 10;
+  border-bottom-color: #ddd;
 }
 
 .page-actions {

data/app/assets/stylesheets/app_frame/application.scss

@@ -12,6 +12,10 @@
 @import 'sidenav';
 @import 'page_header';
 
+section {
+  border-bottom: 1px solid #eee;
+}
+
 .container-fluid > .sidebar {
   position: absolute;
   top: 0;
@@ -45,3 +49,8 @@ table .actions {
   display: block;
 }
 
+#subnav {
+  background-color: #eee;
+  margin: -10px -20px 20px;
+  padding: 10px 20px 0;
+}

data/app/helpers/app_frame/menu_helper.rb

@@ -2,7 +2,8 @@ module AppFrame
   module MenuHelper
     def menu_link(key, path = '#', options = {}, &block)
       active = false
-      highlight = options.delete(:highlights_on) || /#{path}/
+      highlight = options.delete(:highlights_on)
+      highlight ||= options.delete(:exact) ? /^#{path}$/ : /#{path}/
       dropdown = options.delete(:dropdown)
 
       Array(highlight).each do |regex|

data/app/views/application/_subnav.html.haml

@@ -0,0 +1 @@
+= yield :subnav

data/app/views/application/show.html.haml

@@ -5,8 +5,9 @@
   = render 'show', :s => s
 
 - child_resources.each do |data|
-  %h2= data[:name]
-  .btn-toolbar
-    = link_to("New #{data[:resource_name]}", polymorphic_url((controller_namespaces + [resource, data[:resource_class]]), :action => :new), :class => 'btn')
-  = table_for(controller_namespaces + [resource, data[:resource_class]], resource.send(data[:symbol])) do |t|
-    = render (controller_namespaces + [data[:symbol].to_s, 'table']).join('/'), :t => t, :resource_class => data[:resource_class]
+  %section
+    %h2= data[:name]
+    .btn-toolbar
+      = link_to("New #{data[:resource_name]}", polymorphic_url((controller_namespaces + [resource, data[:resource_class]]), :action => :new), :class => 'btn')
+    = table_for(controller_namespaces + [resource, data[:resource_class]], resource.send(data[:symbol])) do |t|
+      = render (controller_namespaces + [data[:symbol].to_s, 'table']).join('/'), :t => t, :resource_class => data[:resource_class]

data/app/views/layouts/app_frame/default.html.haml

@@ -25,7 +25,7 @@
         = render 'page_header'
       .row-fluid
         %span{:class => "span#{content_cols}"}
-          = render 'sub_menu'
+          = render 'subnav'
           = render 'flashes'
           = yield
         - if sidebar?

data/app_frame.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "app_frame"
-  s.version = "0.5.7"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = "2013-09-03"
+  s.date = "2013-09-04"
   s.description = "An app framework"
   s.email = "mateo.murphy@gmail.com"
   s.extra_rdoc_files = [
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
     "app/views/application/_show.html.haml",
     "app/views/application/_sidebar.html.haml",
     "app/views/application/_sidenav.html.haml",
-    "app/views/application/_sub_menu.html.haml",
+    "app/views/application/_subnav.html.haml",
     "app/views/application/_table.html.haml",
     "app/views/application/_toolbar.html.haml",
     "app/views/application/_top_menu.html.haml",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_frame
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -370,7 +370,7 @@ files:
 - app/views/application/_show.html.haml
 - app/views/application/_sidebar.html.haml
 - app/views/application/_sidenav.html.haml
-- app/views/application/_sub_menu.html.haml
+- app/views/application/_subnav.html.haml
 - app/views/application/_table.html.haml
 - app/views/application/_toolbar.html.haml
 - app/views/application/_top_menu.html.haml
@@ -412,7 +412,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -361774337552347466
+      hash: 2928487205871375182
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: