fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 72045f8)
Be more SSL-friendly.
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 27 Jun 2013 13:06:39 +0000 (15:06 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 27 Jun 2013 14:35:05 +0000 (16:35 +0200)
apps/catalogue/templates/catalogue/book_text.html patch | blob | history
apps/catalogue/templates/catalogue/player.html patch | blob | history
apps/funding/templates/funding/offer_detail.html patch | blob | history
apps/wolnelektury_core/static/img/payu.png [new file with mode: 0644] patch | blob
apps/wolnelektury_core/static/js/widget.js patch | blob | history
apps/wolnelektury_core/static/widget.html patch | blob | history
apps/wolnelektury_core/templates/superbase.html patch | blob | history

diff --git a/apps/catalogue/templates/catalogue/book_text.html b/apps/catalogue/templates/catalogue/book_text.html
index 362af1b..f6f2f99 100644 (file)
--- a/apps/catalogue/templates/catalogue/book_text.html
+++ b/apps/catalogue/templates/catalogue/book_text.html
@@ -7,9 +7,9 @@
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <title>{% trans "Wolne Lektury" %} :: {{ book.pretty_title }}</title>
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <title>{% trans "Wolne Lektury" %} :: {{ book.pretty_title }}</title>
-        <link rel="icon" href="{% static "img/favicon.png"% }" type="image/x-icon" />
+        <link rel="icon" href="{% static "img/favicon.png" %}" type="image/x-icon" />
         {% compressed_css "book" %}
         {% compressed_css "book" %}
-        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+        <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         {% compressed_js "book" %}
         <!--[if IE]>
             {% compressed_js "book_ie" %}
         {% compressed_js "book" %}
         <!--[if IE]>
             {% compressed_js "book_ie" %}
diff --git a/apps/catalogue/templates/catalogue/player.html b/apps/catalogue/templates/catalogue/player.html
index d0f0fe0..c57d456 100755 (executable)
--- a/apps/catalogue/templates/catalogue/player.html
+++ b/apps/catalogue/templates/catalogue/player.html
@@ -132,7 +132,7 @@
         {% endif %}
 
 
         {% endif %}
 
 
-        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+        <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         {% compressed_js "player" %}
 
         {{ piwik_tag|safe }}
         {% compressed_js "player" %}
 
         {{ piwik_tag|safe }}
diff --git a/apps/funding/templates/funding/offer_detail.html b/apps/funding/templates/funding/offer_detail.html
index 9dad6fe..39c583b 100755 (executable)
--- a/apps/funding/templates/funding/offer_detail.html
+++ b/apps/funding/templates/funding/offer_detail.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load url from future %}
 {% extends "base.html" %}
 {% load url from future %}
-{% load i18n %}
+{% load i18n static %}
 {% load funding_tags %}
 {% load pagination_tags %}
 {% load fnp_share %}
 {% load funding_tags %}
 {% load pagination_tags %}
 {% load fnp_share %}
@@ -48,7 +48,7 @@
                 {{ form.as_table }}
                 <tr><td></td><td>
                     <button type="submit" style="border: none; background: none; cursor: pointer">
                 {{ form.as_table }}
                 <tr><td></td><td>
                     <button type="submit" style="border: none; background: none; cursor: pointer">
-                    <img alt="{% trans 'Donate!' %}" src="http://static.payu.com/pl/standard/partners/buttons/payu_account_button_01.png" />
+                    <img alt="{% trans 'Donate!' %}" src="{% static 'img/payu.png %}" />
                     </button>
                     </td></tr>
                 </table>
                     </button>
                     </td></tr>
                 </table>
diff --git a/apps/wolnelektury_core/static/img/payu.png b/apps/wolnelektury_core/static/img/payu.png
new file mode 100644 (file)
index 0000000..2e8abf4
Binary files /dev/null and b/apps/wolnelektury_core/static/img/payu.png differ
diff --git a/apps/wolnelektury_core/static/js/widget.js b/apps/wolnelektury_core/static/js/widget.js
index abadfd9..f9cf53e 100644 (file)
--- a/apps/wolnelektury_core/static/js/widget.js
+++ b/apps/wolnelektury_core/static/js/widget.js
@@ -15,13 +15,13 @@ var host = 'wolnelektury.pl';
 /* set attributes of created elements */
 stylesheet.setAttribute('type', 'text/css');
 stylesheet.setAttribute('rel', 'stylesheet');
 /* set attributes of created elements */
 stylesheet.setAttribute('type', 'text/css');
 stylesheet.setAttribute('rel', 'stylesheet');
-stylesheet.setAttribute('href', 'http://'+host+'/static/css/widget.css');
+stylesheet.setAttribute('href', '//'+host+'/static/css/widget.css');
 stylesheetJQUI.setAttribute('type', 'text/css');
 stylesheetJQUI.setAttribute('rel', 'stylesheet');
 stylesheetJQUI.setAttribute('type', 'text/css');
 stylesheetJQUI.setAttribute('rel', 'stylesheet');
-stylesheetJQUI.setAttribute('href', 'http://'+host+'/static/css/ui-lightness/jquery-ui-1.8.16.custom.css');
-linkLogo.setAttribute('href', 'http://'+host);
-logo.setAttribute('src', 'http://'+host+'/static/img/logo-bez.png');
-form.setAttribute('action', 'http://'+host+'/szukaj/');
+stylesheetJQUI.setAttribute('href', '//'+host+'/static/css/ui-lightness/jquery-ui-1.8.16.custom.css');
+linkLogo.setAttribute('href', '//'+host);
+logo.setAttribute('src', '//'+host+'/static/img/logo-bez.png');
+form.setAttribute('action', '//'+host+'/szukaj/');
 form.setAttribute('method', 'get');
 form.setAttribute('accept-charset', 'utf-8');
 form.setAttribute('id', 'wl-form');
 form.setAttribute('method', 'get');
 form.setAttribute('accept-charset', 'utf-8');
 form.setAttribute('id', 'wl-form');
@@ -30,25 +30,25 @@ inputText.setAttribute('title', 'tytul, autor, motyw/temat, epoka, rodzaj, gatun
 inputText.setAttribute('value', '');
 inputText.setAttribute('name', 'q');
 inputText.setAttribute('id', 'id_qq');
 inputText.setAttribute('value', '');
 inputText.setAttribute('name', 'q');
 inputText.setAttribute('id', 'id_qq');
-inputText.setAttribute('data-source', 'http://'+host+'/szukaj/hint');
+inputText.setAttribute('data-source', '//'+host+'/szukaj/hint/');
 /*inputText.setAttribute('size', '13');*/
 inputSubmit.setAttribute('type', 'image');
 /*inputText.setAttribute('size', '13');*/
 inputSubmit.setAttribute('type', 'image');
-inputSubmit.setAttribute('src', 'http://'+host+'/static/img/search.png');
+inputSubmit.setAttribute('src', '//'+host+'/static/img/search.png');
 /* inputSubmit.setAttribute('style', 'position:relative; top:5px; margin-left:5px');*/
 
 /* import jquery and autocomplete */
 var scriptJ = document.createElement('script');
 scriptJ.setAttribute('type', 'text/javascript');
 /* inputSubmit.setAttribute('style', 'position:relative; top:5px; margin-left:5px');*/
 
 /* import jquery and autocomplete */
 var scriptJ = document.createElement('script');
 scriptJ.setAttribute('type', 'text/javascript');
-scriptJ.setAttribute('src', 'http://'+host+'/static/js/jquery.js');
+scriptJ.setAttribute('src', '//'+host+'/static/js/jquery.js');
 
 var scriptUI = document.createElement('script');
 scriptUI.setAttribute('type', 'text/javascript');
 
 var scriptUI = document.createElement('script');
 scriptUI.setAttribute('type', 'text/javascript');
-scriptUI.setAttribute('src', 'http://'+host+'/static/js/jquery-ui-1.8.2.custom.min.js');
+scriptUI.setAttribute('src', '//'+host+'/static/js/jquery-ui-1.8.2.custom.min.js');
 scriptUI.setAttribute('id', 'wl-jquery-ui-script')
 
 var scriptSearch = document.createElement('script');
 scriptSearch.setAttribute('type', 'text/javascript');
 scriptUI.setAttribute('id', 'wl-jquery-ui-script')
 
 var scriptSearch = document.createElement('script');
 scriptSearch.setAttribute('type', 'text/javascript');
-scriptSearch.setAttribute('src', 'http://'+host+'/static/js/search.js');
+scriptSearch.setAttribute('src', '//'+host+'/static/js/search.js');
 scriptSearch.setAttribute('id', 'wl-search-script')
 
 body[0].appendChild(scriptJ);
 scriptSearch.setAttribute('id', 'wl-search-script')
 
 body[0].appendChild(scriptJ);
@@ -72,7 +72,7 @@ scriptSearch.onload = function() {
                     });
                         },
             dataType: "jsonp",
                     });
                         },
             dataType: "jsonp",
-            host: "http://"+host});
+            host: "//"+host});
 }
 scriptSearch.onreadystatechange = function() { if (scriptSearch.readyState == 'complete') { scriptSearch.onload(); } };
 
 }
 scriptSearch.onreadystatechange = function() { if (scriptSearch.readyState == 'complete') { scriptSearch.onload(); } };
 
diff --git a/apps/wolnelektury_core/static/widget.html b/apps/wolnelektury_core/static/widget.html
index b49b006..8389e0b 100644 (file)
--- a/apps/wolnelektury_core/static/widget.html
+++ b/apps/wolnelektury_core/static/widget.html
@@ -5,7 +5,7 @@
 <!-- KONIEC -->
 
 <!-- START Umiescic ten element zaraz przed zamknieciem taga body: </body> -->
 <!-- KONIEC -->
 
 <!-- START Umiescic ten element zaraz przed zamknieciem taga body: </body> -->
-<script type="text/javascript" src="http://wolnelektury.pl/static/js/widget.js"></script>
+<script type="text/javascript" src="//wolnelektury.pl/static/js/widget.js"></script>
 <!-- KONIEC -->
 
 </body>
 <!-- KONIEC -->
 
 </body>
diff --git a/apps/wolnelektury_core/templates/superbase.html b/apps/wolnelektury_core/templates/superbase.html
index 0a28dd1..41146b6 100644 (file)
--- a/apps/wolnelektury_core/templates/superbase.html
+++ b/apps/wolnelektury_core/templates/superbase.html
@@ -195,7 +195,7 @@
         {% endblock bodycontent %}
 
 
         {% endblock bodycontent %}
 
 
-        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+        <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         <script type="text/javascript">
             var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
             var STATIC_URL = "{{ STATIC_URL }}";
         <script type="text/javascript">
             var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
             var STATIC_URL = "{{ STATIC_URL }}";