1、修改了注册里的问题

2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小

app/helpers/users_helper.rb

@@ -110,13 +110,13 @@ module UsersHelper
   else    
     case state
     when 0
-      s = content_tag('span', '我加入的课程', :class => "current-page")
+      s = content_tag('span', l(:label_my_course), :class => "current-page")
       content << content_tag('li', s)
       content << content_tag('li', link_to('我的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
       content_tag('div', content, :class => "pagination")      
     when 1
       s = content_tag('span', '我的作业', :class => "current-page")
-      content << content_tag('li', link_to('我加入的课程', {:controller => 'users', :action => 'user_courses', :type => 0}))
+      content << content_tag('li', link_to(l(:label_my_course), {:controller => 'users', :action => 'user_courses', :type => 0}))
       content << content_tag('li', s, :class => "current-page")      
     content_tag('div', content, :class => "pagination")
 end

app/views/account/register.html.erb

@@ -257,7 +257,7 @@
 	<option value="0"><%= l(:label_teacher) %></option> 
 	<option value="1"><%= l(:label_student) %></option> 
 	<option value="2"><%= l(:label_enterprise) %></option> 
-	<option value="3"><%= l(:label_developer) %></option> 
+	<option value="3"><%= l(:label_account_developer) %></option> 
 	
 </select></td>
 <td>

app/views/bids/_bid_homework_show.html.erb

@@ -15,7 +15,7 @@
 					<tr>
 						<td> <% if bid.reward_type.nil? or bid.reward_type == 1 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %>
 							<%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %> 
-							<!-- <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong> --> 
+							
 							<% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
 					</tr>
 					<tr>

app/views/bids/_homework.html.erb

@@ -11,7 +11,7 @@
 <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %>
 
 <div class='icon icon-add'>
-	<%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
+	<%= toggle_link l(:button_submit_homework), 'put-bid-form' %>
 </div>
 <% elsif @homework_list.empty? %>
 	<div class="font_lighter_sidebar" style="padding-left: 10px">暂无学生提交作业！</div>

app/views/bids/show.html.erb

@@ -20,8 +20,8 @@
 						<%= @bid.budget%>
 						</span></strong></td>
 				<% else %>
-				<td><strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑">
-					<%= l(:label_bids_credit) %>&nbsp;<%= @bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong></td>
+				<!-- <td><strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑">
+					<%= l(:label_bids_credit) %>&nbsp;<%= @bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong></td> -->
 				<% end %>
       </tr>
       <!--modified by baiyu-->

app/views/layouts/base_homework.html.erb

@@ -33,9 +33,9 @@
 							<div class="main_context">
 								<div class="spaceleft">
 									<div>
-										<table  style="padding-top: 20px ;width: 232px ; height: 80px;">
+										<table  style="padding-top: 20px ;width: 232px ; height: 80px;">  <!-- modified by bai -->
 											<tr>
-												<td class="info_font" align="center" style=" word-wrap: break-word; word-break: break-all; color: #ed8924 "><%= h @bid.name %></td>
+												<td class="info_font" style=" word-wrap: break-word; word-break: break-all; color: #ed8924 "><%= h @bid.name %></td>
 											</tr>
 											<tr>
 												<td align="center"> <%= watcher_link(@bid, User.current) %> </td>

app/views/projects/_course_form.html.erb

@@ -180,7 +180,7 @@
 	          							
 	    <% end %>
 	 <% end %></td>
-	 <td>
+	 <td>
 	 <% unless @course.nil? %>
 		<% if @course.term == l(:label_spring) %>
 			 <p><table><tr>
@@ -226,8 +226,8 @@
 		
 		<% end %></td></tr></table></p>
 	<!-- end  -->
-	 
-	 
+	 
+	 
 <% end %>
 <!-- <p style="margin-left:-10px;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></p> -->
 <p style="display:none;"><%= f.text_field :project_type, :value => 1 %></p>

app/views/projects/new.html.erb

@@ -5,13 +5,13 @@
 		<div class="box tabular">
     	<%= render :partial => 'course_form', :locals => { :f => f } %>
     	<%= submit_tag l(:button_create) %>
-	    <%= submit_tag l(:button_create_and_continue), :name => 'course_continue' %>
+	    <!-- <%= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->
     <% else %>
 		<h3><%=l(:label_project_new)%></h3>
 		<div class="box tabular">
     	<%= render :partial => 'form', :locals => { :f => f } %>
     	<%= submit_tag l(:button_create) %>
-	    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>	
+	    <!-- <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>	 -->
     <% end %>	
 	<%= javascript_tag "$('#project_name').focus();" %>	
     </div>

config/locales/zh.yml

@@ -508,6 +508,7 @@ zh:
   label_new_contest: 竞赛
   label_requirement_focus: 关注需求
   label_developer: 用户
+  label_account_developer: 开发者
   label_enterprise_into: 进入企业
   label_college_into: 进入高校
   label_investor: 投资人：
@@ -905,7 +906,7 @@ zh:
   button_check_all: 全选
   button_uncheck_all: 清除
   button_delete: 删除
-  button_create: 创建
+  button_create: 提交 #bai
   button_create_and_continue: 创建并继续
   button_test: 测试
   button_edit: 编辑
@@ -914,7 +915,7 @@ zh:
   button_change: 修改
 
   button_apply: 查询
-  button_clear: 取消查询
+  button_clear: 清除留言
   button_clear_requirement: 取消
   button_lock: 锁定
   button_unlock: 解锁
@@ -1285,7 +1286,7 @@ zh:
   field_enterprise: '企业：'
   
   button_bidding_homework: 参加竞标 #huang
-  field_homework_type: 作业类型
+  field_homework_type: 提交形式    #bai
   label_homework_respond: 作业情况
 
   label_bid_me: 我要应标
@@ -1515,7 +1516,7 @@ zh:
   label_user_create_project: 创建了
 #added by bai
   label_identity: 身份
-  label_teacher: 教 师
+  label_teacher: 教师
   label_teacher_homework: 教师姓名
   label_student: 学生
   label_other: 其他
@@ -1534,6 +1535,9 @@ zh:
   label_course_time: 课程年度
   label_i_new_activity: 有了新活动在
   label_choose_course: 选择课程
+  button_submit_homework: 提交作业
+  label_my_course: 我的课程
+  button_submit_bid: 参与竞标
   
   #end
   

db/migrate/20131009074454_change_student_id_type.rb

@@ -0,0 +1,9 @@
+class ChangeStudentIdType < ActiveRecord::Migration
+  def up
+    change_column :user_extensions, :student_id, :string
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130929011921) do
+ActiveRecord::Schema.define(:version => 20131009074454) do
 
   create_table "a_user_watchers", :force => true do |t|
     t.string   "name"
@@ -699,7 +699,7 @@ ActiveRecord::Schema.define(:version => 20130929011921) do
     t.datetime "updated_at",         :null => false
     t.integer  "identity"
     t.string   "technical_title"
-    t.integer  "student_id"
+    t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
     t.string   "location_city"

public/themes/redpenny-master/stylesheets/application.css

@@ -372,7 +372,7 @@ ul.projects li.root
 {
 	background-color:#fff; /*顶层导航颜色*/
 	color: #fff;
-	font-size:15px;
+	font-size:13px;     /* bai */
 	font-family: 微软雅黑;
 	position:relative;
 	padding:0;