Index: lib/style/skins/sanparks/footer.html
===================================================================
--- lib/style/skins/sanparks/footer.html	(revision 3738)
+++ lib/style/skins/sanparks/footer.html	(nonexistent)
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-    <head>
-        <title></title>
-        <link rel="stylesheet" type="text/css" href="@systemidserver@@style-skins-path@/sanparks/sanparks.css"/>
-    </head>
-    <body class="footerContent">
-        This project is a cooperative effort of 
-        <a href="http://www.sanparks.org/">Kruger National Park (KNP)</a> and the 
-        <a href="http://www.nceas.ucsb.edu">National Center for Ecological Analysis and Synthesis (NCEAS)</a>.
-        The Data Repository is based on software developed by the 
-        <a href="http://knb.ecoinformatics.org">Knowledge Network for Biocomplexity (KNB)</a>,
-        and houses metadata that are compliant with 
-        <a href="http://knb.ecoinformatics.org/software/eml/">Ecological Metadata Language (EML)</a>.
-        Other sites contributing to the KNB repository include:
-        <ul>
-            <li>
-                <a href="http://knb.ecoinformatics.org/knb/obfs">Organization of Biological Field Stations registry</a>  
-            </li>
-            <li>
-                <a href="http://knb.ecoinformatics.org/knb/style/skins/nrs">UC Natural Reserve System registry</a>  
-            </li>
-            <li>
-                <a href="http://knb.ecoinformatics.org/knb/style/skins/nceas">NCEAS registry</a>  
-            </li>
-            <li>
-                <a href="http://knb.ecoinformatics.org/knb/style/skins/specnet">SpecNet registry</a>  
-            </li>
-        </ul>
-    </body>
-</html>

Property changes on: lib/style/skins/sanparks/footer.html
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: lib/style/skins/sanparks/searchform.html
===================================================================
--- lib/style/skins/sanparks/searchform.html	(revision 3738)
+++ lib/style/skins/sanparks/searchform.html	(nonexistent)
@@ -1,25 +0,0 @@
-<form method="POST" action="@servlet-path@" target="_top">
-Search for: 
-  <input value="INTERSECT" name="operator" type="hidden">   
-  <input size="14" name="anyfield" type="text" value="">
-  <!-- <input name="organizationName" value="Kruger National Park" type="hidden"> -->
-  <input name="action" value="query" type="hidden">
-  <input name="qformat" value="sanparks" type="hidden">
-  <input name="enableediting" value="false" type="hidden">
-  <input name="operator" value="UNION" type="hidden">
-  <input name="returnfield" value="originator/individualName/surName" type="hidden">
-  <input name="returnfield" value="originator/individualName/givenName" type="hidden">
-  <input name="returnfield" value="creator/individualName/surName" type="hidden">
-  <input name="returnfield" value="creator/individualName/givenName" type="hidden">
-  <input name="returnfield" value="originator/organizationName" type="hidden">
-  <input name="returnfield" value="creator/organizationName" type="hidden">
-  <input name="returnfield" value="dataset/title" type="hidden">
-  <input name="returnfield" value="keyword" type="hidden">
-  <input name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.1" type="hidden">
-  <input name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.0" type="hidden">
-  <input name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN" type="hidden">
-  <input name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN" type="hidden">
-  <input name="returndoctype" value="-//NCEAS//resource//EN" type="hidden">
-  <input name="returndoctype" value="-//NCEAS//eml-dataset//EN" type="hidden">
-  <input value="Start Search" type="submit">
-</form>

Property changes on: lib/style/skins/sanparks/searchform.html
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: lib/style/skins/sanparks/SimpleSearchMetacatPostFields.html
===================================================================
--- lib/style/skins/sanparks/SimpleSearchMetacatPostFields.html	(revision 3738)
+++ lib/style/skins/sanparks/SimpleSearchMetacatPostFields.html	(nonexistent)
@@ -1,20 +0,0 @@
-<input type="hidden" name="operator"      value="INTERSECTION"/>
-<input type="hidden" name="returnfield"   value="originator/individualName/surName"/>
-<input type="hidden" name="returnfield"   value="originator/individualName/givenName"/>
-<input type="hidden" name="returnfield"   value="originator/organizationName"/>
-<input type="hidden" name="returnfield"   value="creator/individualName/surName"/>
-<input type="hidden" name="returnfield"   value="creator/organizationName"/>
-<input type="hidden" name="returnfield"   value="dataset/title"/>
-<input type="hidden" name="returnfield"   value="keyword"/>
-<input type="hidden" name="returnfield"   value="creator/individualName/givenName"/>
-<input type="hidden" name="returnfield"   value="idinfo/citation/citeinfo/title"/>
-<input type="hidden" name="returnfield"   value="idinfo/citation/citeinfo/origin"/>
-<input type="hidden" name="returnfield"   value="idinfo/keywords/theme/themekey"/>
-<input type="hidden" name="returndoctype" value="metadata"/>
-<input type="hidden" name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN"/>
-<input type="hidden" name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN"/>
-<input type="hidden" name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.1"/>
-<input type="hidden" name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.0"/>
-<input type="hidden" name="returndoctype" value="-//NCEAS//eml-dataset-2.0//EN"/>
-<input type="hidden" name="returndoctype" value="-//NCEAS//resource//EN"/>
-<input type="hidden" name="qformat"       value="sanparks"/>

Property changes on: lib/style/skins/sanparks/SimpleSearchMetacatPostFields.html
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: lib/style/skins/saeon/searchform.html
===================================================================
--- lib/style/skins/saeon/searchform.html	(revision 3738)
+++ lib/style/skins/saeon/searchform.html	(nonexistent)
@@ -1,25 +0,0 @@
-<form method="POST" action="@servlet-path@" target="_top">
-Search for: 
-  <input value="INTERSECT" name="operator" type="hidden">   
-  <input size="14" name="anyfield" type="text" value="">
-  <!-- <input name="organizationName" value="Kruger National Park" type="hidden"> -->
-  <input name="action" value="query" type="hidden">
-  <input name="qformat" value="saeon" type="hidden">
-  <input name="enableediting" value="false" type="hidden">
-  <input name="operator" value="UNION" type="hidden">
-  <input name="returnfield" value="originator/individualName/surName" type="hidden">
-  <input name="returnfield" value="originator/individualName/givenName" type="hidden">
-  <input name="returnfield" value="creator/individualName/surName" type="hidden">
-  <input name="returnfield" value="creator/individualName/givenName" type="hidden">
-  <input name="returnfield" value="originator/organizationName" type="hidden">
-  <input name="returnfield" value="creator/organizationName" type="hidden">
-  <input name="returnfield" value="dataset/title" type="hidden">
-  <input name="returnfield" value="keyword" type="hidden">
-  <input name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.1" type="hidden">
-  <input name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.0" type="hidden">
-  <input name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN" type="hidden">
-  <input name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN" type="hidden">
-  <input name="returndoctype" value="-//NCEAS//resource//EN" type="hidden">
-  <input name="returndoctype" value="-//NCEAS//eml-dataset//EN" type="hidden">
-  <input value="Start Search" type="submit">
-</form>

Property changes on: lib/style/skins/saeon/searchform.html
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: lib/style/skins/saeon/original.html
===================================================================
--- lib/style/skins/saeon/original.html	(revision 3738)
+++ lib/style/skins/saeon/original.html	(nonexistent)
@@ -1,1115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<title>SAEON &mdash; Saeon</title>
-<base href="http://www.saeon.ac.za/front-page" />
-<meta name="generator" content="Plone - http://plone.org" />
-<!-- Plone ECMAScripts -->
-<script type="text/javascript"
-	src="http://www.saeon.ac.za/portal_javascripts/Plone%20Default/ploneScripts2396.js">
-</script>
-
-<script type="text/javascript"
-	src="http://www.saeon.ac.za/portal_javascripts/Plone%20Default/ploneScripts3406.js">
-                </script>
-
-<style type="text/css">
-<!--
-@import
-	url(http://www.saeon.ac.za/portal_css/Plone%20Default/ploneStyles5796.css)
-	;
--->
-</style>
-
-<link rel="alternate stylesheet" type="text/css" media="screen"
-	href="http://www.saeon.ac.za/portal_css/Plone%20Default/ploneStyles7799.css"
-	title="Small Text" />
-
-<link rel="alternate stylesheet" type="text/css" media="screen"
-	href="http://www.saeon.ac.za/portal_css/Plone%20Default/ploneStyles3568.css"
-	title="Large Text" />
-
-<style type="text/css" media="all">
-<!--
-@import
-	url(http://www.saeon.ac.za/portal_css/Plone%20Default/ploneStyles2614.css)
-	;
--->
-</style>
-
-<!-- Internet Explorer CSS Fixes -->
-<!--[if lt IE 7]>
-        <style type="text/css" media="all">@import url(http://www.saeon.ac.za/IEFixes.css);</style>
-    <![endif]-->
-
-<link rel="shortcut icon" type="image/x-icon"
-	href="http://www.saeon.ac.za/favicon.ico" />
-
-<link rel="home" href="http://www.saeon.ac.za" title="Front page" />
-<link rel="search" title="Search this site"
-	href="http://www.saeon.ac.za/search_form" />
-
-<link rel="author" title="Author information"
-	href="http://www.saeon.ac.za/author/admin" />
-<link rel="contents" href="http://www.saeon.ac.za/sitemap"
-	title="Site Map" />
-
-<!-- Disable IE6 image toolbar -->
-<meta http-equiv="imagetoolbar" content="no" />
-
-</head>
-
-<body
-	style="background-image: url('bg.png'); background-repeat: repeat-x;"
-	class="section-front-page" dir="ltr">
-
-<table align="center" width="100%" cellpadding="0" cellspacing="0">
-
-	<tr>
-		<td background="banner_background_left.jpg">&nbsp;</td>
-		<td height="255" width="760"
-			style="background-image: url('logo.jpg'); background-position: top center; background-repeat: no-repeat;">
-		</td>
-		<td background="banner_background_right.jpg">&nbsp;</td>
-	</tr>
-</table>
-<div id="visual-portal-wrapper">
-
-<div id="portal-top">
-
-<div id="portal-header"><a class="hiddenStructure" accesskey="2"
-	href="http://www.saeon.ac.za//#documentContent">Skip to content.</a> <a
-	class="hiddenStructure" accesskey="6"
-	href="http://www.saeon.ac.za//#portlet-navigation-tree">Skip to
-navigation</a> <!--div metal:use-macro="here/global_siteactions/macros/site_actions">
-               Site-wide actions (Contact, Sitemap, Help, Style Switcher etc)
-             </div--> <!--div metal:use-macro="here/global_searchbox/macros/quick_search">
-               The quicksearch box, normally placed at the top right
-             </div--> <!--a metal:use-macro="here/global_logo/macros/portal_logo">
-               The portal logo, linked to the portal root
-             </a-->
-
-<div id="portal-skinswitcher"></div>
-
-
-<h5 class="hiddenStructure">Sections</h5>
-
-<ul id="portal-globalnav">
-	<li id="portaltab-index_html" class="selected"><a
-		href="http://www.saeon.ac.za" style="background-color: White">Home</a></li>
-
-	<li id="portaltab-news" class="plain"><a
-		href="http://www.saeon.ac.za/news" style="background-color: White"
-		title="What's in the news...">News</a></li>
-	<li id="portaltab-documents" class="plain"><a
-		href="http://www.saeon.ac.za/documents"
-		style="background-color: White" title="Documents">Documents</a></li>
-	<li id="portaltab-presentations" class="plain"><a
-		href="http://www.saeon.ac.za/presentations"
-		style="background-color: White" title="SAEON Presentation">Presentations</a></li>
-	<li id="portaltab-careers" class="plain"><a
-		href="http://www.saeon.ac.za/careers" style="background-color: White"
-		title="">Careers</a></li>
-	<li id="portaltab-blog" class="plain"><a
-		href="http://www.saeon.ac.za/blog" style="background-color: White"
-		title="">Discussion Forum</a></li>
-	<li id="portaltab-eNewsletter" class="plain"><a
-		href="http://www.saeon.ac.za/eNewsletter"
-		style="background-color: White" title="">eNewsletter</a></li>
-	<li id="portaltab-nodes" class="plain"><a
-		href="http://www.saeon.ac.za/nodes" style="background-color: White"
-		title="Observation nodes of SAEON">Nodes</a></li>
-
-</ul>
-
-</div>
-
-
-
-<h5 class="hiddenStructure">Personal tools</h5>
-
-<ul id="portal-personaltools">
-
-
-
-	<li><a href="http://www.saeon.ac.za/login_form"> Log in </a></li>
-
-
-	<li><a href="http://www.saeon.ac.za/join_form"> Join </a></li>
-
-
-</ul>
-
-
-<div id="portal-breadcrumbs"><span id="breadcrumbs-you-are-here">You
-are here:</span> <a href="http://www.saeon.ac.za">Home</a></div>
-</div>
-
-<div class="visualClear"><!-- --></div>
-
-
-
-<table id="portal-columns">
-
-	<tbody>
-		<tr>
-
-			<td id="portal-column-one">
-			
-			<div class="visualPadding">
-			
-			<dl class="portlet" id="portlet-navigation-tree">
-				<dt class="portletHeader"><a
-					href="http://www.saeon.ac.za/sitemap">Navigation</a></dt>
-
-
-				<dd class="portletItem">
-				<ul class="portletNavigationTree navTreeLevel0">
-
-					<li class="navTreeItem">
-					<div class="contenttype-plone-site"><a
-						class="navTreeCurrentItem visualIconPadding"
-						href="http://www.saeon.ac.za" title="saeon"> Home </a></div>
-					</li>
-
-
-
-
-
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-topic"><a
-						href="http://www.saeon.ac.za/news"
-						class="state-published visualIconPadding"
-						title="What's in the news...">News</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-folder"><a
-						href="http://www.saeon.ac.za/documents"
-						class="state-published visualIconPadding" title="Documents">Documents</a>
-
-					</div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-folder"><a
-						href="http://www.saeon.ac.za/presentations"
-						class="state-published visualIconPadding"
-						title="SAEON Presentation">Presentations</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-document"><a
-						href="http://www.saeon.ac.za/data-policy"
-						class="state-published visualIconPadding" title="Data policy">Data
-					policy</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-link"><a
-						href="http://www.saeon.ac.za/metadata-project"
-						class="state-published visualIconPadding" title="">Metadata
-					Project</a></div>
-
-
-
-					</li>
-
-
-
-
-
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-document"><a
-						href="http://www.saeon.ac.za/resources"
-						class="state-published visualIconPadding"
-						title="Useful tools and advice">Resources</a></div>
-
-
-
-					</li>
-
-
-
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-folder"><a
-						href="http://www.saeon.ac.za/careers"
-						class="state-published visualIconPadding" title="">Careers</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-document"><a
-						href="http://www.saeon.ac.za/committees"
-						class="state-published visualIconPadding"
-						title="SAEON Advisory Board">Committees</a></div>
-
-
-
-					</li>
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-link"><a
-						href="http://www.saeon.ac.za/students"
-						class="state-published visualIconPadding" title="">Students</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-document"><a
-						href="http://www.saeon.ac.za/links"
-						class="state-published visualIconPadding" title="">Links</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-document"><a
-						href="http://www.saeon.ac.za/contacts"
-						class="state-published visualIconPadding" title="">Contacts</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-document"><a
-						href="http://www.saeon.ac.za/distribution-list"
-						class="state-published visualIconPadding" title="">Distribution
-					list</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-link"><a
-						href="http://www.saeon.ac.za/link_eltosa"
-						class="state-published visualIconPadding"
-						title="ELTOSA (Environmental Long-Term Observatories of southern Africa) is a network of southern African countries embarking on time-series environmental research and monitoring programmes delivering time-series datasets. These multi-disciplinary programmes are site-based and meant to run for five years or longer and over several decades.">ELTOSA</a>
-
-					</div>
-
-
-
-					</li>
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-link"><a
-						href="http://www.saeon.ac.za/ilter"
-						class="state-published visualIconPadding" title="">ILTER</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-link"><a
-						href="http://www.saeon.ac.za/nrf-home"
-						class="state-published visualIconPadding" title="">NRF home</a></div>
-
-
-
-					</li>
-
-
-
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-link"><a
-						href="http://www.saeon.ac.za/search"
-						class="state-published visualIconPadding" title="">Search</a></div>
-
-
-
-					</li>
-
-
-
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-easyblog"><a
-						href="http://www.saeon.ac.za/blog"
-						class="state-public visualIconPadding" title="">Discussion
-					Forum</a></div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-folder"><a
-						href="http://www.saeon.ac.za/eNewsletter"
-						class="state-published visualIconPadding" title="">eNewsletter</a>
-
-
-					</div>
-
-
-
-					</li>
-
-
-					<li class="navTreeItem visualNoMarker">
-
-
-
-					<div class="contenttype-folder"><a
-						href="http://www.saeon.ac.za/nodes"
-						class="state-published visualIconPadding"
-						title="Observation nodes of SAEON">Nodes</a></div>
-
-
-
-					</li>
-
-
-
-
-
-
-				</ul>
-				</dd>
-			</dl>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-			<dl class="portlet" id="portlet-login">
-
-				<dt class="portletHeader"><a
-					href="http://www.saeon.ac.za/login_form">Log in</a></dt>
-
-				<dd class="portletItem odd">
-				<form action="http://www.saeon.ac.za/login_form" name="loginform"
-					method="post"><input type="hidden" name="form.submitted"
-					value="1" /> <input type="hidden" name="came_from"
-					value="http://www.saeon.ac.za//" /> <input type="hidden"
-					name="js_enabled" id="js_enabled" value="0" /> <input
-					type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />
-				<input type="hidden" name="login_name" id="login_name" value="" />
-				<input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />
-
-				<div class="field"><label for="__ac_name">Login Name</label> <br />
-				<input type="text" size="10" alt="Login Name"
-					onclick="showCookieMessage('cookies_message')" tabindex="10001"
-					name="__ac_name" value="" id="__ac_name" /></div>
-
-				<div class="field"><label for="__ac_password">Password</label>
-				<br />
-				<input type="password" size="10" alt="Password"
-					onclick="showCookieMessage('cookies_message')" tabindex="10002"
-					name="__ac_password" id="__ac_password" /></div>
-
-				<div id="cookies_message" class="portalMessage"
-					style="display: none">Cookies are not enabled. You must <a
-					href="enabling_cookies">enable cookies</a> before you can log in.</div>
-
-
-				<div class="formControls"><input class="context" type="submit"
-					name="submit" value="Log in" alt="Log in"
-					onclick="javascript:return setLoginVars('__ac_name','login_name','__ac_password','pwd_empty','js_enabled','cookies_enabled')"
-					tabindex="10003" /></div>
-				</form>
-				</dd>
-
-				<dd class="portletItem even"><a
-					href="http://www.saeon.ac.za/mail_password_form"> <img
-					src="http://www.saeon.ac.za/info_icon.gif" alt="" title=""
-					height="16" width="16" /> Forgot your password? </a></dd>
-
-				<dd class="portletItem"><a
-					href="http://www.saeon.ac.za/join_form"> <img
-					src="http://www.saeon.ac.za/user.gif" alt="" title="User"
-					height="16" width="16" /> New user? </a></dd>
-			</dl>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-			&nbsp;</div>
-			</td>
-
-
-
-			<td id="portal-column-content">
-
-
-			<div id="content" class="">
-
-
-
-			<div class="documentContent" id="region-content"><a
-				name="documentContent"></a>
-
-
-
-
-
-
-
-
-			<div class="documentActions">
-
-
-			<h5 class="hiddenStructure">Document Actions</h5>
-
-			<ul>
-
-				<li><a href="http://www.saeon.ac.za/front-page/sendto_form">
-
-				<img src="http://www.saeon.ac.za/mail_icon.gif"
-					alt="Send this page to somebody" title="Send this page to somebody" />
-				</a></li>
-
-
-				<li><a href="javascript:this.print();"> <img
-					src="http://www.saeon.ac.za/print_icon.gif" alt="Print this page"
-					title="Print this page" /> </a></li>
-
-
-			</ul>
-
-
-
-
-			</div>
-
-			<h1 class="documentFirstHeading">SAEON</h1>
-
-			<div>
-
-			<div class="documentByLine"><span> by <a
-				href="http://www.saeon.ac.za/author/admin">SAEON</a> </span> &mdash; <span>
-			last modified </span> 2007-11-22 17:54
-
-
-
-
-
-
-
-
-
-			<div class="reviewHistory"></div>
-
-			</div>
-
-			</div>
-
-
-
-
-
-			<div class="plain">
-			<h3 class="Subheading">SAEON: A DEVELOPING FACILITY OF THE NRF
-			FUNDED BY DST</h3>
-			<p>SAEON is a research facility that establishes and maintains
-			nodes (environmental observatories, field stations or sites) linked
-			by an information management network to serve as research and
-			education platforms for long-term studies of ecosystems that will
-			provide for incremental advances in our understanding of ecosystems
-			and our ability to detect, predict and react to environmental change.
-			The core research programme will strive to distinguish between
-			anthropogenic and natural change as well as to unravel the relations
-			between social change and ecosystem change. One of the primary
-			features of the Long Term Ecological Research (LTER) approach is that
-			it overcomes the deficiencies associated with postgraduate research
-			projects. Typically those cannot interpret the ever-present temporal
-			and spatial environmental variability because of the pressure to
-			produce a thesis within two to three years. SAEON will bring better
-			cohesion between research programmes nationally and internationally
-			and will ensure that LTER data is archived and accessible as a
-			national asset for generations to come.</p>
-			<p></p>
-			<h3 class="Subheading"><b>WHO SHOULD READ FURTHER?</b></h3>
-			<p></p>
-			<ul>
-				<li>Scientists and students/learners interested in long-term
-				studies of the earth systems and biodiversity</li>
-				<li>Research managers</li>
-				<li>Environmental educators</li>
-				<li>Companies impacting on the goods and services provided by
-				the environment</li>
-				<li>Politicians, policy makers and environmental managers
-				requiring environmental information</li>
-				<li>Members of the public whose livelihoods are vulnerable to
-				environmental change</li>
-				<li>Funding agencies interested in developing capacity and
-				promoting knowledge of life-support systems and how they are
-				changing</li>
-			</ul>
-			<p><b><br />
-			</b></p>
-			<h3 class="Subheading"><b>KEYWORDS for SAEON</b></h3>
-			<p>Climate change, global change, environmental change, research,
-			environmental education, rural sociology, environmental information
-			systems, biodiversity, earth systems, ecosystems, social systems,
-			livelihoods, agriculture, monitoring, long-term data series,
-			oceanography, atmospheric sciences, rivers, hydrology, remote
-			sensing, nutrient loading, land-use, ecology, primary production,
-			floods, droughts, public health, industry, economics, human
-			geography, geochemistry, groundwater, vulnerability, fisheries,
-			network, National System of Innovation, societal change,
-			experimentation, multi-disciplinary, research platform, spatial
-			variation, landscape, disturbance regimes, event-driven, site-based,
-			freshwater, soils, sediments, ocean, coast, mountains.</p>
-
-			</div>
-
-			<div id="relatedItems"></div>
-
-
-
-
-
-			<div class="discussion"></div>
-
-
-			</div>
-
-			</div>
-
-
-			</td>
-
-
-
-			<td id="portal-column-two">
-			<div class="visualPadding">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-			<div>
-
-			<table>
-				<tr>
-					<td>
-					<div id="portal-searchbox">
-					<form name="searchform" action="http://www.saeon.ac.za/search"
-						style="white-space: nowrap" onsubmit="return liveSearchSubmit()">
-
-					<label for="searchGadget" class="hiddenStructure">Search
-					Site</label>
-
-					<div class="LSBox"><input id="searchGadget" tabindex="20001"
-						name="SearchableText" type="text" size="10" title="Search Site"
-						accesskey="4" class="visibility:visible" /> <input
-						class="searchButton" type="submit" tabindex="20002" value="Search" />
-
-					<div class="LSResult" id="LSResult" style="">
-					<div class="LSShadow" id="LSShadow"></div>
-					</div>
-					</div>
-
-					</form>
-
-					</div>
-					</td>
-				</tr>
-				<tr>
-					<td>
-					<dl class="portlet" id="portlet-news">
-
-						<dt class="portletHeader"><a
-							href="http://www.saeon.ac.za/news">News</a></dt>
-
-
-						<dd class="portletItem odd"><a
-							href="http://www.saeon.ac.za/2007/nrf-call-for-research-proposals-in-environmental-change-2008"
-							title="SAEON features strongly in the 2008 National Research Foundation (NRF) call for proposals">
-						<img src="http://www.saeon.ac.za/newsitem_icon.gif" alt=""
-							title="News" height="16" width="16" /> NRF Call for Research
-						Proposals in Environmental Change - 2008 <span
-							class="portletItemDetails">2007-05-31</span> </a></dd>
-
-
-						<dd class="portletItem even"><a
-							href="http://www.saeon.ac.za/2006/announcement-special-interest-symposium-entitled-long-term-monitoring-theory-practice-and-the-future"
-							title="As part of it’s 41st Annual Congress, the Grassland Society of Southern Africa would like to announce a Special Interest Symposium entitled &quot;Long Term Monitoring: Theory, Practice and the Future&quot; to be held on Wednesday 19th July 2006.">
-
-						<img src="http://www.saeon.ac.za/newsitem_icon.gif" alt=""
-							title="News" height="16" width="16" /> Special Interest
-						Symposium entitled "Long Term Monitoring: Theory, Practice and the
-						Future" announced <span class="portletItemDetails">2006-05-08</span>
-						</a></dd>
-
-
-						<dd class="portletItem odd"><a
-							href="http://www.saeon.ac.za/2006/a-successful-foward-looking-trendsetting-summit"
-							title=""> <img src="http://www.saeon.ac.za/newsitem_icon.gif"
-							alt="" title="News" height="16" width="16" /> A successful,
-						forward-looking, trendsetting Summit <span
-							class="portletItemDetails">2006-04-12</span> </a></dd>
-
-
-						<dd class="portletItem even"><a
-							href="http://www.saeon.ac.za/2006/summit-to-create-environmental-observation-blueprint-for-the-future"
-							title="Address by the Deputy Minister of Science and Technology, Mr Derek Hanekom">
-						<img src="http://www.saeon.ac.za/newsitem_icon.gif" alt=""
-							title="News" height="16" width="16" /> Summit to create
-						Environmental observation Blueprint for the Future <span
-							class="portletItemDetails">2006-03-27</span> </a></dd>
-
-
-						<dd class="portletItem odd"><a
-							href="http://www.saeon.ac.za/2006/opening-of-the-saeon-summit"
-							title="The Department of Science and Technology and I are very pleased to be associated with this First SAEON Summit, a landmark event on the Earth Observation and Environmental Science Calendar of South Africa. So often conferences come and go, stimulating scientific discourse but leaving behind only a collection of reports of scientific progress, and a few additions to the CV’s of those who presented papers.">
-						<img src="http://www.saeon.ac.za/newsitem_icon.gif" alt=""
-							title="News" height="16" width="16" /> Opening Address of the
-						SAEON Summit... <span class="portletItemDetails">2006-03-27</span>
-						</a></dd>
-
-
-						<dd class="portletFooter"><a
-							href="http://www.saeon.ac.za/news"> More news&hellip; </a></dd>
-					</dl>
-
-					</td>
-				</tr>
-			</table>
-
-			</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-			<!-- The calendar, rendered as a table -->
-
-			<table>
-				<tr>
-					<td>
-
-					<table class="ploneCalendar" id="thePloneCalendar"
-						summary="Calendar">
-						<thead>
-							<tr>
-
-								<th id="calendar-previous"><a
-									href="http://www.saeon.ac.za/front-page/document_view?None&amp;month:int=11&amp;year:int=2007&amp;orig_query=None"
-									rel="nofollow" title="Previous month">&laquo;</a></th>
-								<th colspan="5">December 2007</th>
-								<th id="calendar-next"><a
-									href="http://www.saeon.ac.za/front-page/document_view?None&amp;month:int=1&amp;year:int=2008&amp;orig_query=None"
-									rel="nofollow" title="Next month">&raquo;</a></th>
-
-							</tr>
-							<tr class="weekdays">
-
-								<td>Su</td>
-
-
-								<td>Mo</td>
-
-
-								<td>Tu</td>
-
-
-								<td>We</td>
-
-
-								<td>Th</td>
-
-
-
-								<td>Fr</td>
-
-
-								<td>Sa</td>
-
-							</tr>
-						</thead>
-
-
-						<tbody>
-							<tr>
-								<td></td>
-
-								<td></td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td>1</td>
-							</tr>
-							<tr>
-
-								<td>2</td>
-								<td>3</td>
-								<td>4</td>
-								<td>5</td>
-								<td class="todaynoevent">6</td>
-								<td>7</td>
-
-								<td>8</td>
-							</tr>
-							<tr>
-								<td>9</td>
-								<td>10</td>
-								<td>11</td>
-								<td>12</td>
-
-								<td>13</td>
-								<td>14</td>
-								<td>15</td>
-							</tr>
-							<tr>
-								<td>16</td>
-								<td>17</td>
-
-								<td>18</td>
-								<td>19</td>
-								<td>20</td>
-								<td>21</td>
-								<td>22</td>
-							</tr>
-
-							<tr>
-								<td>23</td>
-								<td>24</td>
-								<td>25</td>
-								<td>26</td>
-								<td>27</td>
-
-								<td>28</td>
-								<td>29</td>
-							</tr>
-							<tr>
-								<td>30</td>
-								<td>31</td>
-								<td></td>
-
-								<td></td>
-								<td></td>
-								<td></td>
-								<td></td>
-							</tr>
-						</tbody>
-					</table>
-					<table>
-
-						<tr>
-							<td bgcolor="#f0f0ec" valign="top" width="167">
-							<table bgcolor="#fafaf8" border="0" cellpadding="1"
-								cellspacing="1">
-								<tbody>
-									<tr>
-										<td height="73" valign="top"><a
-											href="http://www.saeon.ac.za/summit/" class="white"><img
-											src="images-1/imagesummitscr.jpg" alt="summit website"></a></td>
-									</tr>
-									<tr>
-										<td height="38" valign="top">
-										<p><em>Visit the <a
-											href="http://www.saeon.ac.za/summit/">SAEON Summit
-										website </a></em></p>
-										</td>
-
-									</tr>
-
-								</tbody>
-							</table>
-							<table bgcolor="#fafaf8" border="0" cellpadding="1"
-								cellspacing="1">
-								<tbody>
-									<tr>
-										<td height="73" valign="top"><a
-											href="http://www.saeon.ac.za/students/"><img
-											src="images-1/imagestudentweb.jpg" alt="students websit"
-											class="white"></a></td>
-									</tr>
-									<tr>
-										<td height="58" valign="top">
-										<p><em>Visit the <a
-											href="http://www.saeon.ac.za/students">SAEON Graduate
-										Students' Network website</a></em></p>
-										</td>
-
-									</tr>
-								</tbody>
-							</table>
-							<table bgcolor="#fafaf8" border="0" cellpadding="1"
-								cellspacing="1">
-								<tbody>
-									<tr>
-										<td height="73" valign="top"><a
-											href="http://www.saeon.ac.za/eNewsletter/Online/2007/november"><img
-											src="images-1/nov-2007.jpg" alt="newsletter image"
-											class="white"></a></td>
-									</tr>
-									<tr>
-										<td height="58" valign="top">
-										<p><em>Read the latest <a
-											href="http://www.saeon.ac.za/eNewsletter/Online/2007/november">SAEON
-										eNewsletter</a></em></p>
-										</td>
-
-									</tr>
-								</tbody>
-							</table>
-							<h3>SAEON vision</h3>
-							<p>A sustained, co-ordinated, responsive and comprehensive
-							South African Earth observation network that delivers long-term
-							reliable data for scientific research and informs decision-making
-							for a knowledge society and improved quality of life.</p>
-							</td>
-						</tr>
-						<tr>
-							<td bgcolor="white"><img src="nrf.gif" /> <img
-								src="dst.gif" /></td>
-						</tr>
-
-					</table>
-
-
-					</td>
-				</tr>
-			</table>
-
-
-
-
-
-
-
-
-
-			&nbsp;</div>
-			</td>
-
-
-		</tr>
-	</tbody>
-</table>
-
-
-<div class="visualClear"><!-- --></div>
-
-
-<hr class="netscape4" />
-
-
-
-<div id="portal-footer">
-
-
-<p></p>
-
-</div>
-
-<div id="portal-colophon"><!--
-
-        Please keep the Plone Powered button (or a textual link to us) if you use
-        Plone on your site. It's a nice token of gratitude, and we appreciate your
-        help in promoting the Plone name.
-
-        Plone is powered by the combined forces of Zope and CMF, two absolutely
-        great systems made by Zope Corporation (http://zope.com) and they in turn
-        are based on the best programming language in the world - Python
-        (http://www.python.org). We owe these guys a lot, thanks for making Plone
-        possible!
-
-      --> <a href="http://plone.org" class="colophonIcon"
-	title="This Plone site was built using Plone, the Open Source Content Management System. Click for more information."
-	style="background-image: url(http://www.saeon.ac.za/plone_powered.gif);">
-Powered by Plone, the Open Source Content Management System </a>
-
-
-
-<p class="discreet">This site conforms to the following standards:</p>
-
-<div class="colophonWrapper">
-<ul>
-	<li><a href="http://www.section508.gov" class="colophonIcon"
-		title="This Plone site conforms to the US Government Section 508 Accessibility Guidelines."
-		style="background-image: url(http://www.saeon.ac.za/colophon_sec508.gif);">
-	Section 508 </a></li>
-	<li><a href="http://www.w3.org/WAI/WCAG1AA-Conformance"
-		class="colophonIcon"
-		title="This Plone site conforms to the W3C-WAI Web Content Accessibility Guidelines."
-		style="background-image: url(http://www.saeon.ac.za/colophon_wai-aa.gif);">
-	WCAG </a></li>
-	<li><a href="http://validator.w3.org/check/referer"
-		class="colophonIcon" title="This Plone site is valid XHTML."
-		style="background-image: url(http://www.saeon.ac.za/colophon_xhtml.png);">
-	Valid XHTML </a></li>
-	<li><a href="http://jigsaw.w3.org/css-validator/check/referer"
-		class="colophonIcon" title="This Plone site was built with valid CSS."
-		style="background-image: url(http://www.saeon.ac.za/colophon_css.png);">
-	Valid CSS </a></li>
-	<li><a href="http://plone.org/browsersupport" class="colophonIcon"
-		title="This Plone site is usable in any web browser."
-		style="background-image: url(http://www.saeon.ac.za/colophon_anybrowser.png);">
-	Usable in any browser </a></li>
-</ul>
-</div>
-
-</div>
-
-
-</div>
-
-
-
-</body>
-</html>
-

Property changes on: lib/style/skins/saeon/original.html
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: lib/style/skins/saeon/SimpleSearchMetacatPostFields.html
===================================================================
--- lib/style/skins/saeon/SimpleSearchMetacatPostFields.html	(revision 3738)
+++ lib/style/skins/saeon/SimpleSearchMetacatPostFields.html	(nonexistent)
@@ -1,20 +0,0 @@
-<input type="hidden" name="operator"      value="INTERSECTION"/>
-<input type="hidden" name="returnfield"   value="originator/individualName/surName"/>
-<input type="hidden" name="returnfield"   value="originator/individualName/givenName"/>
-<input type="hidden" name="returnfield"   value="originator/organizationName"/>
-<input type="hidden" name="returnfield"   value="creator/individualName/surName"/>
-<input type="hidden" name="returnfield"   value="creator/organizationName"/>
-<input type="hidden" name="returnfield"   value="dataset/title"/>
-<input type="hidden" name="returnfield"   value="keyword"/>
-<input type="hidden" name="returnfield"   value="creator/individualName/givenName"/>
-<input type="hidden" name="returnfield"   value="idinfo/citation/citeinfo/title"/>
-<input type="hidden" name="returnfield"   value="idinfo/citation/citeinfo/origin"/>
-<input type="hidden" name="returnfield"   value="idinfo/keywords/theme/themekey"/>
-<input type="hidden" name="returndoctype" value="metadata"/>
-<input type="hidden" name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN"/>
-<input type="hidden" name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN"/>
-<input type="hidden" name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.1"/>
-<input type="hidden" name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.0"/>
-<input type="hidden" name="returndoctype" value="-//NCEAS//eml-dataset-2.0//EN"/>
-<input type="hidden" name="returndoctype" value="-//NCEAS//resource//EN"/>
-<input type="hidden" name="qformat"       value="saeon"/>

Property changes on: lib/style/skins/saeon/SimpleSearchMetacatPostFields.html
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: lib/style/skins/sanparks/upload.jsp
===================================================================
--- lib/style/skins/sanparks/upload.jsp	(revision 3738)
+++ lib/style/skins/sanparks/upload.jsp	(revision 3739)
@@ -24,15 +24,15 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 %>
-
+<%@ include file="settings.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
     <head>
         <title>SANParks - South African National Park Data Repository</title>
-        <link rel="stylesheet" href="@systemidserver@@style-skins-path@/default/default.css" type="text/css"/>
-        <link rel="stylesheet" type="text/css" href="@systemidserver@@style-skins-path@/sanparks/sanparks.css"/>
-        <script language="JavaScript" type="text/JavaScript" src="@systemidserver@@style-skins-path@/sanparks/sanparks.js"></script>
-        <script language="JavaScript" type="text/JavaScript" src="@systemidserver@@style-common-path@/branding.js"></script>
+        <link rel="stylesheet" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/default.css" type="text/css"/>
+        <link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/sanparks.css"/>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/sanparks.js"></script>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/common/branding.js"></script>
     </head>
     <body>
         <script language="JavaScript">
@@ -39,7 +39,7 @@
             function getMapFrame() {
                 return document.getElementById('mapFrame');
             }
-            insertTemplateOpening();
+            insertTemplateOpening("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
         
         <jsp:include page="SaeonUpload.jspx" />
@@ -47,7 +47,7 @@
         <script language="JavaScript">
             //insertLoginBox();
             //insertSearchBox();
-            insertTemplateClosing();
+            insertTemplateClosing("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
     </body>
 </html>
Index: lib/style/skins/sanparks/sanparks.xml
===================================================================
--- lib/style/skins/sanparks/sanparks.xml	(revision 3738)
+++ lib/style/skins/sanparks/sanparks.xml	(revision 3739)
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
-<style-set name="knp">
+<style-set name="sanparks">
 <!-- general login & search -->
-  <default-style>@systemidserver@@style-common-path@/ascii-treeview.xsl</default-style>
+  <default-style>style/common/ascii-treeview.xsl</default-style>
 
   <doctype publicid="-//NCEAS//resultset//EN">
-    <!-- <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/sanparks/sanparks.xsl</target> -->
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/resultset.xsl</target>
+    <!-- <target publicid="-//W3C//HTML//EN">style/skins/sanparks/sanparks.xsl</target> -->
+    <target publicid="-//W3C//HTML//EN">style/common/resultset.xsl</target>
   </doctype>
 
   <doctype publicid="-//NCEAS//login//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/sanparks/knp-login.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/skins/sanparks/knp-login.xsl</target>
   </doctype>
   <doctype publicid="-//NCEAS//unauth_login//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/sanparks/knp-login.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/skins/sanparks/knp-login.xsl</target>
   </doctype>
 
 <!--
@@ -19,7 +19,7 @@
     ARE THESE STILL NEEDED????????????
 
   <doctype publicid="-//NCEAS//eml-generic//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/generic-morpho.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/generic-morpho.xsl</target>
   </doctype>
 -->
 
@@ -28,64 +28,64 @@
 <!-- NOTE these settings are unchanged from the previous version - only the xsl 
      filename has changed from "eml-dataset-display.xsl" to "eml-dataset-2.0.0beta4.xsl" -->
   <doctype publicid="eml://ecoinformatics.org/eml-2.0.1">
-    <!-- <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/sanparks/sanparks.xsl</target> -->
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.1/eml.xsl</target>
+    <!-- <target publicid="-//W3C//HTML//EN">style/skins/sanparks/sanparks.xsl</target> -->
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.1/eml.xsl</target>
   </doctype>
   <doctype publicid="eml://ecoinformatics.org/eml-2.0.0">
-    <!-- <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/sanparks/sanparks.xsl</target> -->
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.1/eml.xsl</target>
+    <!-- <target publicid="-//W3C//HTML//EN">style/skins/sanparks/sanparks.xsl</target> -->
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.1/eml.xsl</target>
   </doctype>
   <doctype publicid="-//NCEAS//eml-dataset//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
   </doctype>
   <doctype publicid="-//NCEAS//eml-dataset-2.0//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
   </doctype>
   <doctype publicid="-//NCEAS//eml-resource//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
   </doctype>
 <!-- beta6 modules -->
   <doctype publicid="-//ecoinformatics.org//eml-access-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-access-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-access-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-attribute-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-attribute-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-attribute-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-constraint-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-constraint-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-constraint-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-coverage-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-coverage-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-coverage-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-dataset-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-dataset-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-entity-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-entity-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-entity-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-literature-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-literature-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-literature-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-physical-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-physical-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-physical-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-project-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-project-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-project-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-protocol-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-protocol-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-protocol-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-software-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-software-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-software-2.0.0beta6.xsl</target>
   </doctype>
 
   <!-- NBII/FGDC styles -->
   <doctype publicid="metadata">
-    <!--target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/fgdc/nbii-metacat.xsl</target-->
-    <!-- <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/sanparks/sanparks.xsl</target> -->
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/fgdc/fgdc_1.xsl</target>
+    <!--target publicid="-//W3C//HTML//EN">style/common/fgdc/nbii-metacat.xsl</target-->
+    <!-- <target publicid="-//W3C//HTML//EN">style/skins/sanparks/sanparks.xsl</target> -->
+    <target publicid="-//W3C//HTML//EN">style/common/fgdc/fgdc_1.xsl</target>
   </doctype>
 </style-set>
Index: lib/style/skins/sanparks/SaeonLogin.jspx
===================================================================
--- lib/style/skins/sanparks/SaeonLogin.jspx	(revision 3738)
+++ lib/style/skins/sanparks/SaeonLogin.jspx	(revision 3739)
@@ -14,10 +14,17 @@
         private ClientViewHelper clientViewHelper = null;
     </jsp:declaration>
 
+<jsp:directive.include file="settings.jsp" />
+
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 
-	<script language="JavaScript" type="text/JavaScript" src="@systemidserver@@style-skins-path@/sanparks/searchPathQuery.js"/>
+	<jsp:element name="script">
+		<jsp:attribute name="language">JavaScript</jsp:attribute>
+		<jsp:attribute name="src">
+			<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/sanparks/searchPathQuery.js"</jsp:expression>
+		</jsp:attribute>
+	</jsp:element>
 	<script type="text/javascript">
 		function trim(stringToTrim) {
 			return(stringToTrim.replace(/^\s+|\s+$/g,""));
@@ -52,8 +59,13 @@
 	</script>
 
 	<title>SANParks - South African National Park Data Repository</title>
-	<link href="@systemidserver@@style-skins-path@/sanparks/sanparks.css" rel="stylesheet" type="text/css" />
-
+	<jsp:element name="link">
+		<jsp:attribute name="rel">stylesheet</jsp:attribute>
+		<jsp:attribute name="type">text/css</jsp:attribute>
+		<jsp:attribute name="href">
+			<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/sanparks/sanparks.css"</jsp:expression>
+		</jsp:attribute>
+	</jsp:element>
 </head>
 	
 <body>
@@ -158,7 +170,7 @@
 		<jsp:attribute name="name">searchform</jsp:attribute>
 		<jsp:attribute name="method">post</jsp:attribute>
 		<jsp:attribute name="action">
-			<jsp:expression>request.getContextPath() + "/metacat"</jsp:expression>
+			<jsp:expression>METACAT_URL</jsp:expression>
 		</jsp:attribute>
 		<jsp:attribute name="target">_top</jsp:attribute>
 		<jsp:attribute name="onsubmit">setQueryFormField()</jsp:attribute>
@@ -209,10 +221,13 @@
 	
 	<h3>
 		Login
-		<!-- TODO: Config param follows --> 
-		<a href="@cgi-prefix@/ldapweb.cgi?cfg=sanparks" target="_parent">
+		<jsp:element name="a">
+			<jsp:attribute name="target">_parent</jsp:attribute>
+			<jsp:attribute name="href">
+				<jsp:expression>CGI_PREFIX + "/ldapweb.cgi?cfg=sanparks"</jsp:expression>
+			</jsp:attribute>
 			<span class="regtext"> (request an account...)</span>
-		</a>
+		</jsp:element>
 	</h3>
 	<form name="loginForm" method="post" action="./"
 		onsubmit="return allowSubmit(this)">
@@ -283,15 +298,23 @@
 				align="center" 
 				valign="top">
 				
-				<!-- TODO: Config param follows --> 
-				<a
-					href="@cgi-prefix@/ldapweb.cgi?cfg=sanparks&amp;stage=resetpass"
-					target="_parent">reset your password</a>
+				<!-- reset pass --> 
+				<jsp:element name="a">
+					<jsp:attribute name="target">_parent</jsp:attribute>
+					<jsp:attribute name="href">
+						<jsp:expression>CGI_PREFIX + "/ldapweb.cgi?cfg=sanparks&amp;stage=resetpass"</jsp:expression>
+					</jsp:attribute>
+					reset your password
+				</jsp:element>
 				|
-				<!-- TODO: Config param follows --> 
-				<a
-					href="@cgi-prefix@/ldapweb.cgi?cfg=sanparks&amp;stage=changepass"
-					target="_parent">change your password</a>
+				<!-- change pass --> 
+				<jsp:element name="a">
+					<jsp:attribute name="target">_parent</jsp:attribute>
+					<jsp:attribute name="href">
+						<jsp:expression>CGI_PREFIX + "/ldapweb.cgi?cfg=sanparks&amp;stage=changepass"</jsp:expression>
+					</jsp:attribute>
+					change your password
+				</jsp:element>
 			</td>
 		</tr>
 	</table>
@@ -310,9 +333,13 @@
 	<table width="100%">
 		<tr valign="top">
 			<td align="right">
-				<form action="@systemidserver@@style-skins-path@/sanparks/upload.jsp" method="post">
+				<jsp:element name="form">
+					<jsp:attribute name="method">post</jsp:attribute>
+					<jsp:attribute name="action">
+						<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/sanparks/upload.jsp"</jsp:expression>
+					</jsp:attribute>
 					<input type="submit" value="Go >" class="button_login" />
-				</form>
+				</jsp:element>
 			</td>
 		</tr>
 	</table>			
@@ -344,7 +371,7 @@
 	
 		<!-- map frame -->
         <script language="JavaScript">
-            insertMap();
+            insertMap("<jsp:expression>SERVER_URL_WITH_CONTEXT</jsp:expression>");
         </script>
 	</td>
 	
Index: lib/style/skins/sanparks/footer.jspx
===================================================================
--- lib/style/skins/sanparks/footer.jspx	(revision 3738)
+++ lib/style/skins/sanparks/footer.jspx	(revision 3739)
@@ -3,11 +3,18 @@
     
     <!-- to change the content type or response encoding change the following line -->
     <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:directive.include file="settings.jsp" />
     
     <html>
     	<head>
 		   	<title>footer</title>
-			<link rel="stylesheet" type="text/css" href="@systemidserver@@style-skins-path@/sanparks/sanparks.css"/>
+			<jsp:element name="link">
+				<jsp:attribute name="rel">stylesheet</jsp:attribute>
+				<jsp:attribute name="type">text/css</jsp:attribute>
+				<jsp:attribute name="href">
+					<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/sanparks/sanparks.css"</jsp:expression>
+				</jsp:attribute>
+			</jsp:element>
 		</head>
         <body class="footerContent">
             <p class="regtext">
Index: lib/style/skins/sanparks/header.jsp
===================================================================
--- lib/style/skins/sanparks/header.jsp	(revision 3738)
+++ lib/style/skins/sanparks/header.jsp	(revision 3739)
@@ -24,12 +24,12 @@
 	 */
 %>
 <!--____________________________max_width____________________________________-->
-
+<%@ include file="settings.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>SANParks - South African National Park Data Repository</title>
-<link rel="stylesheet" type="text/css" href="@systemidserver@@style-skins-path@/sanparks/sanparks.css"/>
+<link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/sanparks.css"/>
 </head>
 
 <body>
@@ -37,7 +37,7 @@
 	<!-- Header -->
 	<tr style="background: #7BB865;">
 		<td style="background: #124325;"><a href="http://www.SANParks.org/" title="SANParks.org Home"><img
-			border="0" src="images/logofade.jpg" alt="SANParks.org Home" /></a>
+			border="0" src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/images/logofade.jpg" alt="SANParks.org Home" /></a>
 		</td>
 		<td align="center" nowrap="nowrap" width="100%">
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -56,7 +56,7 @@
 					</td>
 					<!-- 
 					<td nowrap="nowrap">
-						<a href="@cgi-prefix@/register-dataset.cgi?cfg=sanparks" target="_top" class="headermenu">Register Data</a>
+						<a href="<%=CGI_PREFIX%>/register-dataset.cgi?cfg=sanparks" target="_top" class="headermenu">Register Data</a>
 					</td>
 					-->
 				</tr>
@@ -63,8 +63,7 @@
 			</table>
 		</td>
 		<td valign="bottom" align="right">
-			<!-- <img src='images/lilies.jpg' alt='Lilies' /> -->
-			<img src='images/giraffe.jpg' alt='Giraffe' />
+			<img src='<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/images/giraffe.jpg' alt='Giraffe' />
 		</td>
 	</tr>
 </table>
Index: lib/style/skins/sanparks/sanparks.xsl
===================================================================
--- lib/style/skins/sanparks/sanparks.xsl	(revision 3738)
+++ lib/style/skins/sanparks/sanparks.xsl	(revision 3739)
@@ -31,9 +31,9 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:eml="eml://ecoinformatics.org/eml-2.0.1" 
 	            version="1.0">
-    <xsl:import href="@systemidserver@@style-common-path@/resultset-table.xsl"/>
-    <xsl:import href="@systemidserver@@style-common-path@/eml-2.0.1/emlroot.xsl"/>
-    <xsl:import href="@systemidserver@@style-common-path@/fgdc/fgdc_1.xsl"/>
+    <xsl:import href="../../common/resultset-table.xsl"/>
+    <xsl:import href="../../common/eml-2.0.1/emlroot.xsl"/>
+    <xsl:import href="../../common/fgdc/fgdc_1.xsl"/>
 
 	<xsl:output method="html" />
 	<xsl:param name="sessid" />
Index: lib/style/skins/sanparks/confirm.jsp
===================================================================
--- lib/style/skins/sanparks/confirm.jsp	(revision 3738)
+++ lib/style/skins/sanparks/confirm.jsp	(revision 3739)
@@ -24,14 +24,15 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 %>
+<%@ include file="settings.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
     <head>
         <title>SANParks - South African National Park Data Repository</title>
-        <link rel="stylesheet" href="@systemidserver@@style-skins-path@/default/default.css" type="text/css"/>
-        <link rel="stylesheet" type="text/css" href="@systemidserver@@style-skins-path@/sanparks/sanparks.css"/>
-        <script language="JavaScript" type="text/JavaScript" src="@systemidserver@@style-skins-path@/sanparks/sanparks.js"></script>
-        <script language="JavaScript" type="text/JavaScript" src="@systemidserver@@style-common-path@/branding.js"></script>
+        <link rel="stylesheet" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/default.css" type="text/css"/>
+        <link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/sanparks.css"/>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/sanparks.js"></script>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/common/branding.js"></script>
     </head>
     <body>
         <script language="JavaScript">
Index: lib/style/skins/sanparks/leftnav.jsp
===================================================================
--- lib/style/skins/sanparks/leftnav.jsp	(revision 3738)
+++ lib/style/skins/sanparks/leftnav.jsp	(revision 3739)
@@ -1,8 +1,9 @@
+<%@ include file="settings.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>SANParks - South African National Park Data Repository</title>
-<link rel="stylesheet" type="text/css" href="@systemidserver@@style-skins-path@/sanparks/sanparks.css"/>
+<link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/sanparks.css"/>
 </head>
 
 <body class="templateleftcolclass">
@@ -14,7 +15,7 @@
 	<tr class="leftnav" valign="top">
 		<td>
 			
-			<form action="./index.jsp" method="post" target="_top" name="orgForm">
+			<form action="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/index.jsp" method="post" target="_top" name="orgForm">
 				<input name="organizationScope" type="hidden" value="" />
 				<table>
 					<tr>
Index: lib/style/skins/sanparks/settings.jsp
===================================================================
--- lib/style/skins/sanparks/settings.jsp	(nonexistent)
+++ lib/style/skins/sanparks/settings.jsp	(revision 3739)
@@ -0,0 +1,47 @@
+<%@page import="edu.ucsb.nceas.metacat.MetaCatUtil"%>
+<!--
+  *   '$RCSfile$'
+  *     Authors: Matthew Brooke
+  *   Copyright: 2000 Regents of the University of California and the
+  *              National Center for Ecological Analysis and Synthesis
+  * For Details: http://www.nceas.ucsb.edu/
+  *
+  *    '$Author$'
+  *      '$Date$'
+  *  '$Revision$'
+  *
+  * Settings file for the default metacat skin
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-->
+<%
+   
+   // CONTEXT NAME of metacat installed:
+	String      CONTEXT_NAME          = request.getContextPath();
+	
+	// URL of SERVER with context (and optional port)
+	String     SERVER_URL_WITH_CONTEXT =  request.getScheme() + "://" + request.getServerName();
+	if ( request.getLocalPort() != 80 ) {
+		SERVER_URL_WITH_CONTEXT += ":" + request.getLocalPort();
+	}
+	SERVER_URL_WITH_CONTEXT += CONTEXT_NAME;
+
+	// URL of metacat to be used for login & searching:
+	String      METACAT_URL           =  SERVER_URL_WITH_CONTEXT+ "/metacat";
+	
+	// URL for LDAP login actions
+	String 		CGI_PREFIX = MetaCatUtil.getOption("cgi-prefix");
+
+%>

Property changes on: lib/style/skins/sanparks/settings.jsp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: lib/style/skins/sanparks/sanparks.js
===================================================================
--- lib/style/skins/sanparks/sanparks.js	(revision 3738)
+++ lib/style/skins/sanparks/sanparks.js	(revision 3739)
@@ -86,31 +86,31 @@
 
 
 //  Location of the header that will be displayed at the top of the page
-var HEADER_URL = "@style-skins-path@/sanparks/header.jsp";
+var HEADER_URL = "style/skins/sanparks/header.jsp";
 //var HEADER_URL = "";
 
 // Location of the search box that will be displayed above the  
 //  results on the results page (optional)
 var SEARCHBOX_URL = "";  //= "searchform.html"
-//var SEARCHBOX_URL = "@style-skins-path@/sanparks/SaeonLogin.jspx";
+//var SEARCHBOX_URL = "style/skins/sanparks/SaeonLogin.jspx";
 
 //  Location of the header that will be displayed at the top of the page
-var LEFTCOL_URL = "@style-skins-path@/sanparks/leftnav.jsp";
+var LEFTCOL_URL = "style/skins/sanparks/leftnav.jsp";
 //var LEFTCOL_URL = "";
   
 //  Location of the header that will be displayed at the top of the page
-//var RIGHTCOL_URL = "@style-skins-path@/sanparks/spatial/pma.html";
+//var RIGHTCOL_URL = "style/skins/sanparks/spatial/pma.html";
 var RIGHTCOL_URL = "";
 
 //  Location of the header that will be displayed at the top of the page
-var FOOTER_URL = "@style-skins-path@/sanparks/footer.jspx";
+var FOOTER_URL = "style/skins/sanparks/footer.jspx";
 //var FOOTER_URL = "";
   
 //var LOGINBOX_URL = "";
-var LOGINBOX_URL = "@style-skins-path@/sanparks/SaeonLogin.jspx";
+var LOGINBOX_URL = "style/skins/sanparks/SaeonLogin.jspx";
 
 //  Location of the map that will be displayed
-var MAP_URL = "@style-skins-path@/sanparks/spatial/pma.html";
+var MAP_URL = "style/skins/sanparks/spatial/pma.html";
 //var MAP_URL = "";
 
 
Index: lib/style/skins/sanparks/index.jsp
===================================================================
--- lib/style/skins/sanparks/index.jsp	(revision 3738)
+++ lib/style/skins/sanparks/index.jsp	(revision 3739)
@@ -24,31 +24,27 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 %>
+<%@ include file="settings.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
     <head>
         <title>SANParks - South African National Park Data Repository</title>
-        <link rel="stylesheet" href="@systemidserver@@style-skins-path@/default/default.css" type="text/css"/>
-        <link rel="stylesheet" type="text/css" href="@systemidserver@@style-skins-path@/sanparks/sanparks.css"/>
-        <script language="JavaScript" type="text/JavaScript" src="@systemidserver@@style-skins-path@/sanparks/sanparks.js"></script>
-        <script language="JavaScript" type="text/JavaScript" src="@systemidserver@@style-common-path@/branding.js"></script>
+        <link rel="stylesheet" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/default.css" type="text/css"/>
+        <link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/sanparks.css"/>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/sanparks/sanparks.js"></script>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/common/branding.js"></script>
     </head>
     <body>
         <script language="JavaScript">
-            insertTemplateOpening();
+            insertTemplateOpening("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
         
         <!-- Main content -->
         <jsp:include page="SaeonLogin.jspx" />
         
-        <!-- map frame -->
-        <script language="JavaScript">
-            //insertMap();
-        </script>
-        
         <!-- wrap it up with the closing -->
         <script language="JavaScript">
-            insertTemplateClosing();
+            insertTemplateClosing("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
     </body>
 </html>
Index: lib/style/skins/sanparks/SaeonDelete.jspx
===================================================================
--- lib/style/skins/sanparks/SaeonDelete.jspx	(revision 3738)
+++ lib/style/skins/sanparks/SaeonDelete.jspx	(revision 3739)
@@ -4,6 +4,7 @@
     <jsp:directive.page contentType="text/html;charset=UTF-8"/>
     <jsp:directive.page import="edu.ucsb.nceas.metacat.clientview.ClientViewHelper"/>
     <jsp:directive.page import="edu.ucsb.nceas.metacat.clientview.ClientView"/>
+    <jsp:directive.include file="settings.jsp" />
     
     <jsp:declaration>
         private ClientViewHelper            clientViewHelper;
@@ -12,7 +13,13 @@
     <html xmlns="http://www.w3.org/1999/xhtml">
         <head>
         	<title>SANParks - South African National Park Data Repository</title>
-        	<link rel="stylesheet" type="text/css" href="@systemidserver@@style-skins-path@/sanparks/sanparks.css"/>
+        	<jsp:element name="link">
+				<jsp:attribute name="rel">stylesheet</jsp:attribute>
+				<jsp:attribute name="type">text/css</jsp:attribute>
+				<jsp:attribute name="href">
+					<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/sanparks/sanparks.css"</jsp:expression>
+				</jsp:attribute>
+			</jsp:element>
         </head>
         <body style="background: #FFFFFF;">
             <jsp:useBean id="clientViewBean" scope="session" class="edu.ucsb.nceas.metacat.clientview.ClientView"/>
Index: lib/style/skins/saeon/upload.jsp
===================================================================
--- lib/style/skins/saeon/upload.jsp	(revision 3738)
+++ lib/style/skins/saeon/upload.jsp	(revision 3739)
@@ -24,16 +24,16 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 %>
-<%@ include file="../../common/common-settings.jsp"%>
+<%@ include file="settings.jsp"%>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
     <head>
         <title>SAEON - South African Environmental Observation Network Repository</title>
-        <link rel="stylesheet" href="../default/default.css" type="text/css"/>
-        <link rel="stylesheet" type="text/css" href="saeon.css"/>
-        <script language="JavaScript" type="text/JavaScript" src="saeon.js"></script>
-        <script language="JavaScript" type="text/JavaScript" src="../../common/branding.js"></script>
+        <link rel="stylesheet" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/default.css" type="text/css"/>
+        <link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.css"/>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.js"></script>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/common/branding.js"></script>
     </head>
     <body>
         <script language="JavaScript">
@@ -40,15 +40,13 @@
             function getMapFrame() {
                 return document.getElementById('mapFrame');
             }
-            insertTemplateOpening();
+            insertTemplateOpening("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
         
         <jsp:include page="SaeonUpload.jspx" />
         
         <script language="JavaScript">
-            //insertLoginBox();
-            //insertSearchBox();
-            insertTemplateClosing();
+            insertTemplateClosing("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
     </body>
 </html>
Index: lib/style/skins/saeon/saeon.js
===================================================================
--- lib/style/skins/saeon/saeon.js	(revision 3738)
+++ lib/style/skins/saeon/saeon.js	(revision 3739)
@@ -86,31 +86,31 @@
 
 
 //  Location of the header that will be displayed at the top of the page
-var HEADER_URL = "@style-skins-path@/saeon/header.jsp";
+var HEADER_URL = "style/skins/saeon/header.jsp";
 //var HEADER_URL = "";
 
 // Location of the search box that will be displayed above the  
 //  results on the results page (optional)
 var SEARCHBOX_URL = "";  //= "searchform.html"
-//var SEARCHBOX_URL = "@style-skins-path@/saeon/SaeonLogin.jspx";
+//var SEARCHBOX_URL = "style/skins/saeon/SaeonLogin.jspx";
 
 //  Location of the header that will be displayed at the top of the page
-var LEFTCOL_URL = "@style-skins-path@/saeon/leftnav.jsp";
+var LEFTCOL_URL = "style/skins/saeon/leftnav.jsp";
 //var LEFTCOL_URL = "";
   
 //  Location of the header that will be displayed at the top of the page
-//var RIGHTCOL_URL = "@style-skins-path@/saeon/spatial/pma.html";
+//var RIGHTCOL_URL = "style/skins/saeon/spatial/pma.html";
 var RIGHTCOL_URL = "";
 
 //  Location of the header that will be displayed at the top of the page
-var FOOTER_URL = "@style-skins-path@/saeon/footer.jspx";
+var FOOTER_URL = "style/skins/saeon/footer.jspx";
 //var FOOTER_URL = "";
   
 //var LOGINBOX_URL = "";
-var LOGINBOX_URL = "@style-skins-path@/saeon/SaeonLogin.jspx";
+var LOGINBOX_URL = "style/skins/saeon/SaeonLogin.jspx";
 
 //  Location of the map that will be displayed
-var MAP_URL = "@style-skins-path@/saeon/spatial/pma.html";
+var MAP_URL = "style/skins/saeon/spatial/pma.html";
 //var MAP_URL = "";
 
 
Index: lib/style/skins/saeon/SaeonLogin.jspx
===================================================================
--- lib/style/skins/saeon/SaeonLogin.jspx	(revision 3738)
+++ lib/style/skins/saeon/SaeonLogin.jspx	(revision 3739)
@@ -14,11 +14,18 @@
         private ClientViewHelper clientViewHelper = null;
     </jsp:declaration>
 
+<jsp:directive.include file="settings.jsp" />
+
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 
-	<script language="JavaScript" type="text/JavaScript" src="./searchPathQuery.js"/>
-	<script type="text/javascript">
+	<jsp:element name="script">
+		<jsp:attribute name="language">JavaScript</jsp:attribute>
+		<jsp:attribute name="src">
+			<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/saeon/searchPathQuery.js"</jsp:expression>
+		</jsp:attribute>
+	</jsp:element>
+	<script type="text/javascript" language="JavaScript">
 		function trim(stringToTrim) {
 			return(stringToTrim.replace(/^\s+|\s+$/g,""));
 		}
@@ -52,8 +59,13 @@
 	</script>
 
 	<title>SAEON - South African Environmental Observation Network Repository</title>
-	<link href="saeon.css" rel="stylesheet" type="text/css" />
-
+	<jsp:element name="link">
+		<jsp:attribute name="rel">stylesheet</jsp:attribute>
+		<jsp:attribute name="type">text/css</jsp:attribute>
+		<jsp:attribute name="href">
+			<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/saeon/saeon.css"</jsp:expression>
+		</jsp:attribute>
+	</jsp:element>
 </head>
 	
 <body>
@@ -154,9 +166,15 @@
 		</jsp:scriptlet>
 	</p>
 	
-	<form id="searchform" name="searchform" method="post" action="../../../metacat" 
-		target="_top" 
-		onsubmit="setQueryFormField()">
+	<jsp:element name="form">
+		<jsp:attribute name="id">searchform</jsp:attribute>
+		<jsp:attribute name="name">searchform</jsp:attribute>
+		<jsp:attribute name="method">post</jsp:attribute>
+		<jsp:attribute name="action">
+			<jsp:expression>METACAT_URL</jsp:expression>
+		</jsp:attribute>
+		<jsp:attribute name="target">_top</jsp:attribute>
+		<jsp:attribute name="onsubmit">setQueryFormField()</jsp:attribute>
 		<p class="regtext">
 		The repository search system is used to locate data sets of interest by 
 		searching through existing registered data sets. 
@@ -192,7 +210,7 @@
 		Browse all existing data sets by title. This operation can be slow.
 		</p>
 		<input type="button" value="Browse All" onclick="setBrowseAll();form.submit()" />
-	</form>
+	</jsp:element>
 	
 	</td>
 	<td width="250px">
@@ -204,12 +222,11 @@
 	
 	<dl class="portlet" id="portlet-login" style="width: 100%;">
 		<dt class="portletHeader">
-			<!-- <a href="./login.jsp">Log in</a>-->
 			Log in
 		</dt>
 		<dd class="portletItem odd">
 			<form name="loginForm" method="post" action="./"
-				onsubmit="return allowSubmit(this)">
+				onsubmit="return allowSubmit(this);">
 				<input name="qformat" type="hidden" value="saeon" />
 				<table>
 					<tr valign="top">
@@ -247,13 +264,22 @@
 		</dd>
 
 		<dd class="portletItem even">
-			<a href="@cgi-prefix@/ldapweb.cgi?cfg=saeon" target="_parent">
-				<img src="images/user.gif" alt="New user?" 
-				title="User" 
-				height="16" 
-				width="16" />
+			<jsp:element name="a">
+				<jsp:attribute name="target">_parent</jsp:attribute>
+				<jsp:attribute name="href">
+					<jsp:expression>CGI_PREFIX + "/ldapweb.cgi?cfg=saeon"</jsp:expression>
+				</jsp:attribute>
+				<jsp:element name="img">
+					<jsp:attribute name="src">
+						<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/saeon/images/user.gif"</jsp:expression>
+					</jsp:attribute>
+					<jsp:attribute name="alt">New User?</jsp:attribute>
+					<jsp:attribute name="title">User</jsp:attribute>
+					<jsp:attribute name="height">16</jsp:attribute>
+					<jsp:attribute name="width">16</jsp:attribute>
+				</jsp:element>	
 				New user?
-			</a>
+			</jsp:element>
 		</dd>
 	</dl>
 	
@@ -290,31 +316,58 @@
 			</table>
 		</dd>
 		<dd class="portletItem even">
-			<a target='_top' href='./index.jsp?action=Logout&amp;qformat=saeon'>
-				<img src="images/user.gif" alt="Logout" 
-				title="Logout" 
-				height="16" 
-				width="16" />
+			<jsp:element name="a">
+				<jsp:attribute name="target">_top</jsp:attribute>
+				<jsp:attribute name="href">
+					<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/saeon/index.jsp?action=Logout&amp;qformat=saeon"</jsp:expression>
+				</jsp:attribute>
+				<jsp:element name="img">
+					<jsp:attribute name="src">
+						<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/saeon/images/user.gif"</jsp:expression>
+					</jsp:attribute>
+					<jsp:attribute name="alt">logout</jsp:attribute>
+					<jsp:attribute name="title">User</jsp:attribute>
+					<jsp:attribute name="height">16</jsp:attribute>
+					<jsp:attribute name="width">16</jsp:attribute>
+				</jsp:element>	
 				logout
-			</a>
+			</jsp:element>
 		</dd>
 		<dd class="portletItem">
-			<a href="@cgi-prefix@/ldapweb.cgi?cfg=saeon&amp;stage=resetpass" target="_parent">
-				<img src="images/user.gif" alt="New user?" 
-				title="User" 
-				height="16" 
-				width="16" />
+			<jsp:element name="a">
+				<jsp:attribute name="target">_parent</jsp:attribute>
+				<jsp:attribute name="href">
+					<jsp:expression>CGI_PREFIX + "/ldapweb.cgi?cfg=saeon&amp;stage=resetpass"</jsp:expression>
+				</jsp:attribute>
+				<jsp:element name="img">
+					<jsp:attribute name="src">
+						<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/saeon/images/user.gif"</jsp:expression>
+					</jsp:attribute>
+					<jsp:attribute name="alt">reset password</jsp:attribute>
+					<jsp:attribute name="title">User</jsp:attribute>
+					<jsp:attribute name="height">16</jsp:attribute>
+					<jsp:attribute name="width">16</jsp:attribute>
+				</jsp:element>	
 				reset your password
-			</a>
+			</jsp:element>
 		</dd>
 		<dd class="portletItem even">
-			<a href="@cgi-prefix@/ldapweb.cgi?cfg=saeon&amp;stage=changepass" target="_parent">
-				<img src="images/user.gif" alt="New user?" 
-				title="User" 
-				height="16" 
-				width="16" />
+			<jsp:element name="a">
+				<jsp:attribute name="target">_parent</jsp:attribute>
+				<jsp:attribute name="href">
+					<jsp:expression>CGI_PREFIX + "/ldapweb.cgi?cfg=saeon&amp;stage=changepass"</jsp:expression>
+				</jsp:attribute>
+				<jsp:element name="img">
+					<jsp:attribute name="src">
+						<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/saeon/images/user.gif"</jsp:expression>
+					</jsp:attribute>
+					<jsp:attribute name="alt">change password</jsp:attribute>
+					<jsp:attribute name="title">User</jsp:attribute>
+					<jsp:attribute name="height">16</jsp:attribute>
+					<jsp:attribute name="width">16</jsp:attribute>
+				</jsp:element>	
 				change your password
-			</a>
+			</jsp:element>
 		</dd>
 	</dl>		
 	<jsp:scriptlet>
@@ -334,9 +387,13 @@
 			<table>
 				<tr valign="top">
 					<td align="right">
-						<form action="./upload.jsp" method="post">
+						<jsp:element name="form">
+							<jsp:attribute name="method">post</jsp:attribute>
+							<jsp:attribute name="action">
+								<jsp:expression>SERVER_URL_WITH_CONTEXT + "/style/skins/saeon/upload.jsp"</jsp:expression>
+							</jsp:attribute>
 							<input type="submit" value="Go >" class="button_login" />
-						</form>
+						</jsp:element>
 					</td>
 				</tr>
 			</table>			
@@ -370,7 +427,7 @@
 		<div style="padding-left: 100px">
 		<!-- map frame -->
         <script language="JavaScript">
-            insertMap();
+            insertMap("<jsp:expression>SERVER_URL_WITH_CONTEXT</jsp:expression>");
         </script>
         </div>
 	</td>
Index: lib/style/skins/saeon/header.jsp
===================================================================
--- lib/style/skins/saeon/header.jsp	(revision 3738)
+++ lib/style/skins/saeon/header.jsp	(revision 3739)
@@ -24,7 +24,7 @@
 	 */
 %>
 <!--____________________________max_width____________________________________-->
-
+<%@ include file="settings.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@page import="edu.ucsb.nceas.metacat.clientview.ClientViewHelper"%>
 <html>
@@ -31,20 +31,20 @@
 <head>
 <title>SAEON - South African Environmental Observation Network
 Repository</title>
-<link rel="stylesheet" type="text/css" href="saeon.css" />
+<link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.css" />
 </head>
 
 <body
-	style="background-image: url('images/bg.png'); background-repeat: repeat-x;"
+	style="background-image: url('<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/images/bg.png'); background-repeat: repeat-x;"
 	class="section-front-page" dir="ltr">
 
 <table align="center" width="100%" cellpadding="0" cellspacing="0">
 	<tr>
-		<td background="images/banner_background_left.jpg">&nbsp;</td>
+		<td background="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/images/banner_background_left.jpg">&nbsp;</td>
 		<td height="255" width="760"
-			style="background-image: url('images/logo.jpg'); background-position: top center; background-repeat: no-repeat;">
+			style="background-image: url('<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/images/logo.jpg'); background-position: top center; background-repeat: no-repeat;">
 		</td>
-		<td background="images/banner_background_right.jpg">&nbsp;</td>
+		<td background="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/images/banner_background_right.jpg">&nbsp;</td>
 	</tr>
 </table>
 <div id="visual-portal-wrapper">
@@ -62,7 +62,7 @@
 
 <ul id="portal-globalnav">
 	<li class="plain">
-		<a href="./" 
+		<a href="http://www.saeon.ac.za/" 
 		target="_top"
 		style="background-color: White; font-weight: normal" 
 		title="SAEON">SAEON</a></li>
@@ -73,7 +73,7 @@
 		title="Data Repository">Repository</a></li>
 	<!-- 	
 	<li class="plain">
-		<a href="@cgi-prefix@/register-dataset.cgi?cfg=saeon"
+		<a href="<%=CGI_PREFIX%>/register-dataset.cgi?cfg=saeon"
 		target="_top"
 		style="background-color: White; font-weight: normal" 
 		title="Register">Register</a></li>
@@ -102,7 +102,7 @@
 <h5 class="hiddenStructure">Personal tools</h5>
 <ul id="portal-personaltools">
 	<li><%=loginHTML %></li>
-	<li><a href="@cgi-prefix@/ldapweb.cgi?cfg=saeon" target="_top"> Join </a></li>
+	<li><a href="<%=CGI_PREFIX%>/ldapweb.cgi?cfg=saeon" target="_top"> Join </a></li>
 </ul>
 
 </body>
Index: lib/style/skins/saeon/confirm.jsp
===================================================================
--- lib/style/skins/saeon/confirm.jsp	(revision 3738)
+++ lib/style/skins/saeon/confirm.jsp	(revision 3739)
@@ -24,18 +24,19 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 %>
+<%@ include file="settings.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
     <head>
         <title>SAEON - South African Environmental Observation Network</title>
-        <link rel="stylesheet" href="../default/default.css" type="text/css"/>
-        <link rel="stylesheet" type="text/css" href="saeon.css"/>
-        <script language="JavaScript" type="text/JavaScript" src="saeon.js"></script>
-        <script language="JavaScript" type="text/JavaScript" src="../../common/branding.js"></script>
+        <link rel="stylesheet" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/default.css" type="text/css"/>
+        <link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.css"/>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.js"></script>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/common/branding.js"></script>
     </head>
     <body>
         <script language="JavaScript">
-            insertTemplateOpening();
+            insertTemplateOpening("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
         
         <!-- Main content -->
@@ -43,7 +44,7 @@
         
         <!-- wrap it up with the closing -->
         <script language="JavaScript">
-            insertTemplateClosing();
+            insertTemplateClosing("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
     </body>
 </html>
Index: lib/style/skins/saeon/leftnav.jsp
===================================================================
--- lib/style/skins/saeon/leftnav.jsp	(revision 3738)
+++ lib/style/skins/saeon/leftnav.jsp	(revision 3739)
@@ -1,8 +1,9 @@
+<%@ include file="settings.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>SAEON - South African Environmental Observation Network Repository</title>
-<link rel="stylesheet" type="text/css" href="saeon.css" />
+<link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.css" />
 </head>
 
 <body class="templateleftcolclass">
Index: lib/style/skins/saeon/settings.jsp
===================================================================
--- lib/style/skins/saeon/settings.jsp	(nonexistent)
+++ lib/style/skins/saeon/settings.jsp	(revision 3739)
@@ -0,0 +1,47 @@
+<%@page import="edu.ucsb.nceas.metacat.MetaCatUtil"%>
+<!--
+  *   '$RCSfile$'
+  *     Authors: Matthew Brooke
+  *   Copyright: 2000 Regents of the University of California and the
+  *              National Center for Ecological Analysis and Synthesis
+  * For Details: http://www.nceas.ucsb.edu/
+  *
+  *    '$Author$'
+  *      '$Date$'
+  *  '$Revision$'
+  *
+  * Settings file for the default metacat skin
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-->
+<%
+   
+   // CONTEXT NAME of metacat installed:
+	String      CONTEXT_NAME          = request.getContextPath();
+	
+	// URL of SERVER with context (and optional port)
+	String     SERVER_URL_WITH_CONTEXT =  request.getScheme() + "://" + request.getServerName();
+	if ( request.getLocalPort() != 80 ) {
+		SERVER_URL_WITH_CONTEXT += ":" + request.getLocalPort();
+	}
+	SERVER_URL_WITH_CONTEXT += CONTEXT_NAME;
+
+	// URL of metacat to be used for login & searching:
+	String      METACAT_URL           =  SERVER_URL_WITH_CONTEXT+ "/metacat";
+	
+	// URL for LDAP login actions
+	String 		CGI_PREFIX = MetaCatUtil.getOption("cgi-prefix");
+
+%>

Property changes on: lib/style/skins/saeon/settings.jsp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: lib/style/skins/saeon/index.jsp
===================================================================
--- lib/style/skins/saeon/index.jsp	(revision 3738)
+++ lib/style/skins/saeon/index.jsp	(revision 3739)
@@ -24,33 +24,27 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 %>
-<%@ include file="../../common/common-settings.jsp"%>
-
+<%@ include file="settings.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
     <head>
         <title>SAEON - South African Environmental Observation Network Repository</title>
-        <link rel="stylesheet" href="../default/default.css" type="text/css"/>
-        <link rel="stylesheet" type="text/css" href="saeon.css"/>
-        <script language="JavaScript" type="text/JavaScript" src="saeon.js"></script>
-        <script language="JavaScript" type="text/JavaScript" src="../../common/branding.js"></script>
+        <link rel="stylesheet" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/default.css" type="text/css"/>
+        <link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.css"/>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.js"></script>
+        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/common/branding.js"></script>
     </head>
     <body>
         <script language="JavaScript">
-            insertTemplateOpening();
+            insertTemplateOpening("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
         
         <!-- Main content -->
         <jsp:include page="SaeonLogin.jspx" />
         
-        <!-- map frame -->
-        <script language="JavaScript">
-            //insertMap();
-        </script>
-        
         <!-- wrap it up with the closing -->
         <script language="JavaScript">
-            insertTemplateClosing();
+            insertTemplateClosing("<%=SERVER_URL_WITH_CONTEXT%>");
         </script>
     </body>
 </html>
Index: lib/style/skins/saeon/saeon.xml
===================================================================
--- lib/style/skins/saeon/saeon.xml	(revision 3738)
+++ lib/style/skins/saeon/saeon.xml	(revision 3739)
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <style-set name="knp">
 <!-- general login & search -->
-  <default-style>@systemidserver@@style-common-path@/ascii-treeview.xsl</default-style>
+  <default-style>style/common/ascii-treeview.xsl</default-style>
 
   <doctype publicid="-//NCEAS//resultset//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/resultset.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/resultset.xsl</target>
   </doctype>
 
   <doctype publicid="-//NCEAS//login//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/saeon/saeon-login.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/skins/saeon/saeon-login.xsl</target>
   </doctype>
   <doctype publicid="-//NCEAS//unauth_login//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/saeon/saeon-login.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/skins/saeon/saeon-login.xsl</target>
   </doctype>
 
 <!--
@@ -18,7 +18,7 @@
     ARE THESE STILL NEEDED????????????
 
   <doctype publicid="-//NCEAS//eml-generic//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/generic-morpho.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/generic-morpho.xsl</target>
   </doctype>
 -->
 
@@ -27,64 +27,64 @@
 <!-- NOTE these settings are unchanged from the previous version - only the xsl 
      filename has changed from "eml-dataset-display.xsl" to "eml-dataset-2.0.0beta4.xsl" -->
   <doctype publicid="eml://ecoinformatics.org/eml-2.0.1">
-    <!-- <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/saeon/saeon.xsl</target> -->
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.1/eml.xsl</target>
+    <!-- <target publicid="-//W3C//HTML//EN">style/skins/saeon/saeon.xsl</target> -->
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.1/eml.xsl</target>
   </doctype>
   <doctype publicid="eml://ecoinformatics.org/eml-2.0.0">
-    <!-- <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/saeon/saeon.xsl</target> -->
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.1/eml.xsl</target>
+    <!-- <target publicid="-//W3C//HTML//EN">style/skins/saeon/saeon.xsl</target> -->
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.1/eml.xsl</target>
   </doctype>
   <doctype publicid="-//NCEAS//eml-dataset//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
   </doctype>
   <doctype publicid="-//NCEAS//eml-dataset-2.0//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
   </doctype>
   <doctype publicid="-//NCEAS//eml-resource//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta4/eml-dataset-2.0.0beta4.xsl</target>
   </doctype>
 <!-- beta6 modules -->
   <doctype publicid="-//ecoinformatics.org//eml-access-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-access-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-access-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-attribute-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-attribute-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-attribute-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-constraint-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-constraint-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-constraint-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-coverage-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-coverage-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-coverage-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-dataset-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-dataset-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-entity-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-entity-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-entity-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-literature-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-literature-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-literature-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-physical-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-physical-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-physical-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-project-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-project-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-project-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-protocol-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-protocol-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-protocol-2.0.0beta6.xsl</target>
   </doctype>
   <doctype publicid="-//ecoinformatics.org//eml-software-2.0.0beta6//EN">
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/eml-2.0.0beta6/eml-software-2.0.0beta6.xsl</target>
+    <target publicid="-//W3C//HTML//EN">style/common/eml-2.0.0beta6/eml-software-2.0.0beta6.xsl</target>
   </doctype>
 
   <!-- NBII/FGDC styles -->
   <doctype publicid="metadata">
-    <!--target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/fgdc/nbii-metacat.xsl</target-->
-    <!-- <target publicid="-//W3C//HTML//EN">@systemidserver@@style-skins-path@/saeon/saeon.xsl</target> -->
-    <target publicid="-//W3C//HTML//EN">@systemidserver@@style-common-path@/fgdc/fgdc_1.xsl</target>
+    <!--target publicid="-//W3C//HTML//EN">style/common/fgdc/nbii-metacat.xsl</target-->
+    <!-- <target publicid="-//W3C//HTML//EN">style/skins/saeon/saeon.xsl</target> -->
+    <target publicid="-//W3C//HTML//EN">style/common/fgdc/fgdc_1.xsl</target>
   </doctype>
 </style-set>
