Merge branch 'master' into debian

diff --git a/snf-astakos-app/Changelog b/snf-astakos-app/Changelog
index 056f2a9..8bf728c 100644 (file)
--- a/snf-astakos-app/Changelog
+++ b/snf-astakos-app/Changelog
@@ -1,6 +1,11 @@
 Changelog
 ---------
 
+v0.7.4
+^^^^^^
+- Use https for google webfonts
+
+
 v0.7.3
 ^^^^^^
 - Fix anonymoususer logout

diff --git a/snf-astakos-app/astakos/im/static/im/cloudbar/README.rst b/snf-astakos-app/astakos/im/static/im/cloudbar/README.rst
index 9e4faef..f946c99 100644 (file)
--- a/snf-astakos-app/astakos/im/static/im/cloudbar/README.rst
+++ b/snf-astakos-app/astakos/im/static/im/cloudbar/README.rst
@@ -48,11 +48,11 @@ Example
 
 .. codeblock:: javascript
     
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
     <script>
         var CLOUDBAR_COOKIE_NAME = '_pithos2_a';
         var CLOUDBAR_ACTIVE_SERVICE = 'cloud';
-        var CLOUDBAR_LOCATION = "http://accounts.cloud.grnet.gr/cloudbar/";
+        var CLOUDBAR_LOCATION = "https://accounts.cloud.grnet.gr/cloudbar/";
 
         $(document).ready(function(){
             $.getScript(CLOUDBAR_LOC + 'cloudbar.js');

diff --git a/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
index 6351956..241ecdb 100644 (file)
--- a/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
+++ b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
@@ -29,7 +29,7 @@ $(document).ready(function(){
     $("head").append(css);
     
     // load fonts
-    var font_url = 'http://fonts.googleapis.com/css?family=Didact+Gothic&subset=latin,greek,greek-ext';
+    var font_url = 'https://fonts.googleapis.com/css?family=Didact+Gothic&subset=latin,greek,greek-ext';
     var css_font = $("<link />");
     css_font.attr({rel:'stylesheet', type:'text/css', href:font_url});
     $("head").append(css_font);

diff --git a/snf-astakos-app/astakos/im/templates/im/base.html b/snf-astakos-app/astakos/im/templates/im/base.html
index e8616c3..31de473 100644 (file)
--- a/snf-astakos-app/astakos/im/templates/im/base.html
+++ b/snf-astakos-app/astakos/im/templates/im/base.html
@@ -27,7 +27,7 @@
 
   {% block page.css %}
        
-      <link href='http://fonts.googleapis.com/css?family=Didact+Gothic&subset=latin' rel='stylesheet' type='text/css'>
+      <link href='https://fonts.googleapis.com/css?family=Didact+Gothic&subset=latin' rel='stylesheet' type='text/css'>
       <link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}css/global.css">
       <link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}css/print.css" media="print">
       <!--[if lte IE 7]>