p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
z9hang 2014-07-01 17:13:08 +08:00
parent d34ab220cc 138211efba
commit 8b0f155be7
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/messages/_form.html.erb
View File

@ -3,7 +3,7 @@
<div class="box ph10_5"> <div class="box ph10_5">
<!--[form:message]--> <!--[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--> <%= f.text_field :subject,:size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
</p> </p>
<p> <p>

2
app/views/users/_my_joinedcourse.html.erb
View File

@ -13,7 +13,7 @@
<% else %> <% else %>
<div class="user_course_list menu-div"> <div class="user_course_list menu-div">
<div class="menu"> <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> <ul>
<li mode='doing' class="on">进行中</li> <li mode='doing' class="on">进行中</li>
<li mode='end'>已完结</li> <li mode='end'>已完结</li>

6
db/schema.rb
View File

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