commit 653246466fd76dd1f3dc515967fc03204e7e3f06
parent 8a12d08cf34e0cd3d872df344c972f90253a3825
Author: sej <sej@sejdt.localhost>
Date: Sun, 29 Sep 2024 23:12:39 +0200
Cleanup of unneeded templates + fix wrong thumb path in index.html.
Diffstat:
13 files changed, 90 insertions(+), 300 deletions(-)
diff --git a/templates/album.html b/templates/album.html
@@ -1,26 +1,30 @@
- <!DOCTYPE html>
- <html lang="en">
- <head>
- <title>{{ title }}</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="stylesheet" href="css/stylesheet.css">
- </head>
- <body>
+{% extends "base.html" %}
+{% block title %}{{ title }}{% endblock %}
+{% block navbar %}
+<a class="half" href="index.html">
+ <p>Return to all albums</p>
+</a>
- <h1>{{ title }}</h1>
- <p>This is a paragraph.</p>
+<a class="quarter" href="{{ prevalbum }}">
+ <p><==</p>
+</a>
- <div class="flex-container wrap">
+<a class="right quarter" href="{{ nextalbum }}">
+ <p>==></p>
+</a>
+{% endblock %}
+{% block content %}
+<h1>{{ title }}</h1>
+{# <p>This is a paragraph.</p> #}
- {% for img in imgs %}
- <div class="box">
- <a href="img/viewer/{{ img }}.html">
- <img src="img/thumbs/{{ img }}">
- </a>
- </div>
- {% endfor %}
-
- </div>
- </body>
- </html>
+<div class="flex-container wrap">
+
+ {% for img in imgs %}
+ <div class="box">
+ <a href="img/viewer/{{ title }}/{{ img }}.html">
+ <img src="img/thumb/{{ img }}">
+ </a>
+ </div>
+ {% endfor %}
+</div>
+{% endblock %}
diff --git a/templates/album2.html b/templates/album2.html
@@ -1,30 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ title }}{% endblock %}
-{% block navbar %}
-<a class="half" href="index.html">
- <p>Return to all albums</p>
-</a>
-
-<a class="quarter" href="{{ prevalbum }}">
- <p><==</p>
-</a>
-
-<a class="right quarter" href="{{ nextalbum }}">
- <p>==></p>
-</a>
-{% endblock %}
-{% block content %}
-<h1>{{ title }}</h1>
-{# <p>This is a paragraph.</p> #}
-
-<div class="flex-container wrap">
-
- {% for img in imgs %}
- <div class="box">
- <a href="img/viewer/{{ title }}/{{ img }}.html">
- <img src="img/thumb/{{ img }}">
- </a>
- </div>
- {% endfor %}
-</div>
-{% endblock %}
diff --git a/templates/basekm.html b/templates/basekm.html
@@ -1,38 +0,0 @@
-{# base.html #}
- <!DOCTYPE html>
- <html lang="en">
- <head>
- <title>{% block title %}{% endblock %}</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="robots" content="noindex">
- <link rel="stylesheet" href="{{ csspath }}">
- </head>
- <body>
- {% if navbar %}
- <div id="navbar">
- <a class="np half" href="{{ previ }}"></a>
- <a class="right np half" href="{{ nexti }}"></a>
- </div>
- {% endif %}
- {% block content %}
- <div class="view-container">
- <a href="{{ imgpath + img }}">
- <img class="viewer" src="{{ imgpath + img }}">
- </a>
- </div>
- <p class="desc">{{ exif }}</p>
- {% endblock %}
- </body>
- <footer>
- <p>Author: sej
- {% if buttons %}
- | <a href="../../index.html">Index</a> |
- <a href="{{ fullrespath + img }}">Full res</a> |
- <a href="{{ metadatapath + img[:8] + '.csv' }}">Metadata</a>
- {% endif %}
- </p>
-
- <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
- </footer>
- </html>
diff --git a/templates/index.html b/templates/index.html
@@ -1,25 +1,31 @@
- <!DOCTYPE html>
- <html lang="en">
- <head>
- <title>{{ title }}</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="stylesheet" href="css/stylesheet.css">
- </head>
- <body>
+{% extends "base.html" %}
+{% block title %}{{ title }}{% endblock %}
+{% block navbar %}
+<a class="half" href="index.html">
+ <p>Return to all albums</p>
+</a>
- <h1>{{ title }}</h1>
- <p>This is a paragraph.</p>
+<a class="quarter" href="{{ prevalbum }}">
+ <p><==</p>
+</a>
- {% for img in imgs %}
- <div class="gallery" >
- <a href="{{ hrefs[loop.index0] }}">
- <img class="preview" src="img/thumb/{{ img }}">
- </a>
- <div class="desc">
- <p class="desc">{{ desc[loop.index0] }}</p>
- </div>
+<a class="right quarter" href="{{ nextalbum }}">
+ <p>==></p>
+</a>
+{% endblock %}
+{% block content %}
+<h1>{{ title }}</h1>
+
+<div class="flex-container wrap">
+ {% for img in imgs %}
+ <div class="box">
+ <a href="{{ hrefs[loop.index0] }}">
+ <img class="preview" src="img/thumb/{{ img }}">
+ </a>
+ <div class="desc">
+ <p class="desc">{{ desc[loop.index0] }}</p>
</div>
- {% endfor %}
- </body>
- </html>
+ </div>
+ {% endfor %}
+</div>
+{% endblock %}
diff --git a/templates/index2.html b/templates/index2.html
@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Index{% endblock %}
-
-{% block content%}
-
-<h1>{{ title }}</h1>
-<p>This is a paragraph.</p>
-
-{% for img in imgs %}
-<div class="gallery" >
- <a href="{{ hrefs[loop.index0] }}">
- <img class="preview" src="img/thumbs/{{ img }}">
- </a>
- <div class="desc">
- <p class="desc">{{ desc[loop.index0] }}</p>
- </div>
-</div>
-{% endfor %}
-{% endblock %}
diff --git a/templates/index3.html b/templates/index3.html
@@ -1,31 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ title }}{% endblock %}
-{% block navbar %}
-<a class="half" href="index.html">
- <p>Return to all albums</p>
-</a>
-
-<a class="quarter" href="{{ prevalbum }}">
- <p><==</p>
-</a>
-
-<a class="right quarter" href="{{ nextalbum }}">
- <p>==></p>
-</a>
-{% endblock %}
-{% block content %}
-<h1>{{ title }}</h1>
-
-<div class="flex-container wrap">
- {% for img in imgs %}
- <div class="box">
- <a href="{{ hrefs[loop.index0] }}">
- <img class="preview" src="img/thumbs/{{ img }}">
- </a>
- <div class="desc">
- <p class="desc">{{ desc[loop.index0] }}</p>
- </div>
- </div>
- {% endfor %}
-</div>
-{% endblock %}
diff --git a/templates/km.html b/templates/km.html
@@ -1,4 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-
-{% endblock %}
diff --git a/templates/kmalbum.html b/templates/kmalbum.html
@@ -1,17 +0,0 @@
-{% extends "basekm.html" %}
-{% block title %}{{ title }}{% endblock %}
-{% block content %}
-<h1>{{ title }}</h1>
-{# <p>This is a paragraph.</p> #}
-
-<div class="flex-container wrap">
-
- {% for img in imgs %}
- <div class="box">
- <a href="img/viewer/{{ img }}.html">
- <img src="img/thumb/{{ img }}">
- </a>
- </div>
- {% endfor %}
-</div>
-{% endblock %}
diff --git a/templates/kmindex.html b/templates/kmindex.html
@@ -1,18 +0,0 @@
-{% extends "basekm.html" %}
-{% block title %}{{ title }}{% endblock %}
-{% block content %}
-<h1>{{ title }}</h1>
-
-<div class="flex-container wrap">
- {% for img in imgs %}
- <div class="box">
- <a href="{{ hrefs[loop.index0] }}">
- <img class="preview" src="img/thumbs/{{ img }}">
- </a>
- <div class="desc">
- <p class="desc">{{ desc[loop.index0] }}</p>
- </div>
- </div>
- {% endfor %}
-</div>
-{% endblock %}
diff --git a/templates/kmviewer.html b/templates/kmviewer.html
@@ -1,19 +0,0 @@
-{% extends "basekm.html" %}
-
-{% block title %}{{ img }}{% endblock %}
-{% if navbar %}
-
-<a class="np half" href="{{ previ }}">
-</a>
-
-<a class="right np half" href="{{ nexti }}">
-</a>
-{% endif %}
-{% block content %}
-<div class="view-container">
- <a href="{{ fullrespath + img }}">
- <img class="viewer" src="{{ previewpath + img }}">
- </a>
-</div>
-<p id="metadata" class="imgdesc">{{ exif }}</p>
-{% endblock %}
diff --git a/templates/viewer.html b/templates/viewer.html
@@ -1,25 +1,35 @@
- <!DOCTYPE html>
- <html lang="en">
- <head>
- <title>{{ img }}</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="stylesheet" href="../../css/stylesheet.css">
- </head>
- <body>
- <div id="navbar">
- <a href="{{ previ }}">
- <p><==</p>
- </a>
- <a class="right" href="{{ nexti }}">
- <p>==></p>
- </a>
- </div>
- <div class="view-container">
- <a href="{{ imgpath + img }}">
- <img class="viewer" src="{{ imgpath + img }}">
- </a>
- </div>
- <p class="desc">{{ exif }}</p>
- </body>
- </html>
+{% extends "base.html" %}
+
+{% block title %}{{ img }}{% endblock %}
+{% block navbar %}
+
+<a href="{{ albumpath }}">
+ <p>Back to albums view</p>
+</a>
+
+<a href="/index.html">
+ <p>Back to index view</p>
+</a>
+
+<a href="{{ fullrespath + img }}">
+ <p>Open original</p>
+</a>
+
+<a href="../{{ img }}.html">
+ <p>Open i all-viewer</p>
+</a>
+
+<a class="np half" href="{{ previ }}">
+</a>
+
+<a class="right np half" href="{{ nexti }}">
+</a>
+{% endblock %}
+{% block content %}
+<div class="view-container">
+ <a href="{{ fullrespath + img }}">
+ <img class="viewer" src="{{ previewpath + img }}">
+ </a>
+</div>
+<p id="metadata" class="imgdesc">{{ exif }}</p>
+{% endblock %}
diff --git a/templates/viewer2.html b/templates/viewer2.html
@@ -1,35 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ img }}{% endblock %}
-{% block navbar %}
-
-<a href="{{ albumpath }}">
- <p>Back to albums view</p>
-</a>
-
-<a href="/index.html">
- <p>Back to index view</p>
-</a>
-
-<a href="{{ fullrespath + img }}">
- <p>Open original</p>
-</a>
-
-<a href="../{{ img }}.html">
- <p>Open i all-viewer</p>
-</a>
-
-<a class="np half" href="{{ previ }}">
-</a>
-
-<a class="right np half" href="{{ nexti }}">
-</a>
-{% endblock %}
-{% block content %}
-<div class="view-container">
- <a href="{{ fullrespath + img }}">
- <img class="viewer" src="{{ previewpath + img }}">
- </a>
-</div>
-<p id="metadata" class="imgdesc">{{ exif }}</p>
-{% endblock %}
diff --git a/templates/viewer3.html b/templates/viewer3.html
@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ img }}{% endblock %}
-{% if navbar %}
-
-<a class="np half" href="{{ previ }}">
-</a>
-
-<a class="right np half" href="{{ nexti }}">
-</a>
-{% endif %}
-{% block content %}
-<div class="view-container">
- <a href="{{ fullrespath + img }}">
- <img class="viewer" src="{{ previewpath + img }}">
- </a>
-</div>
-<p id="metadata" class="imgdesc">{{ exif }}</p>
-{% endblock %}
