From: larsk <lars.kurth@citrix.com>
Date: Fri, 14 Jun 2013 21:18:12 +0000 (+0100)
Subject: reverting changes as the header/footer seems to have disappeared in v1.1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0955cc8f21d10cdfddfaa44073814ee08c2a2572;p=people%2Flarsk%2Fxenproject-org-websites.git

reverting changes as the header/footer seems to have disappeared in v1.1
---

diff --git a/theme-blog.xenproject.org/carrington-blog/footer/footer-default-old.php b/theme-blog.xenproject.org/carrington-blog/footer/footer-default-old.php
index b219905..5675d78 100644
--- a/theme-blog.xenproject.org/carrington-blog/footer/footer-default-old.php
+++ b/theme-blog.xenproject.org/carrington-blog/footer/footer-default-old.php
@@ -25,7 +25,7 @@ if (CFCT_DEBUG) { cfct_banner(__FILE__); }
 		<hr class="lofi" />
 		<div id="footer" class="section">
 			<div class="wrapper">		
-  <p id="generator-link"><?php _e('Proudly powered by <a href="http://wordpress.org/" rel="generator">WordPress</a> running on a <a href="http://www.rackspace.com/" title="Rackspace Xen instance">Rackspace Xen instance</a>.', 'carrington-blog'); ?></p>
+  <p id="generator-link"><?php _e('Proudly powered by <a href="http://wordpress.org/" rel="generator">WordPress</a> running on a <a href="http://www.slicehost.com" title="WordPress Themes">Slicehost Xen VPS</a>.', 'carrington-blog'); ?></p>
 <?php
 if (cfct_get_option('cfct_credit') == 'yes') {
 ?>
@@ -38,20 +38,4 @@ if (cfct_get_option('cfct_credit') == 'yes') {
 	</div><!--#page-->
 	<?php wp_footer() ?>
 </body>
-
-<script type="text/javascript">
-
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-40152447-1']);
-_gaq.push(['_setDomainName', 'xenproject.org']);
-_gaq.push(['_trackPageview']);
-
-(function() {
-var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-
-</script>
-
 </html>
\ No newline at end of file
diff --git a/theme-blog.xenproject.org/carrington-blog/footer/footer-default.php b/theme-blog.xenproject.org/carrington-blog/footer/footer-default.php
index b219905..4f9b1f9 100644
--- a/theme-blog.xenproject.org/carrington-blog/footer/footer-default.php
+++ b/theme-blog.xenproject.org/carrington-blog/footer/footer-default.php
@@ -25,7 +25,7 @@ if (CFCT_DEBUG) { cfct_banner(__FILE__); }
 		<hr class="lofi" />
 		<div id="footer" class="section">
 			<div class="wrapper">		
-  <p id="generator-link"><?php _e('Proudly powered by <a href="http://wordpress.org/" rel="generator">WordPress</a> running on a <a href="http://www.rackspace.com/" title="Rackspace Xen instance">Rackspace Xen instance</a>.', 'carrington-blog'); ?></p>
+  <p id="generator-link"><?php _e('Proudly powered by <a href="http://wordpress.org/" rel="generator">WordPress</a> running on a <a href="http://www.slicehost.com" title="WordPress Themes">Slicehost Xen VPS</a>.', 'carrington-blog'); ?></p>
 <?php
 if (cfct_get_option('cfct_credit') == 'yes') {
 ?>
@@ -35,23 +35,15 @@ if (cfct_get_option('cfct_credit') == 'yes') {
 ?>
 			</div><!--.wrapper-->
 		</div><!--#footer -->
-	</div><!--#page-->
+	<div class="green-footer">
+    <div class="mywrapper myclearfix">
+    	<p>&copy;2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved. <br>
+    Linux Foundation is a registered trademark of The Linux Foundation. <br>
+    Xen Project is a trademark of The Linux Foundation.</p>		 
+    </div> 
+</div>
+
+    </div><!--#page-->
 	<?php wp_footer() ?>
 </body>
-
-<script type="text/javascript">
-
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-40152447-1']);
-_gaq.push(['_setDomainName', 'xenproject.org']);
-_gaq.push(['_trackPageview']);
-
-(function() {
-var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-
-</script>
-
 </html>
\ No newline at end of file