app_frame 0.5.6 → 0.5.7

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

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

@@ -0,0 +1,20 @@
+select {
+  width: auto;
+}
+
+input[type=text], input[type=url], textarea, .cke_skin_kama {
+  width: 700px;
+}
+
+input.search-query {
+  width: 300px;
+}
+
+.select2-container {
+  width: 700px;
+}
+
+select.date {
+  width: auto;
+}
+

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

@@ -0,0 +1,15 @@
+.page-header {
+  position: fixed;
+  top: 20px;
+  left: 0;
+  right: 0%;
+  padding: 0 20px;
+  background-color: white;
+  z-index: 10;
+}
+
+.page-actions {
+  position: absolute;
+  top: 15px;
+  right: 20px;
+}

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

@@ -0,0 +1,25 @@
+$sidenav_size: 180px;
+
+#sidenav {
+  position: fixed;
+  width: $sidenav_size;
+  left: 0;
+  top: 40px;
+  bottom: 0;
+  background-color: #f2f7fa;
+  border-right: 1px solid #eee;
+  padding: 10px 0;
+  overflow-y: auto;
+}
+
+.with-sidenav {
+  #main {
+    padding-left: $sidenav_size + 20px;
+  }
+  
+  .page-header {
+    left: $sidenav_size + 1px;
+  }
+
+}
+

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

@@ -4,10 +4,13 @@
  */
 
 @import 'bootstrap';
-#main, .sidebar {  margin-top:50px; }
+#main, .sidebar {  margin-top:110px; }
 @import 'bootstrap-responsive';
 @import 'tree';
 @import 'devise';
+@import 'forms';
+@import 'sidenav';
+@import 'page_header';
 
 .container-fluid > .sidebar {
   position: absolute;
@@ -22,44 +25,15 @@
   margin-right: 280px;
 }
 
-table .last {
-  width: 100px;
-}
-
-td.last {
-  text-align:center;
-}
-
-select {
-  width: auto;
-}
-
-.page-actions {
-  float: right;
-  padding-top: 4px;
+table .actions {
+  width: 1%;
+  white-space:nowrap;
 }
 
 .page-range {
   float: right;
 }
 
-
-input[type=text], input[type=url], textarea, select, .cke_skin_kama {
-  width: 700px;
-}
-
-input.search-query {
-  width: 300px;
-}
-
-.select2-container {
-  width: 700px;
-}
-
-select.date {
-  width: auto;
-}
-
 .btn-toolbar {
   margin-bottom: 20px;
   form {

data/app/helpers/app_frame/layout_helper.rb

@@ -0,0 +1,29 @@
+module AppFrame::LayoutHelper
+  def sidenav
+    @sidenav ||= render 'sidenav'
+  end
+  
+  def sidenav?
+    sidenav.present?
+  end
+  
+  def sidebar
+    @sidebar ||= render 'sidebar'
+  end
+  
+  def sidebar?
+    sidebar.present?
+  end
+  
+  def content_cols
+    @content_cols = 12
+    #@content_cols -= 2 if sidenav?
+    @content_cols -= 2 if sidebar?  
+    @content_cols
+  end
+  
+  def body_class
+    "with-sidenav" if sidenav?
+  end
+  
+end

data/app/views/app_frame/devise/registrations/edit.html.haml

@@ -10,7 +10,7 @@
 
   = f.button :submit, "Update", :class => 'btn'
 
-%h3 Cancel my account<
+%h3 Cancel my account
 
 %p
   Unhappy? 

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

@@ -1,7 +1,5 @@
 .btn-toolbar
-  .btn-group
-    = link_to("New #{resource_name}", new_resource_url, :class => 'btn')
   - if searchable?
-    .btn-group.pull-right
+    .btn-group
       = form_for collection_url, :class => "form-search", :method => :get do 
-        = text_field_tag 'q', params[:q], :class => "search-query"
+        = text_field_tag 'q', params[:q], :class => "search-query", :placeholder => 'Search'

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

@@ -1,5 +1,6 @@
 - content_for :page_header do
-  = page_header resource_name.pluralize
+  = page_header resource_name.pluralize do
+    = link_to("New #{resource_name}", new_resource_url, :class => 'btn btn-primary')
 
 = render 'toolbar'
 

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

@@ -1,9 +1,8 @@
-- sidebar = render 'sidebar'
 !!! 5
 %html
   %head
     = render 'head'
-  %body
+  %body{:class => body_class}
     .navbar.navbar-inverse.navbar-fixed-top{:'data-dropdown'=>"dropdown"}
       .navbar-inner
         .container-fluid
@@ -19,19 +18,17 @@
               = render 'secondary_menu'
     
     #main.container-fluid
-      - if sidebar.present?
-        .content
-          .page-header
-            = render 'page_header'
+      - if sidenav?
+        #sidenav
+          = sidenav
+      .page-header
+        = render 'page_header'
+      .row-fluid
+        %span{:class => "span#{content_cols}"}
           = render 'sub_menu'
           = render 'flashes'
           = yield
-        .sidebar
-          = sidebar
-      - else
-        .page-header
-          = render 'page_header'      
-        = render 'sub_menu'      
-        = render 'flashes'
-        = yield
-        
+        - if sidebar?
+          .span2.sidebar
+            = sidebar
+            

data/app_frame.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "app_frame"
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = "2013-08-25"
+  s.date = "2013-09-03"
   s.description = "An app framework"
   s.email = "mateo.murphy@gmail.com"
   s.extra_rdoc_files = [
@@ -20,13 +20,15 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
     "app/assets/javascripts/app_frame/application.js",
     "app/assets/stylesheets/app_frame/_devise.scss",
+    "app/assets/stylesheets/app_frame/_forms.scss",
+    "app/assets/stylesheets/app_frame/_page_header.scss",
+    "app/assets/stylesheets/app_frame/_sidenav.scss",
     "app/assets/stylesheets/app_frame/_tree.scss",
     "app/assets/stylesheets/app_frame/application.scss",
     "app/controllers/app_frame/devise/confirmations_controller.rb",
@@ -35,6 +37,7 @@ Gem::Specification.new do |s|
     "app/controllers/app_frame/devise/sessions_controller.rb",
     "app/helpers/app_frame/bootstrap_helper.rb",
     "app/helpers/app_frame/breadcrumb_helper.rb",
+    "app/helpers/app_frame/layout_helper.rb",
     "app/helpers/app_frame/menu_helper.rb",
     "app/helpers/app_frame/pagination_helper.rb",
     "app/helpers/app_frame/resources_helper.rb",
@@ -60,6 +63,7 @@ Gem::Specification.new do |s|
     "app/views/application/_secondary_menu.html.haml",
     "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/_table.html.haml",
     "app/views/application/_toolbar.html.haml",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_frame
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -326,13 +326,15 @@ files:
 - .document
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
 - app/assets/javascripts/app_frame/application.js
 - app/assets/stylesheets/app_frame/_devise.scss
+- app/assets/stylesheets/app_frame/_forms.scss
+- app/assets/stylesheets/app_frame/_page_header.scss
+- app/assets/stylesheets/app_frame/_sidenav.scss
 - app/assets/stylesheets/app_frame/_tree.scss
 - app/assets/stylesheets/app_frame/application.scss
 - app/controllers/app_frame/devise/confirmations_controller.rb
@@ -341,6 +343,7 @@ files:
 - app/controllers/app_frame/devise/sessions_controller.rb
 - app/helpers/app_frame/bootstrap_helper.rb
 - app/helpers/app_frame/breadcrumb_helper.rb
+- app/helpers/app_frame/layout_helper.rb
 - app/helpers/app_frame/menu_helper.rb
 - app/helpers/app_frame/pagination_helper.rb
 - app/helpers/app_frame/resources_helper.rb
@@ -366,6 +369,7 @@ files:
 - app/views/application/_secondary_menu.html.haml
 - 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/_table.html.haml
 - app/views/application/_toolbar.html.haml
@@ -408,7 +412,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1054025559741133892
+      hash: -361774337552347466
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,212 +0,0 @@
-GIT
-  remote: git://github.com/ryanb/nested_form.git
-  revision: 42028bc06e72a848d297edc1467a969a7c9def57
-  specs:
-    nested_form (0.3.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
-      mail (~> 2.5.4)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
-    arel (3.0.2)
-    bcrypt-ruby (3.1.1)
-    bootstrap-sass (2.3.2.1)
-      sass (~> 3.2)
-    builder (3.0.4)
-    devise (3.0.3)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      warden (~> 1.2.3)
-    diff-lcs (1.2.4)
-    display_for (0.1.12)
-    erubis (2.7.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    haml (4.0.3)
-      tilt
-    haml-rails (0.4)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (>= 3.1, < 4.1)
-      railties (>= 3.1, < 4.1)
-    has_scope (0.6.0.rc)
-      actionpack (>= 3.2, < 5)
-      activesupport (>= 3.2, < 5)
-    hashie (2.0.5)
-    highline (1.6.19)
-    hike (1.2.3)
-    httpauth (0.2.0)
-    i18n (0.6.5)
-    inherited_resources (1.4.1)
-      has_scope (~> 0.6.0.rc)
-      responders (~> 1.0.0.rc)
-    jeweler (1.8.7)
-      builder
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
-      rake
-      rdoc
-    journey (1.0.4)
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    kaminari (0.14.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-    log_buddy (0.7.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.24)
-    multi_json (1.7.9)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nested_set (1.7.1)
-      activerecord (>= 3.0.0)
-      railties (>= 3.0.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    orm_adapter (0.4.0)
-    polyamorous (0.6.3)
-      activerecord (>= 3.0)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.14)
-      actionmailer (= 3.2.14)
-      actionpack (= 3.2.14)
-      activerecord (= 3.2.14)
-      activeresource (= 3.2.14)
-      activesupport (= 3.2.14)
-      bundler (~> 1.0)
-      railties (= 3.2.14)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    responders (1.0.0.rc)
-      railties (>= 3.2, < 5)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rspec-rails (2.14.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    sass (3.2.10)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    select2-rails (3.4.8)
-      sass-rails
-      thor (~> 0.14)
-    settingslogic (2.0.9)
-    simple_form (2.1.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    squeel (1.1.0)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
-      polyamorous (~> 0.6.0)
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    warden (1.2.3)
-      rack (>= 1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bootstrap-sass (~> 2.3.2.1)
-  bundler (~> 1.3.4)
-  devise
-  display_for (= 0.1.12)
-  haml-rails
-  inherited_resources
-  jeweler (~> 1.8.7)
-  kaminari
-  log_buddy
-  nested_form!
-  nested_set
-  rails (~> 3.2.14)
-  rspec-rails
-  sass-rails
-  select2-rails
-  settingslogic
-  simple_form
-  simplecov
-  squeel