fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: edf01dc)
experiment
authorRadek Czajka <rczajka@rczajka.pl>
Thu, 28 Apr 2022 08:17:21 +0000 (10:17 +0200)
committerRadek Czajka <rczajka@rczajka.pl>
Thu, 28 Apr 2022 08:17:21 +0000 (10:17 +0200)
src/catalogue/templates/catalogue/2022/book_detail.html patch | blob | history
src/experiments/experiments.py patch | blob | history
src/wolnelektury/settings/custom.py patch | blob | history
src/wolnelektury/static/2022/styles/layout/_article.scss patch | blob | history
src/wolnelektury/static/2022/styles/layout/_aside.scss patch | blob | history
src/wolnelektury/templatetags/piwik_tags.py patch | blob | history

diff --git a/src/catalogue/templates/catalogue/2022/book_detail.html b/src/catalogue/templates/catalogue/2022/book_detail.html
index 8548c29..9dfac94 100644 (file)
--- a/src/catalogue/templates/catalogue/2022/book_detail.html
+++ b/src/catalogue/templates/catalogue/2022/book_detail.html
@@ -5,6 +5,7 @@
 {% load choose_fragment license_icon from catalogue_tags %}
 {% load catalogue_tags %}
 {% load likes_book from social_tags %}
 {% load choose_fragment license_icon from catalogue_tags %}
 {% load catalogue_tags %}
 {% load likes_book from social_tags %}
+{% load piwik_tags %}
 
 
 <html class="no-js">
 
 
 <html class="no-js">
@@ -21,6 +22,8 @@
       <link rel="preconnect" href="https://fonts.googleapis.com">
       <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
       <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,600;0,700;1,300;1,400&display=swap" rel="stylesheet">
       <link rel="preconnect" href="https://fonts.googleapis.com">
       <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
       <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,600;0,700;1,300;1,400&display=swap" rel="stylesheet">
+
+      {% tracking_code %}
   </head>
   <body>
 
   </head>
   <body>
 
@@ -29,12 +32,12 @@
         <h3>Zmieniamy się!</h3>
         <p>
           Jeżeli to czytasz jesteś jedną z osób, której prezentujemy nowy wygląd strony książki.
         <h3>Zmieniamy się!</h3>
         <p>
           Jeżeli to czytasz jesteś jedną z osób, której prezentujemy nowy wygląd strony książki.
-          Będziemy bardzo! wdzięczni za Twoją opinię – <a href='{% url 'suggest' %}' target="_blank">możesz nam ją przesłać tutaj</a>.
+          Będziemy bardzo! wdzięczni za Twoją opinię – <a href='/formularz/ux-strona-ksiazki-T1/' target="_blank">możesz nam ją przesłać tutaj</a>.
           Jeżeli wolisz klasyczny wygląd - wystarczy, że <a class="quit-experiment" href="#">klikniesz tutaj</a>
         </p>
         <!-- button class="l-change-pop__close">
           Jeżeli wolisz klasyczny wygląd - wystarczy, że <a class="quit-experiment" href="#">klikniesz tutaj</a>
         </p>
         <!-- button class="l-change-pop__close">
-          <i class="icon icon-close"></i>
-        </button -->
+             <i class="icon icon-close"></i>
+             </button -->
       </div>
       <div class="l-container">
         <a href="/" class="l-navigation__logo">
       </div>
       <div class="l-container">
         <a href="/" class="l-navigation__logo">
@@ -48,10 +51,10 @@
         <div class="l-navigation__actions">
           <a href="/ludzie/polka/"><i class="icon icon-liked"></i></a>
           <!-- button class="l-navigation__button js-menu" aria-label="Menu">
         <div class="l-navigation__actions">
           <a href="/ludzie/polka/"><i class="icon icon-liked"></i></a>
           <!-- button class="l-navigation__button js-menu" aria-label="Menu">
-            <span class="c-hamburger">
-              <span class="bar"></span>
-            </span>
-          </button-->
+               <span class="c-hamburger">
+               <span class="bar"></span>
+               </span>
+               </button-->
         </div>
       </div>
     </nav>
         </div>
       </div>
     </nav>
@@ -76,12 +79,6 @@
               <img src="{% if book.cover_clean %}{{ book.cover_clean.url }}{% endif %}" alt="{{ book.pretty_title }}" width="240">
             </a>
           </figure>
               <img src="{% if book.cover_clean %}{{ book.cover_clean.url }}{% endif %}" alt="{{ book.pretty_title }}" width="240">
             </a>
           </figure>
-          <ul class="l-aside__info">
-            <li><span>Epoka:</span> {% for tag in book.epochs %}<a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a> {% endfor %}</li>
-            <li><span>Rodzaj:</span> {% for tag in book.kinds %}<a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a> {% endfor %}</li>
-            <li><span>Gatunek:</span> {% for tag in book.genres %}<a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a> {% endfor %}</li>
-
-          </ul>
 
           {% if book.parent or book.get_children %}
             <ul class="l-aside__zbiory">
 
           {% if book.parent or book.get_children %}
             <ul class="l-aside__zbiory">
@@ -127,6 +124,12 @@
             </ul>
           {% endif  %}
 
             </ul>
           {% endif  %}
 
+          <ul class="l-aside__info">
+            <li><span>Epoka:</span> {% for tag in book.epochs %}<a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a> {% endfor %}</li>
+            <li><span>Rodzaj:</span> {% for tag in book.kinds %}<a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a> {% endfor %}</li>
+            <li><span>Gatunek:</span> {% for tag in book.genres %}<a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a> {% endfor %}</li>
+
+          </ul>
         </aside>
         <div class="l-content">
           <header class="l-header">
         </aside>
         <div class="l-content">
           <header class="l-header">
@@ -444,7 +447,7 @@
                 <article class="l-books__item">
                   <figure class="l-books__item__img">
                     <a href="{{ rel.get_absolute_url }}">
                 <article class="l-books__item">
                   <figure class="l-books__item__img">
                     <a href="{{ rel.get_absolute_url }}">
-                      <img src="{% if rel.cover %}{{ rel.cover.url }}{% endif %}" alt="{{ rel.pretty_title }}">
+                      <img src="{% if rel.cover_clean %}{{ rel.cover_clean.url }}{% endif %}" alt="{{ rel.pretty_title }}">
                     </a>
                   </figure>
                   <h3>
                     </a>
                   </figure>
                   <h3>
@@ -463,7 +466,7 @@
               <article class="l-books__item">
                 <figure class="l-books__item__img">
                   <a href="{{ rel.get_absolute_url }}">
               <article class="l-books__item">
                 <figure class="l-books__item__img">
                   <a href="{{ rel.get_absolute_url }}">
-                    <img src="{% if rel.cover %}{{ rel.cover.url }}{% endif %}" alt="{{ rel.pretty_title }}">
+                    <img src="{% if rel.cover_clean %}{{ rel.cover_clean.url }}{% endif %}" alt="{{ rel.pretty_title }}">
                   </a>
                 </figure>
                 <h3>
                   </a>
                 </figure>
                 <h3>
@@ -518,6 +521,17 @@
     <script src="{% static '2021/scripts/main.js' %}"></script>
 
     {% javascript '2022' %}
     <script src="{% static '2021/scripts/main.js' %}"></script>
 
     {% javascript '2022' %}
-    {% javascript '2022_player' %}
+      {% javascript '2022_player' %}
+        <!-- Hotjar Tracking Code for https://wolnelektury.pl/ -->
+        <script>
+         (function(h,o,t,j,a,r){
+             h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+             h._hjSettings={hjid:2661024,hjsv:6};
+             a=o.getElementsByTagName('head')[0];
+             r=o.createElement('script');r.async=1;
+             r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+             a.appendChild(r);
+         })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+        </script>
   </body>
 </html>
   </body>
 </html>
diff --git a/src/experiments/experiments.py b/src/experiments/experiments.py
index 63c74c6..bc40163 100644 (file)
--- a/src/experiments/experiments.py
+++ b/src/experiments/experiments.py
@@ -1,4 +1,5 @@
 import re
 import re
+from django.conf import settings
 from django.utils.translation import get_language
 from .base import Experiment
 
 from django.utils.translation import get_language
 from .base import Experiment
 
@@ -6,6 +7,7 @@ from .base import Experiment
 class NewLayout(Experiment):
     slug = 'layout'
     name = 'Nowy layout strony'
 class NewLayout(Experiment):
     slug = 'layout'
     name = 'Nowy layout strony'
+    size = settings.EXPERIMENTS_LAYOUT
 
     def qualify(self, request):
         if get_language() != 'pl':
 
     def qualify(self, request):
         if get_language() != 'pl':
diff --git a/src/wolnelektury/settings/custom.py b/src/wolnelektury/settings/custom.py
index e9449cf..da3af83 100644 (file)
--- a/src/wolnelektury/settings/custom.py
+++ b/src/wolnelektury/settings/custom.py
@@ -63,3 +63,5 @@ CIVICRM_ACTIVITIES = {
     'Recurring contribution': 'Wpłata cykliczna',
     'Failed contribution': 'Nieudana wpłata',
 }
     'Recurring contribution': 'Wpłata cykliczna',
     'Failed contribution': 'Nieudana wpłata',
 }
+
+EXPERIMENTS_LAYOUT = 0
diff --git a/src/wolnelektury/static/2022/styles/layout/_article.scss b/src/wolnelektury/static/2022/styles/layout/_article.scss
index a40be7b..fb7b0e7 100644 (file)
--- a/src/wolnelektury/static/2022/styles/layout/_article.scss
+++ b/src/wolnelektury/static/2022/styles/layout/_article.scss
@@ -34,6 +34,11 @@
       font-size: 18px;
       line-height: 150%;
       font-weight: normal;
       font-size: 18px;
       line-height: 150%;
       font-weight: normal;
+
+    }
+
+    a {
+        color: #007880;
     }
   }
 }
     }
   }
 }
diff --git a/src/wolnelektury/static/2022/styles/layout/_aside.scss b/src/wolnelektury/static/2022/styles/layout/_aside.scss
index 934ad64..772307f 100644 (file)
--- a/src/wolnelektury/static/2022/styles/layout/_aside.scss
+++ b/src/wolnelektury/static/2022/styles/layout/_aside.scss
@@ -11,9 +11,8 @@
         display: block;
     }
   }
         display: block;
     }
   }
-
-  .l-aside__info {
-    & + .l-aside__zbiory {
+  > ul {
+    & + ul {
       margin-top: 15px;
     }
   }
       margin-top: 15px;
     }
   }
@@ -71,6 +70,7 @@
     }
 
     a {
     }
 
     a {
+      color: #007880;
       &:hover {
         text-decoration: underline;
       }
       &:hover {
         text-decoration: underline;
       }
diff --git a/src/wolnelektury/templatetags/piwik_tags.py b/src/wolnelektury/templatetags/piwik_tags.py
index 551b81d..eec690f 100644 (file)
--- a/src/wolnelektury/templatetags/piwik_tags.py
+++ b/src/wolnelektury/templatetags/piwik_tags.py
@@ -18,4 +18,4 @@ def tracking_code(context):
         url = settings.PIWIK_URL
     except AttributeError:
         raise ImproperlyConfigured('PIWIK_URL does not exist.')
         url = settings.PIWIK_URL
     except AttributeError:
         raise ImproperlyConfigured('PIWIK_URL does not exist.')
-    return {'id': id, 'url': url, 'AB': context.get('AB')}
+    return {'id': id, 'url': url, 'request': context.get('request')}