From ef231ee9d438d8100f0770fa20d2550738b66a1b Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Fri, 9 Aug 2013 10:32:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E7=95=99=E8=A8=80=E9=94=99=E8=AF=AF=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A0=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 6 ------
 app/views/users/index.html.erb      | 9 ---------
 app/views/words/_message.html.erb   | 2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 981d631b0..6ac7d3a31 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -43,7 +43,6 @@ class UsersController < ApplicationController
   helper :words
   #added by young
   def user_projects
-    @message = MessagesForUser.find_message(@user.id)
     @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current))
 
     events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 20)
@@ -78,11 +77,6 @@ class UsersController < ApplicationController
 
   #  added by fq
   def user_activities
-    #####fq
-    #    @message = MessagesForUser.find_message(@user.id)
-    # show projects based on current user visibility
-    #    @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current))
-
     @watcher = User.watched_by_id(@user)
     events = []
     for user in @watcher
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 232ab672f..e61cbbba9 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -77,15 +77,6 @@
 		<%= l(:label_filter_plural) %>
 	</legend> -->
 	<div class="project-search">
-	<label for='status'><%= l(:field_status) %>:</label>
-	<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
-
-	<% if @groups.present? %>
-	<label for='group_id'><%= l(:label_group) %>:</label>
-	<%= select_tag 'group_id', content_tag('option') + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
-	<% end %>
-
-	<label for='name'><%= l(:label_user) %>:</label>
 	<%= text_field_tag 'name', params[:name], :size => 30 %>
 	<%= submit_tag l(:label_search), :class => "small", :name => nil %><!--Modified by young-->
 <!-- </fieldset> -->
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb
index 45c2d8df8..003dc1660 100644
--- a/app/views/words/_message.html.erb
+++ b/app/views/words/_message.html.erb
@@ -20,7 +20,7 @@
         <td colspan="2" width="580px" ><p class="font_description"><%= textilizable journal.notes%></p></td>
         </tr>
       <tr>
-        <td align="left"><a class="font_lighter"> <%= formal_time journal.created_at %></a></td>
+        <td align="left"><a class="font_lighter"> <%= format_time journal.created_at %></a></td>
         <td width="200" align="right" class="a"><%= link_to(image_tag('comment.png'), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true, 
         :method => 'post', :title => l(:button_quote))%><%= link_to(image_tag('delete.png'), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => user}, 
             :remote => true, :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.jour_id == User.current.id %></td>