From 20c5b8095b44283c3252786281e330ed1cb14027 Mon Sep 17 00:00:00 2001
From: Jake <j.vondoemming@stud.uni-goettingen.de>
Date: Sat, 6 Aug 2022 01:43:44 +0200
Subject: [PATCH] updated html
---
theme/templates/base.html | 36 ++++++-----
theme/templates/page.html | 123 +++++++++++++++++++-------------------
theme/templates/tag.html | 4 +-
3 files changed, 83 insertions(+), 80 deletions(-)
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 5f51c79..40dc233 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -7,11 +7,11 @@
{%- import 'macros/content_renderer.html' as content_renderer with context -%}
{%- import 'macros/nav.html' as nav with context -%}
-<html lang="{%- block html_lang -%}{{ l }}{%- endblock html_lang -%}">
+<html lang="{{ l }}" xmlns="http://www.w3.org/1999/xhtml">
<head>
{% block head %}
<meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
<title>{% block title %}{{ t[l].title_prefix }}{{ t[l].sitename }}{{ t[l].title_suffix }}{%endblock%}</title>
<!-- <base target="_blank"> -->
<!-- <meta HTTP-EQUIV="REFRESH" content="500; url=#"> -->
@@ -24,31 +24,37 @@
<!-- <link rel="icon" type="image/png" sizes="192x192" href="static/img/favicon-192x192.png"/>
<link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png"/>-->
<!-- <link rel="icon" type="image/x-icon" sizes="16x16" href="static/img/favicon.ico"/> -->
- {#{%- if FEED_ALL_ATOM %}
- <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ t[l].atom.title|e }}" />
- {% endif -%}#}
{% block extra_head %}{% endblock extra_head %}
{% endblock head %}
</head>
-<body>
+<body id="top">
+ <!--<nav id="controls">
+ </nav>-->
<header>
- {% block header %}
+ {% block site_header %}
<h1><a href="{{ siteurl }}/{{ l }}/" title="{{ t[l].banner.title|e }}" ><img alt="{{ t[l].banner.alt|e }}" src="{{ siteurl }}/{{ theme.static_dir }}/images/banner-logo.png"><span>{{ t[l].banner.prefix|e }}{{ t[l].sitename|e }}{{ t[l].banner.suffix|e }}</span></a></h1>
{% block extra_header %}{% endblock extra_header %}
- {% endblock header %}
+ {% endblock site_header %}
</header>
- <div class="nav-container">
+ <div id="sitemenu-container">
<label for="show-header-menu" class="show-header-menu">☰</label>
<input type="checkbox" id="show-header-menu" role="button">
<label for="show-header-menu" class="show-header-menu-bg"> </label>
{{ nav.render_menu(config.menuitems, l) }}
</div>
- <main>
- {% block content %}
- {% endblock content %}
+ <!--<nav class="breadcrumb">
+ <ul>
+ {% block breadcrumb %}
+ {% endblock breadcrumb %}
+ </ul>
+ </nav>-->
+ <main class="content">
+ {% block main %}
+ {% endblock main %}
</main>
- <footer>
- {% block footer %}
+ {% block page_footer %}
+ {% endblock page_footer %}
+ <footer id="site-footer">
{#- TODO besserer footer -#}
<div>
<a href="https://asta.uni-goettingen.de/impressum/datenschutz/">Datenschutz</a>
@@ -56,8 +62,6 @@
<div>
<div>Fachgruppe Informatik Göttingen, 2022.</div>
<!-- blablabla datenschutz,impressum etc... -->
- {% block extra_footer %}{% endblock extra_footer %}
- {% endblock footer %}
</footer>
</body>
<!-- The Cake Is A Lie! -->
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 1bc0fdb..7e09ac0 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -1,7 +1,5 @@
{% extends "base.html" %}
-{% block html_lang %}{{ page.lang }}{% endblock %}
-
{% block title %}{{ page.title|striptags }}{% endblock %}
{% block extra_head %}
@@ -14,7 +12,7 @@
{% endif %}
{% endblock %}
-{% block content %}
+{% block main %}
<article>
{% block page_header %}
<header>
@@ -30,70 +28,71 @@
{{ render.sections(s, l) }}
{%- endcall -%}
{% endblock %}
- {% block page_footer %}
- <footer>
- <div>
- {{ t[l].page.authors_prefix }}
- <ul>
- {% for author in page.authors %}
- <li> {{ author.name|e }} </li>
- {% endfor %}
- </ul>
- {{ t[l].page.authors_suffix }}
- </div>
+ </article>
+{% endblock %}
- <div>
- {{ t[l].page.published_prefix }}
- <abbr title="{{ page.date_created.isoformat() }}">
- {{ page.date_created.isoformat() }}
- </abbr>
- {{ t[l].page.published_suffix }}
- </div>
+{% block page_footer %}
+ <footer class="page-footer content">
+ <div>
+ {{ t[l].page.authors_prefix }}
+ <ul>
+ {% for author in page.authors %}
+ <li> {{ author.name|e }} </li>
+ {% endfor %}
+ </ul>
+ {{ t[l].page.authors_suffix }}
+ </div>
- <div>{{ t[l].page.modified_prefix }}
- <abbr title="{{ page.date_modified.isoformat() }}">
- {{ page.date_modified.isoformat() }}
- </abbr>
- {{ t[l].page.modified_suffix }}
- </div>
+ <div>
+ {{ t[l].page.published_prefix }}
+ <abbr title="{{ page.date_created.isoformat() }}">
+ {{ page.date_created.isoformat() }}
+ </abbr>
+ {{ t[l].page.published_suffix }}
+ </div>
- <div>
- {{ t[l].page.category_prefix }}
- {{ link.render_tag(page.category,l) }}
- {{ t[l].page.category_suffix }}
- </div>
+ <div>{{ t[l].page.modified_prefix }}
+ <abbr title="{{ page.date_modified.isoformat() }}">
+ {{ page.date_modified.isoformat() }}
+ </abbr>
+ {{ t[l].page.modified_suffix }}
+ </div>
- <div>
- {{ t[l].page.tags_prefix }}
- <ul>
- {% for tag in page.tags %}
- <li>
- {{ link.render_tag(tag,l) }}
- </li>
- {% endfor %}
- </ul>
- {{ t[l].page.tags_suffix }}
- </div>
+ <div>
+ {{ t[l].page.category_prefix }}
+ {{ link.render_tag(page.category,l) }}
+ {{ t[l].page.category_suffix }}
+ </div>
- <div>
- {{ t[l].page.languages_prefix }}
- <ul class="languages">
- {%- for tlang in t['supported'] -%}
- <li>
- {{ link.render(['slug',page.slug,tlang]|join(':'),t[tlang]['langname'],l) }}
- </li>
- {%- endfor -%}
- </ul>
- {{ t[l].page.languages_suffix }}
- </div>
+ <div>
+ {{ t[l].page.tags_prefix }}
+ <ul>
+ {% for tag in page.tags %}
+ <li>
+ {{ link.render_tag(tag,l) }}
+ </li>
+ {% endfor %}
+ </ul>
+ {{ t[l].page.tags_suffix }}
+ </div>
- <div>
- {{ t[l].page.slug_prefix }}
- <code>{{ page.slug|e }}</code>
- {{ t[l].page.slug_suffix }}
- </div>
+ <div>
+ {{ t[l].page.languages_prefix }}
+ <ul class="languages">
+ {%- for tlang in t['supported'] -%}
+ <li>
+ {{ link.render(['slug',page.slug,tlang]|join(':'),t[tlang]['langname'],l) }}
+ </li>
+ {%- endfor -%}
+ </ul>
+ {{ t[l].page.languages_suffix }}
+ </div>
- </footer>
- {% endblock %}
- </article>
+ <div>
+ {{ t[l].page.slug_prefix }}
+ <code>{{ page.slug|e }}</code>
+ {{ t[l].page.slug_suffix }}
+ </div>
+
+ </footer>
{% endblock %}
diff --git a/theme/templates/tag.html b/theme/templates/tag.html
index 3c0cca1..8a52229 100644
--- a/theme/templates/tag.html
+++ b/theme/templates/tag.html
@@ -5,8 +5,8 @@
{%- endcall -%}
{%- endblock -%}
-{% block content %}
+{% block main %}
<section>
{{ render.section({"type": "tag", "tag": tag, "num": None}, l) }}
</section>
-{% endblock content %}
+{% endblock main %}
--
GitLab