From 8403d5365c39a958a674f28a489ac0d88b63bc2b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 31 Aug 2015 17:49:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/project.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/javascripts/project.js b/public/javascripts/project.js index c7a615ba3..a09484fd5 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -248,6 +248,13 @@ function regexDescription() { $("#description_notice_span").focus(); return false; } + else if (name.length > 10000) + { + $("#description_notice_span").text("描述超过10000个字符"); + $("#description_notice_span").css('color', '#ff0000'); + $("#description_notice_span").focus(); + return false; + } else { $("#description_notice_span").text("填写正确"); $("#description_notice_span").css('color', '#008000'); From 284d33b096bdd9df069580ee349eed34cd72677b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Sep 2015 09:18:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E?= =?UTF-8?q?=E5=B8=96=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA=E5=9B=9E=E5=B8=96?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 1fde154bd..7c37ef9a0 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -83,7 +83,7 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
  • - <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, + <%=link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.course_message.subject.html_safe}" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • From 86ced0e290f8c56358477b910759942b71aae904 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Sep 2015 09:40:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E?= =?UTF-8?q?=E5=B8=96=E6=B6=88=E6=81=AF=E5=BA=94=E8=AF=A5=E5=9C=A8RE:?= =?UTF-8?q?=E5=90=8E=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=9B=9E=E5=B8=96=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 7c37ef9a0..9f289e3d5 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -83,8 +83,9 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
  • - <%=link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, - :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", + <%= link_to ma.course_message.parent_id.nil? ? ma.course_message.subject.html_safe : ma.course_message.content.html_safe, + course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id), + :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.course_message.subject.html_safe}" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -152,7 +153,7 @@
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %> "><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %>
  • - <%=link_to ma.forge_message.subject.html_safe, project_boards_path(ma.forge_message.project, + <%=link_to ma.forge_message.parent_id.nil? ? ma.forge_message.subject.html_safe : ma.forge_message.content.html_safe, project_boards_path(ma.forge_message.project, :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, :topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.forge_message.subject.html_safe}" %>
    • From fd0e4a7afd757c0e84b7a42792e3fd5a79edc41b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Sep 2015 09:56:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AEwiki=EF=BC=9A=E8=BE=93?= =?UTF-8?q?=E5=85=A5wiki=E4=B8=BA=E9=9D=9E=E6=B1=89=E5=AD=97=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=94=E9=95=BF=E5=BA=A6=E5=A4=9F=E9=95=BF=EF=BC=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 8d86a6873..a22831b2c 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -507,7 +507,7 @@ img.ui-datepicker-trigger { .wiki_new_ul input{ height:26px; margin-bottom:10px;} .wiki_con_tit{ font-size:14px; color:#09658c; font-weight:bold;width:630px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; margin-bottom:10px;} .wiki_con_box{ line-height:1.9; color:#2d2d2d;} -.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;} +.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px; word-wrap:break-word; word-break:break-all} .wiki_page p{word-break: break-all;word-wrap: break-word;} #wiki_new_box{ display:none;} /*wiki显示附加*/