fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 94b69cb)
Cut the unnecessary middle base template.
authorRadek Czajka <rczajka@rczajka.pl>
Fri, 21 Oct 2022 14:59:54 +0000 (16:59 +0200)
committerRadek Czajka <rczajka@rczajka.pl>
Fri, 21 Oct 2022 14:59:54 +0000 (16:59 +0200)
src/catalogue/templates/catalogue/2022/author_detail.html patch | blob | history
src/catalogue/templates/catalogue/2022/book_detail.html patch | blob | history
src/catalogue/templates/catalogue/2022/theme_detail.html patch | blob | history
src/wolnelektury/templates/2022/base.html patch | blob | history
src/wolnelektury/templates/2022/base_real.html [deleted file] patch | blob | history

diff --git a/src/catalogue/templates/catalogue/2022/author_detail.html b/src/catalogue/templates/catalogue/2022/author_detail.html
index 9ba6aaf..d32c012 100644 (file)
--- a/src/catalogue/templates/catalogue/2022/author_detail.html
+++ b/src/catalogue/templates/catalogue/2022/author_detail.html
@@ -1,4 +1,4 @@
-{% extends '2022/base_real.html' %}
+{% extends '2022/base.html' %}
 
 {% load choose_cites from social_tags %}
 
 
 {% load choose_cites from social_tags %}
 
diff --git a/src/catalogue/templates/catalogue/2022/book_detail.html b/src/catalogue/templates/catalogue/2022/book_detail.html
index 9082d01..d705728 100644 (file)
--- a/src/catalogue/templates/catalogue/2022/book_detail.html
+++ b/src/catalogue/templates/catalogue/2022/book_detail.html
@@ -1,4 +1,4 @@
-{% extends '2022/base_real.html' %}
+{% extends '2022/base.html' %}
 
 {% load static %}
 {% load choose_cites from social_tags %}
 
 {% load static %}
 {% load choose_cites from social_tags %}
diff --git a/src/catalogue/templates/catalogue/2022/theme_detail.html b/src/catalogue/templates/catalogue/2022/theme_detail.html
index c0afc33..5713cec 100644 (file)
--- a/src/catalogue/templates/catalogue/2022/theme_detail.html
+++ b/src/catalogue/templates/catalogue/2022/theme_detail.html
@@ -1,4 +1,4 @@
-{% extends '2022/base_real.html' %}
+{% extends '2022/base.html' %}
 {% load pagination_tags %}
 
 {% block global-content %}
 {% load pagination_tags %}
 
 {% block global-content %}
diff --git a/src/wolnelektury/templates/2022/base.html b/src/wolnelektury/templates/2022/base.html
index 6d9a056..aa85881 100644 (file)
--- a/src/wolnelektury/templates/2022/base.html
+++ b/src/wolnelektury/templates/2022/base.html
@@ -1,4 +1,51 @@
-{% extends "2022/base_real.html" %}
+<!doctype html>
+{% load pipeline %}
+{% load static %}
+{% load piwik_tags %}
+{% load title %}
 
 
+{% block settings %}
+{% endblock %}
 
 
-{% block ogtitle %}{% block titleextra %}{{ page_title }}{% endblock %}{% endblock %}
+<html class="no-js">
+  <head>
+    <meta charset="utf-8">
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>{% if title %}{{ title }} | {% endif %}WolneLektury.pl</title>
+    <link rel="apple-touch-icon" href="apple-touch-icon.png">
+    {% stylesheet '2022' %}
+      <script src="scripts/modernizr.js"></script>
+
+      <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>
+    {% include '2022/header.html' %}
+
+    {% block global-content %}
+      <div class="l-container">
+        <div class="l-breadcrumb">
+          <a href="/"><span>Strona główna</span></a>
+          {% block breadcrumbs %}<span>{{ title }}</span>{% endblock %}
+        </div>
+      </div>
+
+      <main class="l-main">
+        {% block main %}{% endblock %}
+      </main>
+    {% endblock %}
+
+    {% include '2022/footer.html' %}
+
+    <script src="{% static '2022/scripts/vendor.js' %}"></script>
+    <script src="{% static '2021/scripts/main.js' %}"></script>
+
+    {% javascript '2022' %}
+    {% javascript '2022_player' %}
+    {% include '2022/hotjar.html' %}
+  </body>
+</html>
diff --git a/src/wolnelektury/templates/2022/base_real.html b/src/wolnelektury/templates/2022/base_real.html
deleted file mode 100644 (file)
index aa85881..0000000
--- a/src/wolnelektury/templates/2022/base_real.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-{% load pipeline %}
-{% load static %}
-{% load piwik_tags %}
-{% load title %}
-
-{% block settings %}
-{% endblock %}
-
-<html class="no-js">
-  <head>
-    <meta charset="utf-8">
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>{% if title %}{{ title }} | {% endif %}WolneLektury.pl</title>
-    <link rel="apple-touch-icon" href="apple-touch-icon.png">
-    {% stylesheet '2022' %}
-      <script src="scripts/modernizr.js"></script>
-
-      <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>
-    {% include '2022/header.html' %}
-
-    {% block global-content %}
-      <div class="l-container">
-        <div class="l-breadcrumb">
-          <a href="/"><span>Strona główna</span></a>
-          {% block breadcrumbs %}<span>{{ title }}</span>{% endblock %}
-        </div>
-      </div>
-
-      <main class="l-main">
-        {% block main %}{% endblock %}
-      </main>
-    {% endblock %}
-
-    {% include '2022/footer.html' %}
-
-    <script src="{% static '2022/scripts/vendor.js' %}"></script>
-    <script src="{% static '2021/scripts/main.js' %}"></script>
-
-    {% javascript '2022' %}
-    {% javascript '2022_player' %}
-    {% include '2022/hotjar.html' %}
-  </body>
-</html>