From 4932b9fad83201b001c73ae494b7a748a0987b35 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 25 Aug 2016 10:55:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=95=99=E8=A8=80=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/activities.rb    |  2 +-
 app/api/mobile/apis/courses.rb       |  2 +-
 config/menu.yml                      |  2 +-
 config/menu.yml.production           |  2 +-
 config/menu.yml.test                 |  2 +-
 public/assets/wechat/activities.html | 70 ++++++++++++++--------------
 public/assets/wechat/class.html      | 70 ++++++++++++++--------------
 7 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index 69d9ef524..4d07c23f8 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -29,7 +29,7 @@ module Mobile
             if container_type == "All" || container_type == "Course"
               shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
               user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
-              course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
+              course_types = "('Message','News','HomeworkCommon','Poll','Course')"
             end
 
             page = params[:page] ? params[:page] : 0
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index d26779332..bfd559402 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -297,7 +297,7 @@ module Mobile
 
           user = current_user
 
-          course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
+          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           activities = UserActivity.where("(container_type = 'Course' and container_id = #{params[:id]} and act_type in #{course_types})").order('updated_at desc')
 
           page = params[:page] ? params[:page] : 0
diff --git a/config/menu.yml b/config/menu.yml
index 52272e8a0..8cc920707 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -8,7 +8,7 @@ button:
   sub_button:
   -
     type: "view"
-    name: "我的课程"
+    name: "我的班级"
     url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
   -
     type: "view"
diff --git a/config/menu.yml.production b/config/menu.yml.production
index c1431172e..55318e811 100644
--- a/config/menu.yml.production
+++ b/config/menu.yml.production
@@ -8,7 +8,7 @@ button:
   sub_button:
   -
     type: "view"
-    name: "我的课程"
+    name: "我的班级"
     url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
   -
     type: "view"
diff --git a/config/menu.yml.test b/config/menu.yml.test
index dc4aacbe5..45e23aaf3 100644
--- a/config/menu.yml.test
+++ b/config/menu.yml.test
@@ -8,7 +8,7 @@ button:
   sub_button:
   -
     type: "view"
-    name: "我的课程"
+    name: "我的班级"
     url:  "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
   -
     type: "view"
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 548641748..506dcc724 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -163,41 +163,41 @@
           </div>
         </div>
 
-        <div ng-if="act.act_type=='JournalsForMessage'">
-          <div class="post-container">
-              <div class="post-wrapper">
-                  <div class="post-main">
-                      <div dataID = "{{act.act_id}}" ng-click="goDetail('journal_for_message',act.act_id, act.id)" id="act_{{act.id}}">
-                          <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
-                          <div class="post-dynamic-author hidden fl">
-                              <span>{{act.author.real_name}}</span>
-                              <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                              <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
-                          </div>
-                          <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
-                          <div class="cl"></div>
-                          <div class="post-dynamic-title c-grey3 hidden mt12 fb">【班级留言】{{act.subject|safeHtml}}</div>
-                          <div class="post-content c-grey3 mt10 mb10">
-                              <div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></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>
-                      <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{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>
-                          <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
-                      </div>
-                      <div class="fr mr25 f13">
-                          <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                          <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                      </div>
-                      <div class="cl"></div>
-                  </div>
-              </div>
-          </div>
-        </div>
+        <!--<div ng-if="act.act_type=='JournalsForMessage'">-->
+          <!--<div class="post-container">-->
+              <!--<div class="post-wrapper">-->
+                  <!--<div class="post-main">-->
+                      <!--<div dataID = "{{act.act_id}}" ng-click="goDetail('journal_for_message',act.act_id, act.id)" id="act_{{act.id}}">-->
+                          <!--<div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>-->
+                          <!--<div class="post-dynamic-author hidden fl">-->
+                              <!--<span>{{act.author.real_name}}</span>-->
+                              <!--<img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />-->
+                              <!--<img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />-->
+                          <!--</div>-->
+                          <!--<div class="post-dynamic-time fr f13">{{act.latest_update}}</div>-->
+                          <!--<div class="cl"></div>-->
+                          <!--<div class="post-dynamic-title c-grey3 hidden mt12 fb">【班级留言】{{act.subject|safeHtml}}</div>-->
+                          <!--<div class="post-content c-grey3 mt10 mb10">-->
+                              <!--<div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></div>-->
+                          <!--</div>-->
+                          <!--&lt;!&ndash;<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>&ndash;&gt;-->
+                          <!--<div class="cl"></div>-->
+                      <!--</div>-->
+                      <!--<div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{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>-->
+                          <!--<div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>-->
+                      <!--</div>-->
+                      <!--<div class="fr mr25 f13">-->
+                          <!--<a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>-->
+                          <!--<a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>-->
+                      <!--</div>-->
+                      <!--<div class="cl"></div>-->
+                  <!--</div>-->
+              <!--</div>-->
+          <!--</div>-->
+        <!--</div>-->
 
 
         <div ng-if="act.act_type=='Course'">
diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html
index 6c1c35860..349c3bd75 100644
--- a/public/assets/wechat/class.html
+++ b/public/assets/wechat/class.html
@@ -164,41 +164,41 @@
                     </div>
                 </div>
 
-                <div ng-if="act.act_type=='JournalsForMessage'">
-                    <div class="post-container">
-                        <div class="post-wrapper">
-                            <div class="post-main">
-                                <div dataID = "{{act.act_id}}" ng-click="goDetail('journal_for_message',act.act_id, act.id)" id="act_{{act.id}}">
-                                    <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
-                                    <div class="post-dynamic-author hidden fl">
-                                        <span>{{act.author.real_name}}</span>
-                                        <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                                        <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
-                                    </div>
-                                    <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
-                                    <div class="cl"></div>
-                                    <div class="post-dynamic-title c-grey3 hidden mt12 fb">【班级留言】{{act.subject|safeHtml}}</div>
-                                    <div class="post-content c-grey3 mt10 mb10">
-                                        <div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></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>
-                                <!--<div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{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>
-                                    <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
-                                </div>
-                                <div class="fr mr25 f13">
-                                    <a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                                    <a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
-                                </div>
-                                <div class="cl"></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                <!--<div ng-if="act.act_type=='JournalsForMessage'">-->
+                    <!--<div class="post-container">-->
+                        <!--<div class="post-wrapper">-->
+                            <!--<div class="post-main">-->
+                                <!--<div dataID = "{{act.act_id}}" ng-click="goDetail('journal_for_message',act.act_id, act.id)" id="act_{{act.id}}">-->
+                                    <!--<div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>-->
+                                    <!--<div class="post-dynamic-author hidden fl">-->
+                                        <!--<span>{{act.author.real_name}}</span>-->
+                                        <!--<img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />-->
+                                        <!--<img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />-->
+                                    <!--</div>-->
+                                    <!--<div class="post-dynamic-time fr f13">{{act.latest_update}}</div>-->
+                                    <!--<div class="cl"></div>-->
+                                    <!--<div class="post-dynamic-title c-grey3 hidden mt12 fb">【班级留言】{{act.subject|safeHtml}}</div>-->
+                                    <!--<div class="post-content c-grey3 mt10 mb10">-->
+                                        <!--<div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></div>-->
+                                    <!--</div>-->
+                                    <!--&lt;!&ndash;<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>&ndash;&gt;-->
+                                    <!--<div class="cl"></div>-->
+                                <!--</div>-->
+                                <!--&lt;!&ndash;<div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>&ndash;&gt;-->
+                                <!--<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>-->
+                                    <!--<div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>-->
+                                <!--</div>-->
+                                <!--<div class="fr mr25 f13">-->
+                                    <!--<a ng-if="!act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>-->
+                                    <!--<a ng-if="act.reply_count" ng-click="goDetail('journal_for_message',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>-->
+                                <!--</div>-->
+                                <!--<div class="cl"></div>-->
+                            <!--</div>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
 
                 <div ng-if="act.act_type=='Course'">
                     <div class="post-container">