diff --git a/templates/404.html b/templates/404.html index 9379175..138da5c 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,8 +1,8 @@ {% extends "base.html" %} {% block content %} -

404 - {{trans(key="not_found", lang="de")}}

-

{{trans(key="not_found_content", lang="de")}}

-

404 - {{trans(key="not_found", lang="en")}}

-

{{trans(key="not_found_content", lang="en")}}

+

404 - {{ trans(key="not_found", lang="de") }}

+

{{ trans(key="not_found_content", lang="de") }}

+

404 - {{ trans(key="not_found", lang="en") }}

+

{{ trans(key="not_found_content", lang="en") }}

{% endblock content %} \ No newline at end of file diff --git a/templates/album/album-list.html b/templates/album/album-list.html index 9252d5f..443c5a1 100644 --- a/templates/album/album-list.html +++ b/templates/album/album-list.html @@ -2,89 +2,90 @@ {% import "macros.html" as macros %} {% block main %} -

- {{ section.title }} -

+

+ {{ section.title }} +

-
- {% for subsection in section.subsections | reverse %} - {% set subsection_data = get_section(path=subsection) %} +
+ {% for subsection in section.subsections | reverse %} + {% set subsection_data = get_section(path=subsection) %} - {% if subsection_data.pages | length > 0 %} - - {% if subsection_data.extra.cover %} - {% set image_uri = subsection_data.extra.cover %} - {% set height = 200 %} - {% set width = 750 %} - {% else %} - {% set latest_page = subsection_data.pages | first %} + {% if subsection_data.pages | length > 0 %} - {% set scaling = 200 / latest_page.extra.height %} - {% set height = 200 %} - {% set width = latest_page.extra.width * scaling %} + {% if subsection_data.extra.cover %} + {% set image_uri = subsection_data.extra.cover %} + {% set height = 200 %} + {% set width = 750 %} + {% else %} + {% set latest_page = subsection_data.pages | first %} - {% if width > 1150 %} - {% set image_uri = latest_page.extra.file_uri %} - {% elif width > 700 %} - {% set image_uri = latest_page.extra.file_uri_1200 %} - {% elif width > 250 %} - {% set image_uri = latest_page.extra.file_uri_750 %} - {% else %} - {% set image_uri = latest_page.extra.file_uri_300 %} - {% endif %} - {% endif %} - - {% if subsection_data.extra.image_count %} - {% set image_count = subsection_data.extra.image_count %} - {% else %} - {% set image_count = subsection_data.pages | length %} - {% endif %} - - - -
-

{{ subsection_data.extra.display_name }}

- {{ subsection_data.pages | length }} {{ trans(key="images", lang=lang) }} -
- - {% else %} -

HIER MÜSSTE EIN LEERES ALBUM SEIN. TODO

- {% endif %} - {% endfor %} - + {% set scaling = 200 / latest_page.extra.height %} + {% set height = 200 %} + {% set width = latest_page.extra.width * scaling %} - {% for page in section.pages %} + {% if width > 1150 %} + {% set image_uri = latest_page.extra.file_uri %} + {% elif width > 700 %} + {% set image_uri = latest_page.extra.file_uri_1200 %} + {% elif width > 250 %} + {% set image_uri = latest_page.extra.file_uri_750 %} + {% else %} + {% set image_uri = latest_page.extra.file_uri_300 %} + {% endif %} + {% endif %} - {% set scaling = 200 / page.extra.height %} - {% set height = 200 %} - {% set width = page.extra.width * scaling %} - - {% if width > 1150 %} - {% set image_uri = page.extra.file_uri %} - {% elif width > 700 %} - {% set image_uri = page.extra.file_uri_1200 %} - {% elif width > 250 %} - {% set image_uri = page.extra.file_uri_750 %} - {% else %} - {% set image_uri = page.extra.file_uri_300 %} - {% endif %} + {% if subsection_data.extra.image_count %} + {% set image_count = subsection_data.extra.image_count %} + {% else %} + {% set image_count = subsection_data.pages | length %} + {% endif %} - - - + + +
+

{{ subsection_data.extra.display_name }}

+ {{ subsection_data.pages | length }} {{ trans(key="images", lang=lang) }} +
+ + {% else %} +

HIER MÜSSTE EIN LEERES ALBUM SEIN. TODO

+ {% endif %} + {% endfor %} - {% endfor %} -
+ + {% for page in section.pages %} + + {% set scaling = 200 / page.extra.height %} + {% set height = 200 %} + {% set width = page.extra.width * scaling %} + + {% if width > 1150 %} + {% set image_uri = page.extra.file_uri %} + {% elif width > 700 %} + {% set image_uri = page.extra.file_uri_1200 %} + {% elif width > 250 %} + {% set image_uri = page.extra.file_uri_750 %} + {% else %} + {% set image_uri = page.extra.file_uri_300 %} + {% endif %} + + + + + + {% endfor %} +
{% endblock content %} \ No newline at end of file diff --git a/templates/album/album-single.html b/templates/album/album-single.html index 20ad95e..151464e 100644 --- a/templates/album/album-single.html +++ b/templates/album/album-single.html @@ -3,53 +3,57 @@ {% block extra_meta %} - -{{ macros::ifs_metadata(image_filename=page.extra.file_uri, width=page.extra.width, title=page.title, height=page.extra.height) }} + + {{ self::ifs_metadata(image_filename=page.extra.file_uri, width=page.extra.width, title=page.title, height=page.extra.height) }} {% endblock extra_meta %} {% block content %} -

- {{ page.title }} - +

{{ page.title }} - - - -

- -
- - {% if page.lower %} - - - - - - {% endif %} - - - - - - {% if page.higher %} - - - - - - {% endif %} - -
- -{{ page.content | safe }} + + {{ page.title }} + + + +

+ +
+ + {% if page.lower %} + + + + + + {% endif %} + + + + + + {% if page.higher %} + + + + + + {% endif %} + +
+ + {{ page.content | safe }} {% endblock content %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index fb954e6..f7be421 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,11 +1,11 @@ {% if lang == config.default_language %} -{% set lang_stub = "" %} + {% set lang_stub = "" %} {% else %} -{% set lang_stub = "." ~ lang %} + {% set lang_stub = "." ~ lang %} {% endif %} - + @@ -13,37 +13,37 @@ - + {% if current_path %} - + {% endif %} {% if page.authors %} - {% set page_author = page.authors | join(sep=", ") %} + {% set page_author = page.authors | join(sep=", ") %} {% else %} - {% set page_author = config.author %} + {% set page_author = config.author %} {% endif %} {% block extra_meta %} - + {% endblock extra_meta %} {% if section.title %} - {% set title = section.extra.og_title | default(value=section.title ~ " | " ~ config.title) %} - {% set description = section.extra.og_description | default(value=config.description) %} + {% set title = section.extra.og_title | default(value=section.title ~ " | " ~ config.title) %} + {% set description = section.extra.og_description | default(value=config.description) %} {% elif page.title %} - {% set title = page.extra.og_title | default(value=page.title ~ " | " ~ config.title) %} - {% set description = page.extra.og_description | default(value=config.description) %} + {% set title = page.extra.og_title | default(value=page.title ~ " | " ~ config.title) %} + {% set description = page.extra.og_description | default(value=config.description) %} {% else %} - {% set title = config.title %} - {% set description = config.description %} + {% set title = config.title %} + {% set description = config.description %} {% endif %} @@ -73,22 +73,22 @@ {% include "navbar.html" %} {% block main %} -
-
- {% block content %} - {% if page.content %} - {{ page.content | safe }} - {% elif section.content %} - {{ section.content | safe }} - {% endif %} - {% endblock content %} -
-
- {% block sidebar %} - {% include "sidebar.html" %} - {% endblock sidebar %} -
-
+
+
+ {% block content %} + {% if page.content %} + {{ page.content | safe }} + {% elif section.content %} + {{ section.content | safe }} + {% endif %} + {% endblock content %} +
+
+ {% block sidebar %} + {% include "sidebar.html" %} + {% endblock sidebar %} +
+
{% endblock main %}