-
-
{% compress js %}
+
{% endcompress %}
+
-
- -
-{% include 'blog/featured.html' %}
-{% endblock main %}
+ {% include 'blog/featured.html' %}
+ {% endblock main %}
diff --git a/gawa/blog/templates/blog/featured.html b/gawa/blog/templates/blog/featured.html
index 22d064a..a575c4f 100644
--- a/gawa/blog/templates/blog/featured.html
+++ b/gawa/blog/templates/blog/featured.html
@@ -1,40 +1,59 @@
{% load i18n %}
+{% load helper_tags %}
{% get_current_language as LANGUAGE_CODE %}
diff --git a/gawa/gawa/settings.py b/gawa/gawa/settings.py
index 25546ad..4c65909 100644
--- a/gawa/gawa/settings.py
+++ b/gawa/gawa/settings.py
@@ -11,6 +11,8 @@ https://docs.djangoproject.com/en/3.2/ref/settings/
"""
# for getting envvars
+import logging
+from django.utils.translation import gettext_lazy as _
import os
# default django
@@ -35,7 +37,7 @@ ALLOWED_HOSTS = ["*"]
# Allow inclusion of stuff from these origins
CORS_ALLOWED_ORIGINS = [
- "https://static.cscherr.de",
+ "https://static.cscherr.de",
]
# Application definition
@@ -100,7 +102,6 @@ DATABASES = {
}
-
# Password validation
# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
@@ -123,7 +124,6 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization
# https://docs.djangoproject.com/en/3.2/topics/i18n/
-from django.utils.translation import gettext_lazy as _
LANGUAGES = [
("de", _("German")),
@@ -155,10 +155,10 @@ STATIC_URL = '/static/'
COMPRESS_ENABLED = True
STATICFILES_FINDERS = [
- 'django.contrib.staticfiles.finders.FileSystemFinder',
- 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
- 'compressor.finders.CompressorFinder',
- ]
+ 'django.contrib.staticfiles.finders.FileSystemFinder',
+ 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+ 'compressor.finders.CompressorFinder',
+]
COMPRESS_PRECOMPILERS = (
('text/x-scss', 'django_libsass.SassCompiler'),
@@ -173,7 +173,6 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
# Logging configs
-import logging
myServerFormatter = ServerFormatter
myServerFormatter.default_time_format = "%Y-%M-%d %H:%M:%S"
@@ -294,7 +293,7 @@ LOGGING = {
# Media stuff
# this is where user uploaded files will go.
# TODO change this for prod
-#MEDIA_ROOT = "/home/plex/Documents/code/python/gawa/media"
+# MEDIA_ROOT = "/home/plex/Documents/code/python/gawa/media"
MEDIA_ROOT = "/app/media"
MEDIA_URL = "/media/"
-FILE_UPLOAD_TEMP_DIR = "/tmp/gawa/upload"
+# FILE_UPLOAD_TEMP_DIR = "/tmp/gawa/upload"
diff --git a/gawa/gawa/urls.py b/gawa/gawa/urls.py
index 26c88d8..e748c58 100644
--- a/gawa/gawa/urls.py
+++ b/gawa/gawa/urls.py
@@ -14,14 +14,14 @@ Including another URLconf
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.conf.urls.i18n import i18n_patterns
-from django.conf.urls import url
from django.contrib import admin
+from django.urls import include, re_path
from django.urls import include, path
from django.conf import settings
from django.conf.urls.static import static
urlpatterns = [
- url(r'^i18n/', include('django.conf.urls.i18n')),
+ re_path(r'^i18n/', include('django.conf.urls.i18n')),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
urlpatterns += i18n_patterns(
diff --git a/gawa/media/img/thumbnails/AlbumCover.png b/gawa/media/img/thumbnails/AlbumCover.png
deleted file mode 100644
index 51a81fa..0000000
Binary files a/gawa/media/img/thumbnails/AlbumCover.png and /dev/null differ
diff --git a/gawa/media/img/thumbnails/bash.png b/gawa/media/img/thumbnails/bash.png
new file mode 100644
index 0000000..2ede2ad
Binary files /dev/null and b/gawa/media/img/thumbnails/bash.png differ
diff --git a/gawa/media/img/thumbnails/default.jpg b/gawa/media/img/thumbnails/default.jpg
new file mode 100644
index 0000000..c808d08
Binary files /dev/null and b/gawa/media/img/thumbnails/default.jpg differ
diff --git a/gawa/media/img/thumbnails/wayland_logo.png b/gawa/media/img/thumbnails/wayland_logo.png
deleted file mode 100644
index 06c7038..0000000
Binary files a/gawa/media/img/thumbnails/wayland_logo.png and /dev/null differ
diff --git a/gawa/start/admin.py b/gawa/start/admin.py
index a050b64..5865b61 100644
--- a/gawa/start/admin.py
+++ b/gawa/start/admin.py
@@ -10,6 +10,7 @@ def regenerate(modeladmin, request, queryset):
for obj in queryset:
obj.regenerate()
+
@admin.register(Keyword)
class KeywordAdmin(admin.ModelAdmin):
"""
@@ -17,21 +18,25 @@ class KeywordAdmin(admin.ModelAdmin):
"""
list_display = ["text_en", "text_de"]
+
@admin.register(StaticSite)
class StaticSiteAdmin(admin.ModelAdmin):
"""
Admin Interface for StaticSite
"""
- list_display = ["title_en", "subtitle_en", "title_de", "subtitle_de", "suburl"]
+ list_display = ["title_en", "subtitle_en",
+ "title_de", "subtitle_de", "suburl"]
ordering = ['title_de', 'title_en']
actions = [regenerate]
+
@admin.register(Searchable)
class SearchableAdmin(admin.ModelAdmin):
"""
Abstract Admin Interface for all Searchables
"""
- list_display = ["title_en", "subtitle_en", "title_de", "subtitle_de", "suburl"]
+ list_display = ["title_en", "subtitle_en",
+ "title_de", "subtitle_de", "suburl"]
ordering = ['title_de', 'title_en']
actions = [regenerate]
@@ -41,6 +46,7 @@ class LinkAdmin(admin.ModelAdmin):
"""
Admin Interface for Links
"""
- list_display = ["title_en", "title_de", "url", "suburl", "favicon", "status", "personal"]
+ list_display = ["title_en", "title_de", "url",
+ "suburl", "favicon", "status", "personal"]
ordering = ['status', 'title_de', 'title_en']
actions = [regenerate]
diff --git a/gawa/start/apps.py b/gawa/start/apps.py
index 7ec3c85..9f48da5 100644
--- a/gawa/start/apps.py
+++ b/gawa/start/apps.py
@@ -1,5 +1,6 @@
from django.apps import AppConfig
+
class StartConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'start'
diff --git a/gawa/start/forms.py b/gawa/start/forms.py
index ae05552..50c218b 100644
--- a/gawa/start/forms.py
+++ b/gawa/start/forms.py
@@ -1,10 +1,11 @@
from django import forms
from django.utils.translation import gettext as _
+
class MainSearchForm(forms.Form):
search = forms.CharField(
- max_length=100,
- label=''
+ max_length=100,
+ label=''
)
search.widget = forms.TextInput(
attrs={
diff --git a/gawa/start/middleware.py b/gawa/start/middleware.py
index d8fa48f..a2d286c 100644
--- a/gawa/start/middleware.py
+++ b/gawa/start/middleware.py
@@ -15,7 +15,8 @@ class LangBasedOnUrlMiddleware(MiddlewareMixin):
def process_request(request):
if hasattr(request, 'session'):
- active_session_lang = request.session.get(translation.LANGUAGE_SESSION_KEY)
+ active_session_lang = request.session.get(
+ translation.LANGUAGE_SESSION_KEY)
if active_session_lang == request.LANGUAGE_CODE:
return
diff --git a/gawa/start/migrations/0001_initial.py b/gawa/start/migrations/0001_initial.py
index b5a62a1..b61b82f 100644
--- a/gawa/start/migrations/0001_initial.py
+++ b/gawa/start/migrations/0001_initial.py
@@ -1,12 +1,75 @@
-# Generated by Django 3.2.19 on 2023-06-03 12:03
+# Generated by Django 3.2.21 on 2023-10-02 08:14
-from django.db import migrations
+from django.db import migrations, models
+import django.db.models.deletion
class Migration(migrations.Migration):
+ initial = True
+
dependencies = [
]
operations = [
+ migrations.CreateModel(
+ name='Keyword',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('slug', models.SlugField(unique=True)),
+ ('text_de', models.CharField(max_length=40)),
+ ('text_en', models.CharField(max_length=40)),
+ ],
+ options={
+ 'verbose_name': 'Keyword',
+ 'verbose_name_plural': 'keywords',
+ },
+ ),
+ migrations.CreateModel(
+ name='Searchable',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('title_de', models.CharField(default='Nicht übersetzt', max_length=50)),
+ ('title_en', models.CharField(default='Not translated', max_length=50)),
+ ('subtitle_de', models.CharField(blank=True, max_length=50)),
+ ('subtitle_en', models.CharField(blank=True, max_length=50)),
+ ('desc_de', models.TextField(blank=True, default='Keine Beschreibung', max_length=250)),
+ ('desc_en', models.TextField(blank=True, default='no description', max_length=250)),
+ ('date', models.DateTimeField(blank=True, null=True)),
+ ('update', models.DateTimeField(blank=True, null=True)),
+ ('suburl', models.CharField(blank=True, max_length=200, null=True)),
+ ('public', models.BooleanField(default=False)),
+ ('keywords', models.ManyToManyField(blank=True, to='start.Keyword')),
+ ],
+ options={
+ 'verbose_name': 'Searchable',
+ 'verbose_name_plural': 'Searchables',
+ },
+ ),
+ migrations.CreateModel(
+ name='Link',
+ fields=[
+ ('searchable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, to='start.searchable')),
+ ('url', models.URLField(primary_key=True, serialize=False, unique=True)),
+ ('favicon', models.ImageField(blank=True, null=True, upload_to='img/links/favicons')),
+ ('status', models.BooleanField(default=False)),
+ ('personal', models.BooleanField(default=False)),
+ ],
+ options={
+ 'verbose_name': 'Link',
+ 'verbose_name_plural': 'Links',
+ },
+ bases=('start.searchable',),
+ ),
+ migrations.CreateModel(
+ name='StaticSite',
+ fields=[
+ ('searchable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='start.searchable')),
+ ],
+ options={
+ 'verbose_name': 'static site',
+ 'verbose_name_plural': 'static sites',
+ },
+ bases=('start.searchable',),
+ ),
]
diff --git a/gawa/start/migrations/0002_keyword_searchable_staticsite.py b/gawa/start/migrations/0002_keyword_searchable_staticsite.py
deleted file mode 100644
index 77e2dae..0000000
--- a/gawa/start/migrations/0002_keyword_searchable_staticsite.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Generated by Django 3.2.19 on 2023-06-03 12:03
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- initial = True
-
- dependencies = [
- ('start', '0001_initial'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Keyword',
- fields=[
- ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('text_de', models.CharField(max_length=40)),
- ('text_en', models.CharField(max_length=40)),
- ],
- ),
- migrations.CreateModel(
- name='Searchable',
- fields=[
- ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('title_de', models.CharField(default='Titel DE', max_length=50)),
- ('title_en', models.CharField(default='title en', max_length=50)),
- ('subtitle_de', models.CharField(blank=True, max_length=50)),
- ('subtitle_en', models.CharField(blank=True, max_length=50)),
- ('desc_de', models.CharField(default='Beschreibung DE', max_length=250, unique=True)),
- ('desc_en', models.CharField(default='Description EN', max_length=250, unique=True)),
- ('date', models.DateField(blank=True, null=True)),
- ('suburl', models.CharField(blank=True, max_length=200, null=True)),
- ('keywords', models.ManyToManyField(to='start.Keyword')),
- ],
- ),
- migrations.CreateModel(
- name='StaticSite',
- fields=[
- ('searchable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='start.searchable')),
- ],
- bases=('start.searchable',),
- ),
- ]
diff --git a/gawa/start/migrations/0003_searchable_public.py b/gawa/start/migrations/0003_searchable_public.py
deleted file mode 100644
index a923f0c..0000000
--- a/gawa/start/migrations/0003_searchable_public.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.19 on 2023-06-03 23:13
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('start', '0002_keyword_searchable_staticsite'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='searchable',
- name='public',
- field=models.BooleanField(default=True),
- ),
- ]
diff --git a/gawa/start/migrations/0004_auto_20230604_2312.py b/gawa/start/migrations/0004_auto_20230604_2312.py
deleted file mode 100644
index 079904a..0000000
--- a/gawa/start/migrations/0004_auto_20230604_2312.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated by Django 3.2.19 on 2023-06-04 21:12
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('start', '0003_searchable_public'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='keyword',
- options={'verbose_name': 'Keyword', 'verbose_name_plural': 'keywords'},
- ),
- migrations.AlterModelOptions(
- name='searchable',
- options={'verbose_name': 'Searchable', 'verbose_name_plural': 'Searchables'},
- ),
- migrations.AlterModelOptions(
- name='staticsite',
- options={'verbose_name': 'static site', 'verbose_name_plural': 'static sites'},
- ),
- migrations.AlterField(
- model_name='searchable',
- name='desc_de',
- field=models.CharField(default='Beschreibung DE', max_length=250),
- ),
- migrations.AlterField(
- model_name='searchable',
- name='desc_en',
- field=models.CharField(default='Description EN', max_length=250),
- ),
- ]
diff --git a/gawa/start/migrations/0005_link.py b/gawa/start/migrations/0005_link.py
deleted file mode 100644
index 30cb69a..0000000
--- a/gawa/start/migrations/0005_link.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Generated by Django 3.2.19 on 2023-06-05 16:15
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('start', '0004_auto_20230604_2312'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Link',
- fields=[
- ('searchable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, to='start.searchable')),
- ('url', models.URLField(primary_key=True, serialize=False, unique=True)),
- ],
- options={
- 'verbose_name': 'Link',
- 'verbose_name_plural': 'Links',
- },
- bases=('start.searchable',),
- ),
- ]
diff --git a/gawa/start/migrations/0006_alter_searchable_title_en.py b/gawa/start/migrations/0006_alter_searchable_title_en.py
deleted file mode 100644
index b12d787..0000000
--- a/gawa/start/migrations/0006_alter_searchable_title_en.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.19 on 2023-06-05 16:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('start', '0005_link'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='searchable',
- name='title_en',
- field=models.CharField(default='title EN', max_length=50),
- ),
- ]
diff --git a/gawa/start/migrations/0007_link_favicon.py b/gawa/start/migrations/0007_link_favicon.py
deleted file mode 100644
index 6c4f097..0000000
--- a/gawa/start/migrations/0007_link_favicon.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.19 on 2023-06-05 17:48
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('start', '0006_alter_searchable_title_en'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='link',
- name='favicon',
- field=models.ImageField(blank=True, upload_to='img/links/favicons'),
- ),
- ]
diff --git a/gawa/start/migrations/0008_link_status.py b/gawa/start/migrations/0008_link_status.py
deleted file mode 100644
index 8509f2a..0000000
--- a/gawa/start/migrations/0008_link_status.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.19 on 2023-06-05 20:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('start', '0007_link_favicon'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='link',
- name='status',
- field=models.BooleanField(default=False),
- ),
- ]
diff --git a/gawa/start/migrations/0009_alter_link_favicon.py b/gawa/start/migrations/0009_alter_link_favicon.py
deleted file mode 100644
index e9aecdf..0000000
--- a/gawa/start/migrations/0009_alter_link_favicon.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.19 on 2023-06-05 23:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('start', '0008_link_status'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='link',
- name='favicon',
- field=models.ImageField(blank=True, null=True, upload_to='img/links/favicons'),
- ),
- ]
diff --git a/gawa/start/migrations/0010_link_personal.py b/gawa/start/migrations/0010_link_personal.py
deleted file mode 100644
index 273bbbf..0000000
--- a/gawa/start/migrations/0010_link_personal.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.19 on 2023-07-15 12:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('start', '0009_alter_link_favicon'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='link',
- name='personal',
- field=models.BooleanField(default=False),
- ),
- ]
diff --git a/gawa/start/migrations/0011_auto_20230715_1441.py b/gawa/start/migrations/0011_auto_20230715_1441.py
deleted file mode 100644
index b0d8291..0000000
--- a/gawa/start/migrations/0011_auto_20230715_1441.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.2.19 on 2023-07-15 12:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('start', '0010_link_personal'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='searchable',
- name='desc_de',
- field=models.TextField(default='Beschreibung DE', max_length=250),
- ),
- migrations.AlterField(
- model_name='searchable',
- name='desc_en',
- field=models.TextField(default='Description EN', max_length=250),
- ),
- ]
diff --git a/gawa/start/models.py b/gawa/start/models.py
index 0c06496..636e86d 100644
--- a/gawa/start/models.py
+++ b/gawa/start/models.py
@@ -1,3 +1,6 @@
+import random
+import favicon
+import requests
from django.db import models
from django.db.models.options import override
from django.utils.translation import gettext as _
@@ -8,24 +11,23 @@ from django.conf import settings
import logging
logger = logging.getLogger(__name__)
-import requests
-import favicon
-import random
class Keyword(models.Model):
"""
this is the model that should contain searchable keywords
"""
+ slug = models.SlugField(unique=True)
text_de = models.CharField(max_length=40)
text_en = models.CharField(max_length=40)
def __str__(self):
- return f"{{<{self.__class__.__name__}>\"{self.text_en}\"}}"
+ return f"{{<{self.__class__.__name__}>\"{self.slug}\"}}"
class Meta:
verbose_name = _("Keyword")
verbose_name_plural = _("keywords")
+
class Searchable(models.Model):
"""
Abstract class for any model that should be searchable.
@@ -33,17 +35,19 @@ class Searchable(models.Model):
This class is not a real abstract class, I need to query it in the main search, so thats impossible
"""
- title_de = models.CharField(max_length=50, default="Titel DE")
- title_en = models.CharField(max_length=50, default="title EN")
+ title_de = models.CharField(max_length=50, default="Nicht übersetzt")
+ title_en = models.CharField(max_length=50, default="Not translated")
subtitle_de = models.CharField(max_length=50, blank=True)
subtitle_en = models.CharField(max_length=50, blank=True)
- desc_de = models.TextField(max_length=250, unique=False, default="Beschreibung DE")
- desc_en = models.TextField(max_length=250, unique=False, default="Description EN")
- # may be empty/blank for some entries
- date = models.DateField(blank=True, null=True)
- keywords = models.ManyToManyField(Keyword)
+ desc_de = models.TextField(
+ blank=True, max_length=250, unique=False, default="Keine Beschreibung")
+ desc_en = models.TextField(
+ blank=True, max_length=250, unique=False, default="no description")
+ date = models.DateTimeField(blank=True, null=True)
+ update = models.DateTimeField(blank=True, null=True)
+ keywords = models.ManyToManyField(Keyword, blank=True)
suburl = models.CharField(max_length=200, blank=True, null=True)
- public = models.BooleanField(default=True)
+ public = models.BooleanField(default=False)
@classmethod
def regenerate_all_entries(cls):
@@ -55,18 +59,20 @@ class Searchable(models.Model):
obj.regenerate()
def __str__(self):
- return f"{{<{self.__class__.__name__}>\"{self.title_en}\"}}"
+ return f"{{<{self.__class__.__name__}>\"{self.slug}\"}}"
def regenerate(self):
"""
regenerate a object
"""
- raise NotImplementedError(f"{self.__class__.__name__} does not implement regenerate")
+ raise NotImplementedError(
+ f"{self.__class__.__name__} does not implement regenerate")
class Meta:
verbose_name = _("Searchable")
verbose_name_plural = _("Searchables")
+
class StaticSite(Searchable):
"""
This model represents any static site, such as start:index,
@@ -75,20 +81,21 @@ class StaticSite(Searchable):
Every searchable view should inherit from start.views.SearchableView.
# TODO automate scanning for SearchableView classes
"""
-
+
def regenerate(self):
"""
regenerate a object
"""
logger.info(f"regenerating {self.__class__.__name__} object: {self}")
logger.warning(f"{self.__class__.__name__} cannot regenerate.")
- #self.save()
+ # self.save()
pass
class Meta:
verbose_name = _("static site")
verbose_name_plural = _("static sites")
+
class Link(Searchable):
"""
contains all my interesting links
@@ -121,11 +128,13 @@ class Link(Searchable):
icons = favicon.get(self.url, timeout=2)
except (ConnectionError) as ce:
# just keep whatever was stored if we cant get a new favicon
- logger.warn(f"unable to download favicon for {self}: {ce.with_traceback(None)}")
+ logger.warn(
+ f"unable to download favicon for {self}: {ce.with_traceback(None)}")
self.status = False
except Exception as e:
- logger.warn(f"Unexpected Exception while downloading {self}: {e.with_traceback(None)}")
+ logger.warn(
+ f"Unexpected Exception while downloading {self}: {e.with_traceback(None)}")
self.status = False
else:
@@ -144,9 +153,10 @@ class Link(Searchable):
except FileNotFoundError as fe:
logger.error(f"cant write favicon to file for {self}: {fe}")
self.favicon = None
-
+
except Exception as e:
- logger.warn(f"Unexpected Exception while downloading {self}: {e.with_traceback(None)}")
+ logger.warn(
+ f"Unexpected Exception while downloading {self}: {e.with_traceback(None)}")
self.favicon = None
self.save()
diff --git a/gawa/start/templates/base.html b/gawa/start/templates/base.html
index c9b980f..c413731 100644
--- a/gawa/start/templates/base.html
+++ b/gawa/start/templates/base.html
@@ -11,13 +11,9 @@
{% compress css %}
+
+
{% endcompress %}
-
{% block headscripts %}
{% endblock headscripts %}
@@ -106,6 +102,7 @@
+
+
+
-
+
+
+
+
+
+ 
+
+
+
+
+
+ {% if LANGUAGE_CODE == "de" %}
+
+ {{ post.title_de }}
+
+
+ {% elif LANGUAGE_CODE == "en" %} +
+ {{ post.title_en }}
+
+
+ {% else %} +
+ {{ post.title_en }}
+
+
+ {% endif %} +
+
+ {{ post.title_de }}
+
+ {{ post.subtitle_de }}
+
+ + {% elif LANGUAGE_CODE == "en" %} +
+ {{ post.title_en }}
+
+ {{ post.subtitle_en }}
+
+ + {% else %} +
+ {{ post.title_en }}
+
+ {{ post.subtitle_en }}
+
+ + {% endif %} +
+ {% if LANGUAGE_CODE == "de" %}
+
+ {{ post.desc_de }}
+ {% elif LANGUAGE_CODE == "en" %} +{{ post.desc_en }}
+ {% else %} +{{ post.desc_en }}
+ {% endif %} +
+
+ + {{ post.category.name }} +
++
{% if LANGUAGE_CODE == "de" %}
- {{ post.title_de }}
+ {{ post.body_de | safe }} {% elif LANGUAGE_CODE == "en" %} -{{ post.title_en }}
+ {{ post.body_en | safe }} {% else %} -{{ post.title_en }}
+ {{ post.body_en | safe }} {% endif %}
- {{ post.title_de }}
- {{ post.subtitle_de }}
+ {{ post.body_de | safe }} {% elif LANGUAGE_CODE == "en" %} -
{{ post.title_en }}
- {{ post.subtitle_en }}
+ {{ post.body_en | safe }} {% else %} -
{{ post.title_en }}
- {{ post.subtitle_en }}
+ {{ post.body_en | safe }} {% endif %}
-
-
-
-
-
-
-
+
+
-
+
+
- {% if LANGUAGE_CODE == "de" %}
-
{{ post.desc_de }}
- {% elif LANGUAGE_CODE == "en" %} -{{ post.desc_en }}
- {% else %} -{{ post.desc_en }}
- {% endif %} + {% format_time post.date as date %} +{% trans "published" %}: {{ date }}
-
- {{ post.date }}
-
-
{{ post.category.name }}
+ {% format_time post.update as update %} +{% trans "updated" %}: {{ update }}
-
- {% if LANGUAGE_CODE == "de" %}
- {{ post.body_de | safe }}
- {% elif LANGUAGE_CODE == "en" %}
- {{ post.body_en | safe }}
- {% else %}
- {{ post.body_en | safe }}
- {% endif %}
-
- - -