From 97394a6cbe529cff023cae4966f5bc686aaa0355 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Sun, 18 Sep 2016 16:47:13 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8E=E7=8F=AD=E7=BA=A7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html          | 16 ++++++++--------
 public/assets/wechat/class.html               |  2 +-
 public/assets/wechat/class_publishissue.html  |  2 +-
 public/assets/wechat/class_publishnotice.html |  2 +-
 public/assets/wechat/course_discussion.html   |  2 +-
 public/assets/wechat/course_notice.html       |  2 +-
 public/assets/wechat/homework_detail.html     |  2 +-
 public/assets/wechat/invite_code.html         |  2 +-
 public/assets/wechat/myresource.html          |  4 ++--
 public/assets/wechat/review_class_member.html |  4 ++--
 public/stylesheets/weui/weixin.css            |  2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 2d45f4d17..09490b766 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -40,7 +40,7 @@
                   </div>
                   <div class="cl"></div>
                 </div>
-                <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div>
+                <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
                 <div class="fr f13">
                   <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
                   <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@@ -75,7 +75,7 @@
                   </div>
                   <div class="cl"></div>
                 </div>
-                <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div>
+                <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
                 <div class="fr f13">
                   <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
                   <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@@ -111,7 +111,7 @@
                   <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                   <div class="cl"></div>
                 </div>
-                <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div>
+                <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
                 <div class="fr f13">
                   <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
                   <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@@ -147,7 +147,7 @@
                           <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                           <div class="cl"></div>
                       </div>
-                      <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div>
+                      <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
                       <!--<div class="fr f13">-->
                           <!--<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>-->
                           <!--<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>-->
@@ -405,7 +405,7 @@
                                   </div>
                                   <div class="cl"></div>
                               </div>
-                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div>
+                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
                               <div class="fr f13">
                                   <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
                                   <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@@ -440,7 +440,7 @@
                                   </div>
                                   <div class="cl"></div>
                               </div>
-                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div>
+                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
                               <div class="fr f13">
                                   <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
                                   <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@@ -476,7 +476,7 @@
                                   <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                                   <div class="cl"></div>
                               </div>
-                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div>
+                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
                               <div class="fr f13">
                                   <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
                                   <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@@ -512,7 +512,7 @@
                                   <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
                                   <div class="cl"></div>
                               </div>
-                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div>
+                              <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
                               <!--<div class="fr f13">-->
                               <!--<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>-->
                               <!--<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>-->
diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html
index 836575b90..303b73057 100644
--- a/public/assets/wechat/class.html
+++ b/public/assets/wechat/class.html
@@ -1,6 +1,6 @@
 <div class="post-container">
     <div loading-spinner></div>
-    <div class="class-detail-name"><span class="course-name-width hidden inline-block">{{course.name}}</span><span  ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
+    <div class="class-detail-name"><span class="course-name-width hidden inline-block">{{course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</span><span  ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
     <div class="tab-wrap">
         <a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
     </div>
diff --git a/public/assets/wechat/class_publishissue.html b/public/assets/wechat/class_publishissue.html
index f4dd40552..5a65beabf 100644
--- a/public/assets/wechat/class_publishissue.html
+++ b/public/assets/wechat/class_publishissue.html
@@ -1,7 +1,7 @@
 <div class="post-container">
     <div loading-spinner></div>
 
-    <div class="blue-title">{{current_course.name}}</div>
+    <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
     <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">标题</span><input class="new-class-input ml25" ng-model="issuetitle" placeholder="发起讨论，请先输入标题(限128字符)" maxlength="128"></div>
     <div class="full-width-wrap mt15 mb50"><textarea class="full-width-textarea" ng-model="issue" placeholder="请输入您的讨论内容~"></textarea></div>
     <div class="bottom-tab-wrap mt10">
diff --git a/public/assets/wechat/class_publishnotice.html b/public/assets/wechat/class_publishnotice.html
index d27e378d3..e56c762a6 100644
--- a/public/assets/wechat/class_publishnotice.html
+++ b/public/assets/wechat/class_publishnotice.html
@@ -1,7 +1,7 @@
 <div class="post-container">
     <div loading-spinner></div>
 
-    <div class="blue-title">{{current_course.name}}</div>
+    <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
     <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">标题</span><input class="new-class-input ml25" ng-model="noticetitle" placeholder="发布通知，请先输入标题(限64字符)" maxlength="64"></div>
     <div class="full-width-wrap mt15 mb50"><textarea class="full-width-textarea" ng-model="notice" placeholder="请输入您的通知内容~"></textarea></div>
     <div class="bottom-tab-wrap mt10">
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 91aa58fcf..8dc08c788 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -24,7 +24,7 @@
                     <div class="cl"></div>
                     <div class="ml40">
                         <div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
-                        <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.course_project_name}} - 班级讨论区</span><span>{{discussion.created_on}}</span></div>
+                        <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{discussion.course_project_name}} - 班级讨论区</span><span>{{discussion.created_on}}</span></div>
                         <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
                         <div class="cl"></div>
                         <div class="fr f13">
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 247cd1fd0..3358da343 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -23,7 +23,7 @@
                 <div class="cl"></div>
                 <div class="ml40">
                     <div class="post-dynamic-title c-black fb">{{news.title}}</div>
-                    <div class="c-grey4 f13 mt5"><span class="mr10">{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div>
+                    <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div>
                     <div class="f13 c-black mt5 text-control  post-all-content" ng-bind-html="news.description|safeHtml"></div>
                     <div class="cl"></div>
                     <div class="fr f13">
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index e5f73faa9..3898bee14 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -23,7 +23,7 @@
                 <div class="cl"></div>
                 <div class="ml40">
                     <div class="post-dynamic-title c-black fb">{{homework.name}}</div>
-                    <div class="c-grey4 mt5 f13"><span class="mr10">{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
+                    <div class="c-grey4 mt5 f13"><span class="mr10">{{discussion.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
                     <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div>
                     <span class="c-grey f12 mr15">迟交扣分：{{homework.late_penalty}}分</span>
                     <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评开启时间：{{homework.evaluation_start}}</span><br />
diff --git a/public/assets/wechat/invite_code.html b/public/assets/wechat/invite_code.html
index 3aaa00bbe..c6d3b425f 100644
--- a/public/assets/wechat/invite_code.html
+++ b/public/assets/wechat/invite_code.html
@@ -1,7 +1,7 @@
 <div class="post-container">
     <div class="qr-code-wrap">
         <div class="qr-code-box">
-            <div class="share-class-name">{{course.name}}</div>
+            <div class="share-class-name">{{course.syllabus_title}}<font class="fb" style="height:25px; line-height:25px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</div>
             <div class="qr-img-wrap"><img ng-src="https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket={{course.qrcode}}" width="152" class="qr-code-img" /></div>
             <div class="invitation-code-wrap">邀请码：{{course.invite_code}}</div>
         </div>
diff --git a/public/assets/wechat/myresource.html b/public/assets/wechat/myresource.html
index 1848dad60..df04a184f 100644
--- a/public/assets/wechat/myresource.html
+++ b/public/assets/wechat/myresource.html
@@ -13,7 +13,7 @@
     <div ng-class="{'undis': currentTab!=1}">
         <div ng-repeat="r in resources|filter:{filename:searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]">
             <img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <a ng-href="{{g_localhost}}/attachments/download/{{r.id}}/{{r.filename}}?type=wechat" target="_blank" class="fl ml10 resource-width">{{r.filename}}</a><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,1)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
-            <span class="f12 mt5 ml35 c-grey4 fl courseware-from-width hidden">课件来源：{{r.coursename}}</span><span class="f12 ml10 mt5 c-grey4 fl">大小：{{r.attafile_size}}</span><div class="cl"></div>
+            <span class="f12 mt5 ml35 c-grey4 fl courseware-from-width hidden">课件来源：{{r.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{r.coursename}}</span><span class="f12 ml10 mt5 c-grey4 fl">大小：{{r.attafile_size}}</span><div class="cl"></div>
         </div>
         <div ng-if="has_more">
             <div id="more" class="more-events mt10" ng-click="loadResourceData(1,page+1);">更多</div>
@@ -24,7 +24,7 @@
     </div>
     <div ng-class="{'undis': currentTab!=2}">
         <div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span ng-click="goHomeworkDetail(r.id)" class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,2)" class="fr mr10 link-blue2 ">发送</a><div class="cl"></div>
-            <span class="f12 mt5 ml35 c-grey4 fl other-from-width hidden">作业来源：{{r.coursename}}</span><div class="cl"></div>
+            <span class="f12 mt5 ml35 c-grey4 fl other-from-width hidden">作业来源：{{r.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{r.coursename}}</span><div class="cl"></div>
         </div>
         <div ng-if="homework_has_more">
             <div id="more_homeworks" class="more-events mt10" ng-click="loadResourceData(2,homework_page+1);">更多</div>
diff --git a/public/assets/wechat/review_class_member.html b/public/assets/wechat/review_class_member.html
index e066c48f0..b1f0dacc5 100644
--- a/public/assets/wechat/review_class_member.html
+++ b/public/assets/wechat/review_class_member.html
@@ -2,7 +2,7 @@
     <div loading-spinner></div>
     <div ng-show="current_course && current_review_member "  class="post-container" style="padding-bottom:50px;">
         <div ng-show="status==0">
-            <div class="blue-title">{{current_course.name}}</div>
+            <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
             <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_review_member.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}</span><img ng-src="/images/wechat/{{current_review_member.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
             <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
             <ul class="class-list f13 c-grey3">
@@ -29,7 +29,7 @@
     </div>
 
     <div ng-show="current_course && !current_review_member ">
-        <div class="blue-title">{{current_course.name}}</div>
+        <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
         <div class="tac sn-font-grey2" style="margin-top:50px;">{{tip_2}}</div>
     </div>
 
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index cf44a3814..8e0b3933e 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -147,7 +147,7 @@ a.underline {text-decoration:underline;}
 .post-dynamic-author {width:50%; height:30px; line-height:30px; font-size:14px; color:#5b5b5b; vertical-align:middle;}
 .post-dynamic-time {height:30px; line-height:30px; vertical-align:middle;}
 .post-dynamic-title {font-size:15px;}
-.post-dynamic-from {width:50%; font-size:13px;}
+.post-dynamic-from {width:55%; font-size:13px;}
 .post-box-shadow {box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
 .post-reply-author {width:50%; height:20px; line-height:20px; font-size:12px; color:#5d5d5d; vertical-align:middle;}
 .post-reply-time {height:20px; line-height:20px; vertical-align:middle;}

From 7a5f21456d75dcf3cf4c7ec21d3bd9641cea4a21 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 19 Sep 2016 11:24:44 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/edit_userinfo.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/assets/wechat/edit_userinfo.html b/public/assets/wechat/edit_userinfo.html
index f4178fee4..3e4bf51f2 100644
--- a/public/assets/wechat/edit_userinfo.html
+++ b/public/assets/wechat/edit_userinfo.html
@@ -12,6 +12,7 @@
     <form name="regFrm" novalidate>
 
         <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">姓名</span><input class="new-class-input ml25" ng-model="lastname" placeholder="请输入您的真实姓名" maxlength="30" /></div>
+        <div ng-show="lastname == '' " class="c-red f12 mt5 ml15">姓名不能为空</div>
         <div class="course-list-row f13 c-grey3 mt10" style="height:auto;">
             <div class="mt5" style="line-height:20px">
                 <span class="ml15 c-grey3">性别</span>
@@ -28,10 +29,10 @@
         <div class="course-list-row f13 c-grey3 mt10">
             <span class="fl ml15 c-grey3">邮箱</span>
             <input class="new-class-input ml25" type="email" name="email" ng-model="mail" placeholder="请输入您的邮箱地址" maxlength="60" />
-            <div ng-show="regFrm.$submitted || regFrm.email.$touched">
-                <span class="f12 c-red fl ml15" ng-show="regFrm.email.$error.required">电子邮箱地址不能为空</span>
-                <span class="f12 c-red fl ml15" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
-            </div>
+        </div>
+        <div ng-show="regFrm.$submitted || regFrm.email.$touched">
+            <span class="f12 c-red ml15" ng-show="regFrm.email.$error.required">电子邮箱地址不能为空</span>
+            <span class="f12 c-red ml15" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
         </div>
         <div ng-show="lastname == '' " class="f12 c-grey6 mt10 ml15">
             <span class="f13 c-grey3">提示</span>

From 126c18f8333f4afd3fbb60cd53140f6c24927283 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 19 Sep 2016 14:00:52 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9D=A5=E6=BA=90=E5=AE=BD=E5=BA=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9B=E7=8F=AD=E7=BA=A7=E5=8A=A8=E6=80=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/course_notice.html   | 2 +-
 public/assets/wechat/homework_detail.html | 2 +-
 public/stylesheets/weui/weixin.css        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 3358da343..a0c242d72 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -23,7 +23,7 @@
                 <div class="cl"></div>
                 <div class="ml40">
                     <div class="post-dynamic-title c-black fb">{{news.title}}</div>
-                    <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div>
+                    <div class="c-grey4 f13 mt5"><span class="mr10">{{news.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div>
                     <div class="f13 c-black mt5 text-control  post-all-content" ng-bind-html="news.description|safeHtml"></div>
                     <div class="cl"></div>
                     <div class="fr f13">
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 3898bee14..908cff977 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -23,7 +23,7 @@
                 <div class="cl"></div>
                 <div class="ml40">
                     <div class="post-dynamic-title c-black fb">{{homework.name}}</div>
-                    <div class="c-grey4 mt5 f13"><span class="mr10">{{discussion.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
+                    <div class="c-grey4 mt5 f13"><span class="mr10">{{homework.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
                     <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div>
                     <span class="c-grey f12 mr15">迟交扣分：{{homework.late_penalty}}分</span>
                     <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评开启时间：{{homework.evaluation_start}}</span><br />
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 8e0b3933e..d2d92a361 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -203,7 +203,7 @@ a.underline {text-decoration:underline;}
 .img-circle {border-radius:50% !important;}
 .member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;}
 .resource-width {width:76%;}
-.courseware-from-width {max-width:57%;}
+.courseware-from-width {max-width:50%;}
 .other-from-width {max-width:80%;}
 .course-name-width {width:68%;}
 

From 9c214ef57b9756683a1e2f8f8daec86d5414e669 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 19 Sep 2016 14:07:32 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/edit_userinfo.html | 6 +++---
 public/stylesheets/weui/weixin.css      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/assets/wechat/edit_userinfo.html b/public/assets/wechat/edit_userinfo.html
index 3e4bf51f2..b0a00bba2 100644
--- a/public/assets/wechat/edit_userinfo.html
+++ b/public/assets/wechat/edit_userinfo.html
@@ -12,7 +12,7 @@
     <form name="regFrm" novalidate>
 
         <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">姓名</span><input class="new-class-input ml25" ng-model="lastname" placeholder="请输入您的真实姓名" maxlength="30" /></div>
-        <div ng-show="lastname == '' " class="c-red f12 mt5 ml15">姓名不能为空</div>
+        <div ng-show="lastname == '' " class="c-red f12 mt5 ml65">姓名不能为空</div>
         <div class="course-list-row f13 c-grey3 mt10" style="height:auto;">
             <div class="mt5" style="line-height:20px">
                 <span class="ml15 c-grey3">性别</span>
@@ -31,8 +31,8 @@
             <input class="new-class-input ml25" type="email" name="email" ng-model="mail" placeholder="请输入您的邮箱地址" maxlength="60" />
         </div>
         <div ng-show="regFrm.$submitted || regFrm.email.$touched">
-            <span class="f12 c-red ml15" ng-show="regFrm.email.$error.required">电子邮箱地址不能为空</span>
-            <span class="f12 c-red ml15" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
+            <span class="f12 c-red ml65" ng-show="regFrm.email.$error.required">电子邮箱地址不能为空</span>
+            <span class="f12 c-red ml65" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
         </div>
         <div ng-show="lastname == '' " class="f12 c-grey6 mt10 ml15">
             <span class="f13 c-grey3">提示</span>
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index d2d92a361..aa4cff972 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -43,6 +43,7 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4e
 .mr25 {margin-right:25px;}
 .ml55 {margin-left:55px;}
 .mr55 {margin-right:55px;}
+.ml65 {margin-left:65px;}
 .c-red {color:#e81a1a;}
 .c-blue {color:#269ac9;}
 .c-grey {color:#9a9a9a !important;}

From 2856cd06d5c3511486b1ff661d021b7c5212e973 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 20 Sep 2016 14:42:36 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=82=B9=E5=87=BB=E5=8F=AF=E6=94=BE=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/app.html                 |  1 +
 public/assets/wechat/blog_detail.html         |  2 +-
 public/assets/wechat/course_discussion.html   |  2 +-
 public/assets/wechat/course_notice.html       |  2 +-
 public/assets/wechat/homework_detail.html     |  2 +-
 public/assets/wechat/issue_detail.html        |  2 +-
 public/assets/wechat/jour_message_detail.html |  2 +-
 public/assets/wechat/project_discussion.html  |  2 +-
 .../wechat/directives/img_preview.js          | 22 +++++++++++++++++++
 9 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 public/javascripts/wechat/directives/img_preview.js

diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 099384593..232f07494 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -41,6 +41,7 @@
 <script src="/javascripts/wechat/directives/at_delete_link.js"></script>
 <script src="/javascripts/wechat/directives/iphone_recognize.js"></script>
 <script src="/javascripts/wechat/directives/multi_reply.js"></script>
+<script src="/javascripts/wechat/directives/img_preview.js"></script>
 <script src="/javascripts/wechat/controllers/reg.js"></script>
 <script src="/javascripts/wechat/controllers/login.js"></script>
 <script src="/javascripts/wechat/controllers/activity.js"></script>
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 7aa629bb7..91a5fff59 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -25,7 +25,7 @@
                     <div class="post-dynamic-title c-black fb">{{blog.title}}<img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                     <div class="c-grey4 f13 mt5"><span class="mr10">博客</span><span>{{blog.created_at}}</span></div>
 
-                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="blog.content|safeHtml"></div>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="blog.content|safeHtml" img-preview></div>
                     <div class="cl"></div>
                 </div>
                 <div class="fr f13">
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 8dc08c788..7a818bb79 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -25,7 +25,7 @@
                     <div class="ml40">
                         <div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                         <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{discussion.course_project_name}} - 班级讨论区</span><span>{{discussion.created_on}}</span></div>
-                        <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
+                        <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml" img-preview></div>
                         <div class="cl"></div>
                         <div class="fr f13">
                             <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index a0c242d72..c13a7b532 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -24,7 +24,7 @@
                 <div class="ml40">
                     <div class="post-dynamic-title c-black fb">{{news.title}}</div>
                     <div class="c-grey4 f13 mt5"><span class="mr10">{{news.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div>
-                    <div class="f13 c-black mt5 text-control  post-all-content" ng-bind-html="news.description|safeHtml"></div>
+                    <div class="f13 c-black mt5 text-control  post-all-content" ng-bind-html="news.description|safeHtml" img-preview></div>
                     <div class="cl"></div>
                     <div class="fr f13">
                         <div ng-if="!news.praise_count" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 908cff977..161c3be94 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -24,7 +24,7 @@
                 <div class="ml40">
                     <div class="post-dynamic-title c-black fb">{{homework.name}}</div>
                     <div class="c-grey4 mt5 f13"><span class="mr10">{{homework.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
-                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="homework.description|safeHtml" img-preview></div>
                     <span class="c-grey f12 mr15">迟交扣分：{{homework.late_penalty}}分</span>
                     <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评开启时间：{{homework.evaluation_start}}</span><br />
                     <span ng-if="!homework.anonymous_comment" class="c-grey f12 mr15">缺评扣分：{{homework.absence_penalty}}分/作品</span>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index f4eed4bd9..278b545a5 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -26,7 +26,7 @@
                     <div class="post-dynamic-title c-black fb">{{issue.subject}}</div>
                     <div class="c-grey4 f13 mt5"><span class="mr10">{{issue.project_name}} - 项目问题</span><span>{{issue.created_on}}</span></div>
 
-                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="issue.description|safeHtml"></div>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="issue.description|safeHtml" img-preview></div>
                     <span class="c-grey f12 mr15">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}</span>
                     <span class="c-grey f12">优先级：{{issue.issue_priority}}</span><br/>
                     <span class="c-grey f12 mr15">指派给：{{issue.issue_assigned_to}}</span>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index a1db224a6..736ad419b 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -24,7 +24,7 @@
                 <div class="ml40">
                     <div class="c-grey4 f13 mt5"><span class="mr10">留言</span><span>{{message.created_on}}</span></div>
 
-                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="message.content|safeHtml"></div>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="message.content|safeHtml" img-preview></div>
                     <div class="cl"></div>
                     <div class="fr f13">
                         <div ng-if="!message.praise_count" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index dcb5a68a6..7fca33657 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -25,7 +25,7 @@
                     <div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                     <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.course_project_name}} - 项目讨论区</span><span>{{discussion.created_on}}</span></div>
 
-                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml" img-preview></div>
                     <div class="cl"></div>
                     <div class="fr f13">
                         <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
diff --git a/public/javascripts/wechat/directives/img_preview.js b/public/javascripts/wechat/directives/img_preview.js
new file mode 100644
index 000000000..08f33d381
--- /dev/null
+++ b/public/javascripts/wechat/directives/img_preview.js
@@ -0,0 +1,22 @@
+/**
+ * Created by ttang on 2016/9/20.
+ */
+app.directive('imgPreview',["$timeout",'wx',function(timer,wx){
+    return{
+        restrict: 'A',
+        scope: {},
+        link: function(scope, element){
+            timer(function(){
+                var srcList = [];
+                $.each($(".post-all-content img"),function(i,item){
+                    if(item.src){
+                        srcList.push(item.src);
+                        $(item).click(function(e){
+                            wx.previewImage(this.src,srcList);
+                        });
+                    }
+                });
+            })
+        }
+    }
+}]);
\ No newline at end of file