Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/messages/_form.html.erb

@@ -3,7 +3,7 @@
 
 <div class="box ph10_5">
 <!--[form:message]-->
-<p><label for="message_subject"><%= l(:field_subject) %></label><br />
+<p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br />
 <%= f.text_field :subject,:size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
 </p>
 <p>

app/views/users/_my_joinedcourse.html.erb

@@ -13,7 +13,7 @@
 <% else %>
 	<div class="user_course_list menu-div">
   <div class="menu">
-	<%= link_to"#{l(:label_course_view_student)}",course_path(course: 1), :class => 'icon icon-add' %>
+	<%= link_to"#{l(:label_course_view_student)}",courses_path, :class => 'icon icon-add' %>
     <ul>
       <li mode='doing' class="on">进行中</li>
       <li mode='end'>已完结</li>

db/schema.rb

@@ -1041,11 +1041,13 @@ ActiveRecord::Schema.define(:version => 20140626012511) do
   end
 
   create_table "user_scores", :force => true do |t|
-    t.integer "user_id"
-    t.integer "collaboration"
-    t.integer "influence"
-    t.integer "skill"
-    t.integer "activity"
+    t.integer  "user_id",       :null => false
+    t.integer  "collaboration"
+    t.integer  "influence"
+    t.integer  "skill"
+    t.integer  "active"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
   end
 
   create_table "user_statuses", :force => true do |t|