From bd43ef5d617827c437b9deb217cdbaea3dac1dc7 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 18 Jul 2014 16:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=AB=99=E4=B8=A4=E8=BE=B9=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4=E3=80=81=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E5=AF=BC=E8=88=AA=E6=A0=8F=E8=B0=83=E6=95=B4=E3=80=81?=
 =?UTF-8?q?admin=E8=B4=A6=E6=88=B7=E6=96=B0=E5=BB=BA=E7=94=A8=E6=88=B7bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           |  2 +-
 app/views/account/login.html.erb              |  5 +++
 app/views/account/lost_password.html.erb      |  5 +++
 app/views/account/register.html.erb           |  5 +++
 app/views/bids/index.html.erb                 |  5 +++
 app/views/bids/new_bid.html.erb               |  5 +++
 app/views/forums/index.html.erb               |  4 ++
 app/views/forums/new.html.erb                 |  5 +++
 app/views/layouts/_base_header.html.erb       | 38 +++++++++----------
 app/views/layouts/base_admin.html.erb         |  5 +++
 app/views/layouts/base_bids.html.erb          |  4 +-
 app/views/layouts/base_contest.html.erb       |  7 +++-
 app/views/layouts/base_courses.html.erb       |  5 ++-
 app/views/layouts/base_forums.html.erb        |  4 ++
 app/views/layouts/base_homework.html.erb      |  5 ++-
 app/views/layouts/base_memos.html.erb         |  4 ++
 app/views/layouts/base_newcontest.html.erb    |  5 ++-
 app/views/layouts/base_projects.html.erb      |  2 +
 app/views/layouts/base_users.html.erb         |  5 +++
 app/views/memos/new.html.erb                  |  5 +++
 app/views/my/account.html.erb                 |  5 +++
 app/views/projects/new.html.erb               |  2 +
 app/views/users/index.html.erb                |  5 +++
 app/views/users/new.html.erb                  |  5 +++
 app/views/users/show.html.erb                 |  4 +-
 app/views/welcome/contest.html.erb            |  4 ++
 app/views/welcome/course.html.erb             |  4 ++
 app/views/welcome/index.html.erb              |  2 +
 .../stylesheets/application.css               |  2 +-
 29 files changed, 129 insertions(+), 29 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e81355260..27505ad59 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -507,7 +507,7 @@ class UsersController < ApplicationController
       @user.password = @user.password_confirmation = nil
 
       respond_to do |format|
-        format.html { render :action => 'new' }
+        format.html { render :action => 'new',:layout => "base" }
         format.api  { render_validation_errors(@user) }
       end
     end
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index dc1e47ed7..20b0c5c04 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <%= call_hook :view_account_login_top %>
 
 <script type="text/javascript" language="javascript">
diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb
index ceb387e03..b5dc20977 100644
--- a/app/views/account/lost_password.html.erb
+++ b/app/views/account/lost_password.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <h3><%=l(:label_password_lost)%></h3>
 
 <%= form_tag(lost_password_path) do %>
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index fac05e6de..260d53744 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <!-- added by bai 增加地区-->
 <script type="text/javascript" language="javascript">
     function showcity(province, cityField) {
diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb
index d939ca6ac..4d68188cb 100644
--- a/app/views/bids/index.html.erb
+++ b/app/views/bids/index.html.erb
@@ -1,3 +1,8 @@
+<%
+   @nav_dispaly_contest_label = 1
+   @nav_dispaly_store_all_label = 1
+   @nav_dispaly_forum_label = 1
+%>
 <!-- fq -->
 <!-- modified by huang -->
 <div class="top-content">
diff --git a/app/views/bids/new_bid.html.erb b/app/views/bids/new_bid.html.erb
index f00b786cc..21893e655 100644
--- a/app/views/bids/new_bid.html.erb
+++ b/app/views/bids/new_bid.html.erb
@@ -1,3 +1,8 @@
+<%
+   @nav_dispaly_contest_label = 1
+   @nav_dispaly_store_all_label = 1
+   @nav_dispaly_forum_label = 1
+%>
 <!-- fq -->
 <h3><%=l(:label_new_call)%></h3>
 
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index 15f4e2c36..fa6e74ccd 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -1,3 +1,7 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
 <!-- added by fq -->
 <div class="top-content">
 	<table width="940px">
diff --git a/app/views/forums/new.html.erb b/app/views/forums/new.html.erb
index 429f34fad..19c911c37 100644
--- a/app/views/forums/new.html.erb
+++ b/app/views/forums/new.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <!-- added by fq -->
 <h3><%= l :label_forum_new %></h1>
 
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index adec92f7b..7e11d8357 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -2,29 +2,29 @@
 	request.headers['REQUEST_URI'] = "" if request.headers['REQUEST_URI'].nil?
 	realUrl = request.original_url
 	if   (realUrl.match(/.*forge\.trustie\.net\/*/))
-		@nav_dispaly_project_label = 1
-		@nav_dispaly_forum_label = 1
+		#@nav_dispaly_project_label = 1
+		#@nav_dispaly_forum_label = 1
 	elsif (realUrl.match(/.*course\.trustie\.net\/*/))
-		@nav_dispaly_course_all_label = 1
-		@nav_dispaly_forum_label = 1
-		@nav_dispaly_course_label = nil
-		@nav_dispaly_store_all_label = 1
+		#@nav_dispaly_course_all_label = 1
+		#@nav_dispaly_forum_label = 1
+		#@nav_dispaly_course_label = nil
+		#@nav_dispaly_store_all_label = 1
 	elsif (realUrl.match(/.*user\.trustie\.net\/*/))
-		@nav_dispaly_home_path_label = 1
-		@nav_dispaly_main_course_label = 1		
-		@nav_dispaly_main_project_label = 1
-		@nav_dispaly_main_contest_label = 1
+		#@nav_dispaly_home_path_label = 1
+		#@nav_dispaly_main_course_label = 1
+		#@nav_dispaly_main_project_label = 1
+		#@nav_dispaly_main_contest_label = 1
 	elsif (realUrl.match(/.*contest\.trustie\.net\/*/))
-		@nav_dispaly_contest_label = 1
-		@nav_dispaly_store_all_label = 1
+		#@nav_dispaly_contest_label = 1
+		#@nav_dispaly_store_all_label = 1
 	else
-		@nav_dispaly_project_all_label = 1
-		@nav_dispaly_course_all_label = 1
-		@nav_dispaly_forum_label = 1
-		@nav_dispaly_bid_label = 1
-		@nav_dispaly_contest_label = 1
-		@nav_dispaly_store_all_label = 1
-		@nav_dispaly_user_label = 1
+		#@nav_dispaly_project_all_label = 1
+		#@nav_dispaly_course_all_label = 1
+		#@nav_dispaly_forum_label = 1
+		#@nav_dispaly_bid_label = 1
+		#@nav_dispaly_contest_label = 1
+		#@nav_dispaly_store_all_label = 1
+		#@nav_dispaly_user_label = 1
 	end
 %>
 <div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">	
diff --git a/app/views/layouts/base_admin.html.erb b/app/views/layouts/base_admin.html.erb
index 6a6e7ae23..636e33a3f 100644
--- a/app/views/layouts/base_admin.html.erb
+++ b/app/views/layouts/base_admin.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="<%= current_language %>">
 	<head>
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb
index 075ee847f..d7d9e3924 100644
--- a/app/views/layouts/base_bids.html.erb
+++ b/app/views/layouts/base_bids.html.erb
@@ -1,4 +1,6 @@
-<% @nav_dispaly_bid_label = 1 %>
+
+<%  @nav_dispaly_forum_label = 1
+   @nav_dispaly_bid_label = 1 %>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb
index 94d55238a..0f2f4cf96 100644
--- a/app/views/layouts/base_contest.html.erb
+++ b/app/views/layouts/base_contest.html.erb
@@ -1,4 +1,7 @@
-<% @nav_dispaly_contest_label = 1 %>
+<%
+   @nav_dispaly_contest_label = 1
+   @nav_dispaly_store_all_label = 1
+%>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -20,7 +23,7 @@
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3">										
-					<%=render :partial => 'layouts/base_header'%>					
+					<%=render :partial => 'layouts/base_header'%>
 					<div id="main" class="">
 						<!-- added by bai	 -->
 						<div class="top-content">
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 987e7cfbb..725e7fba9 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -1,4 +1,7 @@
-<% #@nav_dispaly_course_label = 1 %>
+<% @nav_dispaly_course_all_label = 1
+   @nav_dispaly_forum_label = 1
+   @nav_dispaly_course_label = nil
+   @nav_dispaly_store_all_label = 1 %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 9def28902..ef376c2ec 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -1,3 +1,7 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
 <% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="en">
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index e4b5db1bf..bff70ba3d 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -1,4 +1,7 @@
-<% @nav_dispaly_course_label = 1 %>
+<% @nav_dispaly_course_all_label = 1
+   @nav_dispaly_forum_label = 1
+   @nav_dispaly_course_label = nil
+   @nav_dispaly_store_all_label = 1 %>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index b033a81cc..875fbd4fc 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -1,3 +1,7 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
 <% @nav_dispaly_forum_label = 1%>
 <!DOCTYPE html>
 <html lang="en">
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index a14f25cd6..2d8f7e964 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -1,4 +1,7 @@
-<% @nav_dispaly_contest_label = 1 %>
+<%
+   @nav_dispaly_contest_label = 1
+   @nav_dispaly_store_all_label = 1
+%>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 80486da7a..ef26df0bd 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -1,3 +1,5 @@
+<% @nav_dispaly_project_label = 1
+   @nav_dispaly_forum_label = 1 %>
 <% #@nav_dispaly_project_label = 1 %>
 <!DOCTYPE html>
 <html lang="en">
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index ac2b0e6fa..45d76a57c 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <% @nav_dispaly_user_label = show_item_on_navbar(params) %>
 <!DOCTYPE html>
 <html lang="en">
diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb
index 0ac0bebea..bcda7896d 100644
--- a/app/views/memos/new.html.erb
+++ b/app/views/memos/new.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <!-- <h1>New memo</h1> -->
 <%= javascript_include_tag "ckeditor/ckeditor.js" %>
 						<div class="top-content">							
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 8d67f5807..3ed947cbf 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <script type="text/javascript">
     $(document).ready(
             function () {
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index e1637e94b..0b76a7f44 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -1,3 +1,5 @@
+<% @nav_dispaly_project_label = 1
+   @nav_dispaly_forum_label = 1 %>
 <%= labelled_form_for @project do |f| %>
 <!--Added by young-->
 	<% if @course_tag == '1' %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index ef46c0a5f..91db4efa5 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+                                    @nav_dispaly_main_course_label = 1
+                                    @nav_dispaly_main_project_label = 1
+                                    @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <!-- modified by huang -->
 <script type="text/javascript">
     function searchUser(){
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index e21129140..e980d5658 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,3 +1,8 @@
+<% @nav_dispaly_home_path_label = 1
+   @nav_dispaly_main_course_label = 1
+   @nav_dispaly_main_project_label = 1
+   @nav_dispaly_main_contest_label = 1 %>
+<% @nav_dispaly_forum_label = 1%>
 <h3><%= link_to l(:label_user_plural), users_path %> &#187; <%=l(:label_user_new)%></h3>
 
 <%= labelled_form_for @user do |f| %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index f2fa522cd..112ea73c0 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -80,9 +80,9 @@
 						<tr>
 	<% if act.reward_type ==3 %>
 		<% if e.user == User.current%>
-							<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
+							<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id),host: Setting.course_domain%></td>
 		<% else %>
-							<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp; <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
+							<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp; <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id),host: Setting.course_domain %></td>
 		<% end %>
 	<% else %>
 		<% if e.user == User.current%>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 35ac5eda1..cfaad4062 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -1,3 +1,7 @@
+<%
+   @nav_dispaly_contest_label = 1
+   @nav_dispaly_store_all_label = 1
+%>
 <%= stylesheet_link_tag 'welcome' %>
  <script type="text/javascript" language="javascript">
 	function clearInfo(id, content) {
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index f6bffe51c..6ddc64899 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -1,3 +1,7 @@
+<% @nav_dispaly_course_all_label = 1
+   @nav_dispaly_forum_label = 1
+   @nav_dispaly_course_label = nil
+   @nav_dispaly_store_all_label = 1 %>
 <%= stylesheet_link_tag 'welcome' %>
 <%= javascript_include_tag 'welcome' %>
 <script type="text/javascript" language="javascript" xmlns="http://www.w3.org/1999/html"
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 586817c40..ac4286aa2 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,3 +1,5 @@
+<% @nav_dispaly_project_label = 1
+   @nav_dispaly_forum_label = 1 %>
 <%= stylesheet_link_tag 'welcome' %>
 <%= javascript_include_tag 'welcome' %>
 <script type="text/javascript" language="javascript">
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index ec266b1bc..3a6c53223 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -50,7 +50,7 @@ only screen and (min-device-pixel-ratio: 2) {
 
 body,#wrapper
 {
-  background-color:#fff; /*整体背景色ecfffb*/
+  background-color:#F6F7F8;/*fff整体背景色ecfffb*/
   font-family:'微软雅黑',Helvetica,Arial,"Lucida Grande",verdana,sans-serif
 }