From 938d0e2bbdd6e3982a577e80bd6c601a2833002c Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 29 Aug 2015 09:23:32 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 5e5c9517b..c5a5f2f0c 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -531,7 +531,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .homepageNewsPublisher { max-width:100px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; } .homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;} .homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;} -.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } +.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;} a.homepageWhite {color:#ffffff;} a.homepageWhite:hover {color:#a1ebff} From 789b62940bc0fb0e4827b6e440b2b402d5cb6647 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 29 Aug 2015 09:33:22 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E4=BC=9A=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=20=E6=89=8B?= =?UTF-8?q?=E5=9C=A8=E4=B8=8A=E8=BE=B9=E7=9A=84=E6=97=B6=E5=80=99=E5=91=88?= =?UTF-8?q?=E6=89=8B=E5=9E=8B=20=E7=AD=9B=E9=80=89=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=90=8E=20=20=E8=87=AA=E9=80=89=E8=B5=84=E6=BA=90=E6=B8=85?= =?UTF-8?q?=E9=9B=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource.js.erb | 3 ++- public/stylesheets/new_user.css | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb index 551c08907..3ebb308b4 100644 --- a/app/views/users/user_resource.js.erb +++ b/app/views/users/user_resource.js.erb @@ -1,3 +1,4 @@ $("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>'); $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); -$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); \ No newline at end of file +$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); +$("#res_count").html(0); \ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index b9b24dcd8..8e8790fb5 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -341,10 +341,10 @@ a.uploadText {color:#ffffff; font-size:14px;} /*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/ /*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/ /*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/ -.resourcesListName {width:160px; height:40px; line-height:40px; text-align:left;} +.resourcesListName {width:180px; height:40px; line-height:40px; text-align:left;} .resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;} .resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;} -.resourcesListUploader {width:180px; height:40px; line-height:40px; text-align:center;} +.resourcesListUploader {width:160px; height:40px; line-height:40px; text-align:center;} .resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;} /*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/ a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left} @@ -404,6 +404,7 @@ a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-rep /*.resourcesUploadBox:hover {background-color:#0781b4;}*/ /* 个人主页右边部分*/ .homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;} +input.homepageSearchIcon:hover {cursor: pointer;} a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;} a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;} a.replyGrey {color:#888888; display:inline-block;} From 6406d5a2842c87debd77a313d769501592fafbdb Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 29 Aug 2015 09:43:44 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/send_for_user_activities.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 0233f7a42..6fc742c99 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -187,7 +187,7 @@ <% if @issues.first || @project_messages.first || @issues_journals.first || @wiki_contents.first || @project_news.first || @project_news_comments.first || @project_journal_messages.first || - @project_news_comments.first %> + @project_attachments.first %>

<%= l(:label_project_overview_new)%>

<% unless @issues.first.nil? || @issues_journals.first.nil? %> From 553e35281ac1d37d98ef9437e2ad87b3ef41f2da Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 29 Aug 2015 09:44:36 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=A1=86=E7=9A=84=E8=BE=B9=E6=A1=86=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 69f5489b0..4b16dcb85 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -412,7 +412,7 @@ a.replyGrey {color:#888888; display:inline-block;} a.replyGrey:hover {color:#4b4b4b;} /*上传资源弹窗*/ -.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} +.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} .uploadDialogText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block; font-weight: bold;} .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative} .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;} From bc186776d80254fdaa735e5a582addacad7e836a Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 29 Aug 2015 09:56:34 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=87=8F=E5=B0=91=E7=95=99=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_resource_share_for_project_popup.html.erb | 4 ++-- app/views/users/_resource_share_popup.html.erb | 4 ++-- app/views/users/add_exist_file_to_course.js.erb | 2 +- app/views/users/add_exist_file_to_project.js.erb | 2 +- app/views/users/search_user_course.js.erb | 2 +- app/views/users/search_user_project.js.erb | 2 +- app/views/users/user_resource.html.erb | 3 +++ public/stylesheets/new_user.css | 1 + 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb index 4d377154e..e5d1732e4 100644 --- a/app/views/users/_resource_share_for_project_popup.html.erb +++ b/app/views/users/_resource_share_for_project_popup.html.erb @@ -1,6 +1,6 @@ -
+
将资源发送至
@@ -44,7 +44,7 @@ <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-
取消
+
取消
<% end %> diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb index 376d674cd..2fc515b4a 100644 --- a/app/views/users/_resource_share_popup.html.erb +++ b/app/views/users/_resource_share_popup.html.erb @@ -1,6 +1,6 @@ -
+
将资源发送至
@@ -44,7 +44,7 @@ <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-
取消
+
取消
<% end %> diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb index 93c572fa0..637570bfb 100644 --- a/app/views/users/add_exist_file_to_course.js.erb +++ b/app/views/users/add_exist_file_to_course.js.erb @@ -1,5 +1,5 @@ <% if @flag == true%> alert('发送成功') -closeModal(); +closePopUp(); <% else%> <% end %> \ No newline at end of file diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb index 93c572fa0..637570bfb 100644 --- a/app/views/users/add_exist_file_to_project.js.erb +++ b/app/views/users/add_exist_file_to_project.js.erb @@ -1,5 +1,5 @@ <% if @flag == true%> alert('发送成功') -closeModal(); +closePopUp(); <% else%> <% end %> \ No newline at end of file diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb index 97bde13aa..60ddd6d9c 100644 --- a/app/views/users/search_user_course.js.erb +++ b/app/views/users/search_user_course.js.erb @@ -12,7 +12,7 @@ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'resource_share_popup' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); showModal('ajax-modal', '452px'); $('#ajax-modal').siblings().remove(); -$('#ajax-modal').before(""); +$('#ajax-modal').before(""); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup"); $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); \ No newline at end of file diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb index 37999120a..26a0f265c 100644 --- a/app/views/users/search_user_project.js.erb +++ b/app/views/users/search_user_project.js.erb @@ -8,7 +8,7 @@ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'resource_share_for_project_popup' ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); showModal('ajax-modal', '452px'); $('#ajax-modal').siblings().remove(); -$('#ajax-modal').before(""); +$('#ajax-modal').before(""); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox") $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index c69062b91..901917220 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -30,6 +30,9 @@ { hideModal($(".uploadBoxContainer")); } + function closePopUp(){ + hideModal($(".boxContainer")); + } function check_files(){ return $("#attachments_fields").children().length == 0; diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4b16dcb85..93237f697 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -431,6 +431,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;} .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:100px; display:inline-block; font-weight: bold;} .resourcesSendTo {float:left; height:20px; margin-top:15px;} +.boxContainer {height:33px; line-height:33px; position:relative} .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;} .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;} .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;} From f2a909f0e5c0cdbf1ad66cd0033a3e28ac9dbb27 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 29 Aug 2015 10:00:04 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E6=90=9C=E7=B4=A2=E5=A4=84=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E6=82=AC=E6=B5=AE=E8=A6=81=E6=89=8B=E5=9E=8B=E5=85=89?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 93237f697..a41e631fb 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -438,6 +438,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;} .searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;} .searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;} +.searchIconPopup:hover {cursor: pointer} .courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;} .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;} .sendCourseName {font-size:12px; color:#5f6060;} From ada04e5e635ad4286c2aa0366021a3cd1c581407 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Sat, 29 Aug 2015 10:13:32 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=A8=A1=E5=9D=97=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 16 +++++++++------- public/images/avatars/User/0 | Bin 4208 -> 2756 bytes public/stylesheets/new_user.css | 18 +++++++++--------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 9ab29ba8b..a34daabbb 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -30,8 +30,8 @@
-
- <%= image_tag(url_to_avatar(@user),width:"206", height: "206", :id=>'nh_user_tx') %> +
+ <%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %> <% if User.current.logged?%> <% if is_current_user%>
@@ -46,16 +46,18 @@ <% end %> <% end%>
-
- +

diff --git a/public/images/avatars/User/0 b/public/images/avatars/User/0 index a4cc45467b6270c6fecc02e21fe8e8836bbc9f9a..bd2597dd2a623d59dea9b37ed4452281a69496d3 100644 GIT binary patch literal 2756 zcmbVN3s6&68a~Ml1Tpeh&_zMLhV_96$qh*$DUSdF1qa0-!dm2Ea)lU@8 zcd&ykQe8DFTk0xLi^8nnD$vSSs}{TX1aUxlDCHqOW>vuK&CP>$%XD`3Ofvb;|9{{A zI{!H_-8c0BuNbX#3jlF(%YhS^TBaf3F3cCp3IGXEaCImErXC2((P)%>21B6^%#vW6 z(LgaKXK1sO3?z`r0HG0DWtLcmYT(Uiwp0;DAHCQ_hozD*dI~3jnV^hDbEKC!F(f*{o*JVFIF&h0!C;QQ_2tL^v8# zp)e;fC_v0a5SYsiMA#fI7g+(bmQZGy7n%0&qltxmk zFgl*8r3AS$A;Io=+HT3^=DG;9S|dWI(wG*lUSFU@86s4T<*URf4)?W@@!tJ*ATtop zhQC%N#SbMbSBQ!8<)}gvCk&(GmOzPA!Vf`0f}%M>HY+M9Him=XjASE17J|fZBH2OFksJ<>&1NCY5LU2_8>difvJ_&}7FUYLwQ_mC z$>m3@&@2t6T90A5wh2hg!8DjU2UEh)NnChYic}%NwyXWj$788hh^nO9P)V!`lfy)R z`O<0P<0BKzVsUw#ST>$Hf`o9R*-=r^ypUifD=I2DmTu)r{-2&P@MIX~;rQ9G*i`rg znnnBQ;~V?sK^6FoQQ=p^Gy+_Rfd`Ui{0fpxonQ}eq);dh6h{XK#~F_Jcczo0qti^9 zv-3=6XPO(0SZ*{IS2tG|numv{r-z4+x3{;?Li-|7snl7tSzc~#Uh`(V&z@&D{I7zk z8Mr%vTi_N%atCC0668)YT>-g(WLZ;B2#Erb9h^v{DUC&P17tFZOmTo93S`lc$dLOY z3KF^QcUgJ6L>`~hSy8?Yf2|ElYWdOA{a1Wb2cSVDJT&AEBEY22fBU!Y-KNt!5Rcif zEF{5H6w(*Q>~upq5ZFIJ2QAFCIV=8xF!JMTzk;`HTjB`-h7|7d10w2DBG@>aPXJ2YH> zZL=b^_<1j(17ri45Zw0UHdge#iM!m}(CzwV@w&L2;&0M{IWE5D2G_<9ZfWw{5;P`I zT2$8NP%`9oYrm>}earRK4T}NLny#i$S6*%3mi(T30y)8h3`BXhUN6YiuG_h>M0rW@ zuK2N);;5fE+EI7mhxlc*wv|OkVc4v?sm@T zF(*BGI>9n4&elIu&O@WVLoc{jd%myp%-Hda+zF)FrQ5S z+C~6sJreg|&XbUy$+L66TSC1pO8QiCAr6gTE;GZRq7nTuX?>Y&M)iVJuQG=@orO<+w_pVm^6t{JK3py<=WKE$ueE{a$43%RS`tNc6OUpyCgc{q`WnDs*)r zRPFsqid=oSAv7hM)7{+hqHd=E0BT#~vy2ss3*oUROB&yhyoh0#IwL&FJ!)7hGB$F! z7<>7N`?-2O5^9O^yxp z8*a+I3!9creD?3?0~OE>$*DJk1d8w}k3s7`TTodsz9IACqW9No!dJ~omitu?%zrt+ z3!MZ*6taN;1JKj#!X3`3@2h!G<56_rHtp^@z3xeG;bh{*cUN5UN*1>awB+Gn^I((f z(Q~b<{f&=47sx8J)8-kQR6BQ^YAJv}xRjn@ZLZa;Pfcf%c%*pvEJ24KGe?*l-5m{dE0McX?Z{34HtePsdNjbUVH(5f%Q+KgQF+>cRd)J9fP4;_Qpmbf^-n7(k32s_>LuX?lj`O%x_(#qOzyM9^b)f(&XUU((Z(@wSvEe++# z*v>i2YX=+Go;|amVAnz>dq~#0(08I*-*$bs^_{ZA%>s0&zo~ftqPx5U#(aq8UE;g6 JwKT%?;6G!sTH^o! literal 4208 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 Date: Sat, 29 Aug 2015 10:16:04 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E6=8A=A5500=E3=80=81=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E4=BD=8D=E7=9A=84bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/views/users/_course_message.html.erb | 2 +- app/views/users/_course_news.html.erb | 2 +- app/views/users/_project_issue.html.erb | 2 +- app/views/users/_project_message.html.erb | 2 +- app/views/users/_user_activities.html.erb | 18 +++++++++--------- app/views/users/show.html.erb | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 555c67d13..1f5d38e25 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -649,7 +649,7 @@ class UsersController < ApplicationController @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10) else @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10) - end + end else @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10) end diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 0f0a145e3..ff7e43105 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -106,7 +106,7 @@ ) if reply.course_destroyable_by?(User.current) %>

-
<%= reply.content.html_safe %>
+
<%= reply.content.html_safe %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 5e538c65e..603901ae4 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -83,7 +83,7 @@ :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
-
<%= comment.comments.html_safe %>
+
<%= comment.comments.html_safe %>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index eb0341607..0ee4f30fb 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -119,7 +119,7 @@
<%= string %>
<% end %> <% else %> -
<%= reply.notes.html_safe %>
+
<%= reply.notes.html_safe %>
<% end %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 3bdbda412..e60676ac6 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -103,7 +103,7 @@ ) if reply.course_destroyable_by?(User.current) %>
-
<%= reply.content.html_safe %>
+
<%= reply.content.html_safe %>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 1cfeb7ed8..b43d0d54e 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -3,16 +3,16 @@