From 8530abf7694fab45c8b85203e8cfef113c7aa6cf Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 16 Sep 2014 11:11:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=202.=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E4=BA=BA=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E5=90=8D=E5=AD=97=E4=BB=8D=E6=98=AF?= =?UTF-8?q?"=E6=88=91"=E7=9A=84BUG=20#1251=20=E8=A7=A3=E5=86=B3=E6=96=B9?= =?UTF-8?q?=E6=A1=88=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=AE=BF=E9=97=AE=E7=94=A8?= =?UTF-8?q?=E6=88=B7ID=E5=92=8C=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95Id?= =?UTF-8?q?=E6=98=AF=E4=B8=8D=E6=98=AF=E4=B8=80=E8=87=B4=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/show.html.erb | 492 ++++++++++++++++++++++------------ 1 file changed, 319 insertions(+), 173 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 551f7e724..bc485325c 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,61 +1,72 @@ - <% if User.current.id == @user.id %> -
-
- <%= "#{@user.name}的动态" %> - -
- +<% if User.current.id == @user.id %> +
+
+ <%= "#{@user.name}的动态" %> +
    <%#链接绑定在页面最下方的jQuery%> +
  • "><%= l :label_user_all_activity %>
    • +
  • "><%= l :label_user_activity_myself %>
    • +
  • "><%= l :label_user_all_respond %>
    • +
+
+ +
+
+ <%= form_tag(:controller => 'users', :action => "show") do %> + -
- <%= form_tag(:controller => 'users', :action => "show") do %> - - <% end %> <% end %> +<% end %> - <% unless @state == 2 %> - <% unless @activity.empty? %> -
- <% @activity.each do |e| %> - <%# 以下一行代码解决有未知的活动无法转换成Model报错%> - <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %> - <% act = e.act %> - <% unless act.nil? %> - <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%> - - - -
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> +<% unless @state == 2 %> + <% unless @activity.empty? %> +
+ <% @activity.each do |e| %> + <%# 以下一行代码解决有未知的活动无法转换成Model报错%> + <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %> + <% act = e.act %> + <% unless act.nil? %> + <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%> + + + + - + + +
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> - <% case e.act_type %> + <% case e.act_type %> <% when 'JournalsForMessage' %> @@ -70,13 +81,41 @@ <% when 'Bid' %> <% if act.reward_type == 3 && @show_course == 1%> - + <% if e.user == User.current %> + + <% else %> + + <% end %> <% else %> - + <% if e.user == User.current %> + + <% else %> + + <% end %> <% end %> @@ -89,15 +128,30 @@ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
- <%= link_to l(:label_find_all_comments), respond_path(e.act_id) %><%= l(:label_comments_count, :count => e.act.commit) %> + <%= link_to l(:label_find_all_comments), respond_path(e.act_id) %> + <%= l(:label_comments_count, :count => e.act.commit) %>
<% when 'Journal' %> - + <% if e.user == User.current %> + + <% else %> + + <% end %> <% if act.notes.nil? %> @@ -118,9 +172,29 @@ <% when 'Changeset' %> - + <% if e.user == User.current %> + + <% else %> + + <% end %> <% when 'Message' %> - + <% if e.user == User.current %> + + <% else %> + + <% end %> <% when 'Principal' %> - + <% if e.user == User.current %> + + <% else %> + + <% end %> @@ -174,9 +279,19 @@ <% when 'News' %> - + <% if e.user == User.current %> + + <% else %> + + <% end %> <% when 'Issue' %> - + <% if e.user == User.current %> + + <% else %> + + <% end %> <% when 'Contest' %> - + <% if e.user == User.current && @show_contest == 1%> + + <% else %> + + <% end %> <% else %> - <%# f=1 %> - <% end %> + <% end %>
- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %> - <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> + <% if User.current.login == e.user.try(:login) %> + + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> + +   + <% else %> + <%= link_to("#{e.user.name}", user_path(e.user_id)) %> + <% end %> + + <%= l(:label_have_feedback) %> + <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> +

<%= textAreailizable act.notes %>

- <%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %> + + <%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %> +
- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> - + + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> + + + <%= l(:label_i_new_activity) %> + + <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> + + + <%= link_to(h(e.user), user_path(e.user_id)) %> +   + + <%= l(:label_new_activity) %> +   + <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> + - <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> - + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> + <%= l(:label_i_new_activity) %> + <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> + + <%= link_to(h(e.user), user_path(e.user_id)) %>  + <%= l(:label_new_activity) %>  + <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> +
- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> - + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>  + <%= l(:label_i_new_activity) %>  + <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> + <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), + {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> + + <%= link_to(h(e.user), user_path(e.user_id)) %>  + <%= l(:label_new_activity) %>  + <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.identifier)) %> + <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), + {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> +
- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %> - + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>  + <%= l(:label_i_new_activity) %>  + <%= link_to format_activity_title(act.title), + {:controller => 'repositories', + :action => 'revision', + :id => act.repository.project, + :repository_id => act.repository.identifier_param, + :rev => act.identifier} %> + + <%= link_to(h(e.user), user_path(e.user_id)) %>  + <%= l(:label_new_activity) %>  + <%= link_to format_activity_title(act.title), + {:controller => 'repositories', + :action => 'revision', + :id => act.repository.project, + :repository_id => act.repository.identifier_param, + :rev => act.identifier} %> +
@@ -132,15 +206,38 @@ <%= format_time(e.act.committed_on) %>
- <%= link_to l(:label_find_all_comments), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %><%= l(:label_comments_count, :count => e.act.count) %> + <%= link_to l(:label_find_all_comments), + {:controller => 'repositories', + :action => 'revision', + :id => act.repository.project, + :repository_id => act.repository.identifier_param, + :rev => act.identifier} %> + + <%= l(:label_comments_count, :count => e.act.count) %>
- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), {:controller => 'messages', :action => 'show', :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> - + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>  + <%= l(:label_i_new_activity) %>  + <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), + {:controller => 'messages', + :action => 'show', + :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> + + <%= link_to(h(e.user), user_path(e.user_id)) %>  + <%= l(:label_new_activity) %>  + <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), + {:controller => 'messages', + :action => 'show', + :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> +
@@ -157,9 +254,17 @@
- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_new_user) %> - + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>  + <%= l(:label_new_user) %> + + <%= link_to(h(e.user), user_path(e.user_id)) %>  + <%= l(:label_new_user) %> +

- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> - + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>  + <%= l(:label_i_new_activity) %>  + <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> + + <%= link_to(h(e.user), user_path(e.user_id)) %>  + <%= l(:label_new_activity) %>  + <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> +
@@ -188,21 +303,44 @@ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
- <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %><%= l(:label_comments_count, :count => e.act.comments_count) %> + + <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %> + + + <%= l(:label_comments_count, :count => e.act.comments_count) %> +
- - <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> -   - - <%= l(:label_i_new_activity) %> -   - <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> - + + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> +   + + <%= l(:label_i_new_activity) %> +   + <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), + {:controller => 'issues', + :action => 'show', + :id => act.id} %> + + + <%= link_to(h(e.user), user_path(e.user_id)) %> +   + + <%= l(:label_new_activity) %> +   + <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), + {:controller => 'issues', + :action => 'show', + :id => act.id} %> +
@@ -215,15 +353,26 @@ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
- <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %><%= l(:label_comments_count, :count => e.act.journals.count) %> + <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %> + <%= l(:label_comments_count, :count => e.act.journals.count) %>
- <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> - + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>  + <%= l(:label_i_new_activity) %>  + <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> + + <%= link_to(h(e.user), user_path(e.user_id)) %>  + <%= l(:label_new_activity) %>  + <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> +

<%= textAreailizable act, :description %>

@@ -236,101 +385,98 @@
-
+ <% end %> + <% end %> + <% end %> +
+ + <% else %> + <% if @user == User.current %> + <%= l(:label_user_activities) %> + <% else %> +

+ <%= l(:label_user_activities_other) %> +

+ <% end %> + <% end %> -
- <% end %> - <% end %> +<% else %> + <% unless @message.empty? %> +
+ <% @message.each do |e| -%> + + + + + +
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> + + + + + + + + + + + +
+ <%= link_to(h(e.user), user_path(e.user)) %> + <% if e.instance_of?(JournalsForMessage) %> + <% if e.reply_id == User.current.id %> + <% if e.jour_type == 'Bid' %> + <%= l(:label_in_bids) %><%= link_to(e.jour.name, respond_path(e.jour)) %> <%= l(:label_quote_my_words) %> + <% elsif e.jour_type == 'User' %> + <%= l(:label_in_users) %><%= link_to(e.jour.firstname, feedback_path(e.jour)) %> <%= l(:label_quote_my_words) %> + <% elsif e.jour_type == 'Project' %> + <%= '在'<<%= link_to(e.jour.name, feedback_path(e.jour)) %> <%= l(:label_reply_plural) %> + <% end %> + <% else %> + <%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id)) %> <%= l(:label_have_respond) %> + <% end %> + <% else %> + <% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %> + <%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id)) %><%= l(:label_have_respond) %> - <% end %> - - - <% else %> - <% if @user == User.current %> - <%= l(:label_user_activities) %> - <% else %> -

- <%= l(:label_user_activities_other) %> -

- <% end %> - <% end %> + <% else %> + <%= l(:label_in_issues) %><%= link_to(e.issue.subject, issue_path(e.issue)) %><%= l(:label_quote_my_words) %> + <% end %> + <% end %> +

<%= textAreailizable e.notes %>

+ <%= format_time e.created_on %>
+
+ <% end %> +
+ + <% else %> - <% unless @message.empty? %> -
- <% @message.each do |e| -%> - - - - - -
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> - - - - - - - - - - - -
- <%= link_to(h(e.user), user_path(e.user)) %> - <% if e.instance_of?(JournalsForMessage) %> - <% if e.reply_id == User.current.id %> - <% if e.jour_type == 'Bid' %> - <%= l(:label_in_bids) %><%= link_to(e.jour.name, respond_path(e.jour)) %> <%= l(:label_quote_my_words) %> - <% elsif e.jour_type == 'User' %> - <%= l(:label_in_users) %><%= link_to(e.jour.firstname, feedback_path(e.jour)) %> <%= l(:label_quote_my_words) %> - <% elsif e.jour_type == 'Project' %> - <%= '在'<<%= link_to(e.jour.name, feedback_path(e.jour)) %> <%= l(:label_reply_plural) %> - <% end %> - <% else %> - <%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id)) %> <%= l(:label_have_respond) %> - <% end %> - <% else %> - <% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %> - <%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id)) %><%= l(:label_have_respond) %> - - <% else %> - <%= l(:label_in_issues) %><%= link_to(e.issue.subject, issue_path(e.issue)) %><%= l(:label_quote_my_words) %> - <% end %> - <% end %> -

<%= textAreailizable e.notes %>

- <%= format_time e.created_on %>
-
- <% end %> -
- - - - <% else %> -

<%= l(:label_no_user_respond_you) %>

- <% end %> - - +

<%= l(:label_no_user_respond_you) %>

<% end %> - + $('[mode=myself]').click(function (event) { + window.location.href = '<%=user_url(@user, type: 1)%>'; + }); + $('[mode=respond]').click(function (event) { + window.location.href = '<%=user_url(@user, type: 2)%>'; + }); + }); +