From 76825373cab2ea76006f00d45154294b79ff7c85 Mon Sep 17 00:00:00 2001 From: beucismis Date: Wed, 10 May 2023 00:10:05 +0300 Subject: [PATCH] Update template --- ozgursozluk/templates/404.html | 6 ++++- ozgursozluk/templates/author.html | 10 ++++++--- ozgursozluk/templates/base.html | 2 +- ozgursozluk/templates/debe.html | 10 +++++++-- ozgursozluk/templates/index.html | 16 ++++++++++---- ozgursozluk/templates/navigation.html | 12 +++++----- ozgursozluk/templates/paginate.html | 32 ++++++++++++++++++--------- ozgursozluk/templates/settings.html | 10 ++++++--- ozgursozluk/templates/topic.html | 28 +++++++++++++---------- 9 files changed, 84 insertions(+), 42 deletions(-) diff --git a/ozgursozluk/templates/404.html b/ozgursozluk/templates/404.html index 0c802b7..2d6162e 100644 --- a/ozgursozluk/templates/404.html +++ b/ozgursozluk/templates/404.html @@ -1,5 +1,9 @@ {% extends "base.html" %} -{% block title %}özgürsözlük - 404{% endblock %} +{% block title %}404 - özgürsözlük{% endblock %} +{% block meta %} + + +{% endblock %} {% block main %}
diff --git a/ozgursozluk/templates/author.html b/ozgursozluk/templates/author.html index ca74176..a5dec27 100644 --- a/ozgursozluk/templates/author.html +++ b/ozgursozluk/templates/author.html @@ -1,9 +1,13 @@ {% extends "base.html" %} -{% block title %}özgürsözlük - user: {{ author.nickname }}{% endblock %} +{% block title %}author: {{ author.nickname }} - özgürsözlük{% endblock %} +{% block meta %} + + +{% endblock %} {% block main %}
- +
{{ author.nickname }} {% if author.level %} @@ -21,7 +25,7 @@ {% if author.biography %}
- {{ author.biography|safe }} + {{ author.biography_html|safe }}
{% endif %} diff --git a/ozgursozluk/templates/base.html b/ozgursozluk/templates/base.html index 13719fd..0cc8c82 100644 --- a/ozgursozluk/templates/base.html +++ b/ozgursozluk/templates/base.html @@ -2,7 +2,7 @@ - + {% block meta %}{% endblock %} diff --git a/ozgursozluk/templates/debe.html b/ozgursozluk/templates/debe.html index a6b36d0..a8adab3 100644 --- a/ozgursozluk/templates/debe.html +++ b/ozgursozluk/templates/debe.html @@ -1,5 +1,9 @@ {% extends "base.html" %} -{% block title %}özgürsözlük - debe{% endblock %} +{% block title %}debe - özgürsözlük{% endblock %} +{% block meta %} + + +{% endblock %} {% block main %}
@@ -8,7 +12,9 @@
diff --git a/ozgursozluk/templates/index.html b/ozgursozluk/templates/index.html index e827dfe..bdb8c46 100644 --- a/ozgursozluk/templates/index.html +++ b/ozgursozluk/templates/index.html @@ -1,5 +1,9 @@ {% extends "base.html" %} {% block title %}özgürsözlük{% endblock %} +{% block meta %} + + +{% endblock %} {% block main %}
@@ -22,13 +26,15 @@
{% if topic.pinned %}pinned{% endif %} - {% if topic.views %}{{ topic.views|safe }}{% endif %} + {% if topic.entry_count %} + {{ topic.entry_count }} + {% endif %}
@@ -37,12 +43,14 @@
- {% if topic.views %}{{ topic.views|safe }}{% endif %} + {% if topic.entry_count %} + {{ topic.entry_count }} + {% endif %}
diff --git a/ozgursozluk/templates/navigation.html b/ozgursozluk/templates/navigation.html index d13ac22..4083f59 100644 --- a/ozgursozluk/templates/navigation.html +++ b/ozgursozluk/templates/navigation.html @@ -1,6 +1,6 @@ -
-
- - -
-
+
+
+ + +
+
diff --git a/ozgursozluk/templates/paginate.html b/ozgursozluk/templates/paginate.html index 2687f1f..50f0e99 100644 --- a/ozgursozluk/templates/paginate.html +++ b/ozgursozluk/templates/paginate.html @@ -1,23 +1,35 @@
{% if a %} {% if p > 1 %} - previous - {% if p < topic.pagecount %}/{% endif %} + + previous + + {% if p < topic.page_count %}/{% endif %} {% endif %} - {% if p < topic.pagecount %}next{% endif %} - {% if topic.pagecount > 1 %} + {% if p < topic.page_count %} + next + {% endif %} + {% if topic.page_count > 1 %} - - last page + + last page + {% endif %} {% else %} {% if p > 1 %} - previous - {% if p < topic.pagecount %}/{% endif %} + + previous + + {% if p < topic.page_count %}/{% endif %} + {% endif %} + {% if p < topic.page_count %} + next {% endif %} - {% if p < topic.pagecount %}next{% endif %} - {% if topic.pagecount > 1 %} + {% if topic.page_count > 1 %} - - last page + + last page + {% endif %} {% endif %}
diff --git a/ozgursozluk/templates/settings.html b/ozgursozluk/templates/settings.html index d87a324..ab9dbb6 100644 --- a/ozgursozluk/templates/settings.html +++ b/ozgursozluk/templates/settings.html @@ -1,5 +1,9 @@ {% extends "base.html" %} -{% block title %}özgürsözlük - settings{% endblock %} +{% block title %}settings - özgürsözlük{% endblock %} +{% block meta %} + + +{% endblock %} {% block main %}
@@ -42,14 +46,14 @@
- note: settings are saved in browser cookies. clearing your cookies will reset them. + note: settings are saved in browser cookies.
clearing your cookies will reset them.

v{{ version }} - last commit: {{ last_commit[:8] }} - - made with <3 on the t61 + made with <3 on the t61
{% endblock %} diff --git a/ozgursozluk/templates/topic.html b/ozgursozluk/templates/topic.html index 182a1ee..c79b4e6 100644 --- a/ozgursozluk/templates/topic.html +++ b/ozgursozluk/templates/topic.html @@ -1,5 +1,9 @@ {% extends "base.html" %} -{% block title %}özgürsözlük - {{ topic.title }}{% endblock %} +{% block title %}{{ topic.title }} {% if p > 1 %}- page: {{ p }}{% endif %} - özgürsözlük{% endblock %} +{% block meta %} + + +{% endblock %} {% block main %}
@@ -8,15 +12,11 @@

{{ topic.title }} - şükela: {% if topic.nice %} - - nice - + nice {% else %} - nice - {% endif %} - {% if not topic.pagecount %} - | - all + + nice + {% endif %}

@@ -24,17 +24,21 @@
{% for entry in topic.entrys %}
- {{ entry.content|safe }} + {{ entry.content_html|safe }}
{% if request.cookies.get('display_author_nicknames') == 'true' %} - {{ entry.author }} + + {{ entry.author }} + - {% endif %} - {{ entry.datetime }} + + {{ entry.datetime }} +