PlexSheep/gawa
1
0
Fork 0
Code Issues 27 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Compare commits

base: PlexSheep:e8c332fce41cd02b7c46b342cbdc7b4b514338f0
Branches Tags
PlexSheep:master
PlexSheep:persistent-db
PlexSheep:devel
PlexSheep:translation
PlexSheep:blog-browse
PlexSheep:blog-style
..
compare: PlexSheep:50db49911fb9bb856476431f23072289e114ab2d
Branches Tags
PlexSheep:persistent-db
PlexSheep:devel
PlexSheep:translation
PlexSheep:blog-browse
PlexSheep:blog-style
PlexSheep:master

No commits in common. "e8c332fce41cd02b7c46b342cbdc7b4b514338f0" and "50db49911fb9bb856476431f23072289e114ab2d" have entirely different histories.
e8c332fce4 ... 50db49911f

3 changed files with 50 additions and 90 deletions
Show stats Expand all files Collapse all files

71
gawa/blog/templates/blog/blogpost.html
View file

@ -1,49 +1,29 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% load helper_tags %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% block languagecode %} {% block languagecode %}{{ LANGUAGE_CODE }}{% endblock languagecode %}
{{ LANGUAGE_CODE }} {% block title %}{% translate "cscherr.de" %} - {% translate "Blog" %}{% endblock title %}
{% endblock languagecode %}
{% block title %}
{% translate "cscherr.de" %} - {% translate "Blog" %}
{% endblock title %}
{% block nav %} {% block nav %}
{% include 'nav.html' %} {% include 'nav.html' %}
{% endblock nav %} {% endblock nav %}
{% block headscripts %} {% block headscripts %}
<script type="text/javascript" <script type="text/javascript" id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3.0.0/es5/tex-mml-chtml.js"></script>
id="MathJax-script"
async
src="https://cdn.jsdelivr.net/npm/mathjax@3.0.0/es5/tex-mml-chtml.js"></script>
{% endblock headscripts %} {% endblock headscripts %}
{% block main %} {% block main %}
<div class="container-xl"> <div class="container-xl">
<article> <article>
<div class="jumbotron my-5"> <div class="jumbotron my-5">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
{% if LANGUAGE_CODE == "de" %} {% if LANGUAGE_CODE == "de" %}
<h1 class=""> <h1 class="">{{ post.title_de }}<br>
{{ post.title_de }} <small class="fs-4">{{ post.subtitle_de }}</small></h1><br>
<br>
<small class="fs-4">{{ post.subtitle_de }}</small>
</h1>
<br>
{% elif LANGUAGE_CODE == "en" %} {% elif LANGUAGE_CODE == "en" %}
<h1 class=""> <h1 class="">{{ post.title_en }}<br>
{{ post.title_en }} <small class="fs-4">{{ post.subtitle_en }}</small></h1><br>
<br>
<small class="fs-4">{{ post.subtitle_en }}</small>
</h1>
<br>
{% else %} {% else %}
<h1 class=""> <h1 class="">{{ post.title_en }}<br>
{{ post.title_en }} <small class="fs-4">{{ post.subtitle_en }}</small></h1><br>
<br>
<small class="fs-4">{{ post.subtitle_en }}</small>
</h1>
<br>
{% endif %} {% endif %}
</div> </div>
</div> </div>
@ -53,8 +33,8 @@
<img src="{{ post.thumbnail.url }}" alt="thumbnail" class="img-fluid"> <img src="{{ post.thumbnail.url }}" alt="thumbnail" class="img-fluid">
</picture> </picture>
</div> </div>
<div class="row px-3"> <div class="col px-3">
<div class=""> <div class="col">
{% if LANGUAGE_CODE == "de" %} {% if LANGUAGE_CODE == "de" %}
<p class="lead">{{ post.desc_de }}</p> <p class="lead">{{ post.desc_de }}</p>
{% elif LANGUAGE_CODE == "en" %} {% elif LANGUAGE_CODE == "en" %}
@ -63,10 +43,11 @@
<p class="lead">{{ post.desc_en }}</p> <p class="lead">{{ post.desc_en }}</p>
{% endif %} {% endif %}
</div> </div>
<div class=""> <div class="col">
<p> <p>{{ post.date }}</p>
<b>{{ post.category.name }}<b> </div>
</p> <div class="col">
<p>{{ post.category.name }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -82,17 +63,7 @@
{% endif %} {% endif %}
</div> </div>
<hr> <hr>
<div class="row text-center">
<div class="col">
{% format_time post.date as date %}
<p>{% trans "published" %}: {{ date }}</p>
</div>
<div class="col">
{% format_time post.update as update %}
<p>{% trans "updated" %}: {{ update }}</p>
</div>
</div>
</article> </article>
</div> </div>
{% include 'blog/featured.html' %} {% include 'blog/featured.html' %}
{% endblock main %} {% endblock main %}

7
gawa/blog/templates/blog/featured.html
View file

@ -1,5 +1,4 @@
{% load i18n %} {% load i18n %}
{% load helper_tags %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
<div class="container-lg mt-5"> <div class="container-lg mt-5">
<h4 class="">{% trans "Featured" %}</h4> <h4 class="">{% trans "Featured" %}</h4>
@ -46,12 +45,6 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
<div class="container p-1 text-center" style="border-top: solid">
<li class="list-group-item">
{% format_time post.date "%F" as date %}
{% trans "published" %}: {{ date }}
</li>
</div>
</a> </a>
</div> </div>
{% endfor %} {% endfor %}

4
gawa/start/templatetags/helper_tags.py
View file

@ -1,7 +1,6 @@
from django.template import Library from django.template import Library
from django.urls import resolve, reverse from django.urls import resolve, reverse
from django.utils.translation import activate, get_language from django.utils.translation import activate, get_language
from datetime import datetime
import re import re
@ -10,9 +9,6 @@ logger = logging.getLogger(__name__)
register = Library() register = Library()
@register.simple_tag
def format_time(timestamp: datetime, format: str = "%F %H:%M:%S") -> str:
return timestamp.strftime(format)
@register.simple_tag(takes_context=True) @register.simple_tag(takes_context=True)
def change_lang(context, lang="de", *args, **kwargs): def change_lang(context, lang="de", *args, **kwargs):