From f2d4d1dfffd262e652d081b480f010407d11c3c0 Mon Sep 17 00:00:00 2001
From: zhangyang <zhangyanggfkd@gmail.com>
Date: Sun, 4 Aug 2013 09:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=86=E6=9E=B6=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer.html.erb                   | 2 +-
 app/views/layouts/base.html.erb                           | 1 +
 app/views/layouts/base_bids.html.erb                      | 8 +-------
 public/themes/redpenny-master/stylesheets/application.css | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index e90580d9f..62d522a81 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -1,5 +1,5 @@
 <div id="footer" style="margin-left:-5px;padding-top: 10px;clear: both;">
   	<div class="bgl"><div class="bgr">
-    	Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2013 Jean-Philippe Lang
+    	Powered by <%= "Trustie2 Team "%> &copy; 2013 Jack
   	</div></div>
 </div>
\ No newline at end of file
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 5925253b8..d1798971d 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -29,6 +29,7 @@
         <%= call_hook :view_layouts_base_content %>
         <div style="clear:both;"></div>
     </div>
+    <%=render :partial => 'layouts/base_footer'%>
 </div>
 </div>
 
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb
index 3c8289168..f5d1d3948 100644
--- a/app/views/layouts/base_bids.html.erb
+++ b/app/views/layouts/base_bids.html.erb
@@ -132,6 +132,7 @@
 							<%= call_hook :view_layouts_base_content %>
 							<div style="clear:both;"></div>
 						</div>
+						<%=render :partial => 'layouts/base_footer'%>
 					</div>
 				</div>
 			</div>
@@ -141,13 +142,6 @@
 			</div>
 			<div id="ajax-modal" style="display:none;"></div>
 
-			<div id="footer">
-				<div class="bgl">
-					<div class="bgr">
-						Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2013 Jean-Philippe Lang
-					</div>
-				</div>
-			</div>
 		</div>
 		</div>
 		<%= call_hook :view_layouts_base_body_bottom %>
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index e194883a1..8fab4dd7a 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -495,7 +495,7 @@ ul.projects li.root
 
 #footer .bgr:after
 {
-	content:' Theme by Jared Denison (themondays)';
+	content:' Theme by Trustie2 Team';
 	float:right
 }