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 6b9f99d2c3339c3d95140e03c94b88ef03187d7b..81c0a4ed02955628fccb88b75ab596273eab17bc 100644 (file)
--- 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 <pre> 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 dbb2bb27d060736e0feeedca87ff9c0399d065f4..e6c6f9f90c0f953ab276d49a72a9ee0949eba303 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -52,7 +52,7 @@ else
        caption_alt=$caption
 fi
 cat << END
-<div class="thumbnail"><a href="$filename"><img src="icons/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>
+<div class="thumbnail"><a href="$link"><img src="icons/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>
 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 <<END
+<h1>${caption}</h1>
+<div class="navigation">
+       <ul>
+               <li><a href='index.html'>Thumbnails</a></li>
+END
+       if [[ ! -z $previouspage ]]; then
+               echo "<li><a href='${previouspage}'>Previous</a></li>"
+       else
+               echo "<li>Previous</li>"
+       fi
+
+       if [[ ! -z $nextpage ]]; then
+               echo "<li><a href='${nextpage}'>Next</a></li>"
+       else
+               echo "<li>Next</li>"
+       fi
+cat <<END
+       </ul>
+</div>
+<div class="mainimage">
+       <img src="${filename}" alt="${caption}" />
+</div>
+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 "<pre>"
 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/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' 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