From 03c8f397291f703660763d94554fe3a0e27edfc1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 29 May 2014 08:37:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=8F=8F=E8=BF=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=95=8C=E9=9D=A2html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_homework.html.erb | 6 +++---
 config/locales/zh.yml                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index 3f0ad6cf..5a358628 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -29,8 +29,8 @@
 						<div class="top-content">						
 							<table>
 								<tr>
-									<td class="info_font" style="width: 240px; color: #15bccf"">高校课程实践社区</td>
-									<td style="width: auto; color: #15bccf""><strong><%= l(:label_user_location) %> : </strong></td>
+									<td class="info_font" style="width: 240px; color: #15bccf">高校课程实践社区</td>
+									<td style="width: auto; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									
 								</tr>
 								<tr>
@@ -155,7 +155,7 @@
 									<!-- tags -->
 									<div class="user_fans">
 										<div class="user_underline"></div>
-										<table style="font-family:微软雅黑; padding-left: 8px">
+										<table style="font-family:'微软雅黑'; padding-left: 8px">
 											<tr>
 												<td><!-- added by william -for tag --> <%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"}%> </td>
 											</tr>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index d5964c01..03530a97 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -600,7 +600,7 @@ zh:
   label_my_page_block: 我的工作台模块
   label_administration: 管理
   label_login: 登录
-  label_login_prompt: 邮箱/账号
+  label_login_prompt: 邮箱/昵称
   lable_user_name: 登录名
   label_logout: 退出
   label_help: 帮助