From: Brett Parker Date: Sat, 13 May 2006 15:32:06 +0000 (+0000) Subject: Add in themed pages for the fullsize images X-Git-Tag: release-1.0.3~1 X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/commitdiff_plain/c757ab6dcdf959f0bb5fcf5fe23c7e94a4c6b819?hp=e1cb8f570febbc032bb3538c32a9b7c2f25aaa67 Add in themed pages for the fullsize images * Adds in option to generate pages for the fullsized images git-archimport-id: arch@sommitrealweird.co.uk--2005-desktop/bpgallery--mainline--1.0--patch-21 --- diff --git a/README b/README index 6b9f99d..81c0a4e 100644 --- a/README +++ b/README @@ -32,6 +32,8 @@ The following environment variables can also be used: BPGALLERY_THEME - set the theme to use (described below) BPGALLERY_THEME_DIR - set an extra location to look for themes OUTPUTHTML - sets the script output to be wrapped in a
 block
+        GENERATEPAGESFORFULLSIZE - decide wether to generate pages for the full
+                                   size images or not
 
 Example Usage:
         TITLE="My Funky Gallery" bpgallery.sh /path/to/image/files
@@ -70,8 +72,18 @@ The functions that you need to declare are as follows:
                 what's it for?:
                         Whatever is in here is generated per thumbnail.
                 available variables:
+		        $link        - the page/image to link to
                         $filename    - the name of the file
                         $caption     - the caption as got from captions.txt
+	bpgallery_ThemeName_page()
+		what's it for?:
+                        It generates the pages for fullsize image pages
+		available variables:
+                        $filename    - the name of the image
+                        $previouspage - the URL for the previous page
+                        $currentpage - the url for the current page
+                        $nextpage    - the url for the next page
+                        $caption     - the image caption
 
 If any of the functions are not defined in a theme then the default theme
 function will be used instead. The default theme is clean and simplistic, this
diff --git a/bpgallery.sh b/bpgallery.sh
index dbb2bb2..e6c6f9f 100755
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -52,7 +52,7 @@ else
 	caption_alt=$caption
 fi
 cat << END
-
$caption_alt
$caption
+
$caption_alt
$caption
END } @@ -90,6 +90,23 @@ div.caption { font-weight: bold; } +div.navigation { + width: 100%; + margin: 2em; + text-align: center; +} + +div.navigation ul { + width: 100%; + display: inline; + text-align: center; +} + +div.navigation ul li { + display: inline; + margin: 2em; +} + a { border: 0px; } @@ -102,6 +119,37 @@ END declare -rf bpgallery_default_stylesheet +function bpgallery_default_page() { + $BPGALLERY_HEAD_FUNCTION + cat <${caption} + +
+ ${caption} +
+END + $BPGALLERY_TAIL_FUNCTION +} + +declare -rf bpgallery_default_page + function bpgallery_escape_url() { temp=$1 temp=${temp//\%/%25} @@ -221,6 +269,18 @@ if [[ -z $OUTPUTHTML ]]; then OUTPUTHTML=0 fi +if [[ -z $GENERATEPAGESFORFULLSIZE ]]; then + GENERATEPAGESFORFULLSIZE=0 +fi + +if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then + if declare -F "bpgallery_${BPGALLERY_THEME}_page" > /dev/null ; then + BPGALLERY_PAGE_FUNCTION="bpgallery_${BPGALLERY_THEME}_page" + else + BPGALLERY_PAGE_FUNCTION="bpgallery_default_page" + fi +fi + if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head" else @@ -299,6 +359,65 @@ function generate_thumbs() { $ECHOCOMMAND "Completed generating thumbs for $totalimages images" } +function generate_pages() { + $ECHOCOMMAND "Generating Pages" + previouspage="" + currentpage="" + nextpage="" + previousimage="" + currentimage="" + nextimage="" + + $FINDCOMMAND . $FINDIMAGESOPTIONS | \ + $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | \ + $SORTCOMMAND -g | \ + while read imagefilename; do + previousimage=$currentimage + currentimage=$nextimage + nextimage=$imagefilename + previouspage=$currentpage + currentpage=$nextpage + nextpage=${imagefilename}.html + filename=${currentimage} + generate_general_page "$previouspage" "$currentpage" "$nextpage" + echo $nextimage + done | tail -n 2 | ( + read previouspage + read currentpage + filename=${currentpage} + currentpage=${currentpage}.html + previouspage=${previouspage}.html + nextpage="" + generate_general_page "$previouspage" "$currentpage" "" + ) +} + + + +function generate_general_page() { + + if [[ -z $1 ]]; then + previouspage="" + fi + + if [[ -z $2 ]]; then + currentpage="" + return + fi + + if [[ -z $3 ]]; then + nextpage="" + fi + + if [ -r captions.txt ]; then + caption=$($GREPCOMMAND -E "^${filename} " captions.txt); caption=${caption#* } + else + caption="" + fi + + $BPGALLERY_PAGE_FUNCTION > $currentpage +} + if [[ $OUTPUTHTML != 0 ]]; then $ECHOCOMMAND "
"
 fi
@@ -358,6 +477,10 @@ fi
 
 generate_thumbs
 
+if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then
+	generate_pages
+fi
+
 if [ -r description.txt ] ; then
 	DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/

/; }; /^$/ { s,$,

,; }; $ { s,$,

, };' description.txt) else @@ -372,7 +495,7 @@ $BPGALLERY_DESCRIPTION_FUNCTION >> index.html $ECHOCOMMAND "Adding Captions" -$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; if [ -r captions.txt ]; then caption=$($GREPCOMMAND -E "^$filename " captions.txt); caption=${caption#* }; else caption=""; fi; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html +$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; if [ -r captions.txt ]; then caption=$($GREPCOMMAND -E "^$filename " captions.txt); caption=${caption#* }; else caption=""; fi; if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then link=$(bpgallery_escape_url "${filename}.html"); else link=$(bpgallery_escape_url "$filename"); fi; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html $BPGALLERY_TAIL_FUNCTION >> index.html