fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 448176e)
Annoying fixes.
authorRadek Czajka <rczajka@rczajka.pl>
Mon, 17 Jun 2019 13:54:33 +0000 (15:54 +0200)
committerRadek Czajka <rczajka@rczajka.pl>
Mon, 17 Jun 2019 13:54:33 +0000 (15:54 +0200)
src/catalogue/templates/catalogue/book_text.html patch | blob | history
src/catalogue/templates/catalogue/picture_detail.html patch | blob | history
src/catalogue/templates/catalogue/viewer_base.html patch | blob | history
src/wolnelektury/settings/static.py patch | blob | history
src/wolnelektury/static/css/annoy.css patch | blob | history
src/wolnelektury/templates/annoy.html patch | blob | history

diff --git a/src/catalogue/templates/catalogue/book_text.html b/src/catalogue/templates/catalogue/book_text.html
index 2a54af7..42eb1fa 100644 (file)
--- a/src/catalogue/templates/catalogue/book_text.html
+++ b/src/catalogue/templates/catalogue/book_text.html
@@ -59,7 +59,6 @@
 
 
 {% block big-pane %}
 
 
 {% block big-pane %}
-  {% include "annoy.html" %}
 
   <article id="main-text">
     <!--#include file='{{ book.html_url }}' -->
 
   <article id="main-text">
     <!--#include file='{{ book.html_url }}' -->
diff --git a/src/catalogue/templates/catalogue/picture_detail.html b/src/catalogue/templates/catalogue/picture_detail.html
index fb864f6..9cb0b19 100644 (file)
--- a/src/catalogue/templates/catalogue/picture_detail.html
+++ b/src/catalogue/templates/catalogue/picture_detail.html
@@ -83,3 +83,8 @@
     <div class="clearboth"></div>
   </div>
 {% endblock %}
     <div class="clearboth"></div>
   </div>
 {% endblock %}
+
+
+{% block extrabody %}
+  {% javascript "picture" %}
+{% endblock %}
diff --git a/src/catalogue/templates/catalogue/viewer_base.html b/src/catalogue/templates/catalogue/viewer_base.html
index 6e86b5f..cdee8d8 100644 (file)
--- a/src/catalogue/templates/catalogue/viewer_base.html
+++ b/src/catalogue/templates/catalogue/viewer_base.html
@@ -13,6 +13,7 @@
     {% block extrahead %}{% endblock %}
   </head>
   <body id="{% block body-id %}reader{% endblock %}">
     {% block extrahead %}{% endblock %}
   </head>
   <body id="{% block body-id %}reader{% endblock %}">
+    {% include "annoy.html" %}
     <nav id="no-menu"><ul>
       <li><a href="#" id="menu-toggle-on"></a></li>
       {% block no-menu-extra %}{% endblock %}
     <nav id="no-menu"><ul>
       <li><a href="#" id="menu-toggle-on"></a></li>
       {% block no-menu-extra %}{% endblock %}
diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 926f1f6..08871d6 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -153,11 +153,16 @@ PIPELINE = {
                 'js/contrib/raphael-min.js',
                 'player/openplayer.js',
                 'js/contrib/progressSpin.min.js',
                 'js/contrib/raphael-min.js',
                 'player/openplayer.js',
                 'js/contrib/progressSpin.min.js',
-                'js/picture.js',
                 'js/annoy.js',
             ],
             'output_filename': 'js/book_text.js',
         },
                 'js/annoy.js',
             ],
             'output_filename': 'js/book_text.js',
         },
+        'picture': {
+            'source_filenames': [
+                'js/picture.js',
+            ],
+            'output_filename': 'js/picture.min.js',
+        }
         'book_ie': {
             'source_filenames': ('js/contrib/ierange-m2.js',),
             'output_filename': 'js/book_ie.min.js',
         'book_ie': {
             'source_filenames': ('js/contrib/ierange-m2.js',),
             'output_filename': 'js/book_ie.min.js',
diff --git a/src/wolnelektury/static/css/annoy.css b/src/wolnelektury/static/css/annoy.css
index ea4a643..1bbf5b3 100755 (executable)
--- a/src/wolnelektury/static/css/annoy.css
+++ b/src/wolnelektury/static/css/annoy.css
@@ -3,7 +3,7 @@
     line-height: 1.15em;
 
     background: orange;
     line-height: 1.15em;
 
     background: orange;
-    z-index: 200;
+    z-index: 99;
     font-family: Arial, sans-serif;
     display: block;
     padding: .1em 1em;
     font-family: Arial, sans-serif;
     display: block;
     padding: .1em 1em;
@@ -23,7 +23,7 @@
     background: orange;
     font-family: Arial, sans-serif;
     position: relative;
     background: orange;
     font-family: Arial, sans-serif;
     position: relative;
-    z-index: 200;
+    z-index: 99;
 }
 #annoy p {
     margin: 0 0 0 10em;;
 }
 #annoy p {
     margin: 0 0 0 10em;;
diff --git a/src/wolnelektury/templates/annoy.html b/src/wolnelektury/templates/annoy.html
index d4d2883..4d53500 100644 (file)
--- a/src/wolnelektury/templates/annoy.html
+++ b/src/wolnelektury/templates/annoy.html
@@ -1,5 +1,5 @@
 {% load static %}
 {% load static %}
-<a id='annoy-on' href="http://nowoczesnapolska.org.pl/pomoz-nam/1-procent/">TPWL</a>
+<a id='annoy-on' href="/towarzystwo/">TPWL</a>
 <div id='annoy'>
   <div id='annoy-content'>
 
 <div id='annoy'>
   <div id='annoy-content'>