From: larsk <lars.kurth@citrix.com>
Date: Fri, 14 Jun 2013 11:39:49 +0000 (+0100)
Subject: Fixed some URLs, Formatting + Slicehost->Rackspace
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8a1c0d859e45e71c1edb96135ad0143e7dbd0fd0;p=people%2Flarsk%2Fxenproject-org-websites.git

Fixed some URLs, Formatting + Slicehost->Rackspace
---

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 5675d78..1d20deb 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.slicehost.com" title="WordPress Themes">Slicehost Xen VPS</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.rackspace.com/" title="Rackspace Xen instance">Rackspace Xen instance</a>.', 'carrington-blog'); ?></p>
 <?php
 if (cfct_get_option('cfct_credit') == 'yes') {
 ?>
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 5675d78..1d20deb 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.slicehost.com" title="WordPress Themes">Slicehost Xen VPS</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.rackspace.com/" title="Rackspace Xen instance">Rackspace Xen instance</a>.', 'carrington-blog'); ?></p>
 <?php
 if (cfct_get_option('cfct_credit') == 'yes') {
 ?>
diff --git a/theme-blog.xenproject.org/carrington-blog/headerfooter.php b/theme-blog.xenproject.org/carrington-blog/headerfooter.php
index eb0db9b..00e5df3 100644
--- a/theme-blog.xenproject.org/carrington-blog/headerfooter.php
+++ b/theme-blog.xenproject.org/carrington-blog/headerfooter.php
@@ -19,20 +19,32 @@ include("./wp-blog-header.php");
 
 
 <div class="myclearfix" id="mytoolbar">
-		<div class="mywrapper myclearfix">
-						<div class="float-left">
-			
-							
-				<div class="module smalltopmenu  deepest">
-
-			<ul class="menu menu-line"><li class="level1 item435 active current"><a class="level1 active current" href="/"><span>Home</span></a></li><li class="level1 item506"><a href="http://wiki.xenproject.org " class="item1 level1"><span>Wiki</span></a></li><li class="level1 item507"><a href="http://blog.xenproject.org" class="item2 level1"><span>Blog</span></a></li><li class="level1 item517"><a href="http://lists.xenproject.org" class="item3 level1"><span>Lists</span></a></li><li class="level1 item508"><a href="http://xenorg.uservoice.com" class="item4 level1"><span>User Voice</span></a></li><li class="level1 item509"><a href="/downloads.html" class="item5 level1"><span>Downloads</span></a></li><li class="level1 item510"><a href="/xen-planet.html" class="item6 level1"><span>Xen Planet</span></a></li></ul>		
-</div>				
+	<div class="mywrapper myclearfix">
+		<div class="float-left">
+			<div class="module smalltopmenu  deepest">
+				<ul class="menu menu-line">
+				 <li class="level1 item435 active current"><a class="level1 active current" href="http://www.xenproject.org"><span>Home</span></a></li>
+				 <li class="level1 item506"><a href="http://wiki.xenproject.org" class="item1 level1"><span>Wiki</span></a></li>
+				 <li class="level1 item507"><a href="http://blog.xenproject.org" class="item2 level1"><span>Blog</span></a></li>
+				 <li class="level1 item517"><a href="http://lists.xenproject.org" class="item3 level1"><span>Lists</span></a></li>
+				 <li class="level1 item508"><a href="http://xenorg.uservoice.com" class="item4 level1"><span>User Voice</span></a></li>
+				 <li class="level1 item509"><a href="http://www.xenproject.org/downloads.html" class="item5 level1"><span>Downloads</span></a></li>
+				 <li class="level1 item510"><a href="http://www.xenproject.org/xen-planet.html" class="item6 level1"><span>Xen Planet</span></a></li>
+				</ul>		
+			</div>				
+		</div>
+		<div class="float-right">
+			<div class="module socialmenu  deepest">
+				<ul class="menu menu-line">
+				 <li class="level1 item511"><a href="https://twitter.com/xen_org" class="twitter level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/twitter-icon.png');" class="icon"> </span>Twitter</span></a></li>
+				 <li class="level1 item512"><a href="https://www.facebook.com/pages/The-Xen-Project/181712638644349" class="facebook level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/facebook-icon.png');" class="icon"> </span>Facebook</span></a></li>
+				 <li class="level1 item513"><a href="http://www.linkedin.com/groups?home=&amp;gid=167190" class="linkedin level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/linkedin-icon.png');" class="icon"> </span>LinkedIn</span></a></li>
+				 <li class="level1 item514"><a href="http://vimeo.com/channels/xen" class="vimeo level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/vimeo-icon.png');" class="icon"> </span>Vimeo</span></a></li>
+				 <li class="level1 item515"><a href="https://plus.google.com/b/109906712194947644104/109906712194947644104/about" class="googleplus level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/googleplus-icon.png');" class="icon"> </span>Google Plus</span></a></li>
+				 <li class="level1 item516"><a href="http://slideshare.net/xen_com_mgr/presentations" class="slideshare level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/slideshare-icon.png');" class="icon"> </span>Slideshare</span></a></li>
+				</ul>		
 			</div>
-							
-						<div class="float-right"><div class="module socialmenu  deepest">
-
-			<ul class="menu menu-line"><li class="level1 item511"><a href="https://twitter.com/xen_org" class="twitter level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/twitter-icon.png');" class="icon"> </span>Twitter</span></a></li><li class="level1 item512"><a href="https://www.facebook.com/pages/The-Xen-Project/181712638644349" class="facebook level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/facebook-icon.png');" class="icon"> </span>Facebook</span></a></li><li class="level1 item513"><a href="http://www.linkedin.com/groups?home=&amp;gid=167190" class="linkedin level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/linkedin-icon.png');" class="icon"> </span>LinkedIn</span></a></li><li class="level1 item514"><a href="http://vimeo.com/channels/xen" class="vimeo level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/vimeo-icon.png');" class="icon"> </span>Vimeo</span></a></li><li class="level1 item515"><a href="https://plus.google.com/b/109906712194947644104/109906712194947644104/about" class="googleplus level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/googleplus-icon.png');" class="icon"> </span>Google Plus</span></a></li><li class="level1 item516"><a href="http://slideshare.net/xen_com_mgr/presentations" class="slideshare level1"><span><span style="background-image: url('http://www.xenproject.org/images/social-menu-icons/slideshare-icon.png');" class="icon"> </span>Slideshare</span></a></li></ul>		
-</div></div>
-					</div>
+		</div>
 	</div>
+</div>
     
\ No newline at end of file
diff --git a/theme-blog.xenproject.org/carrington-blog/myfooter.php b/theme-blog.xenproject.org/carrington-blog/myfooter.php
index 578b071..3c4b513 100644
--- a/theme-blog.xenproject.org/carrington-blog/myfooter.php
+++ b/theme-blog.xenproject.org/carrington-blog/myfooter.php
@@ -6,3 +6,18 @@
     Xen Project is a trademark of The Linux Foundation.</p>		 
     </div> 
 </div>
+
+<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>
\ No newline at end of file