summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/Makefile24
-rwxr-xr-xexamples/gipfel2html260
-rw-r--r--examples/style.css203
3 files changed, 362 insertions, 125 deletions
diff --git a/examples/Makefile b/examples/Makefile
index ac44fb7..668f1f2 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -26,13 +26,12 @@ positions := $(addprefix gipfelweb/gipfel/, $(addsuffix .pos, $(basename $(image
imgpos := $(addprefix gipfelweb/gipfel/, $(addsuffix .imgs, $(basename $(images))))
hillpos := $(addprefix gipfelweb/gipfel/, $(addsuffix .hills, $(basename $(images))))
html := $(addprefix gipfelweb/, $(addsuffix .html, $(basename $(images))))
-htmlhills := $(addprefix gipfelweb/hills/, $(addsuffix .html, $(basename $(images))))
all:
echo "make gipfelweb - create a HTML based view of gipfel oriented"
echo "images in the current directory."
-gipfelweb: dirs $(slides) $(thumbs) $(imgpos) $(hillpos) $(html) $(htmlhills)
+gipfelweb: dirs style $(slides) $(thumbs) $(imgpos) $(hillpos) $(html) gipfelweb/index.html
clean:
rm -rf gipfelweb/gipfel
@@ -43,9 +42,13 @@ clobber:
dirs:
mkdir -p gipfelweb/slides
mkdir -p gipfelweb/thumbs
- mkdir -p gipfelweb/hills
mkdir -p gipfelweb/gipfel
+style: gipfelweb/style.css
+
+gipfelweb/style.css: $(here)style.css
+ cp $< $@
+
gipfelweb/slides/%.jpg: %.jpg
convert $< -filter Lanczos -resize 20000x500\> -quality 94 $@
@@ -70,14 +73,11 @@ gipfelweb/gipfel/%.hills: gipfelweb/slides/%.jpg
gipfelweb/gipfel/index.gipfel: $(positions)
cat $(positions) > gipfelweb/gipfel/index.gipfel
-gipfelweb/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.imgs %.title $(thumbs)
- $(GIPFEL2HTML) images "`cat $*.title`" $* > $@
-
-gipfelweb/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.imgs $(thumbs)
- $(GIPFEL2HTML) images $* $* > $@
+gipfelweb/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.imgs gipfelweb/gipfel/%.hills %.title $(thumbs) gipfelweb/style.css
+ $(GIPFEL2HTML) page $* > $@
-gipfelweb/hills/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.hills %.title
- $(GIPFEL2HTML) hills "`cat $*.title`" $* > $@
+gipfelweb/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.imgs gipfelweb/gipfel/%.hills $(thumbs) gipfelweb/style.css
+ $(GIPFEL2HTML) page $* > $@
-gipfelweb/hills/%.html: gipfelweb/slides/%.jpg gipfelweb/gipfel/%.hills
- $(GIPFEL2HTML) hills $* $* > $@
+gipfelweb/index.html: $(thumbs) $(html)
+ $(GIPFEL2HTML) gallery $(basename $(images)) > $@
diff --git a/examples/gipfel2html b/examples/gipfel2html
index 49814c3..d6ad93f 100755
--- a/examples/gipfel2html
+++ b/examples/gipfel2html
@@ -1,139 +1,173 @@
#!/bin/sh
+# gipfel2html — generate the modern, CSS-only gipfelweb pages.
+#
+# gipfel2html page <file> one panorama page (peaks + photos)
+# gipfel2html gallery <f1> <f2> thumbnail gallery index
+#
+# Markers are positioned in percent of the slide so the panorama can
+# scale freely (responsive default; a CSS-only checkbox switches to
+# full resolution with horizontal scrolling). Interaction is pure CSS:
+# hover for mouse, :focus-within for keyboard, :target for touch.
+
+set -e
+# awk must print dots as decimal separators regardless of locale
+LC_ALL=C
+export LC_ALL
MODE="$1"
-TITLE="$2"
-FILE="$3"
-if [ "$MODE" = "images" ]; then
- DATAFILE="gipfelweb/gipfel/${FILE}.imgs"
-else
- DATAFILE="gipfelweb/gipfel/${FILE}.hills"
-fi
-
-cat << EOF
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
-<html>
+AWK=awk
+
+# percent of slide dimension
+pct() { $AWK -v v="$1" -v m="$2" 'BEGIN { printf "%.2f", v * 100 / m }'; }
+
+# integer percent (for threshold comparisons)
+ipct() { $AWK -v v="$1" -v m="$2" 'BEGIN { printf "%d", v * 100 / m }'; }
+
+# meters -> "12.3 km" / "850 m"
+fmt_dist() {
+ $AWK -v d="$1" 'BEGIN { if (d >= 1000) printf "%.1f km", d / 1000; else printf "%.0f m", d }'
+}
+
+# edge classes so popups stay inside the image: below if near the top,
+# left/right aligned if near a horizontal edge
+edge_classes() {
+ xp="$1"; yp="$2"
+ cls=""
+ [ "$yp" -lt 25 ] && cls="below"
+ if [ "$xp" -lt 12 ]; then cls="$cls left"
+ elif [ "$xp" -gt 88 ]; then cls="$cls right"
+ fi
+ echo "$cls"
+}
+
+
+title_of() {
+ # display title for image base name $1: %.title file, else the name
+ if [ -e "$1.title" ]; then cat "$1.title"; else echo "$1"; fi
+}
+
+head() {
+ cat << EOF
+<!DOCTYPE html>
+<html lang="en">
<head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>$1 — gipfel</title>
+<link rel="stylesheet" href="$2style.css" />
+</head>
EOF
-
-echo "<title>$TITLE</title>"
-
-cat << EOF
-<style type="text/css">
-#gipfel { display: block; position: relative; margin: 0; padding: 0; }
-#gipfel li { visibility: hidden; list-style-type: none; position: absolute; background: url(25w.png); border: 1px solid black; font-family: sans-serif; font-size: x-small; color: #000; padding: 0; line-height: 1.3em; overflow: hidden; }
-#gipfel span { visibility: hidden; position: absolute; left: 0; right: 0; display: block; padding: 5px; }
-#gipfel:hover li { visibility: visible; }
-#gipfel li:hover span {visibility: visible;}
+}
+
+if [ "$MODE" = "gallery" ]; then
+ shift
+ head "gipfelweb" ""
+ cat << EOF
+<body>
+<header><h1>gipfelweb</h1></header>
+<main>
+<div class="gallery">
EOF
-
-IFS=" "
-i=0
-grep -v "^#" ${DATAFILE} | \
-while read name height x y dist flags dummy; do
- if [ "$MODE" = "images" ]; then
- thumb_w=`identify -format %w gipfelweb/thumbs/${name}`
- thumb_h=`identify -format %h gipfelweb/thumbs/${name}`
-
- echo "#id_${i} {left:$((${x} - 10 / 2))px; top: $((${y} - 6 / 2))px; width: 10px; height: 6px;}"
- echo "#id_${i}:hover {width: ${thumb_w}px; height: ${thumb_h}px; background: url(thumbs/${name});}"
- else
- echo "#id_${i} {left:$((${x} - 4 / 2))px; top: $((${y} - 4 / 2))px; width: 4px; height: 4px;}"
- echo "#id_${i}:hover {width: 200px; height: 20px;}"
- fi
-
- i=$((${i} + 1))
-done
-
-cat << EOF
-</style></head>
-<body bgcolor="#919faa">
-<br/>
-<br/>
+ for f in "$@"; do
+ echo "<a href=\"${f}.html\"><img src=\"thumbs/${f}.jpg\" alt=\"${f}\" loading=\"lazy\"><span class=\"t\">$(title_of "$f")</span></a>"
+ done
+ cat << EOF
+</div>
+</main>
+<footer>Created with <a href="https://flpsed.org/gipfel.html">gipfel</a></footer>
+</body>
+</html>
EOF
-
-echo "<h3>$TITLE</h3>"
-
-if [ "$MODE" = "images" ]; then
- echo "<a href=\"hills/${FILE}.html\">show hill names</a>"
-else
- echo "<a href=\"../${FILE}.html\">back to gipfelweb</a>"
+ exit 0
fi
+# ---- one panorama page ----
+FILE="$2"
+SLIDE="gipfelweb/slides/${FILE}.jpg"
+HILLS="gipfelweb/gipfel/${FILE}.hills"
+IMGS="gipfelweb/gipfel/${FILE}.imgs"
+TITLE=$(title_of "$FILE")
+set -- $(identify -format "%w %h" "$SLIDE")
+W="$1" H="$2"
+
+head "$TITLE" ""
cat << EOF
-<table border="0" cellpadding="0" cellspacing="1" bgcolor="black">
-<tr><td>
-<table border="0" cellpadding="10" cellspacing="0" bgcolor="white">
-<tr><td>
-<div id="gipfel">
+<body>
+<header>
+<h1>${TITLE}</h1>
+<a href="index.html">&larr; Gallery</a>
+</header>
+<main>
+<input type="checkbox" id="t-peaks" class="tgl" checked />
+<label class="chip" for="t-peaks">Peaks</label>
+<input type="checkbox" id="t-photos" class="tgl" checked />
+<label class="chip" for="t-photos">Photos</label>
+<input type="checkbox" id="t-labels" class="tgl" />
+<label class="chip" for="t-labels">Labels</label>
+<input type="checkbox" id="t-full" class="tgl" />
+<label class="chip" for="t-full">Full resolution</label>
+<div class="pano-wrap">
+<div class="pano">
+<img class="slide" src="slides/${FILE}.jpg" alt="${TITLE}" />
+<ul class="markers">
EOF
-if [ "$MODE" = "images" ]; then
- echo "<img src=\"slides/${FILE}.jpg\"/>"
-else
- echo "<img src=\"../slides/${FILE}.jpg\"/>"
+# note: no `cmd | while` pipes here — the loop body increments the
+# marker counters and must run in the current shell
+if [ -e "$HILLS" ]; then
+ i=0
+ while IFS=" " read -r name height x y dist rest; do
+ case "$name" in \#*|"") continue ;; esac
+ xp=$(pct "$x" "$W"); yp=$(pct "$y" "$H")
+ cls=$(edge_classes "$(ipct "$x" "$W")" "$(ipct "$y" "$H")")
+ d=$(fmt_dist "$dist")
+ echo "<li class=\"mk peak $cls\" id=\"id_${i}\" style=\"--x:${xp}%;--y:${yp}%\"><a href=\"#id_${i}\" aria-label=\"${name}, ${height} m, distance ${d}\"><span class=\"dot\"></span><span class=\"pop label\">${name} &middot; ${height} m &middot; <span class=\"dist\">${d}</span></span></a></li>"
+ i=$((i + 1))
+ done < "$HILLS"
fi
-
-echo "<ul>"
-i=0
-grep -v "^#" ${DATAFILE} | \
-while read name height x y dist flags dummy; do
- if [ "$MODE" = "images" ]; then
- THUMB_TITLE="${name%.jpg}"
- if [ -e "${name%.jpg}.title" ]; then
- THUMB_TITLE=`cat ${name%.jpg}.title`
- fi
- echo "<li id=\"id_${i}\"><a href=\"${name%.jpg}.html\"><span>${THUMB_TITLE} (${height}m)</span></a></li>"
- else
- echo "<li id=\"id_${i}\"><span>${name} (${height}m)</span></li>"
- fi
-
- i=$((${i} + 1))
-done
-echo "</ul>"
+if [ -e "$IMGS" ]; then
+ j=0
+ while IFS=" " read -r name height x y dist rest; do
+ case "$name" in \#*|"") continue ;; esac
+ [ "$name" = "${FILE}.jpg" ] && continue # no self links
+ xp=$(pct "$x" "$W"); yp=$(pct "$y" "$H")
+ cls=$(edge_classes "$(ipct "$x" "$W")" "$(ipct "$y" "$H")")
+ base="${name%.jpg}"
+ pt=$(title_of "$base")
+ d=$(fmt_dist "$dist")
+ echo "<li class=\"mk photo $cls\" id=\"pid_${j}\" style=\"--x:${xp}%;--y:${yp}%\"><a href=\"#pid_${j}\" aria-label=\"${pt}, distance ${d}\"><span class=\"dot\"></span><span class=\"pop thumb\"><img src=\"thumbs/${name}\" alt=\"${pt}\"><span class=\"cap\">${pt} &middot; <span class=\"dist\">${d}</span></span></span></a></li>"
+ j=$((j + 1))
+ done < "$IMGS"
+fi
cat << EOF
+</ul>
+</div>
</div>
-</td></tr>
-</table>
-</td></tr>
-</table>
-<br/>
-<b>Created with <a href="http://www.ecademix.com/JohannesHofmann/gipfel.html">gipfel</a></b>
-<br/>
-<br/>
EOF
-if [ "$MODE" = "images" ]; then
- echo Move the mouse over the image to see other images.
-else
- echo Move the mouse over the image to see known mountains.
+# related images: panoramas in which this one also appears
+rel=$(awk -F'\t' -v n="${FILE}.jpg" '$1 == n { print FILENAME; exit }' \
+ gipfelweb/gipfel/*.imgs 2>/dev/null || true)
+if [ -n "$rel" ]; then
+ echo '<section class="related"><h2>Visible on these panoramas</h2>'
+ for f in $rel; do
+ img=$(basename "${f%.imgs}")
+ [ "$img" = "$FILE" ] && continue
+ echo "<a href=\"${img}.html\"><img src=\"thumbs/${img}.jpg\" alt=\"${img}\" loading=\"lazy\"></a>"
+ done
+ echo '</section>'
fi
cat << EOF
-<br/>
-Move the mouse over the rectangle to see details.
-<br/>
-<br/>
-This image is visible on these images:<br/>
-EOF
-
-# exact match on the name column (a plain grep -l would also match
-# substrings, e.g. test.jpg inside contest.jpg); exit keeps output to
-# one line per file
-awk -F'\t' -v n="${FILE}.jpg" '$1 == n { print FILENAME; exit }' gipfelweb/gipfel/*.imgs | \
-while read f; do
- img="`basename ${f%.imgs}`"
- if [ "$MODE" = "images" ]; then
- echo "<a href=\"${img}.html\"><img src=\"thumbs/${img}.jpg\"></a><br/>"
- else
- echo "<a href=\"../${img}.html\"><img src=\"../thumbs/${img}.jpg\"></a><br/>"
- fi
-done
-
-
-cat << EOF
+</main>
+<footer>
+Hover the markers for details &middot; on touch devices, tap them.
+<br />
+Created with <a href="https://flpsed.org/gipfel.html">gipfel</a>
+</footer>
</body>
</html>
EOF
diff --git a/examples/style.css b/examples/style.css
new file mode 100644
index 0000000..3c43fb3
--- /dev/null
+++ b/examples/style.css
@@ -0,0 +1,203 @@
+/* gipfelweb stylesheet — modern, CSS-only interaction (no JavaScript).
+ Theme follows the system preference; markers are positioned in
+ percent of the panorama so the image can scale freely. */
+
+:root {
+ --bg: #101014;
+ --panel: #1a1a21;
+ --text: #e8e8ee;
+ --muted: #9a9aa6;
+ --accent: #7aa2f7;
+ --chip: #24242e;
+ --chip-hover: #32323e;
+ --label-bg: rgba(16, 16, 20, 0.85);
+ --dot-peak: #ffd54a;
+ --dot-photo: #7ee787;
+ --shadow: 0 4px 16px rgba(0, 0, 0, 0.45);
+}
+@media (prefers-color-scheme: light) {
+ :root {
+ --bg: #f2f3f7;
+ --panel: #ffffff;
+ --text: #1d1d24;
+ --muted: #61616c;
+ --accent: #2b5fb8;
+ --chip: #e2e3ea;
+ --chip-hover: #d2d3dd;
+ --label-bg: rgba(255, 255, 255, 0.92);
+ --dot-peak: #d97706;
+ --dot-photo: #15803d;
+ --shadow: 0 4px 16px rgba(0, 0, 0, 0.18);
+ }
+}
+
+* { box-sizing: border-box; }
+
+body {
+ margin: 0;
+ background: var(--bg);
+ color: var(--text);
+ font-family: system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
+ line-height: 1.5;
+}
+
+header {
+ padding: 1rem 1.25rem 0.5rem;
+}
+header h1 {
+ margin: 0 0 0.5rem;
+ font-size: 1.35rem;
+ font-weight: 650;
+}
+header a { color: var(--accent); text-decoration: none; }
+header a:hover { text-decoration: underline; }
+
+/* ---- control chips (checkbox hack; inputs are visually hidden) ---- */
+main { padding: 0 1.25rem 1.25rem; }
+
+.tgl { position: absolute; opacity: 0; pointer-events: none; }
+.chip {
+ display: inline-block;
+ margin: 0 0.4rem 0.6rem 0;
+ padding: 0.3rem 0.8rem;
+ border-radius: 999px;
+ background: var(--chip);
+ color: var(--text);
+ font-size: 0.85rem;
+ cursor: pointer;
+ user-select: none;
+ transition: background 0.12s;
+}
+.chip:hover { background: var(--chip-hover); }
+.tgl:checked + .chip { background: var(--accent); color: #fff; }
+.tgl:focus-visible + .chip { outline: 2px solid var(--accent); outline-offset: 2px; }
+
+/* ---- panorama ---- */
+.pano-wrap {
+ background: var(--panel);
+ border-radius: 10px;
+ box-shadow: var(--shadow);
+ overflow: hidden;
+}
+.pano {
+ position: relative;
+ width: 100%;
+}
+.pano img.slide {
+ display: block;
+ width: 100%;
+ height: auto;
+}
+/* full resolution: natural width, horizontal scroll */
+#t-full:checked ~ .pano-wrap { overflow-x: auto; }
+#t-full:checked ~ .pano-wrap .pano { width: max-content; }
+#t-full:checked ~ .pano-wrap img.slide { width: auto; max-width: none; }
+
+ul.markers { position: absolute; inset: 0; margin: 0; padding: 0; list-style: none; }
+
+.mk { position: absolute; left: var(--x); top: var(--y); }
+.mk > a {
+ display: block;
+ position: static;
+ outline: none;
+}
+.dot {
+ display: block;
+ width: 10px;
+ height: 10px;
+ margin: -5px 0 0 -5px;
+ border-radius: 50%;
+ background: var(--dot-peak);
+ box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.55);
+ opacity: 0.45;
+ transition: opacity 0.12s;
+}
+.mk.photo .dot { background: var(--dot-photo); }
+.pano:hover .dot { opacity: 0.9; }
+.mk:hover .dot, .mk:focus-within .dot, .mk:target .dot { opacity: 1; }
+
+/* popups: hidden until hover / keyboard focus / tap (:target) */
+.pop {
+ position: absolute;
+ bottom: 14px;
+ left: 50%;
+ transform: translateX(-50%);
+ visibility: hidden;
+ opacity: 0;
+ transition: opacity 0.12s;
+ white-space: nowrap;
+ background: var(--label-bg);
+ color: var(--text);
+ border-radius: 8px;
+ padding: 0.25rem 0.6rem;
+ font-size: 0.82rem;
+ backdrop-filter: blur(4px);
+ box-shadow: var(--shadow);
+ z-index: 5;
+}
+/* generator adds .below/.left/.right so popups never leave the image */
+.mk.below .pop { bottom: auto; top: 14px; }
+.mk.left .pop { left: 0; transform: none; }
+.mk.right .pop { left: auto; right: 0; transform: none; }
+
+.mk:hover .pop, .mk:focus-within .pop, .mk:target .pop {
+ visibility: visible;
+ opacity: 1;
+}
+.pop .dist { color: var(--muted); }
+.pop.thumb {
+ padding: 0;
+ background: none;
+ border: 2px solid var(--label-bg);
+}
+.pop.thumb img { display: block; border-radius: 6px; max-width: 400px; }
+.pop.thumb .cap {
+ position: absolute;
+ left: 0; right: 0; bottom: 0;
+ margin: 0;
+ padding: 0.2rem 0.5rem;
+ font-size: 0.75rem;
+ background: var(--label-bg);
+ border-radius: 0 0 4px 4px;
+}
+
+/* view toggles */
+#t-peaks:not(:checked) ~ .pano-wrap .peak { display: none; }
+#t-photos:not(:checked) ~ .pano-wrap .photo { display: none; }
+#t-labels:checked ~ .pano-wrap .pop.label { visibility: visible; opacity: 1; }
+
+/* ---- cross links & footer ---- */
+.related { margin-top: 1.25rem; }
+.related h2 { font-size: 0.95rem; color: var(--muted); font-weight: 550; }
+.related a { display: inline-block; margin: 0 0.5rem 0.5rem 0; }
+.related img {
+ display: block;
+ border-radius: 6px;
+ max-width: 300px;
+ height: auto;
+ box-shadow: var(--shadow);
+}
+footer {
+ padding: 0.5rem 1.25rem 2rem;
+ color: var(--muted);
+ font-size: 0.8rem;
+}
+footer a { color: var(--accent); text-decoration: none; }
+
+/* ---- gallery index ---- */
+.gallery {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
+ gap: 1rem;
+}
+.gallery a {
+ display: block;
+ background: var(--panel);
+ border-radius: 10px;
+ overflow: hidden;
+ box-shadow: var(--shadow);
+ text-decoration: none;
+ color: var(--text);
+}
+.gallery img { display: block; width: 100%; height: auto; }
+.gallery .t { display: block; padding: 0.5rem 0.75rem; font-size: 0.9rem; }