# HG changeset patch # User Jim Hague # Date 1377077570 -3600 # Node ID 01ded8741361ffdb1eb850a4e84cff7cf7cbf488 # Parent 2a7d03d6a89fa5bb47b99110c8ebec98ce1aac6f Use server-side includes (with Apache XBitHack setting) in web. This means that we can have one main web page, dottes.html, for each book and include the intro and tunelist to make the page. This removes the separate header and footer components. Perhaps we should use a template engine instead to generate the output. That means choosing one. And preferably one that isn't aimed only at HTML so we could use it for the printed books. More research required. diff -r 2a7d03d6a89f -r 01ded8741361 dottes.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dottes.html Wed Aug 21 10:32:50 2013 +0100 @@ -0,0 +1,49 @@ + + + + + Cry Havoc tunes - @TITLE@ + + + + + + + + +
+ + + + +
+

@SUBTITLE@

+ +

@INTRO@ +

You can download a PDF with a booklet of these tunes. There is an + A5 landscape book with one + tune per page, a 4x5in portrait book + suitable for use with an eReader like a Kindle, Nook, Kobo etc., + and an A4 book with two or + more tunes per page. +

If you have a printer that can do duplex (i.e. print on both sides + of the paper), you might like the + A5 booklet. + Print this onto A4 paper using both sides of the paper, and fold in half + to make an A5 booklet. +

When changes to this site are made, the issue number is incremented. + This is issue @BUILD@. +

+ +
+

The tunes

+
+ +
+
+
+ + diff -r 2a7d03d6a89f -r 01ded8741361 dottes.html.footer --- a/dottes.html.footer Wed Aug 21 10:28:10 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - - - diff -r 2a7d03d6a89f -r 01ded8741361 dottes.html.header --- a/dottes.html.header Wed Aug 21 10:28:10 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ - - - - - Cry Havoc tunes - @TITLE@ - - - - - - - - -
- - - - -
-

@SUBTITLE@

-

@INTRO@ -

You can download a PDF with a booklet of these tunes. There is an - A5 landscape book with one - tune per page, a 4x5in portrait book - suitable for use with an eReader like a Kindle, Nook, Kobo etc., - and an A4 book with two or - more tunes per page. -

If you have a printer that can do duplex (i.e. print on both sides - of the paper), you might like the - A5 booklet. - Print this onto A4 paper using both sides of the paper, and fold in half - to make an A5 booklet. -

When changes to this site are made, the issue number is incremented. - This is issue @BUILD@. -

- -
-

The tunes

-
diff -r 2a7d03d6a89f -r 01ded8741361 makeWeb.sh --- a/makeWeb.sh Wed Aug 21 10:28:10 2013 +0100 +++ b/makeWeb.sh Wed Aug 21 10:32:50 2013 +0100 @@ -24,6 +24,7 @@ webdir=$dir/web/$1 graphicsdir=$dir/graphics/$1 output=index.html +tunelist=tunelist.html booke=$1 masterbooke=$2 title=$booke @@ -37,9 +38,6 @@ if [ -r $bookedir/subtitle.txt ]; then subtitle=`cat $bookedir/subtitle.txt` fi -if [ -r $bookedir/intro.txt ]; then - intro=`txt2tags --no-headers --target=html --outfile=- $bookedir/intro.txt` -fi if [ -n "$instrument" ]; then title="${title} ($instrument)" @@ -49,8 +47,20 @@ mkdir -p $webdir sed -e "s/@BUILD@/$buildno/" -e "s/@SUBTITLE@/$subtitle/" \ - -e "s/@TITLE@/$title/" -e "s/@INTRO@/$intro/" \ - -e "s/@BOOK@/$booke/" dottes.html.header > $webdir/$output + -e "s/@TITLE@/$title/" -e "s/@BOOK@/$booke/" dottes.html > $webdir/$output + +# Mark output as executable so it is scanned for server-side includes. +chmod +x $webdir/$output + +for item in intro +do + rm -f $webdir/$item.html + if [ -r $booke/$item.txt ]; then + txt2tags --no-headers --target=html --outfile=$webdir/$item.html $booke/$item.txt + else + touch $webdir/$item.html + fi +done # Copy in the book PDFs. Like the graphics, Midi etc. these are assumed # to be already generated. @@ -103,7 +113,5 @@ -e "s/@TUNE@/${name}/" dottes.html.tune > $webdir/$tunepage sed -e "s/@TITLE@/${title//&/\&}/" \ - -e "s/@TUNE@/${name}/" dottes.html.tuneindex >> $webdir/$output + -e "s/@TUNE@/${name}/" dottes.html.tuneindex >> $webdir/$tunelist done - -cat dottes.html.footer >> $webdir/$output