More generic pages.

diff --git a/src/api/templates/api/main.html b/src/api/templates/api/main.html
index a2a67cd..7af79da 100644 (file)
--- a/src/api/templates/api/main.html
+++ b/src/api/templates/api/main.html
@@ -1,7 +1,13 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 {% load build_absolute_uri from fnp_common %}
 
+{% block settings %}
+  {% load title %}
+  {% trans "WolneLektury.pl API" as title %}
+  {% title title %}
+{% endblock %}
+
 {% block title %}{% trans "WolneLektury.pl API" %}{% endblock %}
 
 {% block bodyid %}api{% endblock %}
@@ -35,26 +41,26 @@
     </p>
 
     <ul>
-        <li><a href='{% url "catalogue_api_book_list" "" %}'>
-          {% url "catalogue_api_book_list" "" %}</a> – {% trans "All books" %}</li>
-        <li><a href='{% url "catalogue_api_audiobook_list" "" %}'>
-          {% url "catalogue_api_audiobook_list" "" %}</a> – {% trans "Audiobooks" %}</li>
-        <li><a href='{% url "catalogue_api_daisy_list" "" %}'>
-          {% url "catalogue_api_daisy_list" "" %}</a> – {% trans "DAISY" %}</li>
+      <li><a href='{% url "catalogue_api_book_list" "" %}'>
+        {% url "catalogue_api_book_list" "" %}</a> – {% trans "All books" %}</li>
+      <li><a href='{% url "catalogue_api_audiobook_list" "" %}'>
+        {% url "catalogue_api_audiobook_list" "" %}</a> – {% trans "Audiobooks" %}</li>
+      <li><a href='{% url "catalogue_api_daisy_list" "" %}'>
+        {% url "catalogue_api_daisy_list" "" %}</a> – {% trans "DAISY" %}</li>
 
-        <li><a href='{% url "catalogue_api_tag_list" "author" %}'>
-          {% url "catalogue_api_tag_list" "author" %}</a> – {% trans "List of all authors" %}</li>
-        <li><a href='{% url "catalogue_api_tag_list" "epoch" %}'>
-          {% url "catalogue_api_tag_list" "epoch" %}</a> – {% trans "List of all epochs" %}</li>
-        <li><a href='{% url "catalogue_api_tag_list" "genre" %}'>
-          {% url "catalogue_api_tag_list" "genre" %}</a> – {% trans "List of all genres" %}</li>
-        <li><a href='{% url "catalogue_api_tag_list" "kind" %}'>
-          {% url "catalogue_api_tag_list" "kind" %}</a> – {% trans "List of all kinds" %}</li>
+      <li><a href='{% url "catalogue_api_tag_list" "author" %}'>
+        {% url "catalogue_api_tag_list" "author" %}</a> – {% trans "List of all authors" %}</li>
+      <li><a href='{% url "catalogue_api_tag_list" "epoch" %}'>
+        {% url "catalogue_api_tag_list" "epoch" %}</a> – {% trans "List of all epochs" %}</li>
+      <li><a href='{% url "catalogue_api_tag_list" "genre" %}'>
+        {% url "catalogue_api_tag_list" "genre" %}</a> – {% trans "List of all genres" %}</li>
+      <li><a href='{% url "catalogue_api_tag_list" "kind" %}'>
+        {% url "catalogue_api_tag_list" "kind" %}</a> – {% trans "List of all kinds" %}</li>
 
-        <li><a href='{% url "catalogue_api_tag_list" "theme" %}'>
-          {% url "catalogue_api_tag_list" "theme" %}</a> – {% trans "List of all themes" %}</li>
-        <li><a href='{% url "catalogue_api_collections" %}'>
-          {% url "catalogue_api_collections" %}</a> – {% trans "Collections" %}</li>
+      <li><a href='{% url "catalogue_api_tag_list" "theme" %}'>
+        {% url "catalogue_api_tag_list" "theme" %}</a> – {% trans "List of all themes" %}</li>
+      <li><a href='{% url "catalogue_api_collections" %}'>
+        {% url "catalogue_api_collections" %}</a> – {% trans "Collections" %}</li>
     </ul>
 
     <p>
@@ -84,7 +90,7 @@
     </p>
 
     <p>
-      {% url "api_fragment" "sen-nocy-letniej" "1290526312912-3814598192" as f %}
+      {% url "catalogue_api_fragment" "sen-nocy-letniej" "1290526312912-3814598192" as f %}
       {% blocktrans with "/api/authors/william-shakespeare/themes/zabawa/fragments/" as e %}
         The same way, using also books and themes, you can search for a list of fragments:
         <a href="{{e}}">{{e}}</a>.

diff --git a/src/api/templates/oauth/authorize_token.html b/src/api/templates/oauth/authorize_token.html
index e54f701..49dd098 100644 (file)
--- a/src/api/templates/oauth/authorize_token.html
+++ b/src/api/templates/oauth/authorize_token.html
@@ -1,6 +1,12 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 
+{% block settings %}
+  {% load title %}
+  {% trans "Authorize access to Wolne Lektury" as title %}
+  {% title title %}
+{% endblock %}
+
 {% block titleextra %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %}
 
 {% block body %}

diff --git a/src/api/views.py b/src/api/views.py
index 6762fb1..be1491b 100644 (file)
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -75,7 +75,7 @@ def oauth_user_auth(request):
             realms, credentials = endpoint.get_realms_and_credentials(
                 **oauthlib_request(request))
         except OAuth1Error as e:
-            return HttpResponse(e.message, status=400)
+            return HttpResponse(str(e), status=400)
         callback = request.GET.get('oauth_callback')
 
         form = OAuthAuthenticationForm(initial={

diff --git a/src/catalogue/api/views.py b/src/catalogue/api/views.py
index b45ad46..5512501 100644 (file)
--- a/src/catalogue/api/views.py
+++ b/src/catalogue/api/views.py
@@ -320,7 +320,7 @@ class TagView(RetrieveAPIView):
                 slug=self.kwargs['slug']
             )
         except Http404:
-            if self.method == 'PUT':
+            if self.request.method == 'PUT':
                 return Tag(
                     category=self.kwargs['category'],
                     slug=self.kwargs['slug']

diff --git a/src/dictionary/templates/dictionary/note_list.html b/src/dictionary/templates/dictionary/note_list.html
index 3a19b4e..6c1da2e 100644 (file)
--- a/src/dictionary/templates/dictionary/note_list.html
+++ b/src/dictionary/templates/dictionary/note_list.html
@@ -1,7 +1,12 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n pagination_tags %}
 {% load set_get from set_get %}
 
+{% block settings %}
+  {% load title %}
+  {% trans "Footnotes" as title %}
+  {% title title %}
+{% endblock %}
 
 {% block bodyid %}footnotes{% endblock %}
 

diff --git a/src/infopages/templates/infopages/2022/infopage.html b/src/infopages/templates/infopages/2022/infopage.html
index 9c14723..465ad88 100644 (file)
--- a/src/infopages/templates/infopages/2022/infopage.html
+++ b/src/infopages/templates/infopages/2022/infopage.html
@@ -1,16 +1,12 @@
 {% extends '2022/base.html' %}
 
-
-{% block global-content %}
-  <div class="l-container">
-    <div class="l-breadcrumb">
-      <a href="/"><span>Strona główna</span></a>
-      <a href="{{ page.get_absolute_url }}">{{ page.title }}</a>
-    </div>
-  </div>
+{% block settings %}
+  {% load title %}
+  {% title page.title %}
+{% endblock %}
 
 
-  <main class="l-main">
+{% block main %}
     <div class="l-article__title">
       <h1>{{ page.title }}</h1>
     </div>
@@ -24,6 +20,4 @@
         </div>
       </div>
     </article>
-  </main>
-
 {% endblock %}

diff --git a/src/isbn/templates/isbn/add_isbn.html b/src/isbn/templates/isbn/add_isbn.html
index fcbe6f2..b1eebe2 100644 (file)
--- a/src/isbn/templates/isbn/add_isbn.html
+++ b/src/isbn/templates/isbn/add_isbn.html
@@ -1,4 +1,9 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
+
+{% block settings %}
+  {% load title %}
+  {% title 'Dodaj ISBN' %}
+{% endblock %}
 
 {% block title %}Dodaj ISBN{% endblock %}
 

diff --git a/src/isbn/templates/isbn/assigned_isbn.html b/src/isbn/templates/isbn/assigned_isbn.html
index 971dbab..5cb99b1 100644 (file)
--- a/src/isbn/templates/isbn/assigned_isbn.html
+++ b/src/isbn/templates/isbn/assigned_isbn.html
@@ -1,14 +1,21 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
+
+{% block settings %}
+  {% load title %}
+  {% title 'Przypisane ISBN' %}
+{% endblock %}
 
 {% block title %}Przypisane ISBN{% endblock %}
 
 {% block body %}
 
   <h1>Przypisane ISBN</h1>
-  <h2>{{ title }}</h2>
+  <div class="normal-text">
+    <h2>{{ title }}</h2>
   <dl>
     {% for format, isbn in isbn_formats %}
       <dt>{{ format }}</dt><dd>{{ isbn }}</dd>
     {% endfor %}
   </dl>
+  </div>
 {% endblock %}

diff --git a/src/isbn/templates/isbn/confirm_isbn_wl.html b/src/isbn/templates/isbn/confirm_isbn_wl.html
index dab9f26..96b7326 100644 (file)
--- a/src/isbn/templates/isbn/confirm_isbn_wl.html
+++ b/src/isbn/templates/isbn/confirm_isbn_wl.html
@@ -1,4 +1,9 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
+
+{% block settings %}
+  {% load title %}
+  {% title 'Potwierdź dane' %}
+{% endblock %}
 
 {% block title %}Potwierdź dane{% endblock %}
 

diff --git a/src/isbn/templates/isbn/wl_dc_tags.html b/src/isbn/templates/isbn/wl_dc_tags.html
index 5bf8036..01ca425 100644 (file)
--- a/src/isbn/templates/isbn/wl_dc_tags.html
+++ b/src/isbn/templates/isbn/wl_dc_tags.html
@@ -1,14 +1,21 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
+
+{% block settings %}
+  {% load title %}
+  {% title 'Przypisane ISBN' %}
+{% endblock %}
 
 {% block title %}Znaczniki ISBN{% endblock %}
 
 {% block body %}
 
   <h1>Znaczniki ISBN</h1>
+  <div class="normal-text">
   <h2>{{ title }}</h2>
-<code>{% for format, content_type, isbn in isbn_formats %}
+  <code>{% for format, content_type, isbn in isbn_formats %}
 &lt;dc:relation.hasFormat id="{{ format }}" xmlns:dc="http://purl.org/dc/elements/1.1/">https://wolnelektury.pl/{% if format == 'html' %}katalog/lektura{% else %}media/book/{{ format }}{% endif %}/{{ slug }}.{{ format }}&lt;/dc:relation.hasFormat><br>
 &lt;meta refines="#{{ format }}" id="{{ format }}-id" property="dcterms:identifier">ISBN-{{ isbn }}&lt;/meta><br>
 &lt;meta refines="#{{ format }}-id" property="identifier-type">ISBN&lt;/meta><br>
   &lt;meta refines="#{{ format }}" property="dcterms:format">{{ content_type }}&lt;/meta><br>{% endfor %}</code>
-{% endblock %}
\ No newline at end of file
+  </div>
+{% endblock %}

diff --git a/src/lesmianator/views.py b/src/lesmianator/views.py
index e179c14..b4cbf69 100644 (file)
--- a/src/lesmianator/views.py
+++ b/src/lesmianator/views.py
@@ -16,7 +16,7 @@ def main_page(request):
 
     return render(
         request,
-        'lesmianator/lesmianator.html',
+        'lesmianator/2022/lesmianator.html' if request.EXPERIMENTS['layout'].value else 'lesmianator/lesmianator.html',
         {"last": last, "shelves": shelves})
 
 @cache.never_cache

diff --git a/src/reporting/templates/reporting/main.html b/src/reporting/templates/reporting/main.html
index bae491e..a69e9d1 100644 (file)
--- a/src/reporting/templates/reporting/main.html
+++ b/src/reporting/templates/reporting/main.html
@@ -1,7 +1,13 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 {% load reporting_stats catalogue_tags %}
 
+{% block settings %}
+  {% load title %}
+  {% trans "Reports" as title %}
+  {% title title %}
+{% endblock %}
+
 {% block titleextra %}{% trans "Reports" %}{% endblock %}
 
 {% block bodyid %}reports-stats{% endblock %}

diff --git a/src/stats/templates/stats/top.html b/src/stats/templates/stats/top.html
index f5ee6c2..ed6867e 100644 (file)
--- a/src/stats/templates/stats/top.html
+++ b/src/stats/templates/stats/top.html
@@ -1,4 +1,9 @@
-{% extends 'base/base.html' %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
+
+{% block settings %}
+  {% load title %}
+  {% title 'Top' %}
+{% endblock %}
 
 
 {% block body %}

diff --git a/src/waiter/templates/waiter/wait.html b/src/waiter/templates/waiter/wait.html
index 22f5af8..c004895 100644 (file)
--- a/src/waiter/templates/waiter/wait.html
+++ b/src/waiter/templates/waiter/wait.html
@@ -1,7 +1,15 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 {% load static from static %}
 
+
+{% block settings %}
+  {% load title %}
+  {% trans "Your file is being prepared, please wait." as title %}
+  {% title title %}
+{% endblock %}
+
+
 {% block titleextra %}
   {% if file_url %}
     {% trans "The file is ready for download!" %}
@@ -42,12 +50,14 @@
   {% else %}
     {% if waiting %}
       <h1>
-        <img src="{% static "img/indicator.gif" %}" alt="{% trans 'Please wait' %}"/>
         {% trans "Your file is being prepared, please wait." %}
       </h1>
 
       <div class="normal-text">
-        <p>{% blocktrans with d=waiting.description %}The file you requested was: <em>{{d}}</em>.{% endblocktrans %}</p>
+        <p>
+          <img src="{% static "img/indicator.gif" %}" alt="{% trans 'Please wait' %}"/>
+          {% blocktrans with d=waiting.description %}The file you requested was: <em>{{d}}</em>.{% endblocktrans %}
+        </p>
 
         <p>
           {% blocktrans %}<strong>Be aware:</strong> Generating the file can take a while.

diff --git a/src/wolnelektury/static/2022/more.scss b/src/wolnelektury/static/2022/more.scss
index 8f95d12..4241253 100644 (file)
--- a/src/wolnelektury/static/2022/more.scss
+++ b/src/wolnelektury/static/2022/more.scss
@@ -318,10 +318,11 @@ form {
         color: #92BD39;
     }
 
-    > p, form {
+    > p, form, > .normal-text {
         min-width: 300px;
         margin-left: 50px;
         margin-right: 50px;
+        width: auto;
     }
 }
 

diff --git a/src/wolnelektury/templates/2022/base.html b/src/wolnelektury/templates/2022/base.html
index 12bae59..f314f1f 100644 (file)
--- a/src/wolnelektury/templates/2022/base.html
+++ b/src/wolnelektury/templates/2022/base.html
@@ -22,6 +22,7 @@
       <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 %}
+      {% block extrahead %}{% endblock %}
   </head>
   <body>
     {% include '2022/header.html' %}

diff --git a/src/wolnelektury/templates/publish_plan.html b/src/wolnelektury/templates/publish_plan.html
index ffc1150..22e59a9 100644 (file)
--- a/src/wolnelektury/templates/publish_plan.html
+++ b/src/wolnelektury/templates/publish_plan.html
@@ -1,6 +1,12 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 
+{% block settings %}
+  {% load title %}
+  {% trans "Publishing plan" as title %}
+  {% title title %}
+{% endblock %}
+
 {% block titleextra %}{% trans "Publishing plan" %}{% endblock titleextra %}
 
 

diff --git a/src/wolnelektury/templates/user.html b/src/wolnelektury/templates/user.html
index 3adb030..40c7950 100644 (file)
--- a/src/wolnelektury/templates/user.html
+++ b/src/wolnelektury/templates/user.html
@@ -1,7 +1,13 @@
-{% extends "base/base.html" %}
+{% extends request.EXPERIMENTS.layout.value|yesno:"2022/base_simple.html,base/base.html" %}
 {% load i18n %}
 
 
+{% block settings %}
+  {% load title %}
+  {% trans "User" as title %}
+  {% title title %}
+{% endblock %}
+
 {% block titleextra %}{% trans "User" %}{% endblock %}
 
 {% block body %}