0
@@ -14,7 +14,7 @@ class PostsController < ApplicationController
0
   # GET /posts.xml
0
   def index
0
 
0
-    @posts = Post.search(params[:search], params[:page])
0
+    @posts = Post.search(params[:user], params[:page])
0
     @meta_title = "Posts - "
0
 
0
     respond_to do |format|

0
@@ -25,6 +25,8 @@ class UserService
0
   end
0
 
0
   def valid?
0
+    logger.warn('User not valid') unless @user.valid?
0
+    logger.warn('Photo not valid') unless @photo.valid?
0
     @user.valid? && @photo.valid?
0
   end
0
 

0
@@ -17,7 +17,7 @@ class UsersController < ApplicationController
0
   # GET /users.xml
0
   def index
0
 
0
-    @users = User.find(:all)
0
+    @users = User.search(params[:search], params[:page])
0
 
0
     respond_to do |format|
0
       format.html # index.html.erb
0
@@ -54,6 +54,7 @@ class UsersController < ApplicationController
0
         format.xml  { head :ok }
0
       else
0
         @user = @service.user
0
+        flash[:error] = 'User could not be updated.'
0
         format.html { render :action => "edit" }
0
         format.xml  { render :xml    => @user.errors, 
0
           :status => :unprocessable_entity }
0
@@ -61,7 +62,6 @@ class UsersController < ApplicationController
0
     end
0
   end
0
 
0
- 
0
   def create
0
     logout_keeping_session!
0
     @user = User.new(params[:user])

0
@@ -1,5 +1,10 @@
0
 module UsersHelper
0
   
0
+  def edit_profile_link(user)
0
+    if(user == current_user)
0
+      link_to edit_icon, edit_user_path(user)
0
+    end
0
+  end
0
   #
0
   # Use this to wrap view elements that the user can't access.
0
   # !! Note: this is an *interface*, not *security* feature !!

0
@@ -28,7 +28,11 @@ class Post < ActiveRecord::Base
0
   end
0
 
0
   def self.search(search, page)
0
-    paginate :per_page => 5, :page => page, :order => 'created_at DESC'
0
+    if search
0
+      paginate :per_page => 5, :page => page, :order => 'created_at DESC', :conditions => ['user_id = ?', search]
0
+    else 
0
+      paginate :per_page => 5, :page => page, :order => 'created_at DESC'
0
+    end
0
   end
0
 
0
   def self.find_latest(limit = 5)

0
@@ -62,6 +62,21 @@ class User < ActiveRecord::Base
0
     [self.first_name, self.last_name].join(' ')
0
   end
0
 
0
+  def self.search(search, page)
0
+    paginate :per_page => 5, :page => page, :order => 'created_at'
0
+  end
0
+
0
+  private
0
+
0
+  def create_menu
0
+    parent_menu = Menu.find(:first, :conditions => ['controller = ? and action = ?', 'users', 'index'])
0
+    new_menu = Menu.new(:name => self.login, :controller => 'users', :action => 'show', :proposed_parent_id => parent_menu )
0
+    self.menu = new_menu
0
+
0
+    # Create edit/comment menus
0
+    Menu.create :name => 'Edit', :controller => 'users', :action => 'edit', :menuable_type => self.class.to_s, :menuable_id => self.id, :proposed_parent_id => new_menu
0
+  end
0
+
0
   protected
0
     
0
     def make_activation_code

0
@@ -3,6 +3,7 @@
0
     <ul class="simple_nav" id="main">
0
       <% Menu.root.children.each do |menu| %>
0
         <% next if self.logged_in? && menu.name =~ /Login/ %>
0
+        <% next if self.logged_in? && menu.name =~ /Register/ %>
0
         <% next if !self.logged_in? && menu.name =~ /Logout/ %>
0
         <% unless menu == current_menu.self_and_ancestors[1] %>
0
           <li><%= link_to menu.name, :controller => menu.controller, :action => menu.action %></li>

0
@@ -1,17 +1,12 @@
0
-<h2 class="border-red">Users</h2>
0
+<ul id="gallery" class="span-23 last">
0
+  <% @users.each do |user| %>
0
+    <li class="span-5 center">
0
+    <%= link_to profile_photo(user), user %>
0
+    <p class="span-5 center">
0
+    <%= link_to user.login, user %>
0
+    </p>
0
+    </li>
0
+  <% end %>
0
+</ul>
0
 
0
-<table>
0
-  <tr>
0
-    <th>User</th>
0
-    <th>Image</th>
0
-  </tr>
0
-  <% for user in @users -%>
0
-    <tr>
0
-      <td><%=h user.login %></td>
0
-      <td><%= profile_photo(user) %></td>
0
-      <td><%= link_to 'Show', user %></td>
0
-      <td><%= link_to 'Edit', edit_user_path(user) %></td>
0
-      <td><%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %></td>
0
-    </tr>
0
-  <% end -%>
0
-</table>
0
+<%= will_paginate @users %>

0
@@ -1,5 +1,5 @@
0
 <h2 class="border-red">
0
-  <%= link_to edit_icon, edit_user_path(@user) %>
0
+  <%= edit_profile_link(@user) %>
0
   Profile for <%= @user.name %>
0
 </h2>
0
 
0
@@ -9,7 +9,7 @@
0
   <li><b>|</b></li>
0
   Total posts: <%= @user.posts.size %>
0
   <li><b>|</b></li>
0
-  <li><%= link_to "Find all posts by #{@user.login}", posts_url(:search => @user) %></li>
0
+  <li><%= link_to "Find all posts by #{@user.login}", posts_url(:user => @user) %></li>
0
 </ul>
0
 <p class="post span-17">
0
 <%= @user.profile %>

0
@@ -21,6 +21,7 @@ class CreateMenus < ActiveRecord::Migration
0
 
0
       # Create edit/comment menus
0
       Menu.create :name => 'Edit', :controller => 'posts', :action => 'edit', :menuable_type => post.class.to_s, :menuable_id => post.id, :proposed_parent_id => post_menu
0
+      Menu.create :name => 'Update', :controller => 'posts', :action => 'update', :menuable_type => post.class.to_s, :menuable_id => post.id, :proposed_parent_id => post_menu
0
       Menu.create :name => 'Discuss', :controller => 'posts', :action => 'comment', :menuable_type => post.class.to_s, :menuable_id => post.id, :proposed_parent_id => post_menu
0
     end
0
 
0
@@ -32,6 +33,7 @@ class CreateMenus < ActiveRecord::Migration
0
 
0
       # Create edit/comment menus
0
       Menu.create :name => 'Edit', :controller => 'albums', :action => 'edit', :menuable_type => album.class.to_s, :menuable_id => album.id, :proposed_parent_id => album_menu
0
+      Menu.create :name => 'Update', :controller => 'albums', :action => 'update', :menuable_type => album.class.to_s, :menuable_id => album.id, :proposed_parent_id => album_menu
0
       Menu.create :name => 'Discuss', :controller => 'albums', :action => 'comment', :menuable_type => album.class.to_s, :menuable_id => album.id, :proposed_parent_id => album_menu
0
     end
0
 
0
@@ -46,6 +48,7 @@ class CreateMenus < ActiveRecord::Migration
0
 
0
       # Create edit/comment menus
0
       Menu.create :name => 'Edit', :controller => 'topics', :action => 'edit', :menuable_type => topic.class.to_s, :menuable_id => topic.id, :proposed_parent_id => topic_menu
0
+      Menu.create :name => 'Update', :controller => 'topics', :action => 'update', :menuable_type => topic.class.to_s, :menuable_id => topic.id, :proposed_parent_id => topic_menu
0
     end
0
 
0
     tags = Menu.create :name => 'Tags', :controller => 'tags', :action => 'index', :proposed_parent_id => searches
0
@@ -54,7 +57,20 @@ class CreateMenus < ActiveRecord::Migration
0
       tag.menu = tag_menu
0
     end
0
 
0
+    profiles = Menu.create :name => 'Profiles', :controller => 'users', :action => 'index', :proposed_parent_id => home
0
+    User.find(:all).each do |profile|
0
+      profile_menu = Menu.new :name => profile.login, :controller => 'users', :action => 'show', :proposed_parent_id => profiles
0
+      profile.menu = profile_menu
0
+
0
+      # Create edit menus
0
+      Menu.create :name => 'Edit', :controller => 'users', :action => 'edit', :menuable_type => profile.class.to_s,
0
+                  :menuable_id => profile.id, :proposed_parent_id => profile_menu
0
+      Menu.create :name => 'Update', :controller => 'users', :action => 'update', :menuable_type => profile.class.to_s,
0
+                  :menuable_id => profile.id, :proposed_parent_id => profile_menu
0
+    end
0
+
0
     Menu.create :name => 'Register', :controller => 'users', :action => 'new', :proposed_parent_id => home
0
+
0
     login = Menu.create :name => 'Login', :controller => 'sessions', :action => 'new', :proposed_parent_id => home
0
     Menu.create :name => 'Login Error', :controller => 'sessions', :action => 'create', :proposed_parent_id => login
0
     Menu.create :name => 'Logout', :controller => 'sessions', :action => 'logout', :proposed_parent_id => home