diff --git a/.gitignore b/.gitignore index 27eff40..f09519d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ /content/images/ifs/all/* !/content/images/ifs/all/_index* -/static/media/img/ifs +/static/processed_images \ No newline at end of file diff --git a/config.toml b/config.toml index 8f5e4e7..5589179 100644 --- a/config.toml +++ b/config.toml @@ -47,12 +47,7 @@ not_found = "Inhalt nicht gefunden" locale_name = "de_DE" publish_time = "veröffentlicht am %date% um %time% Uhr von %author%" all = "Alle" -status_finished = "Abgeschlossen" -status_active = "In Betrieb" -status_in_progress = "In Arbeit" -status_obsolete = "Ersetzt" -status_disabled = "Außer Betrieb" -status_broken = "Kaputt" +images = "Bilder" [extra] ifs_base_path = "https://www.mainframe.io/media/ifs-images" @@ -81,7 +76,8 @@ not_found_content = "This is not the content you are looking for!" not_found = "Content not found" locale_name = "en_US" publish_time = "published on %date% at %time% by %author%" -all="All" +all = "All" +images = "Images" status_finished = "Finished" status_in_progress = "In Progress" diff --git a/static/media/blog/2012/lauflicht/img1.jpg b/static/media/blog/2012/lauflicht/img1.jpg index 5b8290c..7a2647d 100644 Binary files a/static/media/blog/2012/lauflicht/img1.jpg and b/static/media/blog/2012/lauflicht/img1.jpg differ diff --git a/static/media/blog/2013/30C3/thumbnail.jpg b/static/media/blog/2013/30C3/thumbnail.jpg index c1e008c..4421e68 100644 Binary files a/static/media/blog/2013/30C3/thumbnail.jpg and b/static/media/blog/2013/30C3/thumbnail.jpg differ diff --git a/templates/ifs/ifs-single.html b/templates/ifs/ifs-single.html index 82fee65..befe65b 100644 --- a/templates/ifs/ifs-single.html +++ b/templates/ifs/ifs-single.html @@ -23,7 +23,9 @@

{% if page.lower %} - << + + + {% endif %} @@ -40,7 +42,9 @@

{% if page.higher %} - >> + + + {% endif %} diff --git a/templates/macros.html b/templates/macros.html index 0c995e3..07f017d 100644 --- a/templates/macros.html +++ b/templates/macros.html @@ -106,14 +106,16 @@ {% set page_description = blog_page.description | default(value="") %} {% if blog_page.extra.thumbnail %} - - {% set thumbnail_url = config.extra.resource_base ~ blog_page.extra.thumbnail %} - {% set thumbnail_metadata = get_image_metadata(path=blog_page.extra.thumbnail) %} - + {% set thumbnail_path = blog_page.extra.thumbnail %} + {% set thumbnail_url = config.extra.resource_base ~ thumbnail_path %} {% else %} - {% set thumbnail_url = "/media/img/logo-ktt.png" %} - {% set thumbnail_metadata = get_image_metadata(path=thumbnail_url) %} + {% set thumbnail_path = "/media/img/logo-ktt.png" %} + {% set thumbnail_url = thumbnail_path %} + {% endif %} + {% if thumbnail_url is not ending_with(".svg") %} + {% set resized_image = resize_image(path=thumbnail_path, format="auto", op="fit_height", width=150, height=150) %} + {% set thumbnail_url = resized_image.url %} {% endif %} {{