annoy stub for misja ksiazka

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 6f7938d..ab364a4 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -31,6 +31,8 @@ PIPELINE = {
 
                 'sponsors/css/sponsors.css',
 
+                'css/annoy.css',
+
                 'uni_form/uni-form.css',
                 'uni_form/default.uni-form.css',
 
@@ -106,6 +108,8 @@ PIPELINE = {
                 'funding/funding.js',
 
                 'uni_form/uni-form.js',
+
+                'js/annoy.js',
                 ),
             'output_filename': 'js/base.min.js',
         },

diff --git a/src/wolnelektury/static/css/annoy.css b/src/wolnelektury/static/css/annoy.css
index 7ffa414..5ee80da 100755 (executable)
--- a/src/wolnelektury/static/css/annoy.css
+++ b/src/wolnelektury/static/css/annoy.css
@@ -2,13 +2,12 @@
     font-size: 13px;
     line-height: 1.15em;
 
-    padding: .1em 1em;
     background: orange;
     z-index: 200;
     font-family: Arial, sans-serif;
     display: block;
-    padding: 0 1em;
-    width: 1em;
+    padding: 2.6px 13px;
+    /*width: 1em;*/
     text-align:center;
     border-radius: 0 0 0 1em;
     position: absolute;
@@ -20,9 +19,9 @@
 #annoy {
     font-size: 13px;
     line-height: 1.15em;
-    padding: 1em 5em 1em 0;
+    /*padding: 1em 5em 1em 0;*/
     display: none;
-    background: orange;
+    /*background: orange;*/
     font-family: Arial, sans-serif;
     position: relative;
     z-index: 200;
@@ -34,6 +33,17 @@
     color: #4E56C8;
 }
 
+#annoy .banner {
+    display: block;
+    margin: auto;
+    width: 975px;
+    background: none;
+}
+
+#annoy .banner img {
+    display: block;
+}
+
 #annoy a#annoy-off {
     padding: .5em 1em .5em;
     width: 1em;

diff --git a/src/wolnelektury/templates/annoy.html b/src/wolnelektury/templates/annoy.html
index a5b34a2..66932ae 100755 (executable)
--- a/src/wolnelektury/templates/annoy.html
+++ b/src/wolnelektury/templates/annoy.html
@@ -1,6 +1,7 @@
 {% load static %}
-<a id='annoy-on' href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">1%</a>
+<a id='annoy-on' href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">Misja Książka</a>
   <div id='annoy'>
+    {% comment %}
     <a href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">
       <img src='{% static "img/procent.png" %}' alt="Logo akcji 1%" style="float:left;margin: 0 2em" />
     </a>
@@ -15,7 +16,8 @@
     </p>
 
     <p><a href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">Dowiedz się więcej</a></p>
-
+    {% endcomment %}
     <a id='annoy-off'>x</a>
+    <a class="banner" href="https://ridero.eu/pl/konkurs/"><img src="{{ MEDIA_URL }}social/cite/banner-na-WL.jpg"/></a>
     <div style="clear:both;"></div>
 </div>

diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html
index f57a947..a8b9cf4 100644 (file)
--- a/src/wolnelektury/templates/base/superbase.html
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -33,11 +33,9 @@
 
       {% block bodycontent %}
 
-        {% if not funding_no_show_current %}
-          {% cache 120 funding_top_bar LANGUAGE_CODE %}
-            {% funding_top_bar %}
-          {% endcache %}
-        {% endif %}
+        {% block annoy %}
+          {% include "annoy.html" %}
+        {% endblock %}
 
         <div id="whole-header">
           <div id="header-wrapper">

diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html
index d46e192..0b6545f 100755 (executable)
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -3,12 +3,21 @@
 {% load i18n catalogue_tags infopages_tags %}
 {% load ssi_include from ssify %}
 {% load cache %}
+{% load funding_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 
 
 {% block title %}{% trans "Wolne Lektury internet library" %}{% endblock %}
 {% block ogtitle %}{% trans "Wolne Lektury internet library" %}{% endblock %}
 
+{% block annoy %}
+  {% if not funding_no_show_current %}
+    {% cache 120 funding_top_bar LANGUAGE_CODE %}
+      {% funding_top_bar %}
+    {% endcache %}
+  {% endif %}
+{% endblock %}
+
 {% block body %}
   {% spaceless %}
     {% if cite %}