From 9c4c1679afa3acd0f0692e6435411fd0d66e346f Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 31 Oct 2014 20:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug<=E6=9C=89=E4=BA=9B?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8Bschool=5Fid=3D0=20=E6=88=96=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E5=88=99=E8=AF=BE=E7=A8=8B=E8=BF=9B=E4=B8=8D=E5=8E=BB>=20Signe?=
 =?UTF-8?q?d-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users.html.erb         | 53 +++++++++++++++++--
 app/views/my/account.html.erb                 |  6 +--
 ...41031122331_change_school_id_for_school.rb | 11 ++++
 db/schema.rb                                  |  2 +-
 4 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20141031122331_change_school_id_for_school.rb
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 97d5fc47f..04501532d 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -21,6 +21,9 @@
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
 		<%= yield :header_tags -%>
+        <% title1 = @user.user_extensions.technical_title %>
+        <% language1 = @user.language %>
+
         <script type="text/javascript">
           function startXMLHttp()
           {
@@ -36,11 +39,55 @@
           {
             setInterval("startXMLHttp()",5000);
           }
+
+          function init_title() {
+              var title = "<%= "#{title1}" %>"
+              var language = "<%= "#{language1}" %>"
+              if(language == 'zh') {
+                  switch (title) {
+                      case 'Professor' :
+                          title1 = '教授';
+                          break;
+                      case 'Associate professor' :
+                          title1 = '副教授';
+                          break;
+                      case 'Lecturer' :
+                          title1 = '讲师';
+                          break;
+                      case 'Teaching assistant' :
+                          title1 = '助教';
+                          break;
+                      default :
+                          title1 = title;
+                          break;
+                  }
+              }
+              else {
+                  switch (title) {
+                      case '教授' :
+                          title1 = 'Professor';
+                          break;
+                      case '副教授' :
+                          title1 = 'Associate professor';
+                          break;
+                      case '讲师' :
+                          title1 = 'Lecturer';
+                          break;
+                      case '助教' :
+                          title1 = 'Teaching assistant';
+                          break;
+                      default :
+                          title1 = title;
+                          break;
+                  }
+              }
+              document.getElementById('td_tech_title').innerHTML = title1;
+          }
         </script>
 
 	</head>
     <!--加上 onload="Javascript:t()" 开始定时刷新分数 -->
-	<body class="<%= h body_css_classes %>">
+	<body class="<%= h body_css_classes %>" onload="init_title()" >
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3">
@@ -193,8 +240,8 @@
                                                   <td style="padding-left: 5px" width="76px">
                                                     <%= l(:label_technical_title) %>:
                                                   </td>
-                                                  <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
-                                                    <%= @user.user_extensions.technical_title %>
+                                                  <td  class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
+                                                       <span id = "td_tech_title"></span>
                                                   </td>
 												<% end %>
 											</tr>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 38f1e3b9f..fc712933c 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -61,7 +61,7 @@
 
     <!-- 昵称 -->
     <p style="width:630px;padding-left: 26px;">
-      <%= f.text_field :login, :required => true, :name => "login"%>
+      <%= f.text_field :login, :required => true, :size => 25, :name => "login"%>
       <span class='font_lighter'><%= l(:label_max_number) %></span>
       <br/>
     </p>
@@ -69,13 +69,13 @@
     <div>
         <span id='name' style='display:none'>
             <p style="width:530px;padding-left: 26px;">
-              <%= f.text_field :lastname, :required => true %>
+              <%= f.text_field :lastname, :size => 25,  :required => true %>
               <span class='font_lighter'>
                 <%= l(:field_lastname_eg) %>
               </span>
             </p>
             <p style="width:530px;padding-left: 26px;">
-              <%= f.text_field :firstname, :required => true %>
+              <%= f.text_field :firstname, :size => 25, :required => true %>
               <span class='font_lighter'>
                 <%= l(:field_firstname_eg) %>
               </span>
diff --git a/db/migrate/20141031122331_change_school_id_for_school.rb b/db/migrate/20141031122331_change_school_id_for_school.rb
new file mode 100644
index 000000000..e042bd48e
--- /dev/null
+++ b/db/migrate/20141031122331_change_school_id_for_school.rb
@@ -0,0 +1,11 @@
+#encoding=UTF-8
+class ChangeSchoolIdForSchool < ActiveRecord::Migration
+  def up
+    sql = "update courses, user_extensions set courses.school_id = user_extensions.school_id
+          where courses.tea_id = user_extensions.user_id"
+    execute(sql)
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 957e603b7..70ed2ce36 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141031065238) do
+ActiveRecord::Schema.define(:version => 20141031122331) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
