From 2ca1362e83114d80d4fdf0de33223de17cf5738d Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Tue, 25 Feb 2014 15:43:03 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E6=8C=89=E7=94=A8=E6=88=B7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E2=80=9D=E5=92=8C=E2=80=9C=E6=90=9C=E7=B4=A2=E2=80=9D?=
 =?UTF-8?q?=E7=9A=84=E5=8C=BA=E5=88=AB=EF=BC=8C=E5=88=86=E5=88=AB=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=90=9C=E7=B4=A2=E4=BB=80=E4=B9=88=EF=BC=9F=20?=
 =?UTF-8?q?=E4=B8=8A=E9=9D=A2=E6=90=9C=E7=B4=A2=E5=88=A0=E6=8E=89=201?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E7=AD=BE=E7=9A=84=E6=A0=BC=E5=BC=8F=E9=9C=80?=
 =?UTF-8?q?=20=E8=A6=81=E4=BC=98=E5=8C=96=EF=BC=88=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=B6=89=E5=8F=8A=E5=88=B0=E6=A0=87=E7=AD=BE=E7=9A=84=E5=9C=B0?=
 =?UTF-8?q?=E6=96=B9=E7=9A=84=E6=A0=87=E7=AD=BE=E7=9A=84=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E9=83=BD=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4=EF=BC=89=20tag?=
 =?UTF-8?q?=E5=91=A8=E5=9B=B4=E8=B7=9D=E7=A6=BB=20=E2=80=9C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E9=80=9A=E7=9F=A5=E2=80=9C=E5=BA=94=E8=AF=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=88=B0=E2=80=9C=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E2=80=9D=E5=90=8E=E9=9D=A2=20=20=E6=94=B9=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/users_helper.rb             | 5 +++++
 app/views/account/register.html.erb     | 2 +-
 app/views/layouts/_base_footer.html.erb | 1 -
 app/views/layouts/base_courses.html.erb | 6 +++---
 app/views/layouts/base_stores.html.erb  | 2 +-
 app/views/layouts/base_users.html.erb   | 2 +-
 config/locales/zh.yml                   | 2 +-
 public/stylesheets/application.css      | 4 ++--
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 1b41fada2..5a3922468 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -240,4 +240,9 @@ module UsersHelper
     displayed_item = %w|index|
     displayed_item.include?(params['action'])
   end
+  # base user上面searchBar显示
+  def show_search_bar params
+    displayed_flag = %w|index|
+    !displayed_flag.include?(params['action'])
+  end
 end
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index 3aabc814a..1ab3b4a69 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -302,7 +302,7 @@
 <!-- added by bai  增加了身份、性别和地区-->
 
 <span id = 'gender' style = 'display:none'>
-<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_gender) %></strong></td>
+<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_gender) %><span class="required"> &nbsp;</span></strong></td>
 	          <td class="info" style="width: 10px">
 	          	<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option>
 	          	                          <option value = '1'>#{l(:label_gender_female)}</option>".html_safe %></td></tr></table></p></span>
diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index 24a72eac4..6de055d04 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -6,7 +6,6 @@
   	</div></div>
 </div>
 <%= debug(params) if Rails.env.development? %>
-<%= 'request.headers[REQUEST_URI] ===> '+request.headers['REQUEST_URI'] if Rails.env.development? %>
 
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c07aa1e51..c6b51343a 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -216,15 +216,15 @@
 									<li>
 										<%= link_to l(:label_homework), homework_project_path(@project), :class => link_class(:homework) ,:project_type => 1  %>
 									</li>
+									<li>
+										<%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news) %>
+									</li>
 									<li>
 										<%= link_to l(:label_course_board), { :controller => 'boards', :action => 'index', :project_id => @project}, :class => link_class(:boards) %> 							
 									</li>
 									<li>
 										<%= link_to l(:label_course_file), project_files_path(@project), :class => link_class(:files)%>
 									</li>
-									<li>
-										<%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news) %>
-									</li>
 									<li>
 										<%= link_to l(:label_course_feedback), project_feedback_path(@project), :class => link_class(:feedback)%>
 									</li>								 	
diff --git a/app/views/layouts/base_stores.html.erb b/app/views/layouts/base_stores.html.erb
index 7020f8e23..05b66dfce 100644
--- a/app/views/layouts/base_stores.html.erb
+++ b/app/views/layouts/base_stores.html.erb
@@ -38,7 +38,7 @@
 									</td>
 								</tr>
 								<tr>
-									<td style="padding-left: 8px"><%= link_to stores_url , stores_url %></td>
+									<td style="padding-left: 8px"><%= link_to request.host()+"/stores" , stores_url %></td>
 									<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_stores_index),stores_url %> </p></td>
 								</tr>
 							</table>							
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 90b0cd727..559f794cc 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -30,7 +30,7 @@
 									<td class="info_font" style="width: 238px; color: #15bccf"><%= l(:label_user_home) %></td>
 									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									<td rowspan="2" width="250px">
-										<div class="top-content-search">
+										<div class="top-content-search <%='hidden' if show_search_bar(params) %>">
 											<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
 											<%= text_field_tag 'name', params[:name], :size => 20 %>
 											<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3e95fd05f..0c1797553 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -160,7 +160,7 @@ zh:
   notice_account_unknown_email: 未知用户
   notice_can_t_change_password: 该帐号使用了外部认证，因此无法更改密码。
   notice_account_lost_email_sent: 系统已将引导您设置新密码的邮件发送给您。
-  notice_account_activated: 您的帐号已被激活。您现在可以登录了。
+  notice_account_activated: 您的帐号已被激活。
   notice_successful_create: 创建成功
   notice_successful_update: 更新成功
   notice_successful_delete: 删除成功
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e5be822ed..96cfaeab2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2666,9 +2666,9 @@ h2 img { vertical-align:middle; }
 /*added by william*/ 
 #tag {
 		background: url(../images/issue_tag.png) no-repeat right -19px;
-		border-radius: 5px 5px 5px 5px;
+		border-radius: 3px;
 		color: #3a587d !important;
-		padding: 0px 4px;
+		padding: 1px 4px 2px 4px;
 		margin: 3px;
 		display: inline-block;
 		font-size: 13px;   /*modified by linchun*/