From eac725a0f4c662dafe8a714130e16854fce33628 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 4 Jul 2014 15:21:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E3=80=81?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=81=E8=AF=BE=E7=A8=8B=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=E7=9B=B8=E5=85=B3=E5=AD=A6=E6=A0=A1=E7=9A=84=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb  | 2 +-
 app/views/layouts/base_homework.html.erb | 2 +-
 app/views/layouts/base_users.html.erb    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index ac5cc104d..5958e18bd 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -167,7 +167,7 @@
             <tr>
               <td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %> :</td>
               <!-- modified by zjc 教师单位添加超链接 -->
-              <td class="font_lighter_sidebar"><%= link_to @course.teacher.user_extensions.school,options={:controller => 'welcome',:action => 'course',:school_id => @course.teacher.user_extensions.school.id}, html_options={:method => 'get'} %></td>
+              <td class="font_lighter_sidebar"><a href="http://course.trustie.net/?school_id=<%= @course.teacher.user_extensions.school.id%>"><%= @course.teacher.user_extensions.school  %></a></td>
             </tr>
         <% else %>
             <tr>
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index fd95f8c32..e4b5db1bf 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -121,7 +121,7 @@
                                             <td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %> :</td>
                                             <!-- modified by zjc 有@user.user_extensions.occupation改为 @user.user_extensions.school 并添加超链接 -->
                                             <% unless  @user.user_extensions.nil? ||  @user.user_extensions.school.nil? %>
-                                            <td class="font_lighter_sidebar"><%= link_to @user.user_extensions.school,options={:controller => 'welcome',:action => 'course',:school_id => @user.user_extensions.school.id}, html_options={:method => 'get'} %></td>
+                                            <td class="font_lighter_sidebar"><%= link_to @user.user_extensions.school,"http://course.trustie.net/?school_id=#{@user.user_extensions.school.id}" %></td>
                                             <% end %>
                                           </tr>
                                         </table>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 0f7c273f1..172bd67af 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -168,7 +168,7 @@
 									<div class="user_underline"></div>
 									<!--info-->
 									<div class="inf_user_context">
-										<table style="font-family:微软雅黑" width="240">
+										<table style="font-family:'微软雅黑'" width="240">
 											<tr>
 												<td style="padding-left: 5px" width="70px"><%= l(:label_user_joinin) %>：</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= format_time(@user.created_on) %></td>
 											</tr>
@@ -178,7 +178,7 @@
 
                                              <!--
 											<tr>
-												<td valign="top" style="padding-left: 5px;"><%= l(:label_user_mail) %>：</td><td class="font_lighter_sidebar"  style="padding-left: 0px; word-wrap: break-word; word-break: break-all"><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
+												<td valign="top" style="padding-left: 5px;"><%#= l(:label_user_mail) %>：</td><td class="font_lighter_sidebar"  style="padding-left: 0px; word-wrap: break-word; word-break: break-all"><%#= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
 											</tr>
                                              -->
 											<!-- added by bai 在个人主页里显示“工作单位”“地区”"教师的职称"-->
@@ -189,7 +189,7 @@
 											<tr>
 												<td style="padding-left: 5px" width="70px"><%= l(:field_occupation) %>：</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
 													<% unless @user.user_extensions.school.nil? %>
-													<%= link_to @user.user_extensions.school.name, options={:controller => 'welcome',:action => 'course',:school_id => @user.user_extensions.school.id}, html_options={:method => 'get'} %>
+                                                    <a href="http://course.trustie.net/?school_id=<%= @user.user_extensions.school.id%>"><%= @user.user_extensions.school.name  %></a>
 													<% end %>
 													</td>
 											</tr>