Merge lp:~stevanr/linaro-license-protection/bug1085007 into lp:~linaro-automation/linaro-license-protection/trunk

[Stevan Radaković]

Removed stale css file.
Introduced protocol-relative links for www.linaro.org.
Changed js/css scripts to hostless absolute paths.

[Paul Sokolovsky (pfalcon)]

Looks good. I didn't known about protocol-relative URLs, found confirmation here: http://stackoverflow.com/questions/4978235/absolute-urls-omitting-the-protocol-scheme-in-order-to-preserve-the-one-of-the . That probably won't solve all issues we have (we have wrong SSL certificate for www.linaro.org), but at least it should resolve biggest probs.

review: Approve

=== modified file 'templates/header.html'
--- templates/header.html	2012-11-27 15:48:02 +0000
+++ templates/header.html	2013-02-21 08:51:20 +0000
@@ -5,16 +5,15 @@
   {% endif %}
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <title>Linaro Snapshots</title>
-  <link rel="stylesheet" type="text/css" href="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/resources/css/ext-all.css" />
-  <link href="http://www.linaro.org/remote/css/init.css" rel="stylesheet" type="text/css" >
-  <link href="http://www.linaro.org/remote/css/remote.css" rel="stylesheet" type="text/css" >
-  <script language="javascript" type="text/javascript" src="http://www.linaro.org/remote/js/linarofamily.js"></script>
-
-
-  <script type="text/javascript" src="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/js/jquery-1.7.2.js"></script>
-  <script type="text/javascript" src="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/js/jquery-ui-1.8.23.custom.min.js"></script>
-  <link rel="stylesheet" type="text/css" href="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/css/jquery-ui/jquery-ui-1.8.23.custom.css" />
-  <link rel="stylesheet" type="text/css" href="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/css/linaro.css" />
+  <link href="//www.linaro.org/remote/css/init.css" rel="stylesheet" type="text/css" >
+  <link href="//www.linaro.org/remote/css/remote.css" rel="stylesheet" type="text/css" >
+  <script language="javascript" type="text/javascript" src="//www.linaro.org/remote/js/linarofamily.js"></script>
+
+
+  <script type="text/javascript" src="/js/jquery-1.7.2.js"></script>
+  <script type="text/javascript" src="/js/jquery-ui-1.8.23.custom.min.js"></script>
+  <link rel="stylesheet" type="text/css" href="/css/jquery-ui/jquery-ui-1.8.23.custom.css" />
+  <link rel="stylesheet" type="text/css" href="/css/linaro.css" />
 
 
   <style>

=== modified file 'templates_releases/header.html'
--- templates_releases/header.html	2012-10-18 09:19:50 +0000
+++ templates_releases/header.html	2013-02-21 08:51:20 +0000
@@ -5,16 +5,15 @@
   {% endif %}
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <title>Linaro Releases</title>
-  <link rel="stylesheet" type="text/css" href="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/resources/css/ext-all.css" />
-  <link href="http://www.linaro.org/remote/css/init.css" rel="stylesheet" type="text/css" >
-  <link href="http://www.linaro.org/remote/css/remote.css" rel="stylesheet" type="text/css" >
-  <script language="javascript" type="text/javascript" src="http://www.linaro.org/remote/js/linarofamily.js"></script>
-
-
-  <script type="text/javascript" src="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/js/jquery-1.7.2.js"></script>
-  <script type="text/javascript" src="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/js/jquery-ui-1.8.23.custom.min.js"></script>
-  <link rel="stylesheet" type="text/css" href="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/css/jquery-ui/jquery-ui-1.8.23.custom.css" />
-  <link rel="stylesheet" type="text/css" href="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/css/linaro.css" />
+  <link href="//www.linaro.org/remote/css/init.css" rel="stylesheet" type="text/css" >
+  <link href="//www.linaro.org/remote/css/remote.css" rel="stylesheet" type="text/css" >
+  <script language="javascript" type="text/javascript" src="//www.linaro.org/remote/js/linarofamily.js"></script>
+
+
+  <script type="text/javascript" src="/js/jquery-1.7.2.js"></script>
+  <script type="text/javascript" src="/js/jquery-ui-1.8.23.custom.min.js"></script>
+  <link rel="stylesheet" type="text/css" href="/css/jquery-ui/jquery-ui-1.8.23.custom.css" />
+  <link rel="stylesheet" type="text/css" href="/css/linaro.css" />
 
 
   <style>