From dd3ae1a0928d1e180578d41d604243e25ceb41cc Mon Sep 17 00:00:00 2001
From: danactive <githubcom@domaindesign.ca>
Date: Sat, 29 Nov 2014 12:04:01 -0800
Subject: [PATCH] Prepare for JSON folder, move albums to XML source folder

---
 app.js                                   |   2 +-
 favicon.ico                              | Bin 0 -> 318 bytes
 gallery-demo/{ => xml}/album_sample.xml  |   2 +-
 gallery-demo/{ => xml}/character_ass.xml |  14 +-
 gallery-demo/{ => xml}/characters.xml    |  42 +++---
 gallery-demo/{ => xml}/gallery.xml       |  26 ++--
 index.htm                                |  12 +-
 js/xml.js                                |   2 +-
 xslt/album.xslt                          |   7 +-
 xslt/gallery.xslt                        | 158 +++++++++++------------
 10 files changed, 133 insertions(+), 132 deletions(-)
 create mode 100644 favicon.ico
 rename gallery-demo/{ => xml}/album_sample.xml (93%)
 rename gallery-demo/{ => xml}/character_ass.xml (98%)
 rename gallery-demo/{ => xml}/characters.xml (89%)
 rename gallery-demo/{ => xml}/gallery.xml (89%)

diff --git a/app.js b/app.js
index 92173db96..152784360 100644
--- a/app.js
+++ b/app.js
@@ -25,7 +25,7 @@ var doT = require('doT'),
 				response.write("<h1>Photo Galleries</h1><ul>");
 
 				for (i = 0; i < len; i+=1) {
-					response.write('<li><a href="gallery-' + galleries[i] + '/gallery.xml">' + galleries[i] + '</li>');
+					response.write('<li><a href="gallery-' + galleries[i] + '/xml/gallery.xml">' + galleries[i] + '</li>');
 				}
 				response.write("</ul>");
 				response.end('<a href="/admin/">Admin</a>');
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..cd6234da1baf9829d095bae0e723f669b38a6316
GIT binary patch
literal 318
zcmbtOu?fI13{#*7Wa`|phh)!7J}pOeS0$4|p=7FpWlNSJK+&tU!Z-`CyQ}ORs)9`n
zMDmx?7sVXHNr^FrT7VEloCBwzjJ5`uyG~vnl(r$6#;acrNVo2wwt4v6$?*9C{@Neh
D);Cea

literal 0
HcmV?d00001

diff --git a/gallery-demo/album_sample.xml b/gallery-demo/xml/album_sample.xml
similarity index 93%
rename from gallery-demo/album_sample.xml
rename to gallery-demo/xml/album_sample.xml
index 3e4a74a2b..1f312413c 100644
--- a/gallery-demo/album_sample.xml
+++ b/gallery-demo/xml/album_sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="../xslt/album.xslt"?>
+<?xml-stylesheet type="text/xsl" href="../../xslt/album.xslt"?>
 <!-- This XML associates photos and videos with meta data: geocode, caption, friends (characters)... -->
 <album gallery="demo">
 	<album_meta>
diff --git a/gallery-demo/character_ass.xml b/gallery-demo/xml/character_ass.xml
similarity index 98%
rename from gallery-demo/character_ass.xml
rename to gallery-demo/xml/character_ass.xml
index b8f31e6af..5459899ac 100644
--- a/gallery-demo/character_ass.xml
+++ b/gallery-demo/xml/character_ass.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This XML assocaiates characters (friends) with albums -->
-<character_association>
-<!-- c_a is character_association; a = album_name; p = photo_id; char_id = c -->
-<c_a><a>sample</a><p>2</p><c>3</c></c_a>
-<c_a><a>sample</a><p>3</p><c>1</c></c_a>
-<c_a><a>sample</a><p>1</p><c>3</c></c_a>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This XML assocaiates characters (friends) with albums -->
+<character_association>
+<!-- c_a is character_association; a = album_name; p = photo_id; char_id = c -->
+<c_a><a>sample</a><p>2</p><c>3</c></c_a>
+<c_a><a>sample</a><p>3</p><c>1</c></c_a>
+<c_a><a>sample</a><p>1</p><c>3</c></c_a>
 </character_association>
\ No newline at end of file
diff --git a/gallery-demo/characters.xml b/gallery-demo/xml/characters.xml
similarity index 89%
rename from gallery-demo/characters.xml
rename to gallery-demo/xml/characters.xml
index 53ffa2d71..23f83cfde 100644
--- a/gallery-demo/characters.xml
+++ b/gallery-demo/xml/characters.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="../xslt/characters.xslt"?>
-<!-- This XML lists all characters seen in the albums -->
-<characters>
-	<a>
-	  <char name="a_friend" id="1"> <!-- name is unique for use in filename (name + active); id is unique for character association -->
-		<first>A</first> <!-- given name -->
-		<last>Friend</last> <!-- surname -->
-		<known>grade1</known> <!-- Optional one word. Where did you meet your friend? -->
-		<active>2006Q2</active> <!-- Year Quarter is when your friends was active for use in filename (i.e. a_friend2006Q2.jpg) -->
-	  </char>
-	</a>
-	<h>
-	  <char name="hurray_more" id="3">
-		<first>Hurray</first>
-		<last>More</last>
-		<nick>Best Friend</nick>
-		<known>Canadian</known>
-		<active>2010Q2</active>
-	  </char>
-	</h>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="../../xslt/characters.xslt"?>
+<!-- This XML lists all characters seen in the albums -->
+<characters>
+	<a>
+	  <char name="a_friend" id="1"> <!-- name is unique for use in filename (name + active); id is unique for character association -->
+		<first>A</first> <!-- given name -->
+		<last>Friend</last> <!-- surname -->
+		<known>grade1</known> <!-- Optional one word. Where did you meet your friend? -->
+		<active>2006Q2</active> <!-- Year Quarter is when your friends was active for use in filename (i.e. a_friend2006Q2.jpg) -->
+	  </char>
+	</a>
+	<h>
+	  <char name="hurray_more" id="3">
+		<first>Hurray</first>
+		<last>More</last>
+		<nick>Best Friend</nick>
+		<known>Canadian</known>
+		<active>2010Q2</active>
+	  </char>
+	</h>
 </characters>
\ No newline at end of file
diff --git a/gallery-demo/gallery.xml b/gallery-demo/xml/gallery.xml
similarity index 89%
rename from gallery-demo/gallery.xml
rename to gallery-demo/xml/gallery.xml
index 04ee63da1..0a844df40 100644
--- a/gallery-demo/gallery.xml
+++ b/gallery-demo/xml/gallery.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="../xslt/gallery.xslt"?>
-<gallery>
-	<album>
-		<gallery_id>1</gallery_id>
-		<album_name>sample</album_name> <!-- unique album name -->
-		<album_version>1.8</album_version> <!-- note for XML schema reference -->
-		<sort>1</sort>
-		<album_h1>Sample</album_h1> <!-- heading 1: album name -->
-		<album_h2>British Columbia</album_h2> <!-- heading 2: State/Province -->
-		<year>2001-2005</year> <!-- Year outputted as text in gallery view -->
-		<filename>2004-01-04-01.jpg</filename> <!-- must start with a four letter year; file must be hosted in the media folder > year folder (i.e. media/2004/2004-01-04-01.jpg) -->
-	</album>
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="../../xslt/gallery.xslt"?>
+<gallery>
+	<album>
+		<gallery_id>1</gallery_id>
+		<album_name>sample</album_name> <!-- unique album name -->
+		<album_version>1.8</album_version> <!-- note for XML schema reference -->
+		<sort>1</sort>
+		<album_h1>Sample</album_h1> <!-- heading 1: album name -->
+		<album_h2>British Columbia</album_h2> <!-- heading 2: State/Province -->
+		<year>2001-2005</year> <!-- Year outputted as text in gallery view -->
+		<filename>2004-01-04-01.jpg</filename> <!-- must start with a four letter year; file must be hosted in the media folder > year folder (i.e. media/2004/2004-01-04-01.jpg) -->
+	</album>
 </gallery>
\ No newline at end of file
diff --git a/index.htm b/index.htm
index 7e8460009..a89dda3b8 100644
--- a/index.htm
+++ b/index.htm
@@ -1,7 +1,7 @@
-<!-- Open this page when not running Node.js -->
-<p><b><a href="gallery-demo/gallery.xml">View Photo Galleries</a></b></p>
-<ul>
-	<li><a href="admin">Photo admin</a></li>
-	<li><a href="https://github.com/danactive/history">GitHub: Download code</a></li>
-	<li><a href="http://danactive.github.io/history/">Demo site 0.15.0</a></li>
+<!-- Open this page when not running Node.js -->
+<p><b><a href="gallery-demo/xml/gallery.xml">View Photo Galleries</a></b></p>
+<ul>
+	<li><a href="admin">Photo admin</a></li>
+	<li><a href="https://github.com/danactive/history">GitHub: Download code</a></li>
+	<li><a href="http://danactive.github.io/history/">Demo site 0.15.0</a></li>
 </ul>
\ No newline at end of file
diff --git a/js/xml.js b/js/xml.js
index 04d9c0ed1..17539e131 100644
--- a/js/xml.js
+++ b/js/xml.js
@@ -4,7 +4,7 @@ function Xml(options) {
 		callback = requireArg({"args": options, "name": "callback", "type": "function"}),
 		gallery = requireArg({"args": options, "name": "gallery", "type": "string"});
 
-	jQuery.get('../gallery-' + gallery + '/album_' + album + '.xml')
+	jQuery.get('../gallery-' + gallery + '/xml/album_' + album + '.xml')
 		.error(ajaxError)
 		.success(function (response) {
 			var json = jQuery.parseJSON(util.xml.convertToJsonString(response,''));
diff --git a/xslt/album.xslt b/xslt/album.xslt
index c3d3f6a4e..1fa3c8d37 100644
--- a/xslt/album.xslt
+++ b/xslt/album.xslt
@@ -3,8 +3,8 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	<xsl:output method="html" doctype-system="about:legacy-compat" />
 	<xsl:variable name="galleryDir" select="/album/@gallery" />
-	<xsl:variable name="charAssPath" select="concat('/gallery-', $galleryDir, '/character_ass.xml')" />
-	<xsl:variable name="charsPath" select="concat('/gallery-', $galleryDir, '/characters.xml')" />
+	<xsl:variable name="charAssPath" select="concat('/gallery-', $galleryDir, '/xml/character_ass.xml')" />
+	<xsl:variable name="charsPath" select="concat('/gallery-', $galleryDir, '/xml/characters.xml')" />
 	<xsl:variable name="char_ass" select="document($charAssPath)/character_association"/>
 	<xsl:variable name="chars" select="document($charsPath)/characters"/>
 	<xsl:variable name="photo__album_name">
@@ -15,7 +15,8 @@
 			<head>
 				<meta charset="utf-8" />
 				<title>History - Photo Album</title>
-				<link  href="../lib/jquery-colorbox/example1/colorbox.css" rel="stylesheet" media="screen" />
+				<base href="../"/>
+				<link href="../lib/jquery-colorbox/example1/colorbox.css" rel="stylesheet" media="screen" />
 				<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.css" />
 				<!--[if lte IE 8]>
 				    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.ie.css" />
diff --git a/xslt/gallery.xslt b/xslt/gallery.xslt
index 569450a6e..c770ddef7 100644
--- a/xslt/gallery.xslt
+++ b/xslt/gallery.xslt
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method="html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-	<xsl:template match="/">
-		<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us">
-			<head>
-				<title>History - Photo Album Galleries</title>
-				<script type="text/javascript" src="../js/global.js"></script>
-				<style type="text/css">
-					.album { float: left; width: 185px; height: 170px; padding: 10px; }
-					.even { background-color: peachpuff; }
-					.odd { background-color: linen; }
-					h1 { font-size: 16px; font-family: "Trebuchet MS"; }
-					h1 a { color: black; text-decoration:none; border-bottom: 1px dotted #666; }
-					h2 { font-size: 12px; color: #8B7765; font-family: Verdana; }
-					h3 { font-size: 14px; font-family: "Trebuchet MS"; color: #8B5A2B; margin: 0px; }
-				</style>
-			</head>
-			<body>
-				<xsl:for-each select="gallery/album">
-					<xsl:sort select="sort" data-type="number" />
-					<div>
-						<xsl:attribute name="class">
-							<xsl:text>album </xsl:text>
-							<xsl:choose>
-								<xsl:when test="position() mod 2">
-									<xsl:text>odd</xsl:text>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:text>even</xsl:text>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:attribute>
-						<div class="album_img">
-							<a>
-								<xsl:attribute name="href">
-									<xsl:text>album_</xsl:text>
-									<xsl:value-of select="album_name"/>
-									<xsl:text>.xml</xsl:text>
-								</xsl:attribute>
-								<img>
-									<xsl:attribute name="src">
-										<xsl:text>media/thumbs/</xsl:text>
-										<xsl:value-of select="substring-before(filename,'-')"/>
-										<xsl:text>/</xsl:text>
-										<xsl:value-of select="filename"/>
-									</xsl:attribute>
-								</img>
-							</a>
-						</div>
-						<h1>
-							<a>
-								<xsl:attribute name="href">
-									<xsl:text>album_</xsl:text>
-									<xsl:value-of select="album_name"/>
-									<xsl:text>.xml</xsl:text>
-								</xsl:attribute>
-								<xsl:value-of select="album_h1"/>
-							</a>
-						</h1>
-						<h2>
-							<xsl:value-of select="album_h2"/>
-						</h2>
-						<xsl:if test="year != 'none'">
-							<h3>
-								<xsl:value-of select="year" />
-
-								<xsl:if test="album_version &gt;= 1.5">
-									<xsl:text> (Map)</xsl:text>
-								</xsl:if>
-							</h3>
-						</xsl:if>
-					</div>
-				</xsl:for-each>
-			</body>
-		</html>
-	</xsl:template>
-
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+
+	<xsl:template match="/">
+		<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us">
+			<head>
+				<title>History - Photo Album Galleries</title>
+				<script type="text/javascript" src="../../js/global.js"></script>
+				<style type="text/css">
+					.album { float: left; width: 185px; height: 170px; padding: 10px; }
+					.even { background-color: peachpuff; }
+					.odd { background-color: linen; }
+					h1 { font-size: 16px; font-family: "Trebuchet MS"; }
+					h1 a { color: black; text-decoration:none; border-bottom: 1px dotted #666; }
+					h2 { font-size: 12px; color: #8B7765; font-family: Verdana; }
+					h3 { font-size: 14px; font-family: "Trebuchet MS"; color: #8B5A2B; margin: 0px; }
+				</style>
+			</head>
+			<body>
+				<xsl:for-each select="gallery/album">
+					<xsl:sort select="sort" data-type="number" />
+					<div>
+						<xsl:attribute name="class">
+							<xsl:text>album </xsl:text>
+							<xsl:choose>
+								<xsl:when test="position() mod 2">
+									<xsl:text>odd</xsl:text>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:text>even</xsl:text>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:attribute>
+						<div class="album_img">
+							<a>
+								<xsl:attribute name="href">
+									<xsl:text>album_</xsl:text>
+									<xsl:value-of select="album_name"/>
+									<xsl:text>.xml</xsl:text>
+								</xsl:attribute>
+								<img>
+									<xsl:attribute name="src">
+										<xsl:text>../media/thumbs/</xsl:text>
+										<xsl:value-of select="substring-before(filename,'-')"/>
+										<xsl:text>/</xsl:text>
+										<xsl:value-of select="filename"/>
+									</xsl:attribute>
+								</img>
+							</a>
+						</div>
+						<h1>
+							<a>
+								<xsl:attribute name="href">
+									<xsl:text>album_</xsl:text>
+									<xsl:value-of select="album_name"/>
+									<xsl:text>.xml</xsl:text>
+								</xsl:attribute>
+								<xsl:value-of select="album_h1"/>
+							</a>
+						</h1>
+						<h2>
+							<xsl:value-of select="album_h2"/>
+						</h2>
+						<xsl:if test="year != 'none'">
+							<h3>
+								<xsl:value-of select="year" />
+
+								<xsl:if test="album_version &gt;= 1.5">
+									<xsl:text> (Map)</xsl:text>
+								</xsl:if>
+							</h3>
+						</xsl:if>
+					</div>
+				</xsl:for-each>
+			</body>
+		</html>
+	</xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file