Schedules, fundings, polls, libraries

diff --git a/src/club/admin.py b/src/club/admin.py
index ce74ec6..2f07a4f 100644 (file)
--- a/src/club/admin.py
+++ b/src/club/admin.py
@@ -1,3 +1,4 @@
+
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
@@ -5,6 +6,7 @@ import json
 from django.contrib import admin
 from django.db.models.functions import Now
 from django.db.models import Q
+from django import forms
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
@@ -67,11 +69,26 @@ class ExpiredFilter(YesNoFilter):
     q = Q(expires_at__isnull=False, expires_at__lt=Now())
 
 
+class ScheduleForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['email'].required = False
+        self.fields['method'].required = False
+        self.fields['consent'].required = False
+
+    class Meta:
+        model = models.Schedule
+        fields = '__all__'
+
+
 class ScheduleAdmin(admin.ModelAdmin):
+    form = ScheduleForm
+
     list_display = [
         'email', 'started_at', 'payed_at', 'expires_at', 'amount', 'monthly', 'yearly', 'is_cancelled',
         'method'
     ]
+    list_display_links = ['email', 'started_at']
     search_fields = ['email']
     list_filter = ['is_cancelled', 'monthly', 'yearly', 'method', PayedFilter, ExpiredFilter, 'source']
     filter_horizontal = ['consent']

diff --git a/src/club/templates/club/index.html b/src/club/templates/club/index.html
index 4268be1..ecc2ef9 100644 (file)
--- a/src/club/templates/club/index.html
+++ b/src/club/templates/club/index.html
@@ -1,4 +1,4 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 {% load active_schedule from club %}
 {% load chunks %}
@@ -8,9 +8,9 @@
 
 
 {% block body %}
-  <div class="white-box normal-text">
 
-    <h1>{% trans "Wolne Lektury need your help!" %}</h1>
+  <h1>{% trans "Wolne Lektury need your help!" %}</h1>
+  <div class="white-box normal-text">
 
     {% chunk 'club' %}
 

diff --git a/src/club/templates/club/schedule.html b/src/club/templates/club/schedule.html
index 422d323..84b6833 100644 (file)
--- a/src/club/templates/club/schedule.html
+++ b/src/club/templates/club/schedule.html
@@ -1,4 +1,4 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 
 
@@ -6,12 +6,12 @@
 
 
 {% block body %}
-<div class="white-box normal-text">
 
   <h1>
     Cieszymy się, że jesteś z nami! Dziękujemy za wsparcie!
   </h1>
-  <p>
+  <div class="white-box normal-text">
+    <p>
 
 
     {% if schedule.payed_at %}

diff --git a/src/funding/templates/funding/2022/includes/funding_box.html b/src/funding/templates/funding/2022/includes/funding_box.html
new file mode 100644 (file)
index 0000000..c04234d
--- /dev/null
+++ b/src/funding/templates/funding/2022/includes/funding_box.html
@@ -0,0 +1,23 @@
+{% load i18n %}
+{% load sorl_thumbnail %}
+
+<article class="l-books__item" data-pop="-{{ book.popularity.count }}">
+  <figure class="l-books__item__img" style="height:240px">
+    <a href="{{ funding.get_absolute_url }}">
+      {% if funding.cover %}
+        <img src="{{ funding.cover.url }}" alt="{{ funding.title }}">
+      {% endif %}
+    </a>
+  </figure>
+  <div class="l-books__item__actions">
+    <div class="l-checkout__support__bar">
+      {% with funding.basic_info as info %}
+        <span class="{% if info.percentage < 15 %}little-progress{% endif %}" style="width: {{ info.percentage|stringformat:'.2f' }}%;"></span>
+      {% endwith %}
+    </div>
+  </div>
+  <h3>
+      {{ funding.author }}
+  </h3>
+  <h2><a href="{{ funding.get_absolute_url }}">{{ funding.title }}</a></h2>
+</article>

diff --git a/src/funding/templates/funding/2022/offer_detail.html b/src/funding/templates/funding/2022/offer_detail.html
index 0812e83..920f844 100644 (file)
--- a/src/funding/templates/funding/2022/offer_detail.html
+++ b/src/funding/templates/funding/2022/offer_detail.html
@@ -66,6 +66,7 @@
             <div class="l-article__overlay" data-max-height="91">
               {{ object.status }}
               {{ object.status_more }}
+              {% chunk 'funding_rules'  %}
             </div>
             <button class="l-article__read-more" aria-label="Kliknij aby rozwinąć" data-label="Więcej" data-action="Mniej">Więcej</button>
           </div>
@@ -101,9 +102,7 @@
     {% fundings object %}
   </article>
 
-  {# pomóż uwolnić #}
   {# 1% #}
   {# share? #}
 
-
 {% endblock %}

diff --git a/src/funding/templates/funding/2022/offer_list.html b/src/funding/templates/funding/2022/offer_list.html
new file mode 100644 (file)
index 0000000..b7528ea
--- /dev/null
+++ b/src/funding/templates/funding/2022/offer_list.html
@@ -0,0 +1,29 @@
+{% extends '2022/base.html' %}
+
+
+{% block settings %}
+  {% load title %}
+  {% title 'X' %}
+{% endblock %}
+
+
+{% block main %}
+  <div class="l-section">
+    <div class="l-books__header">
+      <div class="l-books__input">
+        <i class="icon icon-filter"></i>
+        <input type="text" placeholder="filtry, tytuł" class="quick-filter" data-for="book-list">
+      </div>
+    </div>
+  </div>
+
+
+  <div class="l-section l-section--col">
+    <div class="l-books__grid" id="book-list">
+      {% for funding in object_list %}
+        {% include "funding/2022/includes/funding_box.html" %}
+      {% endfor %}
+    </div>
+  </div>
+
+{% endblock %}

diff --git a/src/funding/templates/funding/disable_notifications.html b/src/funding/templates/funding/disable_notifications.html
index ed5c3a6..2763217 100644 (file)
--- a/src/funding/templates/funding/disable_notifications.html
+++ b/src/funding/templates/funding/disable_notifications.html
@@ -1,8 +1,8 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 {% load fnp_share %}
 
-{% block titleextra %}{% trans "Payment failed" %}{% endblock %}
+{% block titleextra %}{% trans "Disable notifications" %}{% endblock %}
 
 {% block body %}
   <h1>{% trans "Disable notifications" %}</h1>

diff --git a/src/funding/templates/funding/no_thanks.html b/src/funding/templates/funding/no_thanks.html
index b9f2595..ca62ad4 100644 (file)
--- a/src/funding/templates/funding/no_thanks.html
+++ b/src/funding/templates/funding/no_thanks.html
@@ -1,4 +1,4 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 {% load fnp_share %}
 

diff --git a/src/funding/templates/funding/thanks.html b/src/funding/templates/funding/thanks.html
index d3f5dc6..9ad0cdd 100644 (file)
--- a/src/funding/templates/funding/thanks.html
+++ b/src/funding/templates/funding/thanks.html
@@ -1,4 +1,4 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 {% load fnp_share %}
 {% load polls_tags %}

diff --git a/src/funding/templates/funding/wlfund.html b/src/funding/templates/funding/wlfund.html
index a867352..ed872e4 100644 (file)
--- a/src/funding/templates/funding/wlfund.html
+++ b/src/funding/templates/funding/wlfund.html
@@ -1,4 +1,4 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 
 {% block titleextra %}{% trans "Remaining funds" %}{% endblock %}

diff --git a/src/funding/views.py b/src/funding/views.py
index d34eccc..6df231d 100644 (file)
--- a/src/funding/views.py
+++ b/src/funding/views.py
@@ -127,6 +127,11 @@ class CurrentView(OfferDetailView):
 class OfferListView(ListView):
     queryset = Offer.public()
 
+    def get_template_names(self):
+        if self.request.EXPERIMENTS['layout'].value:
+            return 'funding/2022/offer_list.html'
+        return 'funding/offer_list.html'
+    
     def get_context_data(self, **kwargs):
         ctx = super(OfferListView, self).get_context_data(**kwargs)
         ctx['funding_no_show_current'] = True

diff --git a/src/libraries/templates/libraries/catalog_view.html b/src/libraries/templates/libraries/catalog_view.html
index 2a022d4..42b30f7 100644 (file)
--- a/src/libraries/templates/libraries/catalog_view.html
+++ b/src/libraries/templates/libraries/catalog_view.html
@@ -1,6 +1,16 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 
+{% block settings %}
+  {% load title %}
+  {% trans 'Library directories' as title %}
+  {% title title %}
+{% endblock %}
+
+{% block breadcrumbs %}
+  <a href="{% url 'libraries_main_view' %}"><span>{% trans 'Libraries directory' %}</span></a>
+{% endblock %}
+
 {% block titleextra %}{% trans 'Libraries directory' %}{% endblock %}
 
 
@@ -15,4 +25,4 @@
       </ul>
     </div>
   </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

diff --git a/src/libraries/templates/libraries/library_view.html b/src/libraries/templates/libraries/library_view.html
index 283d1c0..8552314 100644 (file)
--- a/src/libraries/templates/libraries/library_view.html
+++ b/src/libraries/templates/libraries/library_view.html
@@ -1,6 +1,16 @@
-{% extends "base/base.html" %}\r
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}\r
 {% load i18n %}\r
 \r
+{% block settings %}\r
+  {% load title %}\r
+  {% title library.name %}\r
+{% endblock %}\r
+\r
+{% block breadcrumbs %}\r
+  <a href="{% url 'libraries_main_view' %}"><span>{% trans 'Libraries directory' %}</span></a>\r
+  <a href="{{ library.catalog.get_absolute_url }}"><span>{{ library.catalog.name }}</span></a>\r
+{% endblock %}\r
+\r
 {% block titleextra %}{{ library.name }}{% endblock %}\r
 \r
 {% block body %}\r
@@ -9,4 +19,4 @@
     <p>Adres strony www: <a href="{{library.url}}">{{library.url}}</a></p>\r
     {% autoescape off %}{{library.description}}{% endautoescape%}\r
   </div>\r
-{% endblock %}
\ No newline at end of file
+{% endblock %}\r

diff --git a/src/libraries/templates/libraries/main_view.html b/src/libraries/templates/libraries/main_view.html
index 3593616..051a82a 100644 (file)
--- a/src/libraries/templates/libraries/main_view.html
+++ b/src/libraries/templates/libraries/main_view.html
@@ -1,6 +1,12 @@
-{% extends "base/base.html" %}\r
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}\r
 {% load i18n %}\r
 \r
+{% block settings %}\r
+  {% load title %}\r
+  {% trans 'Library directories' as title %}\r
+  {% title title %}\r
+{% endblock %}\r
+\r
 {% block titleextra %}{% trans 'Library directories' %}{% endblock %}\r
 \r
 {% block body %}\r
@@ -14,4 +20,4 @@
       </ul>\r
     </div>\r
   </div>\r
-{% endblock %}
\ No newline at end of file
+{% endblock %}\r

diff --git a/src/polls/templates/polls/poll.html b/src/polls/templates/polls/poll.html
index e57d9cd..c87ea4f 100644 (file)
--- a/src/polls/templates/polls/poll.html
+++ b/src/polls/templates/polls/poll.html
@@ -1,4 +1,4 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 {% load polls_tags %}
 
@@ -6,10 +6,11 @@
 
 
 {% block body %}
+  <h1>Ankieta</h1>
   <div class="normal-text">
     {% if voted_already %}
       <p class="poll-msg">{% trans "Thanks for voting! You can see current results below." %}</p>
     {% endif %}
     {% poll poll %}
   </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

diff --git a/src/polls/templates/polls/tags/poll.html b/src/polls/templates/polls/tags/poll.html
index b4a4e7f..8037266 100644 (file)
--- a/src/polls/templates/polls/tags/poll.html
+++ b/src/polls/templates/polls/tags/poll.html
@@ -17,7 +17,8 @@
         {% endif %}
     {% else %}
         <div class="poll">
-            <p>{{poll.question}}</p>
+          <p>{{poll.question}}</p>
+          <br>
             <form action="{{poll.get_absolute_url}}" method="post">{% csrf_token %}
             {{ form.vote }}
             <input type="submit" value="{% trans "Submit" %}" />

diff --git a/src/wolnelektury/static/2022/more.scss b/src/wolnelektury/static/2022/more.scss
index 0a2ba06..3733e3c 100644 (file)
--- a/src/wolnelektury/static/2022/more.scss
+++ b/src/wolnelektury/static/2022/more.scss
@@ -451,6 +451,10 @@ form {
     }
 }
 
+.l-checkout__support__bar {
+    overflow: hidden;
+}
+
 
 .l-change-pop {
     margin-bottom: 18px;
@@ -465,3 +469,21 @@ form {
         background: #92BD39;
     }
 }
+
+
+.poll-bar {
+    height: 10px;
+    width: 100%;
+    display: block;
+    border-radius: 5px;
+    position: relative;
+    overflow: hidden;
+
+    .poll-bar-inner {
+      height: 100%;
+      position: absolute;
+      border-radius: 5px;
+      background-color: #006066;
+      top: 0; left: 0;
+    }
+}