From e7039df8758cc88b9a9cc3b3d1eb21c7b824fae6 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 26 May 2016 17:21:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=82=B9=E5=87=BB=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=8C=BA=E5=9F=9F=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 172 +++++++++++++++------------
 1 file changed, 93 insertions(+), 79 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index dbf5e8b27..018c98f32 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -5,26 +5,28 @@
     <div ng-repeat="act in activities">
       <div ng-if="act.container_type=='Course'">
         <div ng-if="act.act_type=='HomeworkCommon'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/homework/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5">
-                  <a herf="javascript:void(0);">
-                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
-                  </a></div>
-                <div class="post-title hidden">
-                  <a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title mt5 hidden"><a ng-href="#/homework/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
-                  <span class="mr15">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
-                  <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/homework/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5">
+                    <a herf="javascript:void(0);">
+                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    </a></div>
+                  <div class="post-title hidden">
+                    <a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title mt5 mb5 hidden"><a ng-href="#/homework/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
+                    <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f13 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
+                  </div>
+                  <!--<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>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -39,19 +41,21 @@
         </div>
 
         <div ng-if="act.act_type=='News'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_notice/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="f13 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title hidden mt5"><a ng-href="#/course_notice/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2 mt10">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_notice/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f13 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title hidden mt5 mb5"><a ng-href="#/course_notice/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                  </div>
+                  <!--<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>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -66,19 +70,21 @@
         </div>
 
         <div ng-if="act.act_type=='Message'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_discussion/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title hidden mt5"><a ng-href="#/course_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2 mt10">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_discussion/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title hidden mt5 mb5"><a ng-href="#/course_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                  </div>
+                  <!--<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>
-                <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -109,21 +115,23 @@
 
       <div ng-if="act.container_type=='Project'">
         <div ng-if="act.act_type=='Issue'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/issues/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title hidden mt5"><a ng-href="#/issues/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
-                  <span class="mr15">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15">优先级：{{act.issue_detail.issue_priority}}</span> <br />
-                  <span class="mr15">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15">完成度：{{act.issue_detail.done_ratio}}%</span>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/issues/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title hidden mt5 mb5"><a ng-href="#/issues/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <span class="mr15 f13 c-grey2">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15 f13 c-grey2">优先级：{{act.issue_detail.issue_priority}}</span> <br />
+                    <span class="mr15 f13 c-grey2">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15 f13 c-grey2">完成度：{{act.issue_detail.done_ratio}}%</span>
+                  </div>
+                  <!--<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>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -139,19 +147,21 @@
 
 
         <div ng-if="act.act_type=='Message'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/project_discussion/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title hidden mt5"><a ng-href="#/project_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/project_discussion/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title hidden mt5 mb5"><a ng-href="#/project_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                  </div>
+                  <!--<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>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
@@ -181,19 +191,21 @@
 
       <div ng-if="act.container_type=='Principal'">
         <div ng-if="act.act_type=='JournalsForMessage'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/journal_for_message/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><span class="f12 c-grey">留言</span></div>
-                <div class="cl"></div>
-                <div class="cl"></div>
-                <div class="post-content c-grey2 mt5">
-                  <p class="post-all-content" ng-bind-html="act.description|safeHtml"></p>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/journal_for_message/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><span class="f12 c-grey">留言</span></div>
+                  <div class="cl"></div>
+                  <div class="cl"></div>
+                  <div class="post-content c-grey3 mt5 mb5">
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                  </div>
+                  <!--<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>
-                <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
                 <a ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
                 <a ng-if="act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
@@ -208,19 +220,21 @@
       </div>
 
       <div ng-if="act.act_type=='BlogComment'">
-        <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/blog_comment/'+ ($(this).attr('dataID'))">
+        <div class="post-container">
           <div class="post-wrapper">
             <div class="post-main">
-              <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-              <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-              <div class="post-title hidden"><span class="f12 c-grey">博客</span></div>
-              <div class="cl"></div>
-              <div class="post-title hidden mt5"><a ng-href="#/blog_comment/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-              <div class="post-content c-grey2">
-                <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+              <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/blog_comment/'+ ($(this).attr('dataID'))">
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
+                <div class="post-title hidden"><span class="f12 c-grey">博客</span></div>
+                <div class="cl"></div>
+                <div class="post-title hidden mt5 mb5"><a ng-href="#/blog_comment/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                <div class="post-content c-grey3">
+                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                </div>
+                <!--<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>
-              <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-              <div class="cl"></div>
               <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
               <a ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
               <a ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>