From 6ed44b35ccf07ac02790ef9b7cb15104e4612b40 Mon Sep 17 00:00:00 2001 From: "Paul Buetow (mars.fritz.box)" Date: Sun, 16 Feb 2014 12:19:04 +0100 Subject: Add minimal templates. Fix default config file --- Makefile | 2 +- share/templates-minimal/footer.tmpl | 4 ++++ share/templates-minimal/header-first-add.tmpl | 3 +++ share/templates-minimal/header.tmpl | 22 ++++++++++++++++++++++ share/templates-minimal/index.tmpl | 12 ++++++++++++ share/templates-minimal/next.tmpl | 4 ++++ share/templates-minimal/prev.tmpl | 3 +++ share/templates-minimal/preview.tmpl | 3 +++ share/templates-minimal/redirect.tmpl | 9 +++++++++ share/templates-minimal/view.tmpl | 3 +++ src/photoalbum.default.conf | 7 ++++--- 11 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 share/templates-minimal/footer.tmpl create mode 100644 share/templates-minimal/header-first-add.tmpl create mode 100644 share/templates-minimal/header.tmpl create mode 100644 share/templates-minimal/index.tmpl create mode 100644 share/templates-minimal/next.tmpl create mode 100644 share/templates-minimal/prev.tmpl create mode 100644 share/templates-minimal/preview.tmpl create mode 100644 share/templates-minimal/redirect.tmpl create mode 100644 share/templates-minimal/view.tmpl diff --git a/Makefile b/Makefile index c34a8ce..dfcd5b2 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ dch: dch -i dput: dput -u wheezy-buetowdotorg ../$(NAME)_$$(cat ./.version)_amd64.changes -release: dch deb dput +release: all dch deb dput bash -c "git tag $$(cat .version)" git push --tags git commit -a -m 'New release' diff --git a/share/templates-minimal/footer.tmpl b/share/templates-minimal/footer.tmpl new file mode 100644 index 0000000..6473552 --- /dev/null +++ b/share/templates-minimal/footer.tmpl @@ -0,0 +1,4 @@ +cat < + +END diff --git a/share/templates-minimal/header-first-add.tmpl b/share/templates-minimal/header-first-add.tmpl new file mode 100644 index 0000000..f11a346 --- /dev/null +++ b/share/templates-minimal/header-first-add.tmpl @@ -0,0 +1,3 @@ +cat < +END diff --git a/share/templates-minimal/header.tmpl b/share/templates-minimal/header.tmpl new file mode 100644 index 0000000..8b20b53 --- /dev/null +++ b/share/templates-minimal/header.tmpl @@ -0,0 +1,22 @@ +cat < + +$TITLE + + + +END diff --git a/share/templates-minimal/index.tmpl b/share/templates-minimal/index.tmpl new file mode 100644 index 0000000..2ec99d7 --- /dev/null +++ b/share/templates-minimal/index.tmpl @@ -0,0 +1,12 @@ +cat < + +$TITLE + + + + +Redirecting to Page 1 + + +END diff --git a/share/templates-minimal/next.tmpl b/share/templates-minimal/next.tmpl new file mode 100644 index 0000000..a7f7c76 --- /dev/null +++ b/share/templates-minimal/next.tmpl @@ -0,0 +1,4 @@ +cat < +Next $MAXPREVIEWS pictures +END diff --git a/share/templates-minimal/prev.tmpl b/share/templates-minimal/prev.tmpl new file mode 100644 index 0000000..64d15d8 --- /dev/null +++ b/share/templates-minimal/prev.tmpl @@ -0,0 +1,3 @@ +cat <Previous $MAXPREVIEWS pictures +END diff --git a/share/templates-minimal/preview.tmpl b/share/templates-minimal/preview.tmpl new file mode 100644 index 0000000..a5e4bdc --- /dev/null +++ b/share/templates-minimal/preview.tmpl @@ -0,0 +1,3 @@ +cat < +END diff --git a/share/templates-minimal/redirect.tmpl b/share/templates-minimal/redirect.tmpl new file mode 100644 index 0000000..8edfe1c --- /dev/null +++ b/share/templates-minimal/redirect.tmpl @@ -0,0 +1,9 @@ +cat < + + + + + + +END diff --git a/share/templates-minimal/view.tmpl b/share/templates-minimal/view.tmpl new file mode 100644 index 0000000..c93a82b --- /dev/null +++ b/share/templates-minimal/view.tmpl @@ -0,0 +1,3 @@ +cat < +END diff --git a/src/photoalbum.default.conf b/src/photoalbum.default.conf index 6284988..3d7fa3d 100644 --- a/src/photoalbum.default.conf +++ b/src/photoalbum.default.conf @@ -10,11 +10,12 @@ MAXPREVIEWS=100 INCOMING_DIR=$(pwd)/incoming DIST_DIR=$(pwd)/dist TEMPLATE_DIR=/usr/share/photoalbum/templates +#TEMPLATE_DIR=/usr/share/photoalbum/templates-minimal # Includes a .tar of the incoming dir in the dist, can be yes or no -declare -r TARBALL_INCLUDE=yes -declare -r TARBALL_SUFFIX=.tar -declare -r TAR_OPTS='-c' +TARBALL_INCLUDE=yes +TARBALL_SUFFIX=.tar +TAR_OPTS='-c' # Some debugging options #set -e -- cgit v1.2.3