Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

db/schema.rb

@@ -562,9 +562,9 @@ ActiveRecord::Schema.define(:version => 20160709015740) do
     t.integer  "excellent_option",              :default => 0
     t.integer  "is_copy",                       :default => 0
     t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
     t.string   "invite_code"
     t.string   "qrcode"
-    t.integer  "syllabus_id"
   end
 
   add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true

public/assets/wechat/myresource.html

@@ -11,17 +11,24 @@
     </div>
 
     <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}]"><span class="fl ml10 hidden resource-width">{{r.filename}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2">发送</a></div>
+      <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" /> <span class="fl ml10 resource-width">{{r.filename}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
+        <span class="f12 mt5 ml35 c-grey4">课件来源：</span><span class="f12 ml10 mt5 c-grey4">大小：</span>
+      </div>
         <p ng-show="resources && resources.length<=0" class="class-test-tip">暂无课件,<br />
             请登录Trustie网站,在PC浏览器中上传课件。</p>
     </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}]"><span class="fl ml10 hidden resource-width">{{r.homework_name}}</span></div>
+      <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 class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
+        <span class="f12 mt5 ml35 c-grey4">作业来源：</span>
+      </div>
         <p ng-show="homeworks && homeworks.length<=0" class="class-test-tip">暂无作业,<br />
             请登录Trustie网站,在PC浏览器中创建作业。</p>
     </div>
     <div ng-class="{'undis': currentTab!=3}">
-      <div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><span class="fl ml10 hidden resource-width">{{r.exercise_name}}</span></div>
+      <div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
+        <span class="f12 mt5 ml35 c-grey4">题目来源：</span>
+      </div>
         <p ng-show="exercise && exercise.length<=0" class="class-test-tip">暂无测验,<br />
             请登录Trustie网站,在PC浏览器中创建测验。</p>
     </div>

public/stylesheets/weui/weixin.css

@@ -33,6 +33,7 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin-left: 1.4em; margin
 .mr5 {margin-right:5px;}
 .mr10 {margin-right:10px;}
 .ml15 {margin-left:15px;}
+.ml35 {margin-left:35px;}
 .mr15 {margin-right:15px;}
 .mr20 {margin-right:20px;}
 .ml25 {margin-left:25px;}
@@ -184,11 +185,11 @@ a.underline {text-decoration:underline;}
 .class-search-icon {position:absolute; top:16px; left:16px;}
 .class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;}
 .border-top {border-top:1px solid #ccc;}
-.class-detail-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-detail-row {width:100%; line-height:18px; padding:10px 0; border-bottom:1px solid #ccc; background-color:#fff;}
 .class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
 .img-circle {border-radius:50%;}
 .member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;}
-.resource-width {width:80%;}
+.resource-width {width:76%;}
 
 /*20160614班级列表*/
 .course-diff-row {width:100%; height:28px; line-height:28px; vertical-align:middle; background-color:#fff;}