From 0e145c2acbe71d9256cb6a2d0a91ff106e11b185 Mon Sep 17 00:00:00 2001
From: Adam Koprowski <Adam.Koprowski@mlstate.com>
Date: Wed, 16 Jun 2010 12:14:15 +0200
Subject: [PATCH] Books: by ratings/by year; switching tabs to Ajax.

Now all tabs & pop-ups about books load via Ajax, greatly
improving response times.
---
 data/menu.xml               | 11 ++++++++-
 pages/books-2007.xml        |  6 +++++
 pages/books-2008.xml        |  6 +++++
 pages/books-2009.xml        |  6 +++++
 pages/books-2010.xml        |  6 +++++
 pages/books-before-2007.xml |  6 +++++
 pages/books-good.xml        |  6 +++++
 pages/books-great.xml       |  6 +++++
 pages/books-not-good.xml    |  6 +++++
 pages/books-ok.xml          |  6 +++++
 pages/books-ratings.xml     | 20 ++++------------
 pages/books-year.xml        | 29 +++++++++++++++++++++++
 pages/books.xml             | 47 -------------------------------------
 pages/leisure.xml           |  2 +-
 todo.txt                    |  1 +
 xsl/html.xsl                |  4 ++++
 16 files changed, 103 insertions(+), 65 deletions(-)
 create mode 100644 pages/books-2007.xml
 create mode 100644 pages/books-2008.xml
 create mode 100644 pages/books-2009.xml
 create mode 100644 pages/books-2010.xml
 create mode 100644 pages/books-before-2007.xml
 create mode 100644 pages/books-good.xml
 create mode 100644 pages/books-great.xml
 create mode 100644 pages/books-not-good.xml
 create mode 100644 pages/books-ok.xml
 create mode 100644 pages/books-year.xml
 delete mode 100644 pages/books.xml

diff --git a/data/menu.xml b/data/menu.xml
index 28857f9..c42e601 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -48,11 +48,20 @@
 	</entry>
 	<entry fileid="leisure">
 		<text>Free time</text>	
-		<subentry fileid="books">
+		<subentry fileid="books-year">
 			<text>Books: by year</text>
+			<subsubentry fileid="books-2010" />
+			<subsubentry fileid="books-2009" />
+			<subsubentry fileid="books-2008" />
+			<subsubentry fileid="books-2007" />
+			<subsubentry fileid="books-before-2007" />
 		</subentry>
 		<subentry fileid="books-ratings">
 			<text>Books: by rating</text>
+			<subsubentry fileid="books-great" />
+			<subsubentry fileid="books-good" />
+			<subsubentry fileid="books-ok" />
+			<subsubentry fileid="books-not-good" />
 		</subentry>
 		<subentry fileid="books-authors">
 			<text>Books: by authors</text>
diff --git a/pages/books-2007.xml b/pages/books-2007.xml
new file mode 100644
index 0000000..55c4507
--- /dev/null
+++ b/pages/books-2007.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<snippet>
+	<books-by-tag tag="read-2007" />
+</snippet>
diff --git a/pages/books-2008.xml b/pages/books-2008.xml
new file mode 100644
index 0000000..e43a4ab
--- /dev/null
+++ b/pages/books-2008.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<snippet>
+	<books-by-tag tag="read-2008" />
+</snippet>
diff --git a/pages/books-2009.xml b/pages/books-2009.xml
new file mode 100644
index 0000000..d5f738c
--- /dev/null
+++ b/pages/books-2009.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<snippet>
+	<books-by-tag tag="read-2009" />
+</snippet>
diff --git a/pages/books-2010.xml b/pages/books-2010.xml
new file mode 100644
index 0000000..70f6583
--- /dev/null
+++ b/pages/books-2010.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<snippet>
+	<books-by-tag tag="read-2010" />
+</snippet>
diff --git a/pages/books-before-2007.xml b/pages/books-before-2007.xml
new file mode 100644
index 0000000..7e7d4c1
--- /dev/null
+++ b/pages/books-before-2007.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<snippet>
+	<books-by-tag tag="read-before-2007" />
+</snippet>
diff --git a/pages/books-good.xml b/pages/books-good.xml
new file mode 100644
index 0000000..978c1bc
--- /dev/null
+++ b/pages/books-good.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<snippet>
+	<books-by-rating min="4.0" max="4.0" />
+</snippet>
diff --git a/pages/books-great.xml b/pages/books-great.xml
new file mode 100644
index 0000000..ca99ef3
--- /dev/null
+++ b/pages/books-great.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<snippet>
+	<books-by-rating min="4.5" max="5.0" />
+</snippet>
diff --git a/pages/books-not-good.xml b/pages/books-not-good.xml
new file mode 100644
index 0000000..40d504f
--- /dev/null
+++ b/pages/books-not-good.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<snippet>
+	<books-by-rating min="0.0" max="2.5" />
+</snippet>
diff --git a/pages/books-ok.xml b/pages/books-ok.xml
new file mode 100644
index 0000000..4766c59
--- /dev/null
+++ b/pages/books-ok.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<snippet>
+	<books-by-rating min="3.0" max="3.5" />
+</snippet>
diff --git a/pages/books-ratings.xml b/pages/books-ratings.xml
index ca4b386..301dd6c 100644
--- a/pages/books-ratings.xml
+++ b/pages/books-ratings.xml
@@ -18,23 +18,11 @@
 		
 		<div id="books">
 			<ul>
-				<li><a href="#great">Loved it!</a></li>
-				<li><a href="#good">Liked it</a></li>
-				<li><a href="#ok">It was ok</a></li>
-				<li><a href="#not-good">Didn't like it</a></li>
+				<li><a href="books-great.html">Loved it!</a></li>
+				<li><a href="books-good.html">Liked it</a></li>
+				<li><a href="books-ok.html">It was ok</a></li>
+				<li><a href="books-not-good.html">Didn't like it</a></li>
 			</ul>	
-			<div id="great">
-				<books-by-rating min="4.5" max="5.0" />
-			</div>
-			<div id="good">	
-				<books-by-rating min="4.0" max="4.0" />
-			</div>
-			<div id="ok">	
-				<books-by-rating min="3.0" max="3.5" />
-			</div>
-			<div id="not-good">	
-				<books-by-rating min="0.0" max="2.5" />
-			</div>
 		</div>
 	</content>
 </page>
diff --git a/pages/books-year.xml b/pages/books-year.xml
new file mode 100644
index 0000000..689a0da
--- /dev/null
+++ b/pages/books-year.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
+
+<page menu="leisure" jquery="true">
+	<title>Adam Koprowski :: Books</title>
+	<content>
+		<jquery-tabs id="books" />
+		<heading>Books</heading>
+		
+		<lt-link />
+		<div>
+			You can also see my books 
+			<A href="books-ratings.html">by ratings</A>
+			and
+			<A href="books-authors.html">by authors</A>.
+		</div> 		
+		<vspace />
+		
+		<div id="books">
+			<ul>
+				<li><a href="books-2010.html">2010</a></li>
+				<li><a href="books-2009.html">2009</a></li>
+				<li><a href="books-2008.html">2008</a></li>
+				<li><a href="books-2007.html">2007</a></li>
+				<li><a href="books-before-2007.html">&lt;=2006</a></li>
+			</ul>	
+		</div>
+	</content>
+</page>
diff --git a/pages/books.xml b/pages/books.xml
deleted file mode 100644
index 7ff3eb4..0000000
--- a/pages/books.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="../xsl/books.xsl" ?>
-
-<page menu="leisure" jquery="true">
-	<title>Adam Koprowski :: Books</title>
-	<content>
-		<jquery-tabs id="books" />
-		<heading>Books</heading>
-		
-		<lt-link />
-		<div>
-			You can also see my books 
-			<A href="books-ratings.html">by ratings</A>
-			and
-			<A href="books-authors.html">by authors</A>.
-		</div> 		
-		<vspace />
-		
-		<div id="books">
-			<ul>
-				<li><a href="#2010">2010</a></li>
-				<li><a href="#2009">2009</a></li>
-				<li><a href="#2008">2008</a></li>
-				<li><a href="#2007">2007</a></li>
-				<li><a href="#2006">&lt;=2006</a></li>
-			</ul>	
-			<div id="2010">	
-				<subheading>Reading now</subheading>
-				<books-by-tag tag="reading" />
-				<subheading>2010</subheading>
-				<books-by-tag tag="read-2010" />
-			</div>
-			<div id="2009">	
-				<books-by-tag tag="read-2009" />
-			</div>
-			<div id="2008">	
-				<books-by-tag tag="read-2008" />
-			</div>
-			<div id="2007">	
-				<books-by-tag tag="read-2007" />
-			</div>
-			<div id="2006">	
-				<books-by-tag tag="read-before-2007" />
-			</div>
-		</div>
-	</content>
-</page>
diff --git a/pages/leisure.xml b/pages/leisure.xml
index 78b9e3c..d59c7ba 100644
--- a/pages/leisure.xml
+++ b/pages/leisure.xml
@@ -7,7 +7,7 @@
 		<heading>Free time</heading>
 		<text>In my free time I like to:</text>
 		<ul>
-			<li>read books: <A href="books.html">by year</A> | <A href="books-ratings.html">by rating</A> | <A href="books-authors.html">by author</A></li>
+			<li>read books: <A href="books-year.html">by year</A> | <A href="books-ratings.html">by rating</A> | <A href="books-authors.html">by author</A></li>
 			<li>watch movies: <A href="movies.html">by year</A> | <A href="movies-ratings.html">by rating</A></li>
 			<li>run marathons: <A href="running.html">by location</A></li>
 		</ul>
diff --git a/todo.txt b/todo.txt
index 43fb1ee..3c20cfc 100644
--- a/todo.txt
+++ b/todo.txt
@@ -3,6 +3,7 @@ TODO Strip double quotes from titles (beg & end)
 TODO Normalize poster sizes (some are too wide)
 
 === Books:
+TODO Fix book tips (broken because of Ajax-loading of content)
 TODO Author's cloud: the page flicking is almost gone, but it still happens when browsers side scrollbar show up.
 TODO Author's tip with books - make width fit content (calculate based on number of books to show)
 TODO Authors' cloud: put in a jQuery-like panel (consistency with by author & date)
diff --git a/xsl/html.xsl b/xsl/html.xsl
index 26d6875..6a7a8c1 100644
--- a/xsl/html.xsl
+++ b/xsl/html.xsl
@@ -21,6 +21,10 @@
 	<!--******************************************* Templates *******************************************-->
 	<!--*************************************************************************************************-->
 
+	<xsl:template match="snippet">
+		<xsl:apply-templates select="node()" />
+	</xsl:template>
+
 	<xsl:template match="page">
 		<HTML>
 			<xsl:call-template name="html-header" />