From 5ddefe21b858a71e91a7f908b0704a1fca84a4c7 Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 29 Aug 2015 16:39:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B53080?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=8A=A8=E6=80=81=E5=BC=82=E5=B8=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 8 +++++--- app/views/users/show.html.erb | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 900af0e77..0058e6e4c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -627,14 +627,15 @@ class UsersController < ApplicationController end def show + @page = params[:page] ? params[:page].to_i + 1 : 0 - @type = params[:type] + user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")" user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")" course_types = "('Message','News','HomeworkCommon','poll')" project_types = "('Message','Issue')" - if @type - case @type + if params[:type].present? + case params[:type] when "course_homework" @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('created_at desc').limit(10).offset(@page * 10) when "course_news" @@ -654,6 +655,7 @@ class UsersController < ApplicationController @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 # @user_activities = paginateHelper @user_activities,500 + @type = params[:type] respond_to do |format| format.js format.html {render :layout => 'new_base_user'} diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 91a35e711..74ca48595 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -14,7 +14,7 @@ $(window).scroll(scrollHandler); - +
最新动态
From efe5c1e3f404078d6544e36bf71fc3605481d71c Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Sat, 29 Aug 2015 16:52:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_history.html.erb | 2 +- app/views/news/_course_form.html.erb | 2 +- app/views/poll/_poll.html.erb | 2 +- public/stylesheets/courses.css | 32 ++++++++++++++-------------- public/stylesheets/header.css | 4 ++-- public/stylesheets/polls.css | 16 +++++++------- public/stylesheets/public.css | 4 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb index 864509546..70e943e99 100644 --- a/app/views/courses/_history.html.erb +++ b/app/views/courses/_history.html.erb @@ -5,7 +5,7 @@
<%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
-
+
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb index 0a5488714..6d4e915ea 100644 --- a/app/views/news/_course_form.html.erb +++ b/app/views/news/_course_form.html.erb @@ -27,7 +27,7 @@ <%= render :partial => 'attachments/new_form', :locals => {:container => @news} %>
-
  • +
  • <% if is_new %> <%= link_to l(:button_create), "javascript:void(0)", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %> <%= link_to l(:button_cancel), course_news_index_path(@course), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %> diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb index 1828ede6d..1d5752a28 100644 --- a/app/views/poll/_poll.html.erb +++ b/app/views/poll/_poll.html.erb @@ -2,7 +2,7 @@ <% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%> <% if @is_teacher%>
  • -
    +
    <% if has_commit %> <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%> <% else %> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 1393431d7..1a18ca705 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1,7 +1,7 @@ /*右侧内容--动态*/ -.project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;} -.project_r_h02{ width:920px; height:40px; background:#eaeaea; margin-bottom:10px;} +.project_r_h{ width:730px; height:40px; background:#eaeaea; margin-bottom:10px;} +.project_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;} .project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} .project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;} .project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;} @@ -52,7 +52,7 @@ a:hover.problem_new_btn{ background:#ff7143; color:#fff;} .problem_p span{ color:#ff3e00;} a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;} a:hover.problem_pic{border:1px solid #64bdd9;} -.problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;} +.problem_txt{ width:670px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;} a.problem_name{ color:#ff5722;max-width:60px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} a:hover.problem_name{ color:#d33503;} a.problem_tit{ color:#0781b4; max-width:410px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;} @@ -105,14 +105,14 @@ a:hover.grey_btn{ background:#717171; color:#fff;} .w90{width:90px;} .ml10{margin-left:10px;} .resource{ width:670px;} -.re_top{width:660px; height:40px; background:#eaeaea; padding:5px;} +.re_top{width:720px; height:40px; background:#eaeaea; padding:5px;} .re_top input{ float:left;} .re_search{ margin-top:7px; margin-left:5px;} .re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;} .re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px;padding-left: 0px;} a.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; } a:hover.re_fabu{background:#55a1b9;} -.re_con{ margin:5px; width:665px;} +.re_con{ margin:5px; width:720px;} .re_con_top{color:#494949; } .re_con_top span{ color:#999999; font-weight:bold;} a.re_select{ display:block; border:1px solid #ff9900; color:#ff9900; margin-left:10px; padding:1px 5px;} @@ -172,7 +172,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;} .wzan a{ display: block;} a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;} a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} -.msg_box{ width:670px; border-bottom:1px dashed #CCC; padding-top:10px;} +.msg_box{ width:728px; border-bottom:1px dashed #CCC; padding-top:10px;} .msg_box h4{ } .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; } @@ -212,7 +212,7 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_C{border-bottom:1px dashed #CCC; padding:10px 0 0px;} .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;} .ping_dispic a:hover{border:1px solid #15bccf;} -.ping_discon{ float:left; width:610px; margin-left:10px; } +.ping_discon{ float:left; width:670px; margin-left:10px; } /*.ping_distop span{ float:left;}*/ .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;} .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;} @@ -221,16 +221,16 @@ a:hover.ping_sub{ background:#14a8b9;} /* 创建作品 work */ .Newwork{ width:668px; height:418px;} .N_top{ float:right; margin-left:390px; } -.N_con{ color:#484747; font-weight:bold; width:660px; margin-top:10px; } +.N_con{ color:#484747; font-weight:bold; width:710px; margin-top:10px; } .N_con p{ } .w430{ width:470px;} .w557{ width:557px;} .w350{ width:350px;} .h400{height: 400px !important;} .w620{ width:480px; height:160px; border:1px solid #CCC;} -.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px; } +.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:530px; } .bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999; } -.hwork_txt{ width:560px; padding-left:5px; background:#fff;} +.hwork_txt{ width:610px; padding-left:5px; background:#fff;} a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;} a:hover.tijiao{ background:#0f99a9;} .members_left{ float:left; width:410px; margin-right:20px; text-align:center;} @@ -556,7 +556,7 @@ a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; pa /* 20150423作业评分*/ .ml14{ margin-left:14px;} -.w548{ width:552px;} +.w548{ width:600px;} .w547{ width:544px;} .w196{ width:182px;} .w459{ width:459px;} @@ -572,18 +572,18 @@ a:hover.icon_add{background:url(../stylesheets/images/icons.png) -20px -310px no .w664{ width:664px;} .w140{ width:140px;} .talklist_box{ } -.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9; margin-bottom:20px; margin-top: 10px;} +.talkmain_box{ width:730px; border-bottom:1px dashed #d9d9d9; margin-bottom:20px; margin-top: 10px;} .talkmain_pic{} a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;} a:hover.talkmain_pic{border:1px solid #64bdd9;} -.talkmain_txt{ width:610px; margin-left:10px; color:#333;} +.talkmain_txt{ width:670px; margin-left:10px; color:#333;} a.talkmain_name{ color:#ff5722;} a:hover.talkmain_name{ color:#d33503;} .talkmain_tit{ color:#0781b4; width:450px; display:block; } .talklist_main{ } /*.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}*/ .talkConIpt{ background:#f2f2f2; } -.talkWrapBox{ width:610px; margin-left:60px; } +.talkWrapBox{ width:660px; margin-left:60px; } .inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px; margin-bottom:5px;color:#666;} .inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px; margin:5px 0 5px 50px; color:#666;} .inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px; margin:5px 0 5px 0px; color:#666;} @@ -592,7 +592,7 @@ a.Msg_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid a:hover.Msg_pic{border:1px solid #64bdd9;} a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;} a:hover.Reply_pic{border:1px solid #64bdd9;} -.Msg_txt{ float:left; width:540px; margin-left:10px;} +.Msg_txt{ float:left; width:630px; margin-left:10px;} .Msg_txt p{ } .talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;} .talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; } @@ -604,7 +604,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;} /* 20150423作业评分*/ .ml14{ margin-left:14px;} -.w548{ width:552px;} +.w548{ width:600px;} .w547{ width:544px;} .w196{ width:196px;} .w186{ width:186px;} diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index 6b7aa209e..28caa2639 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -90,8 +90,8 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;} a.topnav_login_box:hover {color:#a1ebff;} .navRow1 {margin:0; padding:0;} .navRow2 {margin:0; padding:0;} -.topnav_login_list{ border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -5px;} -.topnav_login_list a{color:#15bccf;} +.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -4px;} +.topnav_login_list a{color:#269ac9;} .topnav_login_list li{ } /*底部*/ diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index 9f7b2d021..5ab4fab81 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -7,8 +7,8 @@ /*问卷列表*/ .polls_content{ width:609px;} -.polls_content02{ width:670px;} -.polls_head{ width:670px; height:48px; background:#eaeaea;} +.polls_content02{ width:730px;} +.polls_head{ width:730px; height:48px; background:#eaeaea;} .polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;} .polls_head span{ font-weight:normal; color:#15bccf;} a.newbtn{ float:right; display:block; width:80px; height:27px; padding-top:3px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;} @@ -61,7 +61,7 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;} /*问卷编辑*/ .polls_edit{ color:#767676;} a:hover{ text-decoration:none; cursor:pointer;} -.tabs{ width:658px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;} +.tabs{ width:718px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;} .tab_item { float:left; height:30px; background:#eeeeee; margin-right:4px; padding:0 8px; margin-bottom:10px;} .icon_delete{ font-size:16px;} a:hover.icon_delete{ font-weight: bold;} @@ -69,7 +69,7 @@ a:hover.icon_delete{ font-weight: bold;} .tab_add{float:left; width:22px; height:22px; border:1px solid #cbcbcb; margin-top:6px; } .icon_page_add{ background:url(images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;} a:hover.icon_page_add{ background:url(images/icons.png) -16px -314px no-repeat;} -.tab_item02{ float:left; width:139px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;} +.tab_item02{ float:left; width:154px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;} .tab_item02:hover{ background:#c9c9c9;} .tab_icon{padding-left:25px;} a:hover.tab_item02{ background:#fff;} @@ -78,9 +78,9 @@ a:hover.tab_item02{ background:#fff;} .icon_text{background:url(images/icons.png) 0px -80px no-repeat; } .icon_textarea{background:url(images/icons.png) 0px -121px no-repeat; } -.ur_editor {width:648px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;} +.ur_editor {width:708px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;} .ur_title_editor_title{ margin-bottom:10px;} -.input_title{ width:627px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;} +.input_title{ width:688px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;} .textarea_editor{ width:627px; height:120px; padding:10px; margin-bottom:10px; background:#fff; border-style:solid; border:1px solid #CBCBCB;} .btn_submit{ width:56px; height:24px; padding-top:4px;background:#15bccf; color:#fff; text-align:center; display:block; float:left; margin-right:10px;} a:hover.btn_submit{background:#0fa9bb;} @@ -98,7 +98,7 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;} a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;} .ur_editor_toolbar{ margin-bottom:10px;} .ur_editor_toolbar input{ width:40px; height:20px; background:#fff;} -.ur_editor02{width:648px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;} +.ur_editor02{width:708px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;} a.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; } a:hover.ur_button_submit{ background:#0fa9bb; text-decoration:none;} @@ -139,7 +139,7 @@ a:hover.btn_pu{ background:#3cb761;} .polls_n p{ margin-top:-4px;} /***新增20150123***/ -.ur_buttons{ width:275px; } +.ur_buttons{ width:260px; } .ur_button_submit{ float:left;} .polls_cha{float:left; margin-left:15px; margin-top:10px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 4cc859721..f2155ca20 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -225,7 +225,7 @@ a:hover.blue_n_btn{ background:#329cbd;} /*框架主类容*/ -#Container{ width:940px; margin:0 auto; } +#Container{ width:1000px; margin:0 auto; } /*头部导航*/ #Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; } @@ -291,7 +291,7 @@ a:hover.search_btn{ background: #0fa9bb;} .search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; } /*主类容左右分栏*/ #LSide{ width:240px; } -#RSide{ width:670px; margin-left:10px; background:#fff; padding:10px; margin-bottom:10px;} +#RSide{ width:730px; margin-left:10px; background:#fff; padding:10px; margin-bottom:10px;} /*底部*/ From a7f161804eda4423a43f32e75ca4199deb8005e8 Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 29 Aug 2015 16:59:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=92=8C=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 4 ++-- app/views/users/_course_message.html.erb | 6 +++--- app/views/users/_course_news.html.erb | 6 +++--- app/views/users/_course_poll.html.erb | 4 ++-- app/views/users/_project_issue.html.erb | 12 ++++++------ app/views/users/_project_message.html.erb | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 10bbe4bdf..a3d4992c5 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
    -
    +
    <% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -12,7 +12,7 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
    -
    +
    <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
    diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index f8b5c70a1..05caa1f91 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
    -
    +
    <% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -14,7 +14,7 @@ <%= link_to activity.course.name.to_s+" | 课程讨论区", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%> <%#= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
    -
    +
    <% if activity.parent_id.nil? %> <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> @@ -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 15fc74386..dbeb8d450 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
    -
    +
    <% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -12,7 +12,7 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程通知", course_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %>
    -
    +
    <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %>
    @@ -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/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index f0a2a8aba..97b3b759d 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -7,7 +7,7 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
    -
    +
    <% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -17,7 +17,7 @@ <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
    -
    +
    <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %> <% if has_commit %> <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%> diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 0ee4f30fb..a56a4dd1f 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
    -
    +
    <% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -12,7 +12,7 @@ <% end %> TO <%= link_to activity.project.name.to_s+" | 项目缺陷", project_path(activity.project), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
    -
    +
    <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> <%= get_issue_priority(activity.priority_id)[1] %>
    @@ -28,11 +28,11 @@
    时间：<%=format_date(activity.created_on) %>
    -
    缺陷描述：<%= activity.description.html_safe %>
    +
    缺陷描述：<%= activity.description.html_safe %>
    <% if activity.attachments.any? %> <% activity.attachments.each do |attachment| %> -
    +
    <%= link_to_short_attachment attachment, :class => 'homepagePostFileAtt newsBlue', :download => true -%> @@ -116,10 +116,10 @@
    <% if reply.details.any? %> <% details_to_strings(reply.details).each do |string| %> -
    <%= string %>
    +
    <%= 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 89f149303..16b003bd8 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
    -
    +
    <% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -14,7 +14,7 @@ <%= link_to activity.project.name.to_s+" | 项目讨论区",project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
    -
    +
    <% if activity.parent_id.nil? %> <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> @@ -24,7 +24,7 @@
    时间：<%= format_date(activity.created_on) %>
    -
    帖子描述： +
    帖子描述： <% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> <% else %> @@ -103,7 +103,7 @@ ) if reply.course_destroyable_by?(User.current) %>
    -
    <%= reply.content.html_safe %>
    +
    <%= reply.content.html_safe %>
    From fc47b793ee40fc76bda1cf8c7f9e7d8e8f33ca6d Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Sat, 29 Aug 2015 17:06:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9D=97=E9=97=B4?= =?UTF-8?q?=E8=B7=9D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_attachment.html.erb | 4 ++-- app/views/users/_course_poll.html.erb | 4 ++-- app/views/users/_project_attachment.html.erb | 2 +- app/views/users/_project_create.html.erb | 2 +- app/views/users/_project_document.html.erb | 2 +- app/views/users/_project_journal.html.erb | 2 +- app/views/users/_project_message.html.erb | 2 +- app/views/users/show_chen.erb | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb index ec68b2332..e0d04548b 100644 --- a/app/views/users/_course_attachment.html.erb +++ b/app/views/users/_course_attachment.html.erb @@ -5,7 +5,7 @@ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
    -
    +
    <% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -15,7 +15,7 @@ <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.container_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
    -
    +
    <%=activity.filename.to_s(附件名称)%>
    diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index f0a2a8aba..e72924780 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -7,7 +7,7 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
    -
    +
    <% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -17,7 +17,7 @@ <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
    -
    +
    <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %> <% if has_commit %> <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%> diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb index 13e6df408..731737610 100644 --- a/app/views/users/_project_attachment.html.erb +++ b/app/views/users/_project_attachment.html.erb @@ -1,5 +1,5 @@
    -
    +
    用户头像
    diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb index b2487c444..913aeb3d0 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -1,5 +1,5 @@
    -
    +
    用户头像
    diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb index 4f5d986d7..4a7fa1f4d 100644 --- a/app/views/users/_project_document.html.erb +++ b/app/views/users/_project_document.html.erb @@ -1,5 +1,5 @@
    -
    +
    用户头像
    diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb index 3c1f8c61d..cc5036ede 100644 --- a/app/views/users/_project_journal.html.erb +++ b/app/views/users/_project_journal.html.erb @@ -1,5 +1,5 @@
    -
    +
    用户头像
    diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 89f149303..db41a1e49 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -1,5 +1,5 @@
    -
    +
    <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
    diff --git a/app/views/users/show_chen.erb b/app/views/users/show_chen.erb index 950350202..11c007b39 100644 --- a/app/views/users/show_chen.erb +++ b/app/views/users/show_chen.erb @@ -138,10 +138,10 @@
    用户头像
    -
    尹教授 TO +
    尹教授 TO 黄井泉，陈正东
    -
    假期开心吗？（讨论区内容）
    +
    假期开心吗？（讨论区内容）
    时间：2015-07-31
    @@ -205,9 +205,9 @@
    用户头像
    -
    尹教授 TO +
    尹教授 TO Trustie Forge（项目名称）
    -
    +
    上传资源未显示在项目动态中（缺陷标题）正常