From c729c1252de1f66b601a60ee0fed495b2c455445 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 28 Apr 2016 10:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blogs/_article.html.erb | 6 +++--- app/views/users/_course_boardlist.html.erb | 5 +++-- app/views/users/_intro_content_ex.html.erb | 24 +++++++++++++++++++++ app/views/users/_project_boardlist.html.erb | 7 +++--- app/views/users/_user_course_list.html.erb | 2 +- public/stylesheets/courses.css | 2 +- public/stylesheets/new_user.css | 2 +- public/stylesheets/project.css | 2 +- 8 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 app/views/users/_intro_content_ex.html.erb diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 9ec17bf90..ec6a6c7b5 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -25,7 +25,7 @@ <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl"%> <% end %> <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> - [已设为首页] + [已设为首页] <% end %> <% if activity.sticky == 1 %> 顶 @@ -45,10 +45,10 @@ 发帖时间：<%= format_time(activity.created_on) %> 更新时间：<%= format_time(activity.updated_on) %>

- <%= count>0 ? "（#{count}）" : "" %> + <%= count>0 ? "#{count}" :"0" %> 回复 | - <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %> + <%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" :"0" %> 赞

diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index 9b5ea305a..12aafa0c3 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -29,8 +29,9 @@ <% if activity.locked %> 锁 <% end %> + <% u = User.where("id=?",activity.author_id).first%> - <%= activity.course.name.to_s %> + 发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
@@ -40,7 +41,7 @@ <% else %> <% content = activity.parent.content %> <% end %> -

<%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>activity.id, :content=>content} %>

+

<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>36} %>

发帖时间：<%= format_time(activity.created_on) %> diff --git a/app/views/users/_intro_content_ex.html.erb b/app/views/users/_intro_content_ex.html.erb new file mode 100644 index 000000000..d667845d0 --- /dev/null +++ b/app/views/users/_intro_content_ex.html.erb @@ -0,0 +1,24 @@ +
+
+ <%= content.to_s.html_safe%> +
+
+ \ No newline at end of file diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb index 917eb2742..5dc1ac673 100644 --- a/app/views/users/_project_boardlist.html.erb +++ b/app/views/users/_project_boardlist.html.erb @@ -29,8 +29,9 @@ <% if activity.locked %> 锁 <% end %> + <% u = User.where("id=?",activity.author_id).first%> - <%= activity.project.name.to_s %> + 发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
@@ -40,7 +41,7 @@ <% else %> <% content = activity.parent.content %> <% end %> -

<%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>activity.id, :content=>content} %>

+

<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>36 } %>

发帖时间：<%= format_time(activity.created_on) %> @@ -51,7 +52,7 @@ <% else %> <% count=activity.children.count%> <% end %> -

<%= count>0 ? "（#{count}）" : "" %>回复|<%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>赞

+

<%= count>0 ? "#{count}" : "0" %>回复|<%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %>赞

diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb index ae24a26de..8d45510a1 100644 --- a/app/views/users/_user_course_list.html.erb +++ b/app/views/users/_user_course_list.html.erb @@ -28,7 +28,7 @@
  • - <%= l(:label_main_term)%> :  <%= current_time_and_term course %> + 开课学期:  <%= current_time_and_term course %> <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %> <% homework_num = course.homework_commons.count %> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 6349e4faa..3ec30ae51 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1320,7 +1320,7 @@ a{text-decoration:none} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} -.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:635px;} +.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;} a:hover.list-title{ color:#269ac9;} .c_red{ font-weight:normal; font-size:12px;} .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index e9e760a3c..eece88a23 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1514,7 +1514,7 @@ a{text-decoration:none} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} -.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:635px;} +.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;} a:hover.list-title{ color:#269ac9;} .c_red{ font-weight:normal; font-size:12px;} .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 02a7759f9..ebedb1c30 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -1218,7 +1218,7 @@ a{text-decoration:none} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} -.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:635px;} +.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;} a:hover.list-title{ color:#269ac9;} .c_red{ font-weight:normal; font-size:12px;} .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}