Return home link, prev/next pgup/pgdn keybindings, fixed deep pathname

30702360 · ph · d3cddfcb · 30702360 · 30702360 · 30702360
Commit 30702360 authored Jan 25, 2017 by ph
--- a/base.html.jinja
+++ b/base.html.jinja
@@ -7,6 +7,7 @@
        <link href='https://fonts.googleapis.com/css?family=Patrick+Hand+SC&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
        <meta name="author" content="Pavel Kácha" />
        <meta name="description" content="Ajka + Pharook = svatba" />
+        <script type="text/javascript" src="/prev_next.js"></script>
    </head>
    <body class="main">
        <div class="gallery_outer">
@@ -15,10 +16,11 @@
            </a>
            <div class="menubar">
                <ul class="menu">
+                    <li><a class="passive_menu" href="/">&larr;</a></li>
                    {% block menu %}{% endblock %}
                </ul>
            </div>
-            <div class="main">
+            <div class="gallery_main">
                {% block content %}{% endblock %}
            </div>
        </div>

--- a/image.html.jinja
+++ b/image.html.jinja
@@ -9,7 +9,7 @@
    <table class="img_table"><tr>
        <td class="img_table_prev">
            {% if prev is not none %}
-            <a class="img_table_a" href="{{prev|e}}.html"><img class="img_table_img" src="tn_{{prev|urlencode}}"/>
+            <a id="prev" class="img_table_a" href="{{prev|e}}.html"><img class="img_table_img" src="tn_{{prev|urlencode}}"/>
            <div class="img_arrow">&lt;</div>
            </a>
            {% endif %}
@@ -24,7 +24,7 @@
        </td>
        <td class="img_table_next">
            {% if nxt is not none %}
-            <a class="img_table_a" href="{{nxt|e}}.html"><img class="img_table_img" src="tn_{{nxt|urlencode}}"/>
+            <a id="next" class="img_table_a" href="{{nxt|e}}.html"><img class="img_table_img" src="tn_{{nxt|urlencode}}"/>
            <div class="img_arrow">&gt;</div>
            </a>
            {% endif %}

--- a/maketn.py
+++ b/maketn.py
@@ -39,7 +39,7 @@ def get_list(path):
    return file_list, dir_list


-def make_tn(fname, tnname, tnwidth=200):
+def make_tn(fname, tnname, tnwidth=160):
    try:
        img = Image.open(fname)
        width, height = img.size
@@ -63,7 +63,7 @@ def get_file(f, default=u""):

 @render(u"index.html")
 def gen_index(path=u"", anchor=[]):
-    mytitle = get_file(os.path.join(path, u"title.txt"), default=path or "Fotoalbum")
+    mytitle = get_file(os.path.join(path, u"title.txt"), default=os.path.basename(path.rstrip(r"/")) or "Album")
    anch = anchor + [mytitle]
    file_list, dir_list = get_list(path)
    dirs = []
@@ -84,7 +84,7 @@ def gen_index(path=u"", anchor=[]):
        mid = os.path.join(path, u"mid_" + cur)
        tn = os.path.join(path, u"tn_" + cur)
        if not os.path.isfile(mid):
-            make_tn(os.path.join(path, cur), mid, tnwidth=1280)
+            make_tn(os.path.join(path, cur), mid, tnwidth=1024)
        gen_image(prev, cur, nxt, path, anchor=anch, target=os.path.join(path, u"%s.html" % cur))
    return dict(title=mytitle, data=data, dirs=dirs, anchor=anch)


--- a/prev_next.js
+++ b/prev_next.js
+document.onkeydown = function(e) {
+    switch (e.keyCode) {
+        case 33:
+            loc = document.getElementById('prev');
+            break;
+        case 34:
+            loc = document.getElementById('next');
+            break;
+    }
+    if (loc) {
+        document.location.href = loc.href;
+    }
+};