More banners and stats.

diff --git a/src/annoy/models.py b/src/annoy/models.py
index 3df56b2..5b9009b 100644 (file)
--- a/src/annoy/models.py
+++ b/src/annoy/models.py
@@ -74,6 +74,14 @@ class DynamicTextInsert(models.Model):
     def __str__(self):
         return str(self.paragraphs)
 
     def __str__(self):
         return str(self.paragraphs)
 

+    @classmethod
+    def get_all(cls, request):
+        Membership = apps.get_model('club', 'Membership')
+        if Membership.is_active_for(request.user) and not request.user.is_staff:
+            return cls.objects.none()
+        return cls.objects.all()
+
+

     def choose(self):
         return self.dynamictextinserttext_set.order_by('?').first()
 
     def choose(self):
         return self.dynamictextinserttext_set.order_by('?').first()
 

diff --git a/src/annoy/static/annoy/banner.js b/src/annoy/static/annoy/banner.js
index ee45613..ad5dd66 100644 (file)
--- a/src/annoy/static/annoy/banner.js
+++ b/src/annoy/static/annoy/banner.js
@@ -12,21 +12,33 @@
                 $target.slideDown('fast');
                 $on.hide();
                 if (Modernizr.localstorage) localStorage.removeItem(tag);
                 $target.slideDown('fast');
                 $on.hide();
                 if (Modernizr.localstorage) localStorage.removeItem(tag);

+                _paq.push(['trackEvent', 'banner', 'unhide', $on.attr('data-target')]);

             });
 
             $off.click(function() {
                 $target.slideUp('fast');
                 $on.show();
                 if (Modernizr.localstorage) localStorage[tag] = true;
             });
 
             $off.click(function() {
                 $target.slideUp('fast');
                 $on.show();
                 if (Modernizr.localstorage) localStorage[tag] = true;

+                _paq.push(['trackEvent', 'banner', 'hide', $on.attr('data-target')]);

             });
 
             if (Modernizr.localstorage) {
                 if (!localStorage[tag]) {
                     $on.hide();
                     $target.show();
             });
 
             if (Modernizr.localstorage) {
                 if (!localStorage[tag]) {
                     $on.hide();
                     $target.show();

+                    _paq.push(['trackEvent', 'banner', 'show', $on.attr('data-target')]);

                 }
             }
         });
 
                 }
             }
         });
 

+        $(document).on('click', ".annoy-banner a", function() {
+            banner = $(this).closest('.annoy-banner');
+            _paq.push(['trackEvent', 'banner', 'click', banner.attr('id')]);
+        });
+        $(document).on('click', ".dynamic-insert a", function() {
+            banner = $(this).closest('.dynamic-insert');
+            _paq.push(['trackEvent', 'dynamic-insert', 'click', banner.attr('data-paragraphs'), banner.attr('data-textid')]);
+        });
+

     });
 })(jQuery);
     });
 })(jQuery);

diff --git a/src/annoy/static/annoy/banner.scss b/src/annoy/static/annoy/banner.scss
index c9ddd2d..e0e0f62 100644 (file)
--- a/src/annoy/static/annoy/banner.scss
+++ b/src/annoy/static/annoy/banner.scss
@@ -229,6 +229,7 @@
 
 .dynamic-insert {
     background: orange;
 
 .dynamic-insert {
     background: orange;

+    margin: 1em 0;

 
     &.with-image {
         min-height: 120px;
 
     &.with-image {
         min-height: 120px;


@@ -244,10 +245,12 @@
         .text {
             padding: 2em;
             flex: 1;
         .text {
             padding: 2em;
             flex: 1;

+            align-self: center;

         }
         img {
             border-radius: 100%;
             margin: 1em;
         }
         img {
             border-radius: 100%;
             margin: 1em;

+            align-self: center;

         }
     }
 }
         }
     }
 }

diff --git a/src/annoy/static/annoy/book_text.js b/src/annoy/static/annoy/book_text.js
index 267d6e1..bef1f13 100644 (file)
--- a/src/annoy/static/annoy/book_text.js
+++ b/src/annoy/static/annoy/book_text.js
@@ -30,6 +30,7 @@
             var counter = 0;
             $(".paragraph, .stanza").each(function() {
                 var p = $(this);
             var counter = 0;
             $(".paragraph, .stanza").each(function() {
                 var p = $(this);

+                if (p.prev().hasClass('anchor')) p = p.prev();

                 if (!underFold) {
                     if (p.offset().top > fold) {
                         underFold = true;
                 if (!underFold) {
                     if (p.offset().top > fold) {
                         underFold = true;

diff --git a/src/annoy/templates/annoy/dynamic_insert.html b/src/annoy/templates/annoy/dynamic_insert.html
index 8285e24..6aa7258 100644 (file)
--- a/src/annoy/templates/annoy/dynamic_insert.html
+++ b/src/annoy/templates/annoy/dynamic_insert.html
@@ -1,8 +1,8 @@
 {% load thumbnail %}
 
 {% with text=insert.choose %}
 {% load thumbnail %}
 
 {% with text=insert.choose %}

-  <div class="dynamic-insert{% if text.image %} with-image{% endif %}" style="{% if text.own_colors %}background-color: {{ text.background_color }};{% endif %}" data-paragraphs="{{ insert.paragraphs }}">
-    <a href="{% url 'club' %}">
+  <div class="dynamic-insert{% if text.image %} with-image{% endif %}" style="{% if text.own_colors %}background-color: {{ text.background_color }};{% endif %}" data-paragraphs="{{ insert.paragraphs }}" data-textid="{{ text.pk }}">
+    <a href="{{ insert.url }}">

       <div class="text" style="{% if text.own_colors %}color:{{ text.text_color }}{% endif %}">
         {{ text.text|safe|linebreaks }}
       </div>
       <div class="text" style="{% if text.own_colors %}color:{{ text.text_color }}{% endif %}">
         {{ text.text|safe|linebreaks }}
       </div>

diff --git a/src/catalogue/templates/catalogue/player.html b/src/catalogue/templates/catalogue/player.html
index 2a48500..57fb2ec 100755 (executable)
--- a/src/catalogue/templates/catalogue/player.html
+++ b/src/catalogue/templates/catalogue/player.html
@@ -14,6 +14,7 @@
     <link rel="icon" href="{% static "img/favicon.png" %}" type="image/png" />
     {% stylesheet 'main' %}
     {% stylesheet "player" %}
     <link rel="icon" href="{% static "img/favicon.png" %}" type="image/png" />
     {% stylesheet 'main' %}
     {% stylesheet "player" %}

+    {% tracking_code %}

   </head>
   <body id="{% block bodyid %}player{% endblock %}">
     {% if book.cover_thumb %}
   </head>
   <body id="{% block bodyid %}player{% endblock %}">
     {% if book.cover_thumb %}


@@ -69,6 +70,5 @@
     <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
     {% javascript "player" %}
 
     <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
     {% javascript "player" %}
 

-    {% tracking_code %}

   </body>
 </html>
   </body>
 </html>

diff --git a/src/catalogue/templates/catalogue/viewer_base.html b/src/catalogue/templates/catalogue/viewer_base.html
index 37c8118..16ad645 100644 (file)
--- a/src/catalogue/templates/catalogue/viewer_base.html
+++ b/src/catalogue/templates/catalogue/viewer_base.html
@@ -12,6 +12,7 @@
     <link rel="icon" href="{% static "img/favicon.png" %}" type="image/x-icon" />
     {% stylesheet "book_text" %}
     {% block extrahead %}{% endblock %}
     <link rel="icon" href="{% static "img/favicon.png" %}" type="image/x-icon" />
     {% stylesheet "book_text" %}
     {% block extrahead %}{% endblock %}

+    {% tracking_code %}

   </head>
   <body id="{% block body-id %}reader{% endblock %}">
     {% annoy_banner 'blackout' %}
   </head>
   <body id="{% block body-id %}reader{% endblock %}">
     {% annoy_banner 'blackout' %}


@@ -66,7 +67,6 @@
     </script>
     {% javascript "book_text" %}
 
     </script>
     {% javascript "book_text" %}
 

-    {% tracking_code %}

     {% block extrabody %}{% endblock %}
     <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>
   </body>
     {% block extrabody %}{% endblock %}
     <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>
   </body>

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index cfed6ca..66a2b91 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -319,7 +319,7 @@ def book_text(request, slug):
     return render(request, 'catalogue/book_text.html', {
         'book': book,
         'book_text': book_text,
     return render(request, 'catalogue/book_text.html', {
         'book': book,
         'book_text': book_text,

-        'inserts': DynamicTextInsert.objects.all()
+        'inserts': DynamicTextInsert.get_all(request)

     })
 
 
     })
 
 

diff --git a/src/club/templates/club/membership_form.html b/src/club/templates/club/membership_form.html
index 959bc30..2e0c2c5 100644 (file)
--- a/src/club/templates/club/membership_form.html
+++ b/src/club/templates/club/membership_form.html
@@ -209,6 +209,8 @@
 </div>
 </div>
 
 </div>
 </div>
 

+{% chunk 'club_form_bottom' %}
+

 </div>
 
 {% endblock %}
 </div>
 
 {% endblock %}

diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html
index 8bdd431..bd7de37 100644 (file)
--- a/src/wolnelektury/templates/base/superbase.html
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -30,6 +30,7 @@
       <link rel="manifest" href="/manifest.json">
       {% stylesheet "main" %}
       {% block extrahead %}{% endblock %}
       <link rel="manifest" href="/manifest.json">
       {% stylesheet "main" %}
       {% block extrahead %}{% endblock %}

+      {% tracking_code %}

     </head>
     <body id="{% block bodyid %}base{% endblock %}">
 
     </head>
     <body id="{% block bodyid %}base{% endblock %}">
 


@@ -173,8 +174,6 @@
       </script>
       {% javascript "base" %}
 
       </script>
       {% javascript "base" %}
 

-      {% tracking_code %}
-

       {% block extrabody %}{% endblock %}
 
       <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>
       {% block extrabody %}{% endblock %}
 
       <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>

diff --git a/src/wolnelektury/templates/piwik/tracking_code.html b/src/wolnelektury/templates/piwik/tracking_code.html
index f09a5c6..bbb0cdb 100644 (file)
--- a/src/wolnelektury/templates/piwik/tracking_code.html
+++ b/src/wolnelektury/templates/piwik/tracking_code.html
@@ -1,15 +1,17 @@
-<!-- Piwik --> 
+<!-- Matomo -->

 <script type="text/javascript">
 <script type="text/javascript">

-  var pkBaseURL = "{{ url }}";
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {{ id }});
-{% for ab, abval in AB.items %}
-  piwikTracker.setCustomVariable({{ forloop.counter }}, "{{ ab }}", "{{ abval }}", "page");
-{% endfor %}
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="{{ url }}piwik.php?idsite={{ id }}" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Tracking Code -->
+  var _paq = window._paq || [];
+  {% for ab, abval in AB.items %}
+    _paq.push(['setCustomVariable', '{{ forloop.counter }}', "{{ ab }}", "{{ abval }}", "page"]);
+  {% endfor %}
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="{{ url }}";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '{{ id }}']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script><noscript><p><img src="{{ url }}matomo.php?idsite={{ id }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+<!-- End Matomo Code -->