From 3d274be77b75787192851dd94d66bd04f255534f Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Wed, 19 Feb 2014 17:23:24 +0800
Subject: [PATCH] fixtures fix, header fix dynamic.

---
 app/views/layouts/_base_header.html.erb |   6 +-
 config/database.yml.example             | 104 ++++++++++++------------
 test/fixtures/courses.yml               |  29 +------
 3 files changed, 59 insertions(+), 80 deletions(-)

diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index daf0f3edd..b97f9677d 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -12,10 +12,10 @@
 			<%=link_to_user(User.current)%>
 			<ul class="sub_menu">
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
-				<li><%=link_to l(:label_my_course), user_courses_user_path(User.current), target:'my_path' %></li>
+				<li><%=link_to l(:label_my_course), user_courses_user_path(User.current) %></li>
 				<% end -%>
-				<li><%=link_to l(:label_my_projects), user_projects_user_path(User.current), target:'my_path' %></li>
-				<li><%=link_to l(:label_user_edit), my_account_path, target:'my_path' %></li>
+				<li><%=link_to l(:label_my_projects), user_projects_user_path(User.current) %></li>
+				<li><%=link_to l(:label_user_edit), my_account_path %></li>
 			</ul>
 		</li>
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
diff --git a/config/database.yml.example b/config/database.yml.example
index 5bcf17bd6..f4c2470bb 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,52 +1,52 @@
-# Default setup is given for MySQL with ruby1.9. If you're running Redmine
-# with MySQL and ruby1.8, replace the adapter name with `mysql`.
-# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
-# Line indentation must be 2 spaces (no tabs).
-
-production:
-  adapter: mysql2
-  database: redmine
-  host: localhost
-  username: root
-  password: ""
-  encoding: utf8
-
-development:
-  adapter: mysql2
-  database: redmine_development
-  host: localhost
-  username: root
-  password: ""
-  encoding: utf8
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  database: redmine_test
-  host: localhost
-  username: root
-  password: ""
-  encoding: utf8
-
-# PostgreSQL configuration example
-#production:
-#  adapter: postgresql
-#  database: redmine
-#  host: localhost
-#  username: postgres
-#  password: "postgres"
-
-# SQLite3 configuration example
-#production:
-#  adapter: sqlite3
-#  database: db/redmine.sqlite3
-
-# SQL Server configuration example
-#production:
-#  adapter: sqlserver
-#  database: redmine
-#  host: localhost
-#  username: jenkins
-#  password: jenkins
+# Default setup is given for MySQL with ruby1.9. If you're running Redmine
+# with MySQL and ruby1.8, replace the adapter name with `mysql`.
+# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
+# Line indentation must be 2 spaces (no tabs).
+
+production:
+  adapter: mysql2
+  database: redmine
+  host: localhost
+  username: root
+  password: ""
+  encoding: utf8
+
+development:
+  adapter: mysql2
+  database: redmine_development
+  host: 10.107.17.20
+  username: root
+  password: "1234"
+  encoding: utf8
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql2
+  database: redmine_test
+  host: 10.107.17.20
+  username: root
+  password: "1234"
+  encoding: utf8
+
+# PostgreSQL configuration example
+#production:
+#  adapter: postgresql
+#  database: redmine
+#  host: localhost
+#  username: postgres
+#  password: "postgres"
+
+# SQLite3 configuration example
+#production:
+#  adapter: sqlite3
+#  database: db/redmine.sqlite3
+
+# SQL Server configuration example
+#production:
+#  adapter: sqlserver
+#  database: redmine
+#  host: localhost
+#  username: jenkins
+#  password: jenkins
diff --git a/test/fixtures/courses.yml b/test/fixtures/courses.yml
index c26d4ec46..69665d935 100644
--- a/test/fixtures/courses.yml
+++ b/test/fixtures/courses.yml
@@ -10,7 +10,7 @@ courses_006:
   created_at: 2013-09-30 08:11:15.000000000 +08:00
   updated_at: 2013-10-11 12:34:29.000000000 +08:00
   location: 
-  term: 秋季学期
+  term: "秋季学期"
   string: 
   password: software
   setup_time: 
@@ -27,7 +27,7 @@ courses_004:
   created_at: 2013-09-27 11:16:11.000000000 +08:00
   updated_at: 2013-12-21 10:55:20.000000000 +08:00
   location: 
-  term: 秋季学期
+  term: "秋季学期"
   string: 
   password: '123456'
   setup_time: ''
@@ -44,7 +44,7 @@ courses_012:
   created_at: 2013-10-08 20:52:10.000000000 +08:00
   updated_at: 2013-10-08 20:52:10.000000000 +08:00
   location: 
-  term: 秋季学期
+  term: "秋季学期"
   string: 
   password: software
   setup_time: 
@@ -61,30 +61,9 @@ courses_020:
   created_at: 2013-10-21 20:47:58.000000000 +08:00
   updated_at: 2014-01-08 09:48:56.000000000 +08:00
   location: 
-  term: 秋季学期
+  term: '秋季学期'
   string: 
   password: multi-agent
   setup_time: ''
   endup_time: ''
   class_period: ''
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-