Ubuntu Developer Portal

Merge lp:~daker/developer-ubuntu-com/fix.1056040-part1 into lp:developer-ubuntu-com/wordpress

  1. fix.1056040-part1
  2. Merge into trunk
Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Michael Hall
Approved revision: 88
Merged at revision: 91
Proposed branch: lp:~daker/developer-ubuntu-com/fix.1056040-part1
Merge into: lp:developer-ubuntu-com/wordpress
Diff against target: 45 lines (+6/-8)
2 files modified
footer.php (+2/-2)
header.php (+4/-6)
To merge this branch: bzr merge lp:~daker/developer-ubuntu-com/fix.1056040-part1
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
Review via email: mp+204675@code.launchpad.net

Commit message

Initial support for SSL content

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

LGTM, thanks for fixing!

review: Approve
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

We also need to update get_template_directory_uri() to return without a protocol.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'footer.php'
--- footer.php 2013-09-20 12:18:59 +0000
+++ footer.php 2014-02-04 13:10:09 +0000
@@ -71,8 +71,8 @@
71 </div>71 </div>
72</footer>72</footer>
7373
74<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>74<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
75<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>75<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
76<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/js/jquery.tweet.js"></script>76<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/js/jquery.tweet.js"></script>
77<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/js/jquery.slider.js"></script>77<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/js/jquery.slider.js"></script>
78<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/js/base.js"></script>78<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/js/base.js"></script>
7979
=== modified file 'header.php'
--- header.php 2013-09-20 12:18:59 +0000
+++ header.php 2014-02-04 13:10:09 +0000
@@ -7,12 +7,12 @@
77
8<title><?php wp_title('|', true, 'right'); ?><?php bloginfo('name'); ?></title>8<title><?php wp_title('|', true, 'right'); ?><?php bloginfo('name'); ?></title>
99
10<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:300,400,400italic">10<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono">
11<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu+Mono:400">
12<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/reset.css" />11<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/reset.css" />
13<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/960.css" />12<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/960.css" />
14<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/base.css" />13<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/base.css" />
15<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/<?php echo $template_id; ?>.css" />14<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/<?php echo $template_id; ?>.css" />
15<link rel="stylesheet" type="text/css" media="screen" href="//assets.ubuntu.com/sites/ubuntu/latest/u/css/global.css" />
1616
17<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />17<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
1818
@@ -22,10 +22,8 @@
2222
23<?php wp_head(); ?>23<?php wp_head(); ?>
2424
25<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />25<script src="//assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/yui-min.js"></script>
26<script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/yui-min.js"></script>26<script src="//assets.ubuntu.com/sites/ubuntu/latest/u/js/global.js"></script>
27<link rel="stylesheet" type="text/css" media="screen" href="http://assets.ubuntu.com/sites/ubuntu/latest/u/css/global.css" />
28<script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/global.js"></script>
2927
30</head>28</head>
3129

Subscribers

People subscribed via source and target branches