Merge lp:~frankban/juju-gui/bug-1095324-external-resources into lp:juju-gui/experimental

[Francesco Banconi]

Avoid loading the last not secure resource

I.e. the Ubuntu font.

https://codereview.appspot.com/7030060/

[Francesco Banconi (frankban)]

Reviewers: mp+141874_code.launchpad.net,

Message:
Please take a look.

Description:
Avoid loading the last not secure resource

I.e. the Ubuntu font.

https://code.launchpad.net/~frankban/juju-gui/bug-1095324-external-resources/+merge/141874

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/7030060/

Affected files:
   A [revision details]
   M app/index.html

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision:
<email address hidden>

Index: app/index.html
=== modified file 'app/index.html'
--- app/index.html 2012-12-05 19:52:20 +0000
+++ app/index.html 2013-01-04 09:11:46 +0000
@@ -6,7 +6,7 @@
      <meta name="viewport" content="width=device-width,initial-scale=1.0">
      <meta name="description" content="">
      <meta name="author" content="Juju team">
- <link
href='http://fonts.googleapis.com/css?family=Ubuntu:400,400italic&subset=latin,latin-ext'
rel='stylesheet' type='text/css'>
+ <link
href='https://fonts.googleapis.com/css?family=Ubuntu:400,400italic&subset=latin,latin-ext'
rel='stylesheet' type='text/css'>
      <link rel="shortcut icon" href="/favicon.ico">
      <link rel="stylesheet"
href="/juju-ui/assets/combined-css/all-static.css">
      <link rel="stylesheet" href="/juju-ui/assets/juju-gui.css">

[Francesco Banconi (frankban)]

Self review: trivial, just s/http/https/, as suggested in the bug
comments.
I will proceed landing this branch and re-creating stable and trunk
releases.

https://codereview.appspot.com/7030060/

[Francesco Banconi (frankban)]

*** Submitted:

Avoid loading the last not secure resource

I.e. the Ubuntu font.

R=
CC=
https://codereview.appspot.com/7030060

https://codereview.appspot.com/7030060/

[Nicola Larosa (teknico)]

I'll approve anyway, land as is. :-)

https://codereview.appspot.com/7030060/

[Francesco Banconi (frankban)]

On 2013/01/04 09:50:30, teknico wrote:
> I'll approve anyway, land as is. :-)

Eh... thanks! :-)

https://codereview.appspot.com/7030060/

=== modified file 'app/index.html'
--- app/index.html	2012-12-05 19:52:20 +0000
+++ app/index.html	2013-01-04 09:45:26 +0000
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="Juju team">
-    <link href='http://fonts.googleapis.com/css?family=Ubuntu:400,400italic&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Ubuntu:400,400italic&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
     <link rel="shortcut icon" href="/favicon.ico">
     <link rel="stylesheet" href="/juju-ui/assets/combined-css/all-static.css">
     <link rel="stylesheet" href="/juju-ui/assets/juju-gui.css">