Merge lp:~mthaddon/juju-website/version-2-fix-https-favicon into lp:~canonical-website-editors/juju-website/version-2

[Tom Haddon]

Per https://wiki.canonical.com/InformationInfrastructure/ISO/Websites/JujuDotUbuntuDotCom#Update_the_.22ubuntu.22_Theme this seems to be the actual branch we deploy from.

This fixes juju.ubuntu.com so that the favicon comes from https if the rest of the site is being served on https to avoid browser warnings. I've cowboyed this place in change on juju.ubuntu.com to confirm, so when you're ready to rollout, you'll want to note that in the deployment RT.

[Anthony Dillon (ya-bo-ng)]

LGTM. Thank you very much.

review: Approve

=== modified file 'header.php'
--- header.php	2013-12-03 17:46:28 +0000
+++ header.php	2014-01-03 15:48:16 +0000
@@ -46,7 +46,7 @@
 <!-- Google Chrome Frame for IE -->
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 
-<link rel="shortcut icon" href="http://assets.ubuntu.com/sites/ubuntu/latest/u/img/favicon.ico" />
+<link rel="shortcut icon" href="//assets.ubuntu.com/sites/ubuntu/latest/u/img/favicon.ico" />
 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
 <script src="/wp-content/themes/ubuntu/library/js/all-yui.js"></script>
 
@@ -119,4 +119,4 @@
 			</ul>
 		</nav>
 	</div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>