From 6d0a7b165ab683b759e1466b2a0e8c64eaa03da1 Mon Sep 17 00:00:00 2001
From: Will Bradley <bradley.will@gmail.com>
Date: Fri, 25 Jan 2013 07:48:13 -0700
Subject: [PATCH] Made some changes to the css and asset compiling settings

---
 app/assets/stylesheets/application.css    | 6 ------
 app/assets/stylesheets/scaffolds.css.scss | 8 ++++++++
 app/views/users/_form.html.erb            | 6 +++---
 config/application.rb                     | 6 +++---
 config/environments/production.rb         | 4 ++--
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index e184bb7..3b5cc66 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -11,9 +11,3 @@
  *= require_self
  *= require_tree .
 */
-table { border-spacing: 0; }
-td, th { padding: 0.5em; }
-.col_highlight { background-color: #ccc; }
-dt { font-weight: bold; }
-.notice { color: green; }
-.alert { color: red; }
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 6ec6a8f..61fedd4 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -67,3 +67,11 @@ div {
     list-style: square;
   }
 }
+
+table { border-spacing: 0; }
+td, th { padding: 0.5em; }
+.col_highlight { background-color: #ccc; }
+dt { font-weight: bold; }
+.notice { color: green; }
+.alert { color: red; }
+
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 1d24aec..ea5f19f 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -46,11 +46,11 @@
   </div>
   <div class="field">
     <%= f.label :member_level, "Desired Member Level" %><br />
-    <%= f.select :member_level, [["None",0],["Unable",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]]  %>
+    <%= f.select :member_level, [[nil],["None",0],["Unable",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]]  %>
   </div>
   <div class="field">
     <%= f.label :payment_method %><br />
-    <%= f.select :payment_method, [["PayPal"],["Dwolla"],["Bill Pay"],["Check"],["Cash"],["Other"]]  %>
+    <%= f.select :payment_method, [[nil],["PayPal"],["Dwolla"],["Bill Pay"],["Check"],["Cash"],["Other"]]  %>
   </div>
   <div class="field">
     <%= f.label :phone %><br />
@@ -80,7 +80,7 @@
 <% end %>
   <div class="field">
     <%= f.label :member, "Member?" %><br />
-    <%= f.select :member, [["No",0],["Inactive",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]]  %>
+    <%= f.select :member, [[nil],["No",0],["Inactive",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]]  %>
   </div>
   <div class="field">
     <%= f.label :instructor, "Instructor?" %><br />
diff --git a/config/application.rb b/config/application.rb
index 5d6ca1a..4cae87d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,9 +4,9 @@ require 'rails/all'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  #Bundler.require(*Rails.groups(:assets => %w(development test)))
   # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
+  Bundler.require(:default, :assets, Rails.env)
 end
 
 module Dooraccess
@@ -54,6 +54,6 @@ module Dooraccess
     config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    config.assets.version = '1.1'
   end
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 97757dd..89d5aee 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -2,7 +2,7 @@ Dooraccess::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # Code is not reloaded between requests
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
@@ -15,7 +15,7 @@ Dooraccess::Application.configure do
   config.assets.compress = true
 
   # Fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = true
+  config.assets.compile = false
 
   # Generate digests for assets URLs
   config.assets.digest = true