donation fixes

diff --git a/src/annoy/models.py b/src/annoy/models.py
index 097872b..6af1cc0 100644 (file)
--- a/src/annoy/models.py
+++ b/src/annoy/models.py
@@ -66,7 +66,13 @@ class Banner(models.Model):
             return self.campaign.image
         else:
             return self.image
             return self.campaign.image
         else:
             return self.image

-    
+
+    def is_external(self):
+        return (self.url and
+                not self.url.startswith('/') and
+                not self.url.startswith('https://wolnelektury.pl/')
+                )
+

     @classmethod
     def choice(cls, place, request, exemptions=True, book=None):
         Membership = apps.get_model('club', 'Membership')
     @classmethod
     def choice(cls, place, request, exemptions=True, book=None):
         Membership = apps.get_model('club', 'Membership')

diff --git a/src/annoy/templates/annoy/banner.html b/src/annoy/templates/annoy/banner.html
index bfecd9d..9a67fcd 100644 (file)
--- a/src/annoy/templates/annoy/banner.html
+++ b/src/annoy/templates/annoy/banner.html
@@ -20,7 +20,9 @@
            {% if banner.background_color %}background-color: {{ banner.background_color }};{% endif %}
         ">
     {% if not banner.action_label %}
            {% if banner.background_color %}background-color: {{ banner.background_color }};{% endif %}
         ">
     {% if not banner.action_label %}

-      <a href="{{ banner.url }}">
+    <a
+      {% if banner.is_external %}target="_blank"{% endif %}
+      href="{{ banner.url }}">

     {% endif %}
     <div class="annoy-banner-inner">
 
     {% endif %}
     <div class="annoy-banner-inner">
 


@@ -34,7 +36,9 @@
       </div>
 
       {% if banner.action_label %}
       </div>
 
       {% if banner.action_label %}

-        <a class="action" href="{{ banner.url }}">
+      <a class="action"
+        {% if banner.is_external %}target="_blank"{% endif %}
+        href="{{ banner.url }}">

           {{ banner.action_label }}
         </a>
       {% endif %}
           {{ banner.action_label }}
         </a>
       {% endif %}

diff --git a/src/club/templates/club/donation_step_base.html b/src/club/templates/club/donation_step_base.html
index 804ace3..3889324 100644 (file)
--- a/src/club/templates/club/donation_step_base.html
+++ b/src/club/templates/club/donation_step_base.html
@@ -29,7 +29,9 @@
 
     <div class="l-checkout__box">
       <div class="l-checkout__box__header">
 
     <div class="l-checkout__box">
       <div class="l-checkout__box__header">

-        <img src="{% block donation-jumbo-image %}{% static '2022/images/checkout-img-1.jpg' %}{% endblock %}" alt="Wspieraj Wolne Lektury">
+        <div class="l-checkout__box__header__img"
+             style="background-image: url({% block donation-jumbo-image %}{% static '2022/images/checkout-img-1.jpg' %}{% endblock %}">
+          </div>

         <div class="l-checkout__box__header__content">
           {% chunk "donate-top" %}
         </div>
         <div class="l-checkout__box__header__content">
           {% chunk "donate-top" %}
         </div>

diff --git a/src/wolnelektury/static/2022/styles/layout/_checkout.scss b/src/wolnelektury/static/2022/styles/layout/_checkout.scss
index 28fd1ce..6bc86d0 100644 (file)
--- a/src/wolnelektury/static/2022/styles/layout/_checkout.scss
+++ b/src/wolnelektury/static/2022/styles/layout/_checkout.scss
@@ -67,10 +67,13 @@
   display: flex;
   background: #083F4D;
 
   display: flex;
   background: #083F4D;
 

-  img {
+  .l-checkout__box__header__img {

       display: none;
       display: none;

+      background-position: center;
+      background-size: cover;

       @include rwd($break-flow) {
           display: block;
       @include rwd($break-flow) {
           display: block;

+          width: 50%;

       }
   }
 }
       }
   }
 }


@@ -330,12 +333,9 @@
     }
   }
   .l-checkout__payments__box__btn-wrp {
     }
   }
   .l-checkout__payments__box__btn-wrp {

-    padding: 0 20px 20px 20px;
+      padding: 20px;

     margin-bottom: 0;
     margin-top: auto;
     margin-bottom: 0;
     margin-top: auto;

-    @include rwd($break-flow) {
-        padding-top: 20px;
-    }

   }
   p {
     margin-top: 0;
   }
   p {
     margin-top: 0;


@@ -353,7 +353,6 @@
       font-family: "Source Sans Pro",sans-serif;
     font-weight: bold;
     font-size: 44px;
       font-family: "Source Sans Pro",sans-serif;
     font-weight: bold;
     font-size: 44px;

-    line-height: 130%;

     letter-spacing: -0.01em;
     height: 90px;
     display: flex;
     letter-spacing: -0.01em;
     height: 90px;
     display: flex;


@@ -370,10 +369,15 @@
     text-align: center;
     color: #083F4D;
 
     text-align: center;
     color: #083F4D;
 

+    flex-direction: column;
+    @include rwd($break-flow) {
+        flex-direction: row;
+        line-height: 130%;
+    }
+

     span {
       font-weight: 600;
       font-size: 25px;
     span {
       font-weight: 600;
       font-size: 25px;

-      line-height: 200%;

       letter-spacing: -0.01em;
       color: #92BD39;
       margin-left: 10px;
       letter-spacing: -0.01em;
       color: #92BD39;
       margin-left: 10px;