From 6e364182019d9ff2881b686288ff21e0cd58487d Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 31 Aug 2016 09:47:51 +0800 Subject: [PATCH 01/16] =?UTF-8?q?admin=E7=95=8C=E9=9D=A2=E7=9A=84=E7=95=99?= =?UTF-8?q?=E8=A8=80=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4=E6=8E=89=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E7=95=99=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 25cc85ae2..334101bb0 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -777,8 +777,15 @@ class AdminController < ApplicationController #留言列表 def leave_messages + notes1, notes2, notes3 = '', '', '' + begin + notes1 = Message.find(19292).content + notes2 = Message.find(19291).content + notes3 = Message.find(19504).content + rescue => e + end @jour = JournalsForMessage.find_by_sql("SELECT * FROM journals_for_messages AS j1 - WHERE j1.jour_type IN ('Course','Principal') AND (j1.m_parent_id IS NULL OR (j1.m_parent_id IN (SELECT id FROM journals_for_messages WHERE jour_type IN ('Course','Principal')))) order by created_on desc") + WHERE j1.jour_type IN ('Course','Principal') AND (j1.m_parent_id IS NULL OR (j1.m_parent_id IN (SELECT id FROM journals_for_messages WHERE jour_type IN ('Course','Principal')))) AND j1.notes !='#{notes1}' AND j1.notes !='#{notes2}' AND j1.notes !='#{notes3}' order by created_on desc") @jour = paginateHelper @jour,30 @page = (params['page'] || 1).to_i - 1 respond_to do |format| From 27a2da8b7b7daf5d6259cff23045a22e360a0108 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 1 Sep 2016 13:56:13 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_new_feedback.html.erb | 1 + public/stylesheets/css/public.css | 1 + 2 files changed, 2 insertions(+) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index 19b930826..ea63f680f 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -3,6 +3,7 @@
+
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 378fb3ba9..28f89a24f 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -116,6 +116,7 @@ a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px n .softwareIcon {background:url(/images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;} /*意见反馈*/ +.qr-code-border {border:2px solid #269ac9;} html{ overflow-x:hidden;} .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; } .side_content{width:154px; height:auto; overflow:hidden; float:left; } From 76b7469f755c8cad798ea97af8a46cb2237200d3 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 1 Sep 2016 14:04:53 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8icon?= =?UTF-8?q?=E7=BC=A9=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/syllabus/icons_syllabus.png | Bin 22951 -> 2260 bytes public/stylesheets/syllabus.css | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/images/syllabus/icons_syllabus.png b/public/images/syllabus/icons_syllabus.png index 4afdb729f96ffa021e9e40a271718a7ea3883b63..3b81336c492f9463e6a0c065b09207c8df248a6a 100644 GIT binary patch literal 2260 zcmc&$XH-*Z8jhlXGCJxiuA}0efGjAaQG_f}AfZGFLkdk$2+0K^q?iNfT7T|P3Yn$q;f-rF?2o%b7FEsK!C`mhk+E3&Wt@? z13JK9I&c=vPv}STz%saO1YL_kh}b-c4TCux5b@}Y2v7)wfMF~S4z4PH0S8!29NgE2 zgd*|qU^vS?jt^4fJZX%$2!=fqeqcY~Ai_cdY*0uCMC?e804u`5Kj~tjwe}bZ2R=cB z5jglCPWh3%06dou0yYRMO9l#!25fB+Xlol=TeJm$L7_276!h3yqOGwuwph$Q;PZe( z*7(d&EQR3u*%q|J!NY|@9u|p=iHSkPSRuIlFeKXE-d?ML!B|2FOF=A0NEcah1jb7W z1W>@>vv@)lmjh@O=^@-GAr20C`bP+C-WOSp;B%Uwgds(A9ukc}X+v59l1Tp>%4UB- z3xpK#Pk;Zbuz(iJ1CbO^z>VTFpu&Y3YfbU6cs@uMa``kaH*zV9Ug2CJR}jwS0eGq{ zVCKu>Fu5@T^G|pZ2}|S%gmexABoc6NNCClOF|qrcP)-;tSG#>Elsy{lV(W~zvUjp^ z#kk_}c(k3J{SueJWkj(-j&O;~{F7_HELYnKY#wBp0Px<|YG(zej%OXGtasN4BaTelfY*TY~d61_ZVF1a;> zy{g%!{we0IF5fHiXRjoSi;HH@BeS!!U)9uk=C#)~HqS3CI%c;HkE%2p4Jof(tyW8= zQm_1W_T6r|TrTMzS11(U<+s07j13NtRMynHTxfI4Y3otV9=)!Zn_sATH*vpN^|ey`B02Grtg>tT@Krgrpkrcoer|5gw@6;qHQqHcGpEsvO>1(h z2Zu&R7Zw(j{R8FgAL%zcWrNc-4UPM=TGg5b^5qVuQK>4o4xN&{6pHD>{O+Q?Z(_4SWK+`a- zSbfe1NUnR}llqiM#yCDae9D=;iJEL-{IfHeLQUS$`;#*{ox1tKq0=gfP4Y@De{CGlUd&NP`Zc0q{TJpDxI+Y$xp&x%ddcEn;s)7}ltE{l;&BT=~feu2> zuBhwYP*e3L7)(>IA9V`7q7!wiWi_Vfm*XzC&WerC%MD>k396m4+L-K<6W8w_OHaBtlZJ_oDit?`M9cO(F8+PT53?0#jvE9$ zHNAIQCrjpU&>FZ>f8fzKU-@uPTLwNg%^jXc@$!?UJB!^$=e|S*;(jsHWm|UZed!w$9+#iY)`;(yB&Lnm13jxx@3ovUu7FN z`tLNcdtm*qiC>>RQ^dz_$|a-+6+B5HhtUYk%nkM4q>(jx#2=5ICRZoCZ5SMQ) z|Hs%4y|GB+?!u%?N1op?==(ZdUb-lE!2VPxHQN3B?hFqgB=j5ri1{Zbtv`Z25?SAX zo1S5jMD+T6!aq%@HN@VD>Kj&%z)K!wJYb!Xsl+ePWiF%JAn3}*vnA2*Btafbx5oJ$ zq)>tpmg{;7UL2H0Rk?+$HT9Q*Z#tf9?IZY^Q7XK@b`je&KJhBbm|k`EE8Xc+@Rspn zXIk>w+5WV$$mA23KT3f$MR)G3Qudo?~u$5dE;5s$c!SAIW$TxLH3% z$%%JwM!64&e>l(I@QY}~{x?h8%DkkuRBJy$Q>ie`hO93M=VZtb@vgd?_IQid{8bqs z+LnKAr#QB0>an>A)-*qByE16+Sqt~cJO|I}pcT5X61;x&IqzSz|1U72iznfZbMW{7 E2D>*%ssI20 literal 22951 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 diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index d6e7c19e9..d28ab1037 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -74,8 +74,8 @@ input.syllabus_input_min{ /*课程大纲-课程列表*/ .icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;} -.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -53px no-repeat; width:20px; height:23px; display:block; cursor:pointer; } -.icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -53px no-repeat; width:20px; height:23px; display:block; } +.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -50px no-repeat; width:20px; height:23px; display:block; cursor:pointer; } +.icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -52px no-repeat; width:20px; height:23px; display:block; } .syllabus_courses_box {position:relative;} .icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; position:absolute; right:10px; top:10px; } .icons_sy_setting:hover{background: url(../images/syllabus/icons_syllabus.png) -25px -33px no-repeat; } From 4c64e883eac0b75e21c0ddae71a42fc489e60221 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 1 Sep 2016 14:30:21 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=82=80=E8=AF=B7=E7=A0=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/join_class.html | 1 + public/assets/wechat/join_project.html | 1 + 2 files changed, 2 insertions(+) diff --git a/public/assets/wechat/join_class.html b/public/assets/wechat/join_class.html index b5733e584..ad43db3a7 100644 --- a/public/assets/wechat/join_class.html +++ b/public/assets/wechat/join_class.html @@ -13,6 +13,7 @@
提示
    +
  • •邀请码在创建班级时产生，请向班级老师获取
  • •教师、助教角色需要班级管理员审批
  • •学生角色无需管理员审批
diff --git a/public/assets/wechat/join_project.html b/public/assets/wechat/join_project.html index 61be93cfd..fe8600999 100644 --- a/public/assets/wechat/join_project.html +++ b/public/assets/wechat/join_project.html @@ -12,6 +12,7 @@
提示
    +
  • •邀请码在创建项目时产生，请向项目管理员获取
  • •管理人员、开发人员角色需要项目管理员审批
  • •报告人员角色无需管理员审批
From 4d93b860f913d1369152245f2ecc996f4b6d1f82 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 1 Sep 2016 15:35:45 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BD=9C=E5=93=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=97=B6=EF=BC=8C=E6=8F=8F=E8=BF=B0=E6=96=87?= =?UTF-8?q?=E5=AD=97=E6=8A=98=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student_work/_work_information.html.erb | 86 +++++++++---------- public/stylesheets/css/courses.css | 5 +- 2 files changed, 47 insertions(+), 44 deletions(-) diff --git a/app/views/student_work/_work_information.html.erb b/app/views/student_work/_work_information.html.erb index 1ced6c84c..f9da89c11 100644 --- a/app/views/student_work/_work_information.html.erb +++ b/app/views/student_work/_work_information.html.erb @@ -1,44 +1,44 @@ - - - \ No newline at end of file diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 163f33338..7d0e6c866 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -536,4 +536,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} /*20160520作品列表table*/ .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;} -.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;} \ No newline at end of file +.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;} + +/*20160901作品信息确认*/ +#worksDescription p {word-wrap:break-word;} \ No newline at end of file From 0a398b38dacec581dd52d8e5e741dc1fcfd7f4b1 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 1 Sep 2016 15:57:29 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/edit_class_member.html | 2 +- public/assets/wechat/edit_project_member.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/wechat/edit_class_member.html b/public/assets/wechat/edit_class_member.html index decb31efb..d06eba89b 100644 --- a/public/assets/wechat/edit_class_member.html +++ b/public/assets/wechat/edit_class_member.html @@ -15,7 +15,7 @@
取消 - 确定 + 确定
diff --git a/public/assets/wechat/edit_project_member.html b/public/assets/wechat/edit_project_member.html index 5500766d5..eb15b074a 100644 --- a/public/assets/wechat/edit_project_member.html +++ b/public/assets/wechat/edit_project_member.html @@ -15,7 +15,7 @@
取消 - 确定 + 确定
From 40f5510195a360e2f35cd35f2f4f213f685208c8 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 1 Sep 2016 16:01:16 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BE=A7=E5=AF=BC=E8=88=AA=E6=96=87?= =?UTF-8?q?=E5=AD=97=E5=92=8C=E6=8C=89=E9=92=AE=E4=B8=8D=E9=87=8D=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/structure.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index 7004c0928..31464673e 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -499,7 +499,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;} .user_leftnav{ width:240px;} .users_accordion li > a { display: block; - padding: 0 10px 0 32px; + padding: 0 25px 0 32px; height:49px; line-height:49px; color: #333; From 5d47ee0c439a343ece894d5f16e42bac53a5211a Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 2 Sep 2016 09:42:45 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=8A=A8=E6=80=81BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/wechat/controllers/class.js | 3 ++- public/javascripts/wechat/controllers/project.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js index 2e3ab4b22..1e9fbcb0e 100644 --- a/public/javascripts/wechat/controllers/class.js +++ b/public/javascripts/wechat/controllers/class.js @@ -23,10 +23,11 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location }).then(function successCallback(response) { console.log(response.data); if(response.data.status == 0){ - vm.class_activities_page = response.data.page; + vm.course_activities_page = response.data.page; if(response.data.page > 0) { vm.course_activities = vm.course_activities.concat(response.data.data); + vm.course_has_more = (response.data.count + response.data.page * 10) < response.data.all_count; } else{ vm.course_activities = response.data.data; diff --git a/public/javascripts/wechat/controllers/project.js b/public/javascripts/wechat/controllers/project.js index 1bdb2f1e0..7b93b891a 100644 --- a/public/javascripts/wechat/controllers/project.js +++ b/public/javascripts/wechat/controllers/project.js @@ -63,6 +63,7 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut if(response.data.page > 0) { vm.project_activities = vm.project_activities.concat(response.data.data); + vm.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count; } else{ vm.project_activities = response.data.data; From 231c660744948f5506ed8b6168d8bbad9a722636 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 2 Sep 2016 10:06:03 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E8=80=81=E5=B8=88=E5=AF=B9=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E7=9A=84=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/_course_show.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 7a61273bb..e8b376f47 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -42,7 +42,6 @@
    • - <% if @topic.author.id == User.current.id %>
    • <%= link_to( l(:button_edit), @@ -59,7 +58,6 @@ :class => 'postOptionLink' ) if @message.course_destroyable_by?(User.current) %>
      • - <% end %>
    • <%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{@message.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %>
    • From 2316b3fe7b12991186be7592ec9386ecb565cfa4 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 2 Sep 2016 10:21:50 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=82=B9=E8=B5=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/blog_detail.html | 7 ++++++- public/assets/wechat/course_discussion.html | 7 ++++++- public/assets/wechat/course_notice.html | 7 ++++++- public/assets/wechat/homework_detail.html | 7 ++++++- public/assets/wechat/issue_detail.html | 7 ++++++- public/assets/wechat/jour_message_detail.html | 7 ++++++- public/assets/wechat/project_discussion.html | 7 ++++++- 7 files changed, 42 insertions(+), 7 deletions(-) diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index 2d11b5964..3b082e7b4 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -57,9 +57,14 @@
-
+
+
+
赞
+
{{homework.praise_count}}
+
{{homework.praise_count}}
+
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index 4e309e6d6..8e0c11c1f 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -57,7 +57,12 @@
-
+
+
+
赞
+
{{homework.praise_count}}
+
{{homework.praise_count}}
+
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index 85b3a901a..5c933aee2 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -72,7 +72,12 @@ -
+
+
+
赞
+
{{homework.praise_count}}
+
{{homework.praise_count}}
+
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index 7fa8459c4..ba3dd6553 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -61,7 +61,12 @@ -
+
+
+
赞
+
{{homework.praise_count}}
+
{{homework.praise_count}}
+
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index efc7ed64d..ed5e0cf09 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -78,7 +78,12 @@ -
+
+
+
赞
+
{{homework.praise_count}}
+
{{homework.praise_count}}
+
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index e2e65ca58..922b6dbfb 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -56,7 +56,12 @@ -
+
+
+
赞
+
{{homework.praise_count}}
+
{{homework.praise_count}}
+
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index 30d464802..f1e492d8b 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -57,7 +57,12 @@ -
+
+
+
赞
+
{{homework.praise_count}}
+
{{homework.praise_count}}
+
From a6bb19eb60fdae025c81de26fa34bdb8572e8d74 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 2 Sep 2016 10:54:40 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=A2=9E=E5=8A=A0=E7=82=B9=E8=B5=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/entities/issue.rb | 4 ++++ app/api/mobile/entities/news.rb | 4 ++++ public/assets/wechat/blog_detail.html | 6 +++--- public/assets/wechat/course_discussion.html | 6 +++--- public/assets/wechat/course_notice.html | 6 +++--- public/assets/wechat/homework_detail.html | 6 +++--- public/assets/wechat/issue_detail.html | 6 +++--- public/assets/wechat/jour_message_detail.html | 6 +++--- public/assets/wechat/project_discussion.html | 6 +++--- 9 files changed, 29 insertions(+), 21 deletions(-) diff --git a/app/api/mobile/entities/issue.rb b/app/api/mobile/entities/issue.rb index e3dbb5023..a46e10da5 100644 --- a/app/api/mobile/entities/issue.rb +++ b/app/api/mobile/entities/issue.rb @@ -52,6 +52,10 @@ module Mobile time_from_now issue.created_on when :act_id issue.id + when :act_type + 'Journal' + when :praise_count + get_activity_praise_num(issue) end end end diff --git a/app/api/mobile/entities/news.rb b/app/api/mobile/entities/news.rb index a64081d8a..d8c4dcab3 100644 --- a/app/api/mobile/entities/news.rb +++ b/app/api/mobile/entities/news.rb @@ -36,6 +36,10 @@ module Mobile time_from_now f.created_on when :act_id f.id + when :praise_count + get_activity_praise_num(f) + when :act_type + 'Comment' end elsif f.is_a?(Hash) && !f.key?(field) diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index 3b082e7b4..54dda1568 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -61,9 +61,9 @@
-
赞
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
赞
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index 8e0c11c1f..0daf0e1bb 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -59,9 +59,9 @@
-
赞
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
赞
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index 5c933aee2..a24321b5e 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -74,9 +74,9 @@
-
赞
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
赞
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index ba3dd6553..9ffdcea4a 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -63,9 +63,9 @@
-
赞
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
赞
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index ed5e0cf09..8aefc8d17 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -80,9 +80,9 @@
-
赞
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
赞
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index 922b6dbfb..8062ccccc 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -58,9 +58,9 @@
-
赞
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
赞
+
{{journal.praise_count}}
+
{{journal.praise_count}}
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index f1e492d8b..e29b062dc 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -59,9 +59,9 @@
-
赞
-
{{homework.praise_count}}
-
{{homework.praise_count}}
+
赞
+
{{journal.praise_count}}
+
{{journal.praise_count}}
From 09741533640f7f9ed4a4164adae883ddfbf79f07 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 2 Sep 2016 13:49:08 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_syllabus.html.erb | 305 ++++++++++++----------- public/stylesheets/syllabus.css | 5 +- 2 files changed, 160 insertions(+), 150 deletions(-) diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb index b29c24fe6..8f71e2ec2 100644 --- a/app/views/layouts/base_syllabus.html.erb +++ b/app/views/layouts/base_syllabus.html.erb @@ -1,148 +1,157 @@ - - - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','syllabus','sy_public',:media => 'all'%> - <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> - <%= javascript_heads %> - <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%> - <%= heads_for_theme %> - <%= call_hook :view_layouts_base_html_head %> - <%= yield :header_tags -%> - - - - - - - -<% is_current_user = User.current.logged?%> -
- <% if User.current.logged? %> - <%= render :partial => 'layouts/logined_header' %> - <% else%> - <%= render :partial => 'layouts/unlogin_header' %> - <% end%> -
-
- -
-
-
- <%=render :partial => 'layouts/syllabus_info' %> -
-
- -
-
- <%= yield %> -
-
-
- <%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %> -
-
- <%= render :partial => 'layouts/syllabus_teacher_list', :locals => {:syllabus => @syllabus} %> -
-
-
-
- -
-
-<%= render :partial => 'layouts/footer' %> -
- - - - - - + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','syllabus','sy_public',:media => 'all'%> + <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> + <%= javascript_heads %> + <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%> + <%= heads_for_theme %> + <%= call_hook :view_layouts_base_html_head %> + <%= yield :header_tags -%> + + + + + + + +<% is_current_user = User.current.logged?%> +
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%> +
+
+
+

+ 位置：   + <%= link_to "尹刚", :class => 'sy_cgrey' %> +  >  + <%=link_to "课程", :class => 'sy_cgrey' %> +  >  + <%=link_to "课程名称", :class => 'sy_cgrey' %> +

+
+
+
+
+ <%=render :partial => 'layouts/syllabus_info' %> +
+
+ +
+
+ <%= yield %> +
+
+
+ <%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %> +
+
+ <%= render :partial => 'layouts/syllabus_teacher_list', :locals => {:syllabus => @syllabus} %> +
+
+
+
+ +
+
+<%= render :partial => 'layouts/footer' %> +
+ + + + + + diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index d28ab1037..f6a8e8e6e 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -113,12 +113,13 @@ a.syllabus_class_title{ font-size:14px; color:#333; max-width:480px; margin-bott /* 课程大纲头部 */ .sy_top{ background:#f5f5f5; - width: 100%; + width: 1000px; height: 138px; + margin: 0 auto; } .sy_top_con{ background: url(../images/sy/bg_sy.jpg) no-repeat; - width: 1280px; + width: 1000px; margin: 0 auto; height: 108px; text-align:center; From 9e317c4a8f8fcc6b6c6ab1d88c147ad12a7deeef Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 2 Sep 2016 13:54:34 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=8D=95=E8=AF=8D=E8=BF=87=E9=95=BF=E4=B8=8D?= =?UTF-8?q?=E6=8A=98=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/public.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 28f89a24f..e08d9a1da 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -1386,7 +1386,7 @@ a.content-username:hover{ color:#297fb8;} .orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;} .orig_user{ margin:10px 15px 10px 5px;} .orig_user span{ color:#999; padding-right:5px;} -.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; } +.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; word-wrap:break-word; } .orig_content img {max-width:100%;} .orig_right{ width:80%; margin-top:5px;} a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; } From d0a2ea02f2fa193f91f9cebf31450909388e14f4 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 2 Sep 2016 14:27:49 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=AD=A6=E5=8F=B7=E8=BF=87=E9=95=BF=E7=9C=81?= =?UTF-8?q?=E7=95=A5=E5=8F=B7=E6=98=BE=E7=A4=BA=EF=BC=9B=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=95=99=E5=B8=88=E5=9B=A2=E9=98=9F=E5=90=8D=E7=A7=B0=E8=BF=87?= =?UTF-8?q?=E9=95=BF=E7=9C=81=E7=95=A5=E5=8F=B7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_new_member_list.html.erb | 4 +- .../layouts/_syllabus_teacher_list.html.erb | 40 +++++++++---------- public/stylesheets/css/public.css | 1 + 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb index 720dfceea..08df18175 100644 --- a/app/views/courses/_new_member_list.html.erb +++ b/app/views/courses/_new_member_list.html.erb @@ -54,11 +54,11 @@
  • - <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.show_name}".html_safe,user_path(member.user)) %> + <%= link_to("#{l(:label_bidding_user_studentname)}：".html_safe,user_path(member.user)) %>

    • <% unless member.user.user_extensions.student_id == ''%> -
  • <%= link_to("#{l(:label_bidding_user_studentcode)}：#{member.user.user_extensions.student_id}".html_safe,user_path(member.user)) %>
    • +
  • <%= link_to("#{l(:label_bidding_user_studentcode)}：".html_safe,user_path(member.user)) %>
    • <% end%>
<% unless @course.course_groups.empty? %> diff --git a/app/views/layouts/_syllabus_teacher_list.html.erb b/app/views/layouts/_syllabus_teacher_list.html.erb index 71fd67a75..344036ccf 100644 --- a/app/views/layouts/_syllabus_teacher_list.html.erb +++ b/app/views/layouts/_syllabus_teacher_list.html.erb @@ -1,21 +1,21 @@ -

教师团队 - 增加教师 -
-

-
    - <% teacher = syllabus.user %> - <%# teachers.each do |teacher| %> -
  • - <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sy_teachers_img fl mr15"), user_path(teacher), :target => "_blank", :alt => "用户头像" %> -
    - <%= link_to teacher.show_name, user_path(teacher), :class => "sy_teachers_name", :target => "_blank" %> - - <% if teacher.user_extensions && teacher.user_extensions.identity %> - <%= get_user_roll teacher %> - <% end%> - -
    -
    -
    • - <%# end %> +

    教师团队 + 增加教师 +
    +

    +
      + <% teacher = syllabus.user %> + <%# teachers.each do |teacher| %> +
    • + <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sy_teachers_img fl mr15"), user_path(teacher), :target => "_blank", :alt => "用户头像" %> +
      + <%= link_to teacher.show_name, user_path(teacher), :class => "sy_teachers_name hidden", :target => "_blank", :title => teacher.show_name %> + + <% if teacher.user_extensions && teacher.user_extensions.identity %> + <%= get_user_roll teacher %> + <% end%> + +
      +
      +
      • + <%# end %>
    \ No newline at end of file diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index e08d9a1da..9565a9e26 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -751,6 +751,7 @@ a:hover.st_add{ color:#ff8e15;} .classbox_on{ border:1px solid #f8df8c; background:#f6f098; padding:0 3px; float:left; margin-left:15px;} .classbox_on a{ color:#716cad;} .st_list_score {width:105px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; vertical-align:middle; font-size:12px; text-align:center;} +.st_info_block {width:150px; display:inline-block; vertical-align:bottom;} /* 创建作品 homework,项目配置 */ .hwork_new{ color:#4c4c4c;} From 51ef4a96e6107902fd59756b1c2781d222ddac57 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 2 Sep 2016 14:42:59 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_syllabus.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb index 8f71e2ec2..d470c8a40 100644 --- a/app/views/layouts/base_syllabus.html.erb +++ b/app/views/layouts/base_syllabus.html.erb @@ -41,11 +41,11 @@

    位置：   - <%= link_to "尹刚", :class => 'sy_cgrey' %> + <%= link_to User.current, user_path(User.current.id), :class => 'sy_cgrey', :target => '_blank' %>  >  - <%=link_to "课程", :class => 'sy_cgrey' %> -  >  - <%=link_to "课程名称", :class => 'sy_cgrey' %> + <%= link_to '课程', user_courselist_user_path(User.current.id), :class => "sy_cgrey", :target => '_blank' %> +  >  + <%= link_to @syllabus.title, syllabus_path(@syllabus.id), :class => "sy_cgrey" %>

    From 396664d4e7434de71b739091f2677ec817723908 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 2 Sep 2016 14:45:01 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_syllabus.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb index 8f71e2ec2..deddaa34f 100644 --- a/app/views/layouts/base_syllabus.html.erb +++ b/app/views/layouts/base_syllabus.html.erb @@ -59,7 +59,7 @@
    <%= yield %>
    -
    +
    <%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %>