diff --git a/content/u/penguincomics/contents.lr b/content/u/penguincomics/contents.lr index a7f5853..1b64227 100644 --- a/content/u/penguincomics/contents.lr +++ b/content/u/penguincomics/contents.lr @@ -1,3 +1,3 @@ _model: comics --- -title: ungleich penguin comics +title: Penguin Comics diff --git a/content/u/penguincomics/somethingelse/contents.lr b/content/u/penguincomics/somethingelse/contents.lr new file mode 100644 index 0000000..5a0fea1 --- /dev/null +++ b/content/u/penguincomics/somethingelse/contents.lr @@ -0,0 +1,8 @@ +subtitle: NOT THE Security Policy +--- +pub_date: 2020-02-04 +--- +_hidden: no +--- +_discoverable: yes +--- diff --git a/content/u/penguincomics/somethingelse/ipv6_header-only-inside-sketch.jpg b/content/u/penguincomics/somethingelse/ipv6_header-only-inside-sketch.jpg new file mode 100644 index 0000000..a0c5af2 Binary files /dev/null and b/content/u/penguincomics/somethingelse/ipv6_header-only-inside-sketch.jpg differ diff --git a/templates/comic.html b/templates/comic.html index fd5a368..956012c 100644 --- a/templates/comic.html +++ b/templates/comic.html @@ -5,7 +5,6 @@ {% block content %} {% set image = this.attachments.images.first() %} - <div class="container"> <div class="row mb-5"> <div class="col-md-3"> diff --git a/templates/comics.html b/templates/comics.html index b9a210c..254aa31 100644 --- a/templates/comics.html +++ b/templates/comics.html @@ -1,33 +1,13 @@ {% extends "layout-2020.html" %} -{% from "macros/blog.html" import render_blog_post %} {% from "macros/pagination.html" import render_pagination %} -{% block title %}{{ this.title }}{% endblock %} -{% block body %} -<header class="intro-header" style="background-image: url('/u/static/images/home-bg.jpg');"> - <div class="container"> - <div class="row"> - <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> - <div class="site-heading"> - <h1>ungleich blog</h1> - <hr class="small"> - <span class="subheading"></span> - </div> - </div> - </div> - </div> -</header> -<div class="container"> - <div class="row"> - <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> - <div class="app app-blog span8"> - <section class="blog-list"> - {% for child in this.pagination.items %} - {{ render_blog_post(child, from_index=true) }} - {% endfor %} - {{ render_pagination(this.pagination) }} - </section> - </div> - </div> - </div> -</div> +{% from "macros/comic.html" import render_comic %} + +{% block title %}Penguin Comics{% endblock %} + +{% block content %} +{% for child in this.pagination.items %} +{{ render_comic(child) }} +{% endfor %} + +{{ render_pagination(this.pagination) }} {% endblock %} diff --git a/templates/macros/comic.html b/templates/macros/comic.html new file mode 100644 index 0000000..651f14a --- /dev/null +++ b/templates/macros/comic.html @@ -0,0 +1,36 @@ +{% macro render_comic(comic) %} +{% set image = comic.attachments.images.first() %} + + +<div class="container"> + <div class="row mb-5"> + <div class="col-md-3"> + <!-- unused for centering --> + </div> + <div class="col-md-6"> + <h2>{{ comic.subtitle }}</h2> + <img src="{{ image|url }}" alt="{{ comic.subtitle }}" + class="img-fluid"/> + </div> + <div class="col-md-3"> + <!-- unused for centering --> + </div> + </div> +</div> + +{% if comic.body %} +<div class="container"> + <div class="row mb-3"> + <div class="col-md-3"> + <!-- unused for centering --> + </div> + <div class="col-md-6"> + {{ comic.body }} + </div> + <div class="col-md-3"> + <!-- unused for centering --> + </div> + </div> +</div> +{% endif %} +{% endmacro %} diff --git a/templates/macros/pagination.html b/templates/macros/pagination.html index 9d047ff..d935218 100644 --- a/templates/macros/pagination.html +++ b/templates/macros/pagination.html @@ -1,26 +1,34 @@ {% macro render_pagination(pagination) %} -<div class="ungleich-center-div"> - <div class="pagination"> - {% if pagination.has_prev %} - <a href="{{ pagination.prev|url }}">« Previous</a> - {% else %} - <span class="disabled">« Previous</span> - {% endif %} | - - {% for page in range(1, pagination.pages + 1) %} - {% if page != pagination.page %} - <a href="{{ pagination.for_page(page)|url }}">{{ page }}</a> | - {% else %} - {{ pagination.page }} | - {% endif %} - {% endfor %} +<div class="container"> + <div class="row mb-5"> + <div class="col-md-3"> + <!-- unused for centering --> + </div> + <div class="col-md-6"> + {% if pagination.has_prev %} + <a href="{{ pagination.prev|url }}">« Previous</a> + {% else %} + « Previous + {% endif %} + | + {% for page in range(1, pagination.pages + 1) %} + {% if page != pagination.page %} + <a href="{{ pagination.for_page(page)|url }}">{{ page }}</a> | + {% else %} + {{ pagination.page }} | + {% endif %} - {% if pagination.has_next %} - <a href="{{ pagination.next|url }}">Next »</a> - {% else %} - <span class="disabled">Next »</span> - {% endif %} + {% endfor %} + {% if pagination.has_next %} + <a href="{{ pagination.next|url }}">Next »</a> + {% else %} + Next » + {% endif %} + </div> + <div class="col-md-3"> + <!-- unused for centering --> + </div> </div> </div> {% endmacro %} diff --git a/templates/product.html b/templates/product.html index 88002d7..622f764 100644 --- a/templates/product.html +++ b/templates/product.html @@ -28,6 +28,7 @@ </div> </div> </div> +x-off {% if this.description2 %} <div class="container"> <div class="row mb-3">