fnp
/
wolnelektury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
29f694e
)
Summon the annoying banner.
author
Radek Czajka
<rczajka@rczajka.pl>
Fri, 8 Feb 2019 10:27:01 +0000
(11:27 +0100)
committer
Radek Czajka
<rczajka@rczajka.pl>
Fri, 8 Feb 2019 10:27:01 +0000
(11:27 +0100)
src/wolnelektury/static/css/annoy.css
patch
|
blob
|
history
src/wolnelektury/static/js/annoy.js
patch
|
blob
|
history
src/wolnelektury/templates/annoy.html
patch
|
blob
|
history
src/wolnelektury/templates/base/superbase.html
patch
|
blob
|
history
diff --git
a/src/wolnelektury/static/css/annoy.css
b/src/wolnelektury/static/css/annoy.css
index
5ee80da
..
54dbfba
100755
(executable)
--- a/
src/wolnelektury/static/css/annoy.css
+++ b/
src/wolnelektury/static/css/annoy.css
@@
-6,8
+6,8
@@
z-index: 200;
font-family: Arial, sans-serif;
display: block;
z-index: 200;
font-family: Arial, sans-serif;
display: block;
- padding:
2.6px 13px
;
- /*width: 1em;*/
+ padding:
.1em 1em
;
+ width: 1em;
text-align:center;
border-radius: 0 0 0 1em;
position: absolute;
text-align:center;
border-radius: 0 0 0 1em;
position: absolute;
@@
-19,9
+19,9
@@
#annoy {
font-size: 13px;
line-height: 1.15em;
#annoy {
font-size: 13px;
line-height: 1.15em;
- /*padding: 1em 5em 1em 0;*/
+ padding: 1em 5em 1em 0;
display: none;
display: none;
- /*background: orange;*/
+ background: orange;
font-family: Arial, sans-serif;
position: relative;
z-index: 200;
font-family: Arial, sans-serif;
position: relative;
z-index: 200;
diff --git
a/src/wolnelektury/static/js/annoy.js
b/src/wolnelektury/static/js/annoy.js
index
3104097
..
d71f146
100644
(file)
--- a/
src/wolnelektury/static/js/annoy.js
+++ b/
src/wolnelektury/static/js/annoy.js
@@
-6,18
+6,18
@@
$("#annoy-on").click(function(e) {
e.preventDefault();
$("#annoy").slideDown('fast');
$(this).hide();
e.preventDefault();
$("#annoy").slideDown('fast');
$(this).hide();
- if (Modernizr.localstorage) localStorage.removeItem("annoyed201
3
");
+ if (Modernizr.localstorage) localStorage.removeItem("annoyed201
9
");
});
$("#annoy-off").click(function() {
$("#annoy").slideUp('fast');
$("#annoy-on").show();
});
$("#annoy-off").click(function() {
$("#annoy").slideUp('fast');
$("#annoy-on").show();
- if (Modernizr.localstorage) localStorage["annoyed201
3
"] = true;
+ if (Modernizr.localstorage) localStorage["annoyed201
9
"] = true;
});
if (Modernizr.localstorage) {
});
if (Modernizr.localstorage) {
- if (!localStorage["annoyed201
3
"]) {
+ if (!localStorage["annoyed201
9
"]) {
$("#annoy-on").hide();
$("#annoy").show();
}
$("#annoy-on").hide();
$("#annoy").show();
}
diff --git
a/src/wolnelektury/templates/annoy.html
b/src/wolnelektury/templates/annoy.html
index
ecf1a1f
..
1f08899
100755
(executable)
--- a/
src/wolnelektury/templates/annoy.html
+++ b/
src/wolnelektury/templates/annoy.html
@@
-1,8
+1,7
@@
{% load static %}
{% load static %}
-<a id='annoy-on' href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">
Misja Książka
</a>
+<a id='annoy-on' href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">
1%
</a>
<div id='annoy'>
<div id='annoy'>
- {% comment %}
- <a href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">
+ <a href="http://nowoczesnapolska.org.pl/pomoz-nam/1-procent/">
<img src='{% static "img/procent.png" %}' alt="Logo akcji 1%" style="float:left;margin: 0 2em" />
</a>
<p>Droga użytkowniczko, drogi użytkowniku!</p>
<img src='{% static "img/procent.png" %}' alt="Logo akcji 1%" style="float:left;margin: 0 2em" />
</a>
<p>Droga użytkowniczko, drogi użytkowniku!</p>
@@
-16,8
+15,6
@@
</p>
<p><a href="http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">Dowiedz się więcej</a></p>
</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 id='annoy-off'>x</a>
- <a class="banner" href="https://ridero.eu/pl/konkurs/"><img src="{{ STATIC_URL }}img/banners/banner_misja_ksiazka.png"/></a>
<div style="clear:both;"></div>
</div>
<div style="clear:both;"></div>
</div>
diff --git
a/src/wolnelektury/templates/base/superbase.html
b/src/wolnelektury/templates/base/superbase.html
index
3ff768f
..
f5feb4e
100644
(file)
--- a/
src/wolnelektury/templates/base/superbase.html
+++ b/
src/wolnelektury/templates/base/superbase.html
@@
-35,6
+35,7
@@
{% block bodycontent %}
{% block annoy %}
{% block bodycontent %}
{% block annoy %}
+ {% include "annoy.html" %}
{% if not funding_no_show_current %}
{% cache 120 funding_top_bar LANGUAGE_CODE %}
{% funding_top_bar %}
{% if not funding_no_show_current %}
{% cache 120 funding_top_bar LANGUAGE_CODE %}
{% funding_top_bar %}