Remove the need to implement loadComplete which is empty in most cases

Restructure presenters in layers based on features allowing for simpler cache implementations
Minor XSLT changes to support new layout from presentation which is more consistent

4 files changed, 10 insertions, 10 deletions

diff --git a/gentoobrowse/xslt/base.xslt b/gentoobrowse/xslt/base.xslt
index 34f2dad..87bffca 100644
--- a/gentoobrowse/xslt/base.xslt
+++ b/gentoobrowse/xslt/base.xslt
@@ -29,17 +29,17 @@
 						<li><a href="/categories">Browse</a></li>
 						<li><a href="/popular">Popular</a></li>
 						<li><a href="JavaScript: void(0);" onclick="toggleForm('#search');" rel="nofollow">Search</a></li>
-						<xsl:if test="count(/gentoo/project2:session/project2:var[@name='loggedInUserID']) = 0">
+						<xsl:if test="count(/gentoo/project2:session/var[@name='loggedInUserID']) = 0">
 							<li><a href="JavaScript: void(0);" onclick="toggleForm('#login');" rel="nofollow">Login</a></li>
 						</xsl:if>
-						<xsl:if test="count(/gentoo/project2:session/project2:var[@name='loggedInUserID']) &gt; 0">
+						<xsl:if test="count(/gentoo/project2:session/var[@name='loggedInUserID']) &gt; 0">
 							<li><a href="/accountHome" rel="nofollow">My Account</a></li>
 						</xsl:if>
 					</ul>
 					<form id="search" class="popup" action="/search" method="get">
 						<h1>Site search</h1>
 						<input type="search" name="criteria" placeholder="Search criteria" required="required" autofocus="autofocus">
-							<xsl:attribute name="value"><xsl:value-of select="/gentoo/project2:params/project2:param[@name='criteria']/@value" /></xsl:attribute>
+							<xsl:attribute name="value"><xsl:value-of select="/gentoo/project2:params/param[@name='criteria']/@value" /></xsl:attribute>
 						</input>
 						<input type="submit" value="Search" class="submit" />
 						<input type="submit" value="Cancel" class="submit" onclick="return hideForm('#search');" />
diff --git a/gentoobrowse/xslt/category.xslt b/gentoobrowse/xslt/category.xslt
index 16ec138..ef16965 100644
--- a/gentoobrowse/xslt/category.xslt
+++ b/gentoobrowse/xslt/category.xslt
@@ -4,9 +4,9 @@
 	<xsl:import href="base.xslt" />
   <xsl:output encoding="utf-8" method="html" media-type="text/html" indent="yes" />
   <xsl:template name="head">
-		<title><xsl:value-of select="/gentoo/project2:uriElems/project2:uriElem[2]" /> Package List - Gentoo Browse</title>
+		<title><xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> Package List - Gentoo Browse</title>
 		<meta name="description">
-			<xsl:attribute name="content">Complete list of Gentoo Linux packages in the <xsl:value-of select="/gentoo/project2:uriElems/project2:uriElem[2]" /> category</xsl:attribute>
+			<xsl:attribute name="content">Complete list of Gentoo Linux packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> category</xsl:attribute>
 		</meta>
 		<link rel="contents" href="/categories" />
   </xsl:template>
diff --git a/gentoobrowse/xslt/herd.xslt b/gentoobrowse/xslt/herd.xslt
index 02ede25..4f39112 100644
--- a/gentoobrowse/xslt/herd.xslt
+++ b/gentoobrowse/xslt/herd.xslt
@@ -4,16 +4,16 @@
 	<xsl:import href="base.xslt" />
   <xsl:output encoding="utf-8" method="html" media-type="text/html" indent="yes" />
   <xsl:template name="head">
-	<title>Packages in the <xsl:value-of select="/gentoo/project2:uriElems/project2:uriElem[2]" /> herd - Gentoo Browse</title>
+	<title>Packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> herd - Gentoo Browse</title>
 	<meta name="description">
-		<xsl:attribute name="content">Packages in the <xsl:value-of select="/gentoo/project2:uriElems/project2:uriElem[2]" /> herd</xsl:attribute>
+		<xsl:attribute name="content">Packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> herd</xsl:attribute>
 	</meta>
   </xsl:template>
   <xsl:template name="content">
 	<xsl:apply-templates select="/gentoo/packages" />
   </xsl:template>
   <xsl:template match="/gentoo/packages">
-  	<h2>Packages in the <xsl:value-of select="/gentoo/project2:uriElems/project2:uriElem[2]" /> herd</h2>
+  	<h2>Packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> herd</h2>
 	<ul>
 		<xsl:apply-templates select="/gentoo/packages/package" />
 	</ul>
diff --git a/gentoobrowse/xslt/package.xslt b/gentoobrowse/xslt/package.xslt
index e1b02fc..8547ff3 100644
--- a/gentoobrowse/xslt/package.xslt
+++ b/gentoobrowse/xslt/package.xslt
@@ -13,7 +13,7 @@
 				$("section#pkgdetails").tabs();
 			})
 		</script>
-		<xsl:if test="count(/gentoo/project2:session/project2:var[@name='loggedInUserID']) != 0">
+		<xsl:if test="count(/gentoo/project2:session/var[@name='loggedInUserID']) != 0">
 			<script type="text/javascript" src="/js/pkgtracking.js" />
 		</xsl:if>
   </xsl:template>
@@ -36,7 +36,7 @@
 						<xsl:value-of select="herd" />
 					</a>)</small>
 				</xsl:if>
-				<xsl:if test="count(/gentoo/project2:session/project2:var[@name='loggedInUserID']) != 0">
+				<xsl:if test="count(/gentoo/project2:session/var[@name='loggedInUserID']) != 0">
 					<a id="dotrack">
 						<xsl:attribute name="href">javascript:track(<xsl:value-of select="/gentoo/summary/package/packageid" />);</xsl:attribute>
 						<xsl:if test="count(tracks/track) = 1">