Add a common collection of data containing the poweredBy folk and replace the hardcoded bit from the template with data from there

15 files changed, 42 insertions, 12 deletions

diff --git a/gentoobrowse/base.xslt b/gentoobrowse/base.xslt
index e516454..357fd9d 100644
--- a/gentoobrowse/base.xslt
+++ b/gentoobrowse/base.xslt
@@ -52,18 +52,14 @@
 				The name "Gentoo" and the "g" logo are trademarks of the Gentoo Foundation, Inc.
 			</div>
 			<div class="poweredby">
-				Powered by
-				<a href="http://www.gentoo.org/">Gentoo</a>
-				|
-				<a href="http://www.postgresql.org/">PostgreSQL</a>
-				|
-				<a href="http://httpd.apache.org/">Apache</a>
-				|
-				<a href="http://www.fastcgi.com/drupal/">FastCGI</a>
-				|
-				<a href="http://www.w3.org/TR/xslt">XSLT</a>
-				|
-				<a href="http://project2.randomdan.homeip.net">Project2</a>
+				Powered by |
+				<xsl:for-each select="/gentoo/power/by">
+					<a>
+						<xsl:attribute name="href"><xsl:value-of select="url" /></xsl:attribute>
+						<xsl:value-of select="name" />
+					</a> |
+				</xsl:for-each>
+				Many thanks.
 			</div>
 		</body>
 	</html>
diff --git a/gentoobrowse/datasources/poweredBy.txt b/gentoobrowse/datasources/poweredBy.txt
new file mode 100644
index 0000000..0e3bead
--- /dev/null
+++ b/gentoobrowse/datasources/poweredBy.txt
@@ -0,0 +1,7 @@
+Gentoo|http://www.gentoo.org/
+PostgreSQL|http://www.postgresql.org/
+Apache|http://httpd.apache.org/
+FastCGI|http://www.fastcgi.com/drupal/
+XSLT|http://www.w3.org/TR/xslt/
+Boost|http://www.boost.org/
+Project2|http://project2.randomdan.homeip.net/
diff --git a/gentoobrowse/present/accountHome.xml b/gentoobrowse/present/accountHome.xml
index f725272..9186f75 100644
--- a/gentoobrowse/present/accountHome.xml
+++ b/gentoobrowse/present/accountHome.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <view name="index" root="gentoo" contenttype="text/xml-xslt" style="login.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
+	<xi:include href="../views/webcommon.xml" />
 	<xi:include href="../checks/loggedIn.xml" />
 	<project2:rawview>
 		<form caption="Logout" submit="Logout" action="/dologout" method="post" />
diff --git a/gentoobrowse/present/accountTracked.xml b/gentoobrowse/present/accountTracked.xml
index 746631b..0359c43 100644
--- a/gentoobrowse/present/accountTracked.xml
+++ b/gentoobrowse/present/accountTracked.xml
@@ -4,6 +4,7 @@
 	<xi:include href="../datasources/postgres-web.xml" />
 	<xi:include href="../checks/loggedIn.xml" />
 	<xi:include href="../views/tracked.xml" />
+	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="trackedPackages" source="trackedPackages" rootname="trackedebuilds" recordname="ebuild" filter="userid">
 		<parameters>
 			<param name="userid"><value source="session" name="loggedInUserID" /></param>
diff --git a/gentoobrowse/present/categories.xml b/gentoobrowse/present/categories.xml
index aa63a6c..ae982ce 100644
--- a/gentoobrowse/present/categories.xml
+++ b/gentoobrowse/present/categories.xml
@@ -2,5 +2,6 @@
 <view name="categories" root="gentoo" contenttype="text/xml-xslt" style="categories.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
 	<xi:include href="../views/categories.xml" />
+	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="categories" source="categories" rootname="categories" recordname="category" />
 </view>
diff --git a/gentoobrowse/present/category.xml b/gentoobrowse/present/category.xml
index f45dc97..d47a33b 100644
--- a/gentoobrowse/present/category.xml
+++ b/gentoobrowse/present/category.xml
@@ -2,6 +2,7 @@
 <view name="category" root="gentoo" contenttype="text/xml-xslt" style="category.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
 	<xi:include href="../views/category.xml" />
+	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="categoryPackages" source="categoryPackages" rootname="packages" recordname="package" filter="byCatName">
 		<parameters>
 			<param name="catname"><value source="uri" index="1" /></param>
diff --git a/gentoobrowse/present/confirm.xml b/gentoobrowse/present/confirm.xml
index adf62a7..d855b42 100644
--- a/gentoobrowse/present/confirm.xml
+++ b/gentoobrowse/present/confirm.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <view name="confirm" root="gentoo" contenttype="text/xml-xslt" style="login.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
+	<xi:include href="../views/webcommon.xml" />
 	<project2:rawview>
 		<para><p xmlns="http://www.w3.org/1999/xhtml">Please enter the confirmation code from your welcome email.</p></para>
 		<form caption="Confirmation" submit="Confirm" action="/doconfirm" method="post">
diff --git a/gentoobrowse/present/index.xml b/gentoobrowse/present/index.xml
index 36b5da6..40b97d4 100644
--- a/gentoobrowse/present/index.xml
+++ b/gentoobrowse/present/index.xml
@@ -2,6 +2,7 @@
 <view name="index" root="gentoo" contenttype="text/xml-xslt" style="home.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
 	<xi:include href="../views/newebuilds.xml" />
+	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="newebuilds" source="newebuilds" rootname="newebuilds" recordname="ebuild" filter="syncCount">
 		<parameters>
 			<param name="count" value="3" />
diff --git a/gentoobrowse/present/login.xml b/gentoobrowse/present/login.xml
index b21689f..545d3d5 100644
--- a/gentoobrowse/present/login.xml
+++ b/gentoobrowse/present/login.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <view name="login" root="gentoo" contenttype="text/xml-xslt" style="login.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
+	<xi:include href="../views/webcommon.xml" />
 	<project2:rawview>
 		<form caption="Login" submit="Login" action="/dologin" method="post">
 			<input type="text" name="username" caption="User name"
diff --git a/gentoobrowse/present/package.xml b/gentoobrowse/present/package.xml
index 69c13cc..06a3b73 100644
--- a/gentoobrowse/present/package.xml
+++ b/gentoobrowse/present/package.xml
@@ -2,6 +2,7 @@
 <view name="package" root="gentoo" contenttype="text/xml-xslt" style="package.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
 	<xi:include href="../views/package.xml" />
+	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="package" source="packages" rootname="summary" recordname="package" filter="catAndName">
 		<parameters>
 			<param name="cat"><value source="uri" index="1" /></param>
diff --git a/gentoobrowse/present/popular.xml b/gentoobrowse/present/popular.xml
index 1ca9850..feb0f0a 100644
--- a/gentoobrowse/present/popular.xml
+++ b/gentoobrowse/present/popular.xml
@@ -2,5 +2,6 @@
 <view name="popular" root="gentoo" contenttype="text/xml-xslt" style="popular.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
 	<xi:include href="../views/popular.xml" />
+	<xi:include href="../views/webcommon.xml" />
 	<project2:view name="popularPackages" source="popularPackages" rootname="packages" recordname="package" />
 </view>
diff --git a/gentoobrowse/present/search.xml b/gentoobrowse/present/search.xml
index b2f0f97..de448f3 100644
--- a/gentoobrowse/present/search.xml
+++ b/gentoobrowse/present/search.xml
@@ -2,6 +2,7 @@
 <view name="search" root="gentoo" contenttype="text/xml-xslt" style="search.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
 	<xi:include href="../views/search.xml" />
+	<xi:include href="../views/webcommon.xml" />
 	<project2:rawview>
 		<form caption="Search" submit="Search" action="/search" method="get" autofocus="criteria">
 			<input type="text" caption="Criteria" name="criteria"
diff --git a/gentoobrowse/present/signup.xml b/gentoobrowse/present/signup.xml
index 44640ce..7c66d7f 100644
--- a/gentoobrowse/present/signup.xml
+++ b/gentoobrowse/present/signup.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <view name="index" root="gentoo" contenttype="text/xml-xslt" style="login.xslt" xmlns:xi="http://www.w3.org/2001/XInclude"
 		xmlns:project2="http://project2.randomdan.homeip.net">
+	<xi:include href="../views/webcommon.xml" />
 	<project2:rawview>
 		<form caption="Signup" submit="Signup" action="/dosignup" method="post">
 			<input type="text" name="username" caption="User name" auto="off" />
diff --git a/gentoobrowse/views/poweredBy.xml b/gentoobrowse/views/poweredBy.xml
new file mode 100644
index 0000000..7a8faab
--- /dev/null
+++ b/gentoobrowse/views/poweredBy.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<block xmlns:project2="http://project2.randomdan.homeip.net">
+	<project2:filerows name="poweredBy" path="datasources/poweredBy.txt" fieldSep="|" newline="&#10;" encoding="ascii">
+		<columns>
+			<column>name</column>
+			<column>url</column>
+		</columns>
+	</project2:filerows>
+	<project2:view name="viewPoweredBy" source="poweredBy" rootname="power" recordname="by" />
+</block>
+
diff --git a/gentoobrowse/views/webcommon.xml b/gentoobrowse/views/webcommon.xml
new file mode 100644
index 0000000..fd84a41
--- /dev/null
+++ b/gentoobrowse/views/webcommon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<block xmlns:xi="http://www.w3.org/2001/XInclude">
+	<xi:include href="poweredBy.xml" />
+</block>
+