From 03056768965881518780e360a11c350c42d26e76 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 19 Oct 2016 09:30:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_project_attachment.html.erb | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 app/views/projects/_project_attachment.html.erb diff --git a/app/views/projects/_project_attachment.html.erb b/app/views/projects/_project_attachment.html.erb new file mode 100644 index 000000000..ee116b788 --- /dev/null +++ b/app/views/projects/_project_attachment.html.erb @@ -0,0 +1,46 @@ +
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> + <%#= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %> +
+
+
+ <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% end %> + TO + <%= link_to activity.project.name.to_s+" | 项目资源", project_files_path(activity.course), :class => "newsBlue ml15" %> +
+
+ <%= link_to activity.filename, project_files_path(activity.course), :class => "postGrey" %> +
+
+
+ 文件大小： + <%= number_to_human_size activity.filesize%> +
+
上传时间：<%= format_time(activity.created_on) %>
+
+ +
+
+
+
+ From 3750252f396eedd6f168ff3d72b90fa9a7cc6212 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 19 Oct 2016 09:35:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8E=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=B8=AD=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_project_activities.html.erb | 2 +- app/views/projects/_project_create.html.erb | 25 ++----------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index 7ba1d7acc..07363a0a5 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -45,7 +45,7 @@ <%= render :partial => 'projects/act_messages', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :is_course => 1, :is_board => 0} %> <% when "Attachment" %> - <%= render :partial => 'users/project_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %> + <%= render :partial => 'projects/project_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %> <% when "Commit" %> <%= render :partial => 'projects/project_commit', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :identifier => get_rep_identifier_by_project(@project) } %> <% end %> diff --git a/app/views/projects/_project_create.html.erb b/app/views/projects/_project_create.html.erb index 0d24c4f6b..a62276542 100644 --- a/app/views/projects/_project_create.html.erb +++ b/app/views/projects/_project_create.html.erb @@ -4,15 +4,10 @@
<%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %> - <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
- <% if user.try(:realname) == ' ' %> - <%= link_to user, user_path(user), :class => "newsBlue mr15" %> - <% else %> - <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %> - <% end %> + <%= link_to user.show_name, user_path(user), :class => "newsBlue mr15" %> TO <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
@@ -22,23 +17,7 @@
创建时间：<%= format_time(project.created_on) %>
-
- - + \ No newline at end of file From 89292054c88bc18a190946f5ea71c658d58fccc0 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 19 Oct 2016 09:57:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=A8=A1=E5=9D=97=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_act_messages.html.erb | 10 +-- .../projects/_project_attachment.html.erb | 22 +------ .../_project_comment_reply_detail.html.erb | 20 ++++++ .../projects/_project_intro_content.html.erb | 19 ++++++ .../_project_journal_comment_reply.html.erb | 8 +++ .../_project_message_contents.html.erb | 29 +++++++++ .../_project_message_replies.html.erb | 62 +++++++++++++++++++ app/views/users/_message_contents.html.erb | 8 +-- 8 files changed, 148 insertions(+), 30 deletions(-) create mode 100644 app/views/projects/_project_comment_reply_detail.html.erb create mode 100644 app/views/projects/_project_intro_content.html.erb create mode 100644 app/views/projects/_project_journal_comment_reply.html.erb create mode 100644 app/views/projects/_project_message_contents.html.erb create mode 100644 app/views/projects/_project_message_replies.html.erb diff --git a/app/views/projects/_act_messages.html.erb b/app/views/projects/_act_messages.html.erb index 786b56087..2faa08f8a 100644 --- a/app/views/projects/_act_messages.html.erb +++ b/app/views/projects/_act_messages.html.erb @@ -2,7 +2,7 @@
<%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> - <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %> + <%#= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
@@ -37,7 +37,7 @@ <% else %> <% content = activity.parent.content%> <% end %> - <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %> + <%=render :partial =>"projects/project_intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
@@ -87,12 +87,12 @@ <%# allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %> <%# count = fetch_user_leaveWord_reply(activity).count %>
- <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %> + <%= render :partial => 'projects/project_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %> <% comments = all_replies[0..2] %> <% if count > 0 %>
- <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%> + <%= render :partial => 'projects/project_message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%>
<% end %> @@ -113,7 +113,7 @@ <% end%>
<% else %> - <%= render :partial => "users/show_unlogged" %> + <%= render :partial => "projects/show_unlogged" %> <% end %>
diff --git a/app/views/projects/_project_attachment.html.erb b/app/views/projects/_project_attachment.html.erb index ee116b788..4cbedee4b 100644 --- a/app/views/projects/_project_attachment.html.erb +++ b/app/views/projects/_project_attachment.html.erb @@ -6,11 +6,7 @@
- <% if activity.try(:author).try(:realname) == ' ' %> - <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> - <% else %> - <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> - <% end %> + <%= link_to activity.try(:author).show_name, user_path(activity.author_id), :class => "newsBlue mr15" %> TO <%= link_to activity.project.name.to_s+" | 项目资源", project_files_path(activity.course), :class => "newsBlue ml15" %>
@@ -24,23 +20,7 @@
上传时间：<%= format_time(activity.created_on) %>
-
- diff --git a/app/views/projects/_project_comment_reply_detail.html.erb b/app/views/projects/_project_comment_reply_detail.html.erb new file mode 100644 index 000000000..70082dae4 --- /dev/null +++ b/app/views/projects/_project_comment_reply_detail.html.erb @@ -0,0 +1,20 @@ +
+ <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %> +
+
+ <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %> + <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %> +
+ <% if comment.class == Journal %> + <% if comment.details.any? %> + <% details_to_strings(comment.details).each do |string| %> +

<%= string %>

+ <% end %> + <% end %> +

<%= comment.content_detail.html_safe %>

+ <% else %> + <%= comment.content_detail.html_safe %> + <% end %> +
+
+
\ No newline at end of file diff --git a/app/views/projects/_project_intro_content.html.erb b/app/views/projects/_project_intro_content.html.erb new file mode 100644 index 000000000..d00f5aea5 --- /dev/null +++ b/app/views/projects/_project_intro_content.html.erb @@ -0,0 +1,19 @@ +
+
+ <%= content.to_s.html_safe %> +
+
+ \ No newline at end of file diff --git a/app/views/projects/_project_journal_comment_reply.html.erb b/app/views/projects/_project_journal_comment_reply.html.erb new file mode 100644 index 000000000..b4f80773f --- /dev/null +++ b/app/views/projects/_project_journal_comment_reply.html.erb @@ -0,0 +1,8 @@ +
+ <% if !comment.parent.nil? && !comment.parent.parent.nil? %> +
+ <%=render :partial => 'projects/project_journal_comment_reply', :locals => {:comment => comment.parent} %> +
+ <% end %> + <%=render :partial => 'projects/project_comment_reply_detail', :locals => {:comment => comment} %> +
\ No newline at end of file diff --git a/app/views/projects/_project_message_contents.html.erb b/app/views/projects/_project_message_contents.html.erb new file mode 100644 index 000000000..365914908 --- /dev/null +++ b/app/views/projects/_project_message_contents.html.erb @@ -0,0 +1,29 @@ +
+ <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %> + <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %> +
+<% if !comment.parent.nil? && !comment.parent.parent.nil? %> + <% parents_rely = [] %> + <% parents_rely = get_reply_parents_no_root parents_rely, comment %> + <% length = parents_rely.length %> +
+ <% if length <= 3 %> + <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %> + <% else %> +
+
+
+ <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %> +
+ <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %> +
+
+ ↓ + + <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %> +
+ <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %> +
+ <% end %> +
+<% end %> \ No newline at end of file diff --git a/app/views/projects/_project_message_replies.html.erb b/app/views/projects/_project_message_replies.html.erb new file mode 100644 index 000000000..0a35e9811 --- /dev/null +++ b/app/views/projects/_project_message_replies.html.erb @@ -0,0 +1,62 @@ +
    + <% comments.each do |comment| %> + +
  • +
    + <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %> +
    +
    + <%= render :partial => 'projects/project_message_contents', :locals => {:comment => comment}%> + + <% if !comment.content_detail.blank? %> +
    + <%= comment.content_detail.html_safe %> +
    +
    +
    + + + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> + + + <% topic = comment.root %> + <% if !topic.locked? && authorize_for('messages', 'reply') %> + + <%= link_to( + l(:button_reply), + {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id, :is_course => is_course, :is_board => is_board}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) %> + + + <% end %> + <% if comment.course_destroyable_by?(User.current) || comment.destroyable_by?(User.current) %> + <%= link_to( + l(:button_delete), + delete_board_message_path(comment,:board_id =>comment.board.id, :user_activity_id => user_activity_id, :activity_id => activity_id, :is_course => is_course, :is_board => is_board), + :method => :post, + :remote => true, + :id => "delete_reply_#{activity_id}_#{comment.id}", + :class => 'fr mr20 undis', + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete) + ) %> + <% end %> + + +
    +
    +
    +

    + <% end %> +
    +
    +
    • + <% end %> +
\ No newline at end of file diff --git a/app/views/users/_message_contents.html.erb b/app/views/users/_message_contents.html.erb index 365914908..a4584f825 100644 --- a/app/views/users/_message_contents.html.erb +++ b/app/views/users/_message_contents.html.erb @@ -8,21 +8,21 @@ <% length = parents_rely.length %>
<% if length <= 3 %> - <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %> + <%=render :partial => 'projects/project_journal_comment_reply', :locals => {:comment => comment.parent} %> <% else %>
- <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %> + <%=render :partial => 'projects/project_journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
- <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %> + <%=render :partial => 'projects/project_comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
↓ <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
- <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %> + <%=render :partial => 'projects/project_comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
<% end %>