From: Ira W. Snyder <devel@irasnyder.com>
Date: Tue, 27 Nov 2007 08:04:01 +0000 (-0800)
Subject: Fix 'maintenence' to 'maintenance' + layout reorganization
X-Git-Tag: turned-in~3
X-Git-Url: https://irasnyder.com/gitweb/?a=commitdiff_plain;ds=inline;h=64aa5e3cbee5e3c07e0d97ee60d03a4a2dfcf787;p=cs356-p2-videostore.git

Fix 'maintenence' to 'maintenance' + layout reorganization

Signed-off-by: Ira W. Snyder <devel@irasnyder.com>
---

diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
index 53cd00b..7d9b914 100644
--- a/app/controllers/login_controller.rb
+++ b/app/controllers/login_controller.rb
@@ -5,10 +5,10 @@ class LoginController < ApplicationController
   before_filter :authorize, :only => :index
 
   # Only managers can do the following actions
-  before_filter :manager, :only => [:add_user, :delete_user, :list_users, :maintenence]
+  before_filter :manager, :only => [:add_user, :delete_user, :list_users, :maintenance]
 
-  def maintenence
-    render :action => 'maintenence'
+  def maintenance
+    render :action => 'maintenance'
   end
 
   def limits
diff --git a/app/models/bonus_purchase.rb b/app/models/bonus_purchase.rb
index a0d8a5c..044b2e2 100644
--- a/app/models/bonus_purchase.rb
+++ b/app/models/bonus_purchase.rb
@@ -7,9 +7,7 @@ class BonusPurchase < Purchase
 
   def self.last_bonus_date(customer,bonus_type,since_date)
     bonuses = BonusPurchase.find_all_by_customer_id(customer, :conditions => ["date >= ?", since_date], :order => 'date DESC')
-    puts "*** BONUSES.length: #{bonuses.length} ***"
     for bonus in bonuses
-      puts "#{bonus.rentable.class.to_s} == #{bonus_type.to_s} => #{bonus.rentable.class.to_s == bonus_type.to_s}"
       if bonus.rentable.class.to_s == bonus_type.to_s
         return bonus.date
       end
diff --git a/app/views/coitem/index.rhtml b/app/views/coitem/index.rhtml
index 3465f5a..fc5e365 100644
--- a/app/views/coitem/index.rhtml
+++ b/app/views/coitem/index.rhtml
@@ -1,4 +1,4 @@
-<h1>Checked Out Items Maintenence</h1>
+<h1>Checked Out Items Maintenance</h1>
 
 <h3>Actions</h3>
 <ul>
diff --git a/app/views/customer/index.rhtml b/app/views/customer/index.rhtml
index 521b806..4048580 100644
--- a/app/views/customer/index.rhtml
+++ b/app/views/customer/index.rhtml
@@ -1,4 +1,4 @@
-<h1>Customer Maintenence</h1>
+<h1>Customer Maintenance</h1>
 
 <h3>Actions</h3>
 <ul>
diff --git a/app/views/game/index.rhtml b/app/views/game/index.rhtml
index e6a4cf8..f765057 100644
--- a/app/views/game/index.rhtml
+++ b/app/views/game/index.rhtml
@@ -1,4 +1,4 @@
-<h1>Game Maintenence</h1>
+<h1>Game Maintenance</h1>
 
 <h3>Actions</h3>
 <ul>
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index 5ad36b2..3647949 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -13,18 +13,20 @@
   </div>
   <div id="columns">
     <div id="side">
-      <p><%= link_to "Make A Purchase", :controller => 'purchase', :action => 'begin' %></p>
+      <p><%= link_to "Customer Transaction", :controller => 'purchase', :action => 'begin' %></p>
       <p><%= link_to "Return Items", :controller => 'coitem', :action => 'return' %></p>
       <br/>
-      <p><%= link_to "Video Maintenence", :controller => 'video', :action => 'index' %></p>
-      <p><%= link_to "Game Maintenence", :controller => 'game', :action => 'index' %></p>
-      <p><%= link_to "Merchandise Maintenence", :controller => 'merchandise', :action => 'index' %></p>
+      <p><%= link_to "Customer Maintenance", :controller => 'customer', :action => 'index' %></p>
+      <p><%= link_to "Game Maintenance", :controller => 'game', :action => 'index' %></p>
+      <p><%= link_to "Merchandise Maintenance", :controller => 'merchandise', :action => 'index' %></p>
+      <p><%= link_to "Video Maintenance", :controller => 'video', :action => 'index' %></p>
+      <br/>
       <p><%= link_to "Checked Out Items", :controller => 'coitem', :action => 'index' %></p>
-      <p><%= link_to "Customer Maintenence", :controller => 'customer', :action => 'index' %></p>
       <p><%= link_to "Financial Information", :controller => 'purchase', :action => 'index' %></p>
-      <p><%= link_to "System Maintenence", :controller => 'login', :action => 'maintenence' %></p>
       <p><%= link_to "Rental and Bonus Policies", :controller => 'login', :action => 'limits' %></p>
       <br/>
+      <p><%= link_to "User Maintenance", :controller => 'login', :action => 'maintenance' %></p>
+      <br/>
       <p><%= link_to "Logout", :controller => 'login', :action => 'logout' %></p>
     </div>
   <div id="main">
diff --git a/app/views/login/maintenence.rhtml b/app/views/login/maintenance.rhtml
similarity index 85%
rename from app/views/login/maintenence.rhtml
rename to app/views/login/maintenance.rhtml
index 043bb71..c927ec9 100644
--- a/app/views/login/maintenence.rhtml
+++ b/app/views/login/maintenance.rhtml
@@ -1,4 +1,4 @@
-<h1>System Maintenence</h1>
+<h1>System Maintenance</h1>
 
 <h3>Actions</h3>
 <ul>
diff --git a/app/views/merchandise/index.rhtml b/app/views/merchandise/index.rhtml
index ec31215..f21a2d8 100644
--- a/app/views/merchandise/index.rhtml
+++ b/app/views/merchandise/index.rhtml
@@ -1,4 +1,4 @@
-<h1>Merchandise Maintenence</h1>
+<h1>Merchandise Maintenance</h1>
 
 <h3>Actions</h3>
 <ul>
diff --git a/app/views/purchase/begin.rhtml b/app/views/purchase/begin.rhtml
index b108db7..bf8a608 100644
--- a/app/views/purchase/begin.rhtml
+++ b/app/views/purchase/begin.rhtml
@@ -1,4 +1,4 @@
-<h1>Start a Purchase</h1>
+<h1>Start a Transaction</h1>
 
 <p>Please read the customer's ID number off of their card and enter
 it in the box below.</p>
diff --git a/app/views/purchase/menu.rhtml b/app/views/purchase/menu.rhtml
index a57bc22..9fb2fa1 100644
--- a/app/views/purchase/menu.rhtml
+++ b/app/views/purchase/menu.rhtml
@@ -1,4 +1,4 @@
-<h1>Purchase Menu</h1>
+<h1>Customer Transaction</h1>
 
 <h3>Customer Information</h3>
 <ul>
diff --git a/app/views/video/index.rhtml b/app/views/video/index.rhtml
index e8a1289..e817cef 100644
--- a/app/views/video/index.rhtml
+++ b/app/views/video/index.rhtml
@@ -1,4 +1,4 @@
-<h1>Video Maintenence</h1>
+<h1>Video Maintenance</h1>
 
 <h3>Actions</h3>
 <ul>
diff --git a/db/development.sqlite3 b/db/development.sqlite3
index ead04f8..6a09f08 100644
Binary files a/db/development.sqlite3 and b/db/development.sqlite3 differ