Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/views/users/user_messages.html.erb

@@ -37,7 +37,7 @@
                 <% if ma.class == CourseMessage %>
                     <% if ma.course_message_type == "News" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布通知</li>
                           <li class="homepageNewsContent fl">
@@ -49,7 +49,7 @@
                     <% end %>
                     <% if ma.course_message_type == "Comment" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了通知</li>
                           <li class="homepageNewsContent fl">
@@ -61,7 +61,7 @@
                     <% end %>
                     <% if ma.course_message_type == "HomeworkCommon" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布作业</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -71,7 +71,7 @@
                     <% end %>
                     <% if ma.course_message_type == "Poll" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布问卷</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -83,7 +83,7 @@
                     <% end %>
                     <% if ma.course_message_type == "Message" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
                           <% if ma.course_message.parent_id.nil? %>
                               <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
@@ -104,7 +104,7 @@
                     <% end %>
                     <% if ma.course_message_type == "StudentWorksScore" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评阅了作品</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -114,7 +114,7 @@
                     <% end %>
                     <% if ma.course_message_type == "JournalsForMessage" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了作品</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -128,7 +128,7 @@
                     <% if ma.forge_message_type == "Issue" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
@@ -143,7 +143,7 @@
                     <% if ma.forge_message_type == "Journal" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue" %>
@@ -160,7 +160,7 @@
                     <% end %>
                     <% if ma.forge_message_type == "Message" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %></li>
 
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布帖子" : "回复帖子" %></li>
@@ -175,7 +175,7 @@
                     <% if ma.forge_message_type == "News" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
@@ -189,7 +189,7 @@
                     <% end %>
                     <% if ma.forge_message_type == "Comment" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了新闻</li>
                           <li class="homepageNewsContent fl">
@@ -204,7 +204,7 @@
                     <% if ma.memo_type == "Memo" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue" %>
@@ -222,7 +222,7 @@
                     <% if ma.journals_for_message_type == "JournalsForMessage" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue" %>