From cefd4b38782b452cc32d563b1fb180818605beb5 Mon Sep 17 00:00:00 2001
From: Will Bradley <bradley.will@gmail.com>
Date: Thu, 14 Feb 2013 00:29:22 -0700
Subject: [PATCH] Added nice front page stuff, fixing sqlite issues, adding
 user payments to profiles

---
 app/controllers/home_controller.rb           |  2 +-
 app/controllers/users_controller.rb          |  1 +
 app/views/cards/index.html.erb               |  1 +
 app/views/devise/registrations/edit.html.erb | 13 ++++++++++++-
 app/views/home/index.html.erb                | 19 +++++++++++++++++--
 app/views/layouts/application.html.erb       |  1 -
 app/views/users/show.html.erb                | 11 +++++++++++
 config/database.yml                          |  2 +-
 8 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 7d19623..da2d5ef 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -6,7 +6,7 @@ def index
   @num_users = User.count
   @recent_users = User.where("created_at > ?", DateTime.now - 7.days).count
   if can? :read, User then
-    @recent_user_names = User.where("created_at > ?", DateTime.now - 7.days)
+    @recent_user_names = User.where("member_level > 10").accessible_by(current_ability).order('created_at desc').limit(5)
   end
   @num_door_opens = DoorLog.where("key = 'G'").count
   @today_door_opens = DoorLog.where("key = 'G' AND created_at > ?", DateTime.now - 1.day).count
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6e2e609..7a6571b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -36,6 +36,7 @@ class UsersController < ApplicationController
   # GET /users/1
   # GET /users/1.json
   def show
+    @payments = Payment.where(:user_id => @user.id).order('date desc').limit(10)
     respond_to do |format|
       format.html # show.html.erb
       format.json { render :json => @user }
diff --git a/app/views/cards/index.html.erb b/app/views/cards/index.html.erb
index 59779f6..7ea1368 100644
--- a/app/views/cards/index.html.erb
+++ b/app/views/cards/index.html.erb
@@ -2,6 +2,7 @@
 
 <%= link_to 'New Card', new_card_path if can? :create, Card %>
 <%= link_to 'Upload all cards', upload_all_path if can? :upload_all, Card %>
+<%= link_to 'Door Logs', door_logs_path if can? :read, DoorLog %>
 <p>
 <b>Most Active Card Last 7 Days:</b> <%= @most_active_card.name %> (<%= @most_active_card.accesses_this_week %> times)
 </p>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index de75463..aca11bf 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,8 +1,19 @@
-<h2>Edit Your Profile</h2>
+<h2>Profile:</h2>
 
 <%= devise_error_messages! %>
 
 <div class="payment_links">
+
+  <% if can? :read, resource.payments then %>
+  <h3>Recorded Payments:</h3>
+  <ul>
+    <% resource.payments.each do |payment| %>
+      <li><%= payment.date %></li>
+    <% end %>
+  </ul>
+  <hr/>
+  <% end %>
+
 <% if resource.payment_method == "Dwolla" %>
 <h3>Dwolla Payment Link</h3>
   <% if resource.member_level == "25" %>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 1607704..9d47d6d 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -14,10 +14,10 @@
 <tr>
 <td>
 <% if ((can? :read, @recent_user_names) && (@recent_user_names.count > 1)) then %>
-<h2>New People:</h2>
+<h2>New People: <em>(say hi!)</em></h2>
 <ul>
 <% @recent_user_names.each do |user| %>
-  <li><%= link_to user.name, user %></li>
+  <li><%= link_to user.name, user %> <%= raw(user.member_status_symbol) %> <em>(Signed up <%= user.created_at.strftime("%b %d") %>)</em></li>
 <% end %>
 </ul>
 <% end %>
@@ -45,7 +45,22 @@
   <li><%= link_to "IRC", "irc://irc.freenode.net#heatsynclabs" %></li>
   <li><%= link_to "Live Webcams", "http://live.heatsynclabs.org/" %></li>
   <li>Lab Phone: (480) 751-1929</li>
+  <li>
+    <style type="text/css">
+     form input {font-family: 'Lucida Console', Monaco, monospace; }
+    </style>
+    
+    <b>Send a Message!</b>
+    <form method="post" action="http://tweet.zyphon.com/signage.php">
+      <em>Type here and your message will show up on the LED sign in the front window!</em><br/>
+      <em>(Please be nice!)</em><br/>
+      <input type="text" name="msg" id="msg" value="  Hello" size="9" /> (max 9 chars per line)<br/>
+      <input type="text" name="msg2" id="msg2" value="  World" size="9" /><br/>
+      <input type="submit" name="submitbutton" id="submitbutton" value="Go!" />
+    </form>
+  </li>
 </ul>
+
 </td>
 </tr>
 </table>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 89d2509..5d907ec 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,7 +18,6 @@
       <%= link_to 'Certifications', certifications_path if can? :read, Certification %>
     <% end %>
     <%= link_to 'Payments', payments_path if can? :read, Payment %>
-    <%= link_to 'Door Logs', door_logs_path if can? :read, DoorLog %>
     <%= link_to 'Computers', macs_path if user_signed_in? && (can? :read, Mac) %>
     <% if user_signed_in? then %><%= link_to 'Profile', edit_user_registration_path %><% end %>
     <%= link_to 'Logout', destroy_user_session_path, :method => :delete if user_signed_in? %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 3b26365..d308703 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -92,6 +92,17 @@
   <% if @user.certifications.blank? %><li>n/a</li><% end %>
 </ul>
 
+<% if current_user.admin? then %>
+<p>
+  <b>Payments:</b>
+  <ul>
+  <% @payments.each do |payment| %>
+    <li><%= payment.date %></li>
+  <% end %>
+  </ul>
+</p>
+<% end %>
+
 <% if current_user.admin? then %>
 <p>
   <b>Created:</b>
diff --git a/config/database.yml b/config/database.yml
index 876f829..51a4dd4 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -22,4 +22,4 @@ production:
   adapter: sqlite3
   database: db/production.sqlite3
   pool: 5
-  timeout: 300000
+  timeout: 5000