Just needs some final testing...

steveklabnik · steveklabnik · commit be1213e3162d · 2009-12-19T06:59:54.000-05:00
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -1,6 +1,6 @@
 class MessagesController < ApplicationController
   def index
-    @messages = Message.all
+    @messages = Message.find(:all, :conditions => ["recipient_id == ?", current_user.id])
   end
 
   def show
@@ -21,7 +21,7 @@ def create
 
 		if @message.save
 			flash[:notice] = 'Message was successfully created.'
-			redirect_to dashboard_url
+			redirect_to user_path(@message.recipient)
 		else
 			render :action => "new"
 		end
diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb
@@ -7,7 +7,7 @@ def create
 		@user_session = UserSession.new(params[:user_session])  
 		if @user_session.save  
 		 flash[:notice] = "Successfully logged in."  
-		 redirect_to dashboard_url
+		 redirect_to user_path(current_user)
 		else  
 		 render :action => 'new'  
 		end  
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -11,7 +11,7 @@ def create
 			steve.watchings.build(:watches_id => @user.id).save
 			@user.watchings.build(:watches_id => 1).save
 			flash[:notice] = "Registration successful."  
-			redirect_to dashboard_url
+			redirect_to user_path(@user)
 		else  
 			render :action => 'new'  
 	 	end  
diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -14,7 +14,7 @@
     <%= image_tag "hhhello.png", :id => "hello" %>
     <div id="nav">
       <% if current_user %>
-        <%= link_to "Dashboard", dashboard_path %> | 
+        <%= link_to "My messages", messages_path %> | 
         <%= link_to "My page", user_path(current_user.username) %> | 
         <%= link_to "Edit info", edit_user_path(current_user.username) %> | 
         <%= link_to "Log out", logout_path %>
diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb
@@ -1,24 +1,7 @@
-<h1>Listing messages</h1>
-
-<table>
-  <tr>
-    <th>Sender</th>
-    <th>Recipient</th>
-    <th>Text</th>
-  </tr>
-
-<% @messages.each do |message| %>
-  <tr>
-    <td><%=h message.sender_id %></td>
-    <td><%=h message.recipient_id %></td>
-    <td><%=h message.text %></td>
-    <td><%= link_to 'Show', message %></td>
-    <td><%= link_to 'Edit', edit_message_path(message) %></td>
-    <td><%= link_to 'Destroy', message, :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New message', new_message_path %>
+  <%= link_to "Send a message", new_message_path %><br /><br />
+  <% if @messages.count == 0 %>
+    <p>Sorry, you don't have any messages.</p>
+  <% end %>
+  <% for message in @messages %>
+  <div style="text-align:left;float:left;max-width:550px" ><%= link_to image_tag(message.sender.avatar_url, :style => "height:2em;"), user_path(message.sender.username) %><span style="vertical-align:super"><%= truncate message.text, :length => 45 %><%= link_to "(full)", message %></span></div><br style="clear:both" />
+  <% end %>
diff --git a/app/views/programs/show.html.erb b/app/views/programs/show.html.erb
@@ -16,9 +16,9 @@
 <h2>Comments</h2><br />
 <% @program.comments.each do |comment| %>
 <% if cycle("yes","no") == "yes" %>
-  <div style="text-align:left;float:left;max-width:550px" ><%= image_tag comment.user.avatar_url, :style => "height:2em;" %><span style="vertical-align:super"><%= comment.text %></span></div><br style="clear:both" />
+  <div style="text-align:left;float:left;max-width:550px" ><%= link_to image_tag(comment.user.avatar_url, :style => "height:2em;"), user_path(comment.user.username) %><span style="vertical-align:super"><%= comment.text %></span></div><br style="clear:both" />
 <% else %>
-  <div style="text-align:right;float:right;max-width:550px" ><span style="vertical-align:super"><%= comment.text %></span><%= image_tag comment.user.avatar_url, :style => "height:2em;" %></div><br style="clear:both" />
+  <div style="text-align:right;float:right;max-width:550px" ><span style="vertical-align:super"><%= comment.text %></span><%= link_to image_tag(comment.user.avatar_url, :style => "height:2em;"), user_path(comment.user.username) %></div><br style="clear:both" />
 <% end %>
 <% end %>
 <br style="clear:both"/>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -5,7 +5,11 @@
     <p><%= link_to @user.link, @user.link %></p>
     <p><%= @user.about %></p>
     <% unless @user == current_user %>
-      <%= link_to "Watch #{@user.username}", watchings_path(:watches_id => @user), :method => :post %>
+      <% if current_user.watches.include? @user %>
+        <%= link_to "Stop watching #{@user.username}", watching_path(current_user.watchings.detect(@user).first), :method => :delete %>
+      <% else %>
+        <%= link_to "Watch #{@user.username}", watchings_path(:watches_id => @user), :method => :post %>
+      <% end %>
     <% else %>
       <br />
     <% end %>
@@ -21,6 +25,9 @@
   <li><%= link_to program.name, program %> - <%= program.description %></li>
   <% end %>
 </ul>
+<% if @user == current_user %>
+  <%= link_to "Make a new program", new_program_path %>
+<% end %>
 </div>
 <br style="clear:both" />
 <hr style="width:550px;" />
diff --git a/config/routes.rb b/config/routes.rb
@@ -9,8 +9,6 @@
 
 	map.root :controller => "welcome"
 
-	map.dashboard "/dashboard", :controller => "dashboard"
-
 	map.login "login", :controller => "user_sessions", :action => "new"
 	map.logout "logout", :controller => "user_sessions", :action => "destroy"
 
diff --git a/generate b/generate
