From 1b7382a0fe36ddd953f1e08dd140b891a94f73f6 Mon Sep 17 00:00:00 2001
From: huangjingquan <huang@163.com>
Date: Tue, 13 Aug 2013 17:00:33 +0800
Subject: [PATCH] =?UTF-8?q?tag=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/tags_controller.rb                     |  2 +-
 app/views/tags/index.html.erb                          | 10 ++++++----
 .../themes/redpenny-master/stylesheets/application.css |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 35e99dc6c..9aac1c934 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,6 +1,6 @@
 # This controller was added by william
 class TagsController < ApplicationController
-
+  layout "base_tags"
   before_filter :require_admin,:only => :show
   include ProjectsHelper
   include IssuesHelper
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 98a009f3b..ecde0bd33 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -1,4 +1,5 @@
-<div class="tag_left">
+<% content_for :sidebar do %>
+<div>
 	<ul>
 		<li>
 			<strong>Selected Tags</strong>
@@ -14,8 +15,9 @@
 		</div>
 	</ul>
 </div>
-
-<div class="tag_right">
+<% end %>
+<% content_for :content do %>
+<div>
 	<h3><strong>Search Results</strong></h3>
 	<div id="filter-menu" align="right">
 		<%= l(:label_tags_numbers) %>
@@ -28,5 +30,5 @@
     	 	:projects_results => @projects_results,:users_results => @users_results ,:show_flag => @obj_flag}%>	
     </div>
 </div>
-
+<% end %>
 
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index ae5f70bc4..222682f5d 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -446,7 +446,7 @@ ul.projects li.root
 {
 	width:240px;/*by young*/
 	height: auto;
-	background:#edecec; /*主题框架背景yanse*/
+	background:#fff; /*主题框架背景yanse*/
 	margin-bottom: 30px;
 	border-right:1px solid #C6E9F1;
 	overflow:auto;