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

app/views/users/_resources_list.html.erb

@@ -14,12 +14,16 @@
           </li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
           <li style="display: none"><%= attach.id %></li>
+          <li class="resource-list-quote fr">100</li>
+          <li style="display: none"><%= attach.id %></li>
+          <li class="resource-list-download fr">100</li>
+          <li style="display: none"><%= attach.id %></li>
+          <li class="resource-list-size fr"><%= number_to_human_size(attach.filesize) %></li>
+          <li style="display: none"><%= attach.id %></li>
           <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
           <li style="display: none"><%= attach.id %></li>
-          <li class="resource-list-size fr"><%= number_to_human_size(attach.filesize) %></li>
-          <li style="display: none"><%= attach.id %></li>
           <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>

app/views/users/_user_resource_info.html.erb

@@ -10,10 +10,12 @@
   <li class="resource-list-checkbox fl"> </li>
   <li class="resource-list-name fl">资源名称</li>
   <li class="resource-list-time fr">上传时间</li>
+  <li class="resource-list-quote fr">引用数</li>
+  <li class="resource-list-download fr">下载数</li>
+  <li class="resource-list-size fr">大小</li>
   <li class="resource-list-uploader fr">上传者</li>
   <li class="resource-list-type fr">类别</li>
-  <li class="resource-list-size fr">大小</li>
+  <li class="resource-list-from fr">来源</li>
-  <li class="resource-list-from fr">资源来源</li>
 </ul>
 <div class="cl"></div>
 <form id="resources_list_form">

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160224074034) do
+ActiveRecord::Schema.define(:version => 20160225024759) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

public/stylesheets/public.css

@@ -1058,12 +1058,14 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .resource-list-tab {width:980px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}
 .resource-list-checkbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
 .resource-checkbox {margin-top:14px; width:12px; height:12px;}
-.resource-list-name {width:440px; height:40px; line-height:40px; text-align:left;}
+.resource-list-name {width:380px; height:40px; line-height:40px; text-align:left;}
-.resource-list-from {width:100px; height:40px; line-height:40px; text-align:center;}
+.resource-list-from {width:150px; height:40px; line-height:40px; text-align:center;}
-.resource-list-size {width:100px; height:40px; line-height:40px; text-align:center;}
+.resource-list-size {width:80px; height:40px; line-height:40px; text-align:center;}
-.resource-list-type {width:100px; height:40px; line-height:40px; text-align:center;}
+.resource-list-type {width:80px; height:40px; line-height:40px; text-align:center;}
-.resource-list-uploader {width:100px; height:40px; line-height:40px; text-align:center;}
+.resource-list-uploader {width:80px; height:40px; line-height:40px; text-align:center;}
-.resource-list-time {width:100px; height:40px; line-height:40px; text-align:center;}
+.resource-list-time {width:70px; height:40px; line-height:40px; text-align:center;}
+.resource-list-quote {width:60px; height:40px; line-height:40px; text-align:center;}
+.resource-list-download {width:60px; height:40px; line-height:40px; text-align:center;}
 .resource-list {width:980px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto; cursor:pointer;}
 .resource-list:hover {background-color:#e1e1e1;}
 .resource-list-option {width:980px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}