From 136fbc90cc5cc62a408a556d289c1bfd6b482e4b Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 13 Dec 2005 23:57:18 +0000
Subject: [PATCH] moved opac over to pure SSI and browser-handled XML entities.

index.xml is the starting point for all opac pages.  It determines which sub-chunks to load
the page_* pages are where the logic for each opac page type resides


git-svn-id: svn://svn.open-ils.org/ILS/trunk@2362 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../web/opac/skin/default/xml/altcanvas.xml   | 11 ++-
 Open-ILS/web/opac/skin/default/xml/body.xml   | 24 ++++++
 .../web/opac/skin/default/xml/css_common.xml  | 25 +++---
 Open-ILS/web/opac/skin/default/xml/fonts.xml  |  1 -
 Open-ILS/web/opac/skin/default/xml/footer.xml | 12 +++
 Open-ILS/web/opac/skin/default/xml/header.xml | 16 ++--
 Open-ILS/web/opac/skin/default/xml/holds.xml  |  1 -
 .../web/opac/skin/default/xml/homesearch.xml  |  3 +-
 .../web/opac/skin/default/xml/html_xsl.xml    | 10 +++
 Open-ILS/web/opac/skin/default/xml/index.xml  | 80 +++++++++---------
 .../web/opac/skin/default/xml/index_body.xml  | 21 +++++
 .../web/opac/skin/default/xml/js_common.xml   | 38 ++++-----
 Open-ILS/web/opac/skin/default/xml/login.xml  |  1 -
 Open-ILS/web/opac/skin/default/xml/logo.xml   |  3 +-
 .../opac/skin/default/xml/myopac_checked.xml  |  1 -
 .../opac/skin/default/xml/myopac_fines.xml    | 36 +++++----
 .../opac/skin/default/xml/myopac_holds.xml    |  1 -
 .../opac/skin/default/xml/myopac_prefs.xml    |  7 +-
 .../opac/skin/default/xml/myopac_summary.xml  |  1 -
 .../web/opac/skin/default/xml/orgtree.xml     |  1 -
 .../opac/skin/default/xml/page_advanced.xml   |  3 +
 .../opac/skin/default/xml/page_mresult.xml    |  9 +++
 .../web/opac/skin/default/xml/page_myopac.xml | 65 +++++++++++++++
 .../opac/skin/default/xml/page_rdetail.xml    | 30 +++++++
 .../opac/skin/default/xml/page_rresult.xml    |  9 +++
 .../skin/default/xml/rdetail_altcanvas.xml    |  1 -
 .../skin/default/xml/rdetail_copyinfo.xml     |  1 -
 .../opac/skin/default/xml/rdetail_extras.xml  |  3 +-
 .../opac/skin/default/xml/rdetail_summary.xml |  1 -
 .../opac/skin/default/xml/result_common.xml   |  5 +-
 .../web/opac/skin/default/xml/result_info.xml | 52 ++++++++++++
 .../opac/skin/default/xml/result_lowhits.xml  |  1 -
 .../opac/skin/default/xml/result_table.xml    | 81 +++----------------
 .../web/opac/skin/default/xml/searchbar.xml   |  1 -
 Open-ILS/web/opac/skin/default/xml/setenv.xml | 34 ++++++++
 .../web/opac/skin/default/xml/sidebar.xml     | 10 ++-
 .../web/opac/skin/default/xml/statusbar.xml   |  1 -
 Open-ILS/web/opac/skin/default/xml/tips.xml   |  1 -
 38 files changed, 393 insertions(+), 208 deletions(-)
 create mode 100644 Open-ILS/web/opac/skin/default/xml/body.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/footer.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/html_xsl.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/index_body.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/page_advanced.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/page_mresult.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/page_myopac.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/page_rresult.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/result_info.xml
 create mode 100644 Open-ILS/web/opac/skin/default/xml/setenv.xml

diff --git a/Open-ILS/web/opac/skin/default/xml/altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/altcanvas.xml
index 448ede5a2b..5d19ad6d5b 100644
--- a/Open-ILS/web/opac/skin/default/xml/altcanvas.xml
+++ b/Open-ILS/web/opac/skin/default/xml/altcanvas.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- These are the UI components that may be needed on any given page.  The must be
 	set to class += 'hide_me' by default -->
@@ -6,10 +5,12 @@
 <div id='not_the_canvas' xmlns:xi="http://www.w3.org/2001/XInclude">
 
 	<!-- the login page -->
-	<xi:include href="login.xml"/> 
+	<!--#if expr="$FRONT_PAGE!='true'"-->
+		<!--#include virtual="login.xml"-->
+	<!--#endif-->
 
 	<!-- The org tree -->
-	<xi:include href="orgtree.xml"/> 
+	<!--#include virtual="orgtree.xml"-->
 
 	<!-- ============================================================================= -->
 	<!-- Register the alternate canvases  -->
@@ -21,7 +22,9 @@
 		config.ids.altcanvas.loading		= 'loading_alt';
 	</script>
 
-	<xi:include href='holds.xml'/>
+	<!--#if expr="$FRONT_PAGE!='true'"-->
+		<!--#include virtual="holds.xml"-->
+	<!--#endif-->
 
 	<div id='loading_alt' class='hide_me non_canvas' style='margin-top: 6px;'>
 		<div style='margin-top: 30px; text-align: left; font-weight: 700;' class='color_3'>
diff --git a/Open-ILS/web/opac/skin/default/xml/body.xml b/Open-ILS/web/opac/skin/default/xml/body.xml
new file mode 100644
index 0000000000..1509248110
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/body.xml
@@ -0,0 +1,24 @@
+<body onload='init();'>
+	<table width='100%' height='99%'>
+		<tbody>
+			<tr>
+				<td id='main_left_cell'>
+					<!--#include virtual="logo.xml"-->
+					<!--#include virtual="sidebar.xml"-->
+				</td>
+				<td id='main_right_cell'>
+					<div id='canvas' class='canvas'>
+						<!--#include virtual="searchbar.xml"-->
+						<!--#include virtual="statusbar.xml"-->
+						<!--#include virtual="altcanvas.xml"-->
+						<!--#include virtual="ilsevents.xml"--> 
+						<!--#include virtual="page_${OILS_PAGE}"-->
+					</div>
+					<br/>
+					<!--#include virtual="tips.xml"-->
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<!--#include virtual='footer.xml'-->
+</body>
diff --git a/Open-ILS/web/opac/skin/default/xml/css_common.xml b/Open-ILS/web/opac/skin/default/xml/css_common.xml
index 6ee1881c3b..33468c7424 100644
--- a/Open-ILS/web/opac/skin/default/xml/css_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/css_common.xml
@@ -1,23 +1,16 @@
-<?xml version='1.0'?>
 
 <!-- CSS shared across pages goes here --> 
 
-<css>
+<link type='text/css' rel='stylesheet' href='../css/layout.css'/>
 
-	<link type='text/css' rel='stylesheet' href='../css/layout.css'/>
-	<link type='text/css' rel='stylesheet' href='../../../common/css/dtree.css'/>
+<!-- Our font CSS's -->
+<link type='text/css' rel='stylesheet'					
+	href='<!--#echo var="OILS_CSS_BASE"-->/mediumfont.css' name='meduim_fonts' csstype='font'/>
 
-	<!-- Our font CSS's -->
-	<link type='text/css' rel='stylesheet'					
-		href='../../../common/css/mediumfont.css' name='meduim_fonts' csstype='font'/>
+<!-- Our colors -->
+<link type='text/css' rel="stylesheet" href="<!--#echo var='OILS_THEME_BASE'-->/default/css/colors.css"  
+	name='Default' csstype='color'/>
 
-	<!-- Our colors -->
-	<link type='text/css' rel="stylesheet" href="../../../theme/default/css/colors.css"  
-		name='Default' csstype='color'/>
+<link type='text/css' rel="alternate stylesheet" href="<!--#echo var='OILS_THEME_BASE'-->/test/css/colors.css" 
+	title='Color Test' name='ColorTest' csstype="color" />
 
-	<!--
-	<link type='text/css' rel="alternate stylesheet" href="../../../theme/test/css/colors.css" 
-		title='Color Test' name='ColorTest' csstype="color" />
-		-->
-
-</css>
diff --git a/Open-ILS/web/opac/skin/default/xml/fonts.xml b/Open-ILS/web/opac/skin/default/xml/fonts.xml
index 4c799eec41..1406de070f 100644
--- a/Open-ILS/web/opac/skin/default/xml/fonts.xml
+++ b/Open-ILS/web/opac/skin/default/xml/fonts.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 <div id='fonts_div'>
 
 	<span>
diff --git a/Open-ILS/web/opac/skin/default/xml/footer.xml b/Open-ILS/web/opac/skin/default/xml/footer.xml
new file mode 100644
index 0000000000..d90364fcd8
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/footer.xml
@@ -0,0 +1,12 @@
+<div style='width: 100%; text-align:center; vertical-align: bottom; margin-top: 50px;'>
+	<!--
+	<div style='width: 90%; background: #E0F0E0; text-align:center; vertical-align: bottom; margin: 10px; border: 1px solid #808080;'>
+	-->
+	<span 
+		style='width: 90%; background: #E0F0E0; text-align:center; vertical-align: bottom; border: 1px solid #808080; padding: 10px;'>
+		<span>Copyright (C) 2005 Georgia Public Library Service</span>
+	</span>
+	<!--
+	</div>
+	-->
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/header.xml b/Open-ILS/web/opac/skin/default/xml/header.xml
index 9268e9e41d..49c7dd0439 100644
--- a/Open-ILS/web/opac/skin/default/xml/header.xml
+++ b/Open-ILS/web/opac/skin/default/xml/header.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0'?>
+<head>
+	<!-- Set the page title -->
 
-<div id='left_div' xmlns:xi="http://www.w3.org/2001/XInclude">
-	<xi:include href="logo.xml"/>
-	<xi:include href="sidebar.xml"/> 
-</div>
+	<!--#include virtual="css_common.xml"-->
+
+	<title>&<!--#echo var="OILS_TITLE"-->;</title>
+
+	<!--#if expr="$slimpac!='true'"-->
+		<!--#include virtual="js_common.xml"-->
+	<!--#endif-->
+
+</head>
diff --git a/Open-ILS/web/opac/skin/default/xml/holds.xml b/Open-ILS/web/opac/skin/default/xml/holds.xml
index f2ebdbb001..5ee36a295d 100644
--- a/Open-ILS/web/opac/skin/default/xml/holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/holds.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div>
 	<div id='xulholds_box' class='hide_me non_canvas' style='margin-top: 6px;'>
diff --git a/Open-ILS/web/opac/skin/default/xml/homesearch.xml b/Open-ILS/web/opac/skin/default/xml/homesearch.xml
index 1aca33b68e..52723e5b53 100644
--- a/Open-ILS/web/opac/skin/default/xml/homesearch.xml
+++ b/Open-ILS/web/opac/skin/default/xml/homesearch.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='canvas_main' 
 	style='border: 3px solid #A7EA9D; -moz-border-radius: 6px; padding: 6px; margin-top: 65px;' 
@@ -26,7 +25,7 @@
 
 
 	<div style='width: 100%; text-align: center'>
-		<img src='../../../images/main_logo.jpg' />
+		<img src='../../../../images/main_logo.jpg' />
 	</div>
 
 
diff --git a/Open-ILS/web/opac/skin/default/xml/html_xsl.xml b/Open-ILS/web/opac/skin/default/xml/html_xsl.xml
new file mode 100644
index 0000000000..f22332079d
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/html_xsl.xml
@@ -0,0 +1,10 @@
+
+<xsl:stylesheet version="1.0"
+	xmlns:xlink="http://www.w3.org/1999/xlink" 
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+	<xsl:output method="html" indent="yes" encoding="utf-8"/>
+	<xsl:template match="/">
+		<xsl:copy-of select='/*[local-name()="html"]'/>
+	</xsl:template>
+</xsl:stylesheet>   
diff --git a/Open-ILS/web/opac/skin/default/xml/index.xml b/Open-ILS/web/opac/skin/default/xml/index.xml
index 15ad674328..069ba8b433 100644
--- a/Open-ILS/web/opac/skin/default/xml/index.xml
+++ b/Open-ILS/web/opac/skin/default/xml/index.xml
@@ -1,44 +1,38 @@
-<?xml version='1.0'?>
-
-
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-	<head>
-		<title>&opac.title.home;</title>
-		<xi:include href="css_common.xml"/>
-		<script language='javascript' src='../../../common/js/utils.js'> </script>
-		<script language='javascript' src='../../../common/js//config.js'> </script>
-		<script language='javascript' src='../../../common/js/CGI.js'> </script>
-		<script language='javascript' src='../../../common/js/Cookie.js'> </script>
-
-		<script language='javascript' src='../../../common/js/slimtree.js'> </script>
-		<script language='javascript' src='../../../common/js/JSON.js'> </script>
-		<script language='javascript' src='../../../common/js/fmcore.js'> </script>
-		<script language='javascript' src='../../../common/js/fmgen.js'> </script>
-		<script language='javascript' src='../../../common/js/opac_utils.js'> </script>
-		<script language='javascript' src='../../../common/js/OrgTree.js'> </script>
-		<script language='javascript' src='../../../common/js/org_utils.js'> </script>
-		<script language='javascript' src='../../../common/js/init.js'> </script>
-
-	</head>
-
-	<body onload='init(); 
-		getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED}));
-		getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));'>
-		<table width='100%' style='border-collapse: collapse;'>
-			<tbody>
-				<tr>
-					<td width='10%'> </td>
-					<td width='80%'>
-						<div id='canvas'>
-							<xi:include href="altcanvas.xml"/>
-							<xi:include href="homesearch.xml"/>
-						</div>
-					</td>
-					<td width='10%'> </td>
-				</tr>
-			</tbody>
-		</table>
-	</body>
-	<script language='javascript'>isFrontPage = true;</script>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Loads the environment -->
+<!--#include virtual="setenv.xml"-->
+
+<!-- Tells the browser to translate the page as HTML --> 
+<?xml-stylesheet type="text/xsl" href="html_xsl.xml"?> 
+
+
+<!DOCTYPE html PUBLIC 
+	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+	<!--#include virtual="/opac/locale/${locale}/common.dtd"-->
+	<!--#include virtual="/opac/locale/${locale}/opac_common.dtd"-->
+
+	<!--#if expr="$OILS_PAGE='rresult.xml' || $OILS_PAGE='mresult.xml'"-->
+		<!--#include virtual="/opac/locale/${locale}/opac_result.dtd"-->
+	<!--#endif-->
+
+	<!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+		<!--#include virtual="/opac/locale/${locale}/opac_rdetail.dtd"-->
+	<!--#endif-->
+
+	<!--#if expr="$OILS_PAGE!='index.xml'"-->
+		<!--#include virtual="/opac/locale/${locale}/opac_holds.dtd"-->
+	<!--#endif-->
+
+]>
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<!--#include virtual="header.xml"-->
+	<!--#if expr="$OILS_PAGE='index.xml'"-->
+		<!--#include virtual="index_body.xml"-->
+	<!--#else-->
+		<!--#include virtual="body.xml"-->
+	<!--#endif-->
 </html>
diff --git a/Open-ILS/web/opac/skin/default/xml/index_body.xml b/Open-ILS/web/opac/skin/default/xml/index_body.xml
new file mode 100644
index 0000000000..adef0caec2
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/index_body.xml
@@ -0,0 +1,21 @@
+<body onload='init(); 
+	getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED}));
+	getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));'>
+	<table width='100%' style='border-collapse: collapse;'>
+		<tbody>
+			<tr>
+				<td width='10%'> </td>
+				<td width='80%'>
+					<div id='canvas'>
+						<!--#include virtual="altcanvas.xml"-->
+						<!--#include virtual="homesearch.xml"-->
+					</div>
+				</td>
+				<td width='10%'> </td>
+			</tr>
+		</tbody>
+	</table>
+	<script language='javascript'>isFrontPage = true;</script>
+</body>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/js_common.xml b/Open-ILS/web/opac/skin/default/xml/js_common.xml
index e951e60122..a09b0a26e3 100644
--- a/Open-ILS/web/opac/skin/default/xml/js_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/js_common.xml
@@ -1,27 +1,24 @@
-<?xml version='1.0'?>
 
-<!-- Javascript shared across all pages -->
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
 
-<div xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en" lang="en">
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookie.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js'> </script>
 
-	<script language='javascript' src='../../../common/js/utils.js'> </script>
-	<script language='javascript' src='../../../common/js//config.js'> </script>
-	<script language='javascript' src='../../../common/js/CGI.js'> </script>
-	<script language='javascript' src='../../../common/js/Cookie.js'> </script>
-	<script language='javascript' src='../../../common/js/Cookies.js'> </script>
-	<script language='javascript' src='../../../common/js/md5.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->//slimtree.js'> </script>
 
-	<script language='javascript' src='../../../common/js/slimtree.js'> </script>
-
-	<script language='javascript' src='../../../common/js/JSON.js'> </script>
-	<script language='javascript' src='../../../common/js/fmcore.js'> </script>
-	<script language='javascript' src='../../../common/js/fmgen.js'> </script>
-	<script language='javascript' src='../../../common/js/opac_utils.js'> </script>
-	<script language='javascript' src='../../../common/js/OrgTree.js'> </script>
-	<script language='javascript' src='../../../common/js/org_utils.js'> </script>
-	<script language='javascript' src='../../../common/js/RemoteRequest.js'> </script>
-	<script language='javascript' src='../../../common/js/init.js'> </script>
-	<script language='javascript' src='../../../common/js/added_content.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmcore.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmgen.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/OrgTree.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js'> </script>
 
 	<!-- Some global js -->
 	<script language='javascript'>
@@ -30,5 +27,4 @@
 		config.css.color_3 = "color_3";
 	</script>
 
-</div>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/login.xml b/Open-ILS/web/opac/skin/default/xml/login.xml
index 436753a087..5038d6745b 100644
--- a/Open-ILS/web/opac/skin/default/xml/login.xml
+++ b/Open-ILS/web/opac/skin/default/xml/login.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='login_box' class='hide_me non_canvas' style='margin-top: 6px;'>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/logo.xml b/Open-ILS/web/opac/skin/default/xml/logo.xml
index 4f0da1f4fe..268a297ef5 100644
--- a/Open-ILS/web/opac/skin/default/xml/logo.xml
+++ b/Open-ILS/web/opac/skin/default/xml/logo.xml
@@ -1,5 +1,4 @@
-<?xml version='1.0'?>
 <div id='logo_div'>
 	<script language='javascript'>config.ids.common.top_logo = "top_left_logo";</script>
-	<img src='../../../images/small_logo.jpg' id='top_left_logo' border='0' class='logo'> </img>
+	<img src='../../../../images/small_logo.jpg' id='top_left_logo' border='0' class='logo'> </img>
 </div>
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml b/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml
index d65f1e4b40..fd67694afa 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml b/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml
index 808e156e1e..ac5a63b8ee 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml
@@ -1,12 +1,11 @@
-<?xml version='1.0'?>
 
 <div id='myopac_fines_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
 	<br/>
-	<table width='100%' class='light_border data_grid'>
+	<table width='100%' class='data_grid data_grid_center'>
 
 		<thead class='color_3'>
-			<tr><td colspan='3' align='center' style='background: none'><b>Summary</b></td></tr>
+			<tr><td colspan='3' style='background: none'><b>Summary</b></td></tr>
 			<tr>
 				<td width='33%'>Total Owed</td>
 				<td width='33%'>Total Paid</td>
@@ -17,9 +16,9 @@
 		<tbody id='myopac_fines_summary_tbody'>
 			<tr id='myopac_fines_summary_loading'><td>Loading...</td></tr>
 			<tr id='myopac_fines_summary_row' class='light_border hide_me'>
-				<td align='center' id='myopac_fines_summary_total' class='light_border'>$</td>
-				<td align='center' id='myopac_fines_summary_paid' class='light_border'>$</td>
-				<td align='center' id='myopac_fines_summary_balance' class='light_border' style='color:red;font-weight: bold;'>$</td>
+				<td id='myopac_fines_summary_total' class='light_border'>$</td>
+				<td id='myopac_fines_summary_paid' class='light_border'>$</td>
+				<td id='myopac_fines_summary_balance' class='light_border' style='color:red;font-weight: bold;'>$</td>
 			</tr>
 		</tbody>
 	</table>
@@ -28,10 +27,13 @@
 	<br/>
 	<br/>
 
+	<!--
 	<table width='100%' class='light_border myopac_table hide_me' id='myopac_trans_table'>
+	-->
+	<table width='100%' class='data_grid data_grid_center hide_me' id='myopac_trans_table'>
 
-		<thead class='color_3'>
-			<tr><td colspan='8' align='center' style='background: none'><b>Transaction Details</b></td></tr>
+		<thead>
+			<tr><td colspan='8' style='background: none'><b>Transaction Details</b></td></tr>
 			<tr>
 				<td width='12%'>Transaction Start Time</td>
 				<td width='12%'>Last Billing Time</td>
@@ -45,15 +47,15 @@
 		</thead>
 
 		<tbody id='myopac_fines_tbody'>
-			<tr id='myopac_trans_row' class='light_border'>
-				<td align='center' name='myopac_trans_start' class='light_border'> </td>
-				<td align='center' name='myopac_trans_last_bill' class='light_border'> </td>
-				<td align='center' name='myopac_trans_last_payment' class='light_border'> </td>
-				<td align='center' name='myopac_trans_init_amount' class='light_border'>$</td>
-				<td align='center' name='myopac_trans_total_paid' class='light_border'>$</td>
-				<td align='center' name='myopac_trans_balance' class='light_border' style='color:red; font-weight: bold;'>$</td>
-				<td align='center' name='myopac_trans_type' class='light_border'> </td>
-				<td align='center' name='myopac_trans_extra' class='light_border'> </td>
+			<tr id='myopac_trans_row'>
+				<td name='myopac_trans_start'> </td>
+				<td name='myopac_trans_last_bill'> </td>
+				<td name='myopac_trans_last_payment'> </td>
+				<td name='myopac_trans_init_amount'>$</td>
+				<td name='myopac_trans_total_paid'>$</td>
+				<td name='myopac_trans_balance' style='color:red; font-weight: bold;'>$</td>
+				<td name='myopac_trans_type'> </td>
+				<td name='myopac_trans_extra'> </td>
 			</tr>
 		</tbody>
 	</table>
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml
index 905a00ca22..273f199df9 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml b/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml
index b6cdc177d7..152dc391a8 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='myopac_prefs_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
@@ -11,11 +10,6 @@
 					<b>Preferences</b>
 				</td>
 			</tr>
-			<!--
-			<tr>
-				<td >More To Come...</td>
-			</tr>
-			-->
 		</thead>
 
 		<tbody id='myopac_prefs_tbody'>
@@ -25,6 +19,7 @@
 				<td>
 					<select id='prefs_hits_per'>
 						<option>5</option>
+						<option>8</option>
 						<option>10</option>
 						<option>15</option>
 						<option>20</option>
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml b/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml
index 6eb4956f46..7283900f61 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='myopac_summary_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
diff --git a/Open-ILS/web/opac/skin/default/xml/orgtree.xml b/Open-ILS/web/opac/skin/default/xml/orgtree.xml
index 251d820cc9..7d71b3b3ec 100644
--- a/Open-ILS/web/opac/skin/default/xml/orgtree.xml
+++ b/Open-ILS/web/opac/skin/default/xml/orgtree.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- the org tree -->
 <div id='org_container' class='hide_me non_canvas'>
diff --git a/Open-ILS/web/opac/skin/default/xml/page_advanced.xml b/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
new file mode 100644
index 0000000000..bcb552a9ea
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
@@ -0,0 +1,3 @@
+<div id='canvas_main'>Advanced Search Goes Here</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/page_mresult.xml b/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
new file mode 100644
index 0000000000..3715f0b8fd
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
@@ -0,0 +1,9 @@
+<div>
+	<script language='javascript' src='../js/sidebar_extras.js'> </script>
+	<script language='javascript' src='../js/mresult.js'> </script>
+	<script language='javascript' src='../js/result_common.js'> </script>
+	<script language='javascript' src='../js/tips.js'> </script>
+	<script language='javascript' src='../js/holds.js'> </script>   
+	<!--#include virtual="result_common.xml"-->
+</div>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
new file mode 100644
index 0000000000..a7f44eeb70
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
@@ -0,0 +1,65 @@
+<div id='canvas_main'>
+
+	<script language='javascript' src='../js/myopac.js'> </script>
+
+	<!-- overwrite the fieldmapper code with the extended fieldmapper code -->
+	<script language='javascript' src='../../../../common/js/fmextcore.js'> </script>
+	<script language='javascript' src='../../../../common/js/fmgen.js'> </script>
+
+	<script language='javascript'>
+		config.ids.myopac = {};
+		config.css.myopac = {};
+		config.names.myopac = {};
+	</script>
+
+	<br/>
+	<table style='width: 95%; text-align: center;'>
+		<tbody>
+			<tr id='myopac_nav_row'>
+
+				<td width='5%' style='border-right: 1px solid #808080;'></td>
+
+				<td class='myopac_link' id='myopac_summary_td' >
+					<a href='javascript:void(0);' 
+						onclick='myOPACChangePage("summary");'> Account Summary</a>
+				</td>
+
+				<td class='myopac_link' id='myopac_checked_td' >
+					<a href='javascript:void(0);' 
+						onclick='myOPACChangePage("checked");'> Checked Out</a>
+				</td>
+
+				<td class='myopac_link' id='myopac_holds_td' >
+					<a href='javascript:void(0);' 
+						onclick='myOPACChangePage("holds");'>Holds</a>
+				</td>
+
+				<td class='myopac_link' id='myopac_fines_td' >
+					<a href='javascript:void(0);' 
+						onclick='myOPACChangePage("fines");'>Fines</a>
+				</td>
+
+				<td class='myopac_link' id='myopac_prefs_td' >
+					<a href='javascript:void(0);' 
+						onclick='myOPACChangePage("prefs");'>Preferences</a>
+				</td>
+
+				<td width='5%' style='border-left: 1px solid #808080;'></td>
+
+			</tr>
+		</tbody>
+	</table>
+
+	<br/>
+
+	<div id='myopac_main_div'>
+		<!--#include virtual="myopac_summary.xml"-->
+		<!--#include virtual="myopac_checked.xml"-->
+		<!--#include virtual="myopac_holds.xml"-->
+		<!--#include virtual="myopac_fines.xml"-->
+		<!--#include virtual="myopac_prefs.xml"-->
+	</div>
+
+</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
new file mode 100644
index 0000000000..ecb315f5af
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
@@ -0,0 +1,30 @@
+<div id='canvas_main'>
+
+	<script language='javascript' src='../js/sidebar_extras.js'> </script>
+	<script language='javascript' src='../js/rdetail.js'> </script>
+	<script language='javascript' src='../js/holds.js'> </script>
+
+	<script language='javascript'>
+		config.ids.rdetail = {};
+		config.ids.rdetail.view_marc = "rdetail_view_marc";
+	</script>
+
+
+	<table style='' class='rdetail_header color_1' width='100%'>
+		<tbody>
+			<tr>
+				<td>
+					<span>&rdetail.detailMain.headerLabel;</span>
+				</td>
+				<td align='right' style='padding-right: 7px;'>
+					<span style='padding-right: 5px;'>
+						<a id='rdetail_place_hold' class='classic_link'>Place Hold</a>
+					</span>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<!--#include virtual="rdetail_summary.xml"-->
+	<br/><br/>
+	<!--#include virtual="rdetail_extras.xml"-->
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rresult.xml b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
new file mode 100644
index 0000000000..c0e3334600
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
@@ -0,0 +1,9 @@
+<div>
+	<script language='javascript' src='../js/sidebar_extras.js'> </script>
+	<script language='javascript' src='../js/rresult.js'> </script>
+	<script language='javascript' src='../js/result_common.js'> </script>
+	<script language='javascript' src='../js/tips.js'> </script>
+	<script language='javascript' src='../js/holds.js'> </script>   
+	<!--#include virtual="result_common.xml"-->
+</div>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml
index 5b14241d91..00f0caff6c 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- record details alternate canvases -->
 <div class=''>
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml
index 1e1139151c..c78659bb84 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- This holds information for copies attached to this record -->
 <div id='rdetail_copy_info_div' class='rdetail_extras_div'>
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_extras.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_extras.xml
index f534d1f87f..3ecdc8ece5 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail_extras.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail_extras.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div xmlns:xi="http://www.w3.org/2001/XInclude">
 
@@ -40,7 +39,7 @@
 	<div id='rdetail_extras_div' style='width: 95%;'> 
 		<div id='rdetail_extras_loading' class='hide_me' 
 			style='padding: 10px;'>Loading...</div>
-		<xi:include href="rdetail_copyinfo.xml"/>
+		<!--#include virtual="rdetail_copyinfo.xml"-->
 
 		<div id='rdetail_reviews_div' class='rdetail_extras_div hide_me'> 
 			<div id='rdetail_review_template' style='width: 100%;'>
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml
index 623a10f927..ddc29a8bcd 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- This holds the record summary information -->
 <div>
diff --git a/Open-ILS/web/opac/skin/default/xml/result_common.xml b/Open-ILS/web/opac/skin/default/xml/result_common.xml
index e082d0cbe7..7bdf1adebd 100644
--- a/Open-ILS/web/opac/skin/default/xml/result_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result_common.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='canvas_main' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
@@ -29,8 +28,8 @@
 		config.names.result.count_cell	= "copy_count_cell";
 	</script>
 
-	<xi:include href="result_table.xml"/>
-	<xi:include href='result_lowhits.xml'/>
+	<!--#include virtual="result_table.xml"-->
+	<!--#include virtual="result_lowhits.xml"-->
 
 </div>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/result_info.xml b/Open-ILS/web/opac/skin/default/xml/result_info.xml
new file mode 100644
index 0000000000..461d01ab4e
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/result_info.xml
@@ -0,0 +1,52 @@
+<table style='width: 100%;'>
+	<tbody>
+
+		<tr style='height: 1em; background: #E0F6E0'>
+
+			<td style='vertical-align: top;'  id='next_prev_links'>
+
+				<span class='hide_me' id='result_info_div' style='font-size: 9pt;'>
+					<span> Results </span> 
+					<span id='offset_start'> </span>
+					<span> - </span>
+					<span id='offset_end'> </span>
+					<span> &common.ofAtLeast; </span>
+					<span id='result_count'> </span>
+					<span style='padding-left: 6px;'> (page </span>
+					<span id='current_page'> </span>
+					<span> &common.of; </span>
+					<span id='num_pages'> </span>
+				</span>
+
+				<span id='start_end_links_span' class='hide_me' 
+						style='padding-left: 40px;' >
+					<a class='search_page_nav_link' id='search_home_link' 
+						title="First results page">Start</a>
+					<a class='search_page_nav_link' id='prev_link' 
+						title='Previus page'> &lt;&lt; </a>
+					<span class='search_page_nav_link' id='page_numbers'> </span>
+					<a  class='search_page_nav_link' id='next_link' 
+						title='Next Page'> &gt;&gt; </a>
+					<a  class='search_page_nav_link' id='end_link' 
+						title="Last results page">End</a>
+				</span>
+
+			</td>
+
+			<td  colspan='5' 
+				style='padding-bottom: 4px; text-align:center; vertical-align: top; border-bottom: 1px solid #E0E0E0;'>
+					<span id='search_info_table' class='hide_me' style='font-size: 8pt;'>
+						<b>Available copies / Total copies </b>
+					</span>
+			</td>
+		</tr>
+
+		<tr style='height: 2em;' id='result_thead_row'>
+			<td> </td>
+			<td rowspan='2' style='font-size: 8pt; padding-top: 4px;' class='copy_count_cell' 
+				width='12%' align='center' name='result_thead_ccell'> </td>
+		</tr>
+
+	</tbody>
+</table>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/result_lowhits.xml b/Open-ILS/web/opac/skin/default/xml/result_lowhits.xml
index 35c30363a7..01dd9e72c4 100644
--- a/Open-ILS/web/opac/skin/default/xml/result_lowhits.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result_lowhits.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='result_low_hits' class='hide_me'>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result_table.xml
index 738a61ec08..3c5f20c987 100644
--- a/Open-ILS/web/opac/skin/default/xml/result_table.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result_table.xml
@@ -1,5 +1,3 @@
-<?xml version='1.0'?>
-
 <!-- Search results are spit into this table -->
 
 <div id='result_table_div' xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -13,68 +11,13 @@
 		</thead>
 
 		<tbody id='result_table'>
-
 			<tr>
 
 				<td class='result_table_row'>
-
-					<table style='width: 100%;'>
-						<tbody>
-
-							<tr style='height: 1em; background: #E0F6E0'>
-
-								<td style='vertical-align: top;'  id='next_prev_links'>
-
-									<span class='hide_me' id='result_info_div' style='font-size: 9pt;'>
-										<span> Results </span> 
-										<span id='offset_start'> </span>
-										<span> - </span>
-										<span id='offset_end'> </span>
-										<span> &common.ofAtLeast; </span>
-										<span id='result_count'> </span>
-										<span style='padding-left: 6px;'> (page </span>
-										<span id='current_page'> </span>
-										<span> &common.of; </span>
-										<span id='num_pages'> </span>
-									</span>
-
-									<span id='start_end_links_span' class='hide_me' 
-											style='padding-left: 40px;' >
-										<a class='search_page_nav_link' id='search_home_link' 
-											title="First results page">Start</a>
-										<a class='search_page_nav_link' id='prev_link' 
-											title='Previus page'> &llt;&llt; </a>
-										<span class='search_page_nav_link' id='page_numbers'> </span>
-										<a  class='search_page_nav_link' id='next_link' 
-											title='Next Page'> &ggt;&ggt; </a>
-										<a  class='search_page_nav_link' id='end_link' 
-											title="Last results page">End</a>
-									</span>
-
-								</td>
-
-								<td  colspan='5' 
-									style='padding-bottom: 4px; text-align:center; vertical-align: top; border-bottom: 1px solid #E0E0E0;'>
-										<span id='search_info_table' class='hide_me' style='font-size: 8pt;'>
-											<b>Available copies / Total copies </b>
-										</span>
-								</td>
-							</tr>
-
-							<tr style='height: 2em;' id='result_thead_row'>
-								<td> </td>
-								<td rowspan='2' style='font-size: 8pt; padding-top: 4px;' class='copy_count_cell' 
-									width='12%' align='center' name='result_thead_ccell'> </td>
-							</tr>
-
-						</tbody>
-					</table>
+					<!--#include virtual="result_info.xml"-->
 				</td>
 			</tr>
 
-
-
-
 			<!-- Template for displaying a search result.  This row template is cloned and inserted
 					for each result returned -->
 
@@ -124,47 +67,47 @@
 								<td name='result_table_format_cell' class='result_table_format_cell'>
 
 									<a name='text_link' class='search_link'> 
-										<img src='../../../images/tor/text.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/text.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='sound recording-nonmusical_link' class='search_link'> 
-										<img src='../../../images/tor/sound recording-nonmusical.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/sound recording-nonmusical.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='moving image_link' class='search_link'> 
-										<img src='../../../images/tor/moving image.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/moving image.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='software, multimedia_link' class='search_link'> 
-										<img src='../../../images/tor/software, multimedia.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/software, multimedia.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='sound recording-musical_link' class='search_link'> 
-										<img src='../../../images/tor/sound recording-musical.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/sound recording-musical.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='cartographic_link' class='search_link'> 
-										<img src='../../../images/tor/cartographic.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/cartographic.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='mixed material_link' class='search_link'> 
-										<img src='../../../images/tor/mixed material.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/mixed material.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='notated music_link' class='search_link'> 
-										<img src='../../../images/tor/notated music.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/notated music.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='sound recording_link' class='search_link'> 
-										<img src='../../../images/tor/sound recording.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/sound recording.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='still images_link' class='search_link'> 
-										<img src='../../../images/tor/still images.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/still images.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<a name='three dimensional object_link' class='search_link'> 
-										<img src='../../../images/tor/three dimensional object.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/three dimensional object.jpg' class='dim tor_pic'> </img>
 									</a>
 
 									<span class='hide_me' 
diff --git a/Open-ILS/web/opac/skin/default/xml/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/searchbar.xml
index d2fa5d9e16..19febe07c8 100644
--- a/Open-ILS/web/opac/skin/default/xml/searchbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/searchbar.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- Searchbar for doing metarecord searches -->
 
diff --git a/Open-ILS/web/opac/skin/default/xml/setenv.xml b/Open-ILS/web/opac/skin/default/xml/setenv.xml
new file mode 100644
index 0000000000..a1feed1d24
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/setenv.xml
@@ -0,0 +1,34 @@
+<!-- Sets our environment variables for convenience and determining which page we're on -->
+
+<!--#set var='OILS_PAGE' value="$DOCUMENT_NAME"-->
+
+<!--#if expr="$DOCUMENT_NAME='index.xml'"-->
+	<!--#set var='OILS_TITLE' value='opac.title.home'-->
+	<!--#set var='FRONT_PAGE' value='true'-->
+
+<!--#elif expr="$DOCUMENT_NAME='mresult.xml'"-->
+	<!--#set var='OILS_TITLE' value='opac.title.mresult'-->
+	
+
+<!--#elif expr="$DOCUMENT_NAME='rresult.xml'"-->
+	<!--#set var='OILS_TITLE' value='opac.title.rresult'-->
+
+<!--#elif expr="$DOCUMENT_NAME='rdetail.xml'"-->
+	<!--#set var='OILS_TITLE' value='opac.title.rdetail'-->
+
+<!--#elif expr="$DOCUMENT_NAME='myopac.xml'"-->
+	<!--#set var='OILS_TITLE' value='opac.title.myopac'-->
+
+<!--#elif expr="$DOCUMENT_NAME='advanced.xml'"-->
+	<!--#set var='OILS_TITLE' value='opac.title.advanced'-->
+
+<!--#endif-->
+
+<!--#set var="OILS_BASE" value="http://${SERVER_NAME}/${OILS_OPAC_BASE}"-->
+<!--#set var="OILS_JS_BASE" value="${OILS_BASE}/common/js"-->
+<!--#set var="OILS_CSS_BASE" value="${OILS_BASE}/common/css"--> 
+<!--#set var="OILS_THEME_BASE" value="${OILS_BASE}/theme"--> 
+
+<!--#if expr="!$locale || $locale=''"-->
+	<!--#set var="locale" value="en-US"-->
+<!--#endif-->
diff --git a/Open-ILS/web/opac/skin/default/xml/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/sidebar.xml
index b213cb770f..e6931ad476 100644
--- a/Open-ILS/web/opac/skin/default/xml/sidebar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/sidebar.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- Navigation bar -->
 
@@ -60,9 +59,10 @@
 	<div id='subject_tree_sidebar' class='sidebar_chunk hide_me'> 
 		<div id='subject_sidebar_tree_div'> </div>
 		<script language='javascript'>
+			removeChildren($('subject_sidebar_tree_div'));
 			var subjectSidebarTree = new SlimTree(
 				document.getElementById('subject_sidebar_tree_div'),
-				'subjectSidebarTree', '../../../images/slimtree/related.jpg');
+				'subjectSidebarTree', '../../../../images/slimtree/related.jpg');
 			subjectSidebarTree.addNode( 'subjectSidebarTreeRoot', -1, 
 				"&sidebar.relevantSubjects.headerLabel;", 
 				'javascript:subjectSidebarTree.toggle(' +
@@ -74,9 +74,10 @@
 		<hr/>
 		<div id='author_sidebar_tree_div'> </div>
 		<script language='javascript'>
+			removeChildren($('author_sidebar_tree_div'));
 			var authorSidebarTree = new SlimTree(
 				document.getElementById('author_sidebar_tree_div'),
-				'authorSidebarTree','../../../images/slimtree/people.jpg');
+				'authorSidebarTree','../../../../images/slimtree/people.jpg');
 			authorSidebarTree.addNode( 'authorSidebarTreeRoot', -1, 
 				"&sidebar.relevantAuthors.headerLabel;", 
 				'javascript:authorSidebarTree.toggle(' +
@@ -88,10 +89,11 @@
 		<hr/>
 		<div id='series_sidebar_tree_div'> </div>
 		<script language='javascript'>
+			removeChildren($('series_sidebar_tree_div'));
 			var seriesSidebarTree = new SlimTree(
 				document.getElementById('series_sidebar_tree_div'),
 				'seriesSidebarTree',
-				'../../../images/slimtree/houses.jpg');
+				'../../../../images/slimtree/houses.jpg');
 			seriesSidebarTree.addNode( 'seriesSidebarTreeRoot', -1, 
 				"&sidebar.relevantSeries.headerLabel;", 
 				'javascript:seriesSidebarTree.toggle(' +
diff --git a/Open-ILS/web/opac/skin/default/xml/statusbar.xml b/Open-ILS/web/opac/skin/default/xml/statusbar.xml
index cab1711b4c..378e812a78 100644
--- a/Open-ILS/web/opac/skin/default/xml/statusbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/statusbar.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='statusbar' style='margin-bottom: 6px; margin-top: 6px;'>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/tips.xml b/Open-ILS/web/opac/skin/default/xml/tips.xml
index cf312189a5..644e07ac4b 100644
--- a/Open-ILS/web/opac/skin/default/xml/tips.xml
+++ b/Open-ILS/web/opac/skin/default/xml/tips.xml
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='tips' class='tips hide_me'>
 	<div class='hide_me'>
-- 
2.43.2