From d32e07bda96cfea9a90c7bf2ac348477733eb1a6 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 6 May 2016 14:22:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AC=A6=E5=8F=B7?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E5=9C=B0=E6=96=B9=E5=A4=9A=E4=BD=99=EF=BC=8C?= =?UTF-8?q?issue=E8=AF=A6=E6=83=85=E9=87=8C=E9=9D=A2=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=9C=86=E7=82=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 -- public/stylesheets/new_user.css | 2 -- public/stylesheets/project.css | 6 +++--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 7f2dac02b..f83a180d3 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -134,8 +134,6 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;} .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;} .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;} -.homepagePostReply ol li{list-style-type: decimal;margin-left: 20px;} -.homepagePostReply ul li{list-style-type: disc;margin-left: 20px;} .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} .borderBottomNone {border-bottom:none !important;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ada7e6318..8e62f6d3f 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -676,8 +676,6 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;} .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} -.homepagePostReply ol li{list-style-type: decimal;margin-left: 20px;} -.homepagePostReply ul li{list-style-type: disc;margin-left: 20px;} .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} .borderBottomNone {border-bottom:none !important;} .topBorder {border-top: 1px solid #e4e4e4;} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index b415a5fac..79f06769e 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -219,7 +219,9 @@ a:hover.talk_btn{ background:#2a9dc1;} /****讨论区内页***/ .mt0{ margin-top:0px;} .talk_info{ margin-left:60px; margin-top:10px;} -.issue_desc li{list-style-type: decimal;margin-left: 20px;} +/*.issue_desc li{list-style-type: decimal;margin-left: 20px;}*/ +.issue_desc ol li{list-style-type: decimal;margin-left: 20px;} +.issue_desc ul li{list-style-type: disc;margin-left: 20px;} .talk_info img {max-width:100%;} a.talk_edit{ color:#426e9a; margin-right:5px;} a:hover.talk_edit{ color:#ff5722;} @@ -971,8 +973,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;} } .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} -.homepagePostReply ol li{list-style-type: decimal;margin-left: 20px;} -.homepagePostReply ul li{list-style-type: disc;margin-left: 20px;} .topBorder { border-top: 1px solid #E4E4E4; } From 34ea7662b27d7d6eed53d5ada6c122d002110aed Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 6 May 2016 17:59:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=86=E5=86=85=E5=AE=B9=E7=9C=81?= =?UTF-8?q?=E7=95=A5=E6=98=BE=E7=A4=BA=E7=9A=84=E5=9B=BA=E5=AE=9A=E5=AD=97?= =?UTF-8?q?=E6=95=B0=E6=94=B9=E4=B8=BA=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_boardlist.html.erb | 2 +- app/views/users/_course_newslist.html.erb | 2 +- app/views/users/_intro_content_ex.html.erb | 2 +- app/views/users/_project_boardlist.html.erb | 2 +- public/javascripts/application.js | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index ce5881a4a..c92d117ee 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -42,7 +42,7 @@ <% else %> <% content = activity.parent.content %> <% end %> -

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

+

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

发帖时间：<%= format_time(activity.created_on) %> diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb index ca782b0d5..ff99e116e 100644 --- a/app/views/users/_course_newslist.html.erb +++ b/app/views/users/_course_newslist.html.erb @@ -30,7 +30,7 @@
-

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

+

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

发布时间：<%= 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 index ae88fc6ac..e3baf3fe2 100644 --- a/app/views/users/_intro_content_ex.html.erb +++ b/app/views/users/_intro_content_ex.html.erb @@ -12,6 +12,6 @@ $("#activity_description_<%= user_activity_id%>").css("max-height", heightType + "px"); } - description_showwords_ellipsis(<%=user_activity_id %>); + description_showwords_ellipsis(<%=user_activity_id %>,<%= maxwordsnum %>); }); \ 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 8a306523f..5f61d26ef 100644 --- a/app/views/users/_project_boardlist.html.erb +++ b/app/views/users/_project_boardlist.html.erb @@ -42,7 +42,7 @@ <% else %> <% content = activity.parent.content %> <% end %> -

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

+

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

发帖时间：<%= format_time(activity.created_on) %> diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 7c52bae35..aa445f817 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1240,7 +1240,7 @@ function expand_reply(container,btnid){ } //by yk 列表描述将文字和起来去掉空格多于100就显示省略号 -function description_showwords_ellipsis(id){ +function description_showwords_ellipsis(id,num){ var str = ""; $("#intro_content_"+id).each(function () { str = str + $(this).text(); @@ -1249,8 +1249,8 @@ function description_showwords_ellipsis(id){ //去掉空格 str = str.replace(/\s/gi,''); - if(str.length > 100){ - str = str.substring(0,100)+"..."; + if(str.length > num){ + str = str.substring(0,num)+"..."; } $("#intro_content_"+id).html(str);