From 80668d6a4791b8a9ff2bdc5bf97ce988e06b60ba Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 7 Jan 2016 10:10:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A5=E4=B8=8B=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9A=20=E9=BC=A0=E6=A0=87=E7=BB=8F=E8=BF=87?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F=E6=97=B6=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=94=A8=E6=88=B7=E7=9A=84=E8=AF=A6=E7=BB=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=8F=AF=E4=BB=A5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0/=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=A7=81=E4=BF=A1/=E7=95=99=E8=A8=80?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_create.html.erb | 1 + app/views/users/_course_homework.html.erb | 1 + app/views/users/_course_message.html.erb | 1 + app/views/users/_course_news.html.erb | 1 + app/views/users/_course_poll.html.erb | 1 + app/views/users/_project_create.html.erb | 1 + app/views/users/_project_issue.html.erb | 1 + app/views/users/_project_message.html.erb | 1 + app/views/users/_show_detail_info.html.erb | 38 +++++++++++++++++++ app/views/users/_user_activities.html.erb | 37 +++++++++++++++++- app/views/users/_user_blog.html.erb | 1 + .../users/_user_journalsformessage.html.erb | 9 ++++- .../users/_watch_btn_for_picture.html.erb | 5 +++ app/views/watchers/_set_watcher.js.erb | 2 + 14 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 app/views/users/_show_detail_info.html.erb create mode 100644 app/views/users/_watch_btn_for_picture.html.erb diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb index 97213283e..dc1e0ee81 100644 --- a/app/views/users/_course_create.html.erb +++ b/app/views/users/_course_create.html.erb @@ -2,6 +2,7 @@
<%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_path(activity.tea_id), :alt => "用户头像" %> + <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index db276d88b..39163ae7a 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -3,6 +3,7 @@
<%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %> + <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 22a4bcf57..3f2c1e0c1 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -2,6 +2,7 @@
<%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %> + <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 475a982e5..2f75717b1 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -2,6 +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} %>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index 48ab5d2f2..c98daef92 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -6,6 +6,7 @@
<%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %> + <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb index 8e3b5a5dc..0e35bca25 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -4,6 +4,7 @@
<%= 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} %>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index cd9704186..7afaa2391 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -2,6 +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} %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 5a9f7e398..f51481abb 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -2,6 +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} %>
diff --git a/app/views/users/_show_detail_info.html.erb b/app/views/users/_show_detail_info.html.erb new file mode 100644 index 000000000..0e249e730 --- /dev/null +++ b/app/views/users/_show_detail_info.html.erb @@ -0,0 +1,38 @@ +
+
+ <%= image_tag(url_to_avatar(user), :width => "50", :height => "50") %> + +
+
+

<%= user %>

<%#= user.show_name %> + +
+

<%= user.user_extensions.technical_title %>

+
+
+
+
+ +
关注
+
+
+
+ +
粉丝
+
+
+
+ +
博客
+
+
+
+ <%= render :partial => 'users/watch_btn_for_picture', :locals => {:user => user} %> +
+ + <%= link_to "私信", feedback_path(user), :class => 'greyBtn fl', :target => "_blank" %> + <%= link_to "留言", feedback_path(user), :class => 'greyBtn fr', :target => "_blank" %> + +
+ +
\ No newline at end of file diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index bb1a42f58..4953dc134 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -1,7 +1,42 @@ <%= content_for(:header_tags) do %> <%= import_ke(enable_at: true, prettify: false, init_activity: true) %> <% end %> - +