Minor club fixes.

diff --git a/src/catalogue/templates/catalogue/book_detail.html b/src/catalogue/templates/catalogue/book_detail.html
index 6e875bd..4b654dd 100644 (file)
--- a/src/catalogue/templates/catalogue/book_detail.html
+++ b/src/catalogue/templates/catalogue/book_detail.html
@@ -56,6 +56,7 @@
   {% endfor %}
 
 
   {% endfor %}
 
 

+{% with extra_info=book.get_extra_info_json %}

   {% if extra_info.source_url %}
     <div class="white-box">
       <a href="{{ extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the book" %}
   {% if extra_info.source_url %}
     <div class="white-box">
       <a href="{{ extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the book" %}


@@ -78,5 +79,6 @@
   <div class="white-box">
     <a href="{% url 'poem_from_book' book.slug %}">{% trans "Mix this book" %}</a>
   </div>
   <div class="white-box">
     <a href="{% url 'poem_from_book' book.slug %}">{% trans "Mix this book" %}</a>
   </div>

+{% endwith %}

 
 {% endblock %}
 
 {% endblock %}

diff --git a/src/catalogue/templates/catalogue/book_short.html b/src/catalogue/templates/catalogue/book_short.html
index 59debf4..3586b2e 100644 (file)
--- a/src/catalogue/templates/catalogue/book_short.html
+++ b/src/catalogue/templates/catalogue/book_short.html
@@ -147,7 +147,7 @@
           </li>
         </ul>
       {% else %}
           </li>
         </ul>
       {% else %}

-        <p class="book-box-tools">{% trans "For now this work is only available for our subscribers." %}
+        <p class="book-box-tools book-box-tools-warn">{% trans "For now this work is only available for our subscribers." %}

           <a href="/towarzystwo/">Dołącz do Towarzystwa Przyjaciół Wolnych Lektur</a>
        </p>
       {% endif %}
           <a href="/towarzystwo/">Dołącz do Towarzystwa Przyjaciół Wolnych Lektur</a>
        </p>
       {% endif %}

diff --git a/src/club/static/club/form.js b/src/club/static/club/form.js
index 6be8220..5e09ce4 100644 (file)
--- a/src/club/static/club/form.js
+++ b/src/club/static/club/form.js
@@ -16,5 +16,9 @@ $(function() {
     }
     update_methods();
     $("#payment-form .plan").change(update_methods);
     }
     update_methods();
     $("#payment-form .plan").change(update_methods);

-    
+
+
+    $("#payment-form").submit(function() {
+        _paq.push(['trackGoal', 12, $("#id_amount").val()]);
+    });

 });
 });

diff --git a/src/club/templates/club/membership_form.html b/src/club/templates/club/membership_form.html
index 8ad0387..480d651 100644 (file)
--- a/src/club/templates/club/membership_form.html
+++ b/src/club/templates/club/membership_form.html
@@ -10,6 +10,22 @@
 {% block body %}
 
   <style>
 {% block body %}
 
   <style>

+
+.methods {
+ color: #888;
+line-height: 30px;
+}
+.methods .method {
+  border: 1px solid #888;
+  border-radius: 5px;
+display: inline-block;
+padding: 0 5px;
+}
+.methods img {
+height: 30px;
+margin-right: 10px;
+vertical-align: middle;
+}

    .payment-method.disabled {
        opacity: .5;
        filter: grayscale(100%);
    .payment-method.disabled {
        opacity: .5;
        filter: grayscale(100%);


@@ -165,6 +181,7 @@
             <span class="button">inna kwota</span>
             <input type="number" min="{{ club.min_amount }}">
           </span>
             <span class="button">inna kwota</span>
             <input type="number" min="{{ club.min_amount }}">
           </span>

+<div class="methods">{% include 'club/payment/payu.html' %}</div>

         </div>
 
 
         </div>
 
 


@@ -177,6 +194,7 @@
             <span class="button">inna kwota</span>
             <input type="number" min="{{ club.min_amount }}">
           </span>
             <span class="button">inna kwota</span>
             <input type="number" min="{{ club.min_amount }}">
           </span>

+<div class="methods">{% include 'club/payment/payu-re.html' %}</div>

         </div>
 
         <h3>
         </div>
 
         <h3>


@@ -185,7 +203,7 @@
 
         <p>
           {{ form.email }}</p>
 
         <p>
           {{ form.email }}</p>

-        <button class="submit" type='submit'>Dołącz</button>
+        <button class="submit" type='submit'>Wpłać</button>

       </form>
 
       <div class="club-form-info">
       </form>
 
       <div class="club-form-info">

diff --git a/src/club/templates/club/payment/payu-re.html b/src/club/templates/club/payment/payu-re.html
index 8f90d53..b81c3aa 100644 (file)
--- a/src/club/templates/club/payment/payu-re.html
+++ b/src/club/templates/club/payment/payu-re.html
@@ -2,4 +2,3 @@
 <img src="{% static 'club/payu/payu.png' %}">
 <img src="{% static 'club/visa-100.png' %}">
 <img src="{% static 'club/mastercard.png' %}">
 <img src="{% static 'club/payu/payu.png' %}">
 <img src="{% static 'club/visa-100.png' %}">
 <img src="{% static 'club/mastercard.png' %}">

-+<br>Płatność cykliczna, odnawiana automatycznie.

diff --git a/src/club/templates/club/payment/payu.html b/src/club/templates/club/payment/payu.html
index 4a3c798..e500424 100644 (file)
--- a/src/club/templates/club/payment/payu.html
+++ b/src/club/templates/club/payment/payu.html
@@ -4,4 +4,3 @@
 <img src="{% static 'club/visa-100.png' %}">
 <img src="{% static 'club/mastercard.png' %}">
 <span class="method">przelew</span>
 <img src="{% static 'club/visa-100.png' %}">
 <img src="{% static 'club/mastercard.png' %}">
 <span class="method">przelew</span>

-<br>Płatność jednorazowa

diff --git a/src/wolnelektury/static/scss/main/book_box.scss b/src/wolnelektury/static/scss/main/book_box.scss
index 6e71fbc..17b72f1 100755 (executable)
--- a/src/wolnelektury/static/scss/main/book_box.scss
+++ b/src/wolnelektury/static/scss/main/book_box.scss
@@ -390,6 +390,15 @@
     @include size(margin-left, 139px + 15px);
   }
 
     @include size(margin-left, 139px + 15px);
   }
 

+  &.book-box-tools-warn {
+     font-size: 1rem;
+     margin-bottom: 1em;
+     max-width: 32em;
+     border: 1px solid #888;
+     padding: 1em;
+  }
+
+

   li {
     @include mono;
     margin-top: 0;
   li {
     @include mono;
     margin-top: 0;


@@ -558,4 +567,4 @@
        background-image:linear-gradient(to right,rgba(255,255,255,0),#ffffff 50%)
     }
   }
        background-image:linear-gradient(to right,rgba(255,255,255,0),#ffffff 50%)
     }
   }

-}
\ No newline at end of file
+}