From 6ad0e6c278e13bb9b82c70ac58cbb46a9e69984b Mon Sep 17 00:00:00 2001
From: erlehmann <erlehmann@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Thu, 14 Feb 2008 15:23:28 +0000
Subject: [PATCH] prefix variable names that specify a path with path_ instead
 of page_

git-svn-id: http://yolanda.mister-muffin.de/svn@237 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/site/main.xml           | 32 ++++++++++++++--------------
 trunk/xsl/opensearch.xsl      |  4 ++--
 trunk/xsl/rss.xsl             |  8 +++----
 trunk/xsl/xhtml.xsl           | 40 +++++++++++++++++------------------
 trunk/xsl/xhtml/frontpage.xsl |  8 +++----
 trunk/xsl/xhtml/loginform.xsl |  8 +++----
 trunk/xsl/xhtml/register.xsl  |  2 +-
 trunk/xsl/xhtml/results.xsl   |  2 +-
 trunk/xsl/xhtml/settings.xsl  |  2 +-
 trunk/xsl/xhtml/upload.xsl    | 12 +++++------
 10 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/trunk/site/main.xml b/trunk/site/main.xml
index edc1091..b70ab7e 100755
--- a/trunk/site/main.xml
+++ b/trunk/site/main.xml
@@ -8,22 +8,22 @@
 	<string id="site_motto">WebTV free as in Speech</string>
 
 	<!-- invisible -->
-	<string id="page_settings">/settings.pl</string>
-	<string id="page_login">/login.pl</string>
-	<string id="page_login-openid">/login.pl?action=openid</string>
-	<string id="page_logout">/login.pl?action=logout</string>
-	<string id="page_authors">http://yolanda.mister-muffin.de/trac</string>
-	<string id="page_license">/LICENSE</string>
-	<string id="page_source-code">http://yolanda.mister-muffin.de/trac/browser/trunk</string>
-	<string id="page_register">/register.pl</string>
-	<string id="page_report_bug">http://yolanda.mister-muffin.de/trac/newticket</string>
-	<string id="page_results">/search.pl?query=</string>
-	<string id="page_root">http://localhost/</string>
-	<string id="page_upload">/upload.pl</string>
-	<string id="page_uploader">/uploader.pl</string>
-	<string id="page_query_latestadditions">/search.pl?query=orderby:timestamp%20sort:descending</string>
-	<string id="page_query_mostdownloads">/search.pl?query=orderby:downloadcount%20sort:descending</string>
-	<string id="page_query_mostviews">/search.pl?query=orderby:viewcount%20sort:descending</string>
+	<string id="path_settings">/settings.pl</string>
+	<string id="path_login">/login.pl</string>
+	<string id="path_login-openid">/login.pl?action=openid</string>
+	<string id="path_logout">/login.pl?action=logout</string>
+	<string id="path_authors">http://yolanda.mister-muffin.de/trac</string>
+	<string id="path_license">/LICENSE</string>
+	<string id="path_source-code">http://yolanda.mister-muffin.de/trac/browser/trunk</string>
+	<string id="path_register">/register.pl</string>
+	<string id="path_report_bug">http://yolanda.mister-muffin.de/trac/newticket</string>
+	<string id="path_results">/search.pl?query=</string>
+	<string id="path_root">http://localhost/</string>
+	<string id="path_upload">/upload.pl</string>
+	<string id="path_uploader">/uploader.pl</string>
+	<string id="path_query_latestadditions">/search.pl?query=orderby:timestamp%20sort:descending</string>
+	<string id="path_query_mostdownloads">/search.pl?query=orderby:downloadcount%20sort:descending</string>
+	<string id="path_query_mostviews">/search.pl?query=orderby:viewcount%20sort:descending</string>
 
 </strings>
 
diff --git a/trunk/xsl/opensearch.xsl b/trunk/xsl/opensearch.xsl
index 749de9a..54d86ea 100644
--- a/trunk/xsl/opensearch.xsl
+++ b/trunk/xsl/opensearch.xsl
@@ -40,7 +40,7 @@
 			width="16"
 			type="image/x-icon"
 		>
-			<xsl:value-of select="$site_strings[@id='page_root']" />images/favicon.ico
+			<xsl:value-of select="$site_strings[@id='path_root']" />images/favicon.ico
 		</Image>
 
 		<Query
@@ -54,7 +54,7 @@
 
 		<Url type="text/html">
 			<xsl:attribute name="template">
-				<xsl:value-of select="$site_strings[@id='page_root']" />/search.pl?query={searchTerms}
+				<xsl:value-of select="$site_strings[@id='path_root']" />/search.pl?query={searchTerms}
 			</xsl:attribute>
 		</Url>
 
diff --git a/trunk/xsl/rss.xsl b/trunk/xsl/rss.xsl
index 6692517..4d12094 100644
--- a/trunk/xsl/rss.xsl
+++ b/trunk/xsl/rss.xsl
@@ -37,8 +37,8 @@
 
 		<channel>
 			<xsl:attribute name="rdf:about">
-				<xsl:value-of select="$site_strings[@id='page_root']" />
-				<xsl:value-of select="$site_strings[@id='page_results']" />
+				<xsl:value-of select="$site_strings[@id='path_root']" />
+				<xsl:value-of select="$site_strings[@id='path_results']" />
 				<xsl:value-of select="//results/@query" />&#38;xslt=rss
 			</xsl:attribute>
 			<title>
@@ -47,8 +47,8 @@
 				<xsl:value-of select="//results/@query" />
 			</title>
 			<link>
-				<xsl:value-of select="$site_strings[@id='page_root']" />
-				<xsl:value-of select="$site_strings[@id='page_results']" />
+				<xsl:value-of select="$site_strings[@id='path_root']" />
+				<xsl:value-of select="$site_strings[@id='path_results']" />
 				<xsl:value-of select="//results/@query" />&#38;
 			</link>
 			<description>
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 0d90b87..777c898 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -83,8 +83,8 @@
 						<xsl:value-of select="$locale_strings[@id='rss_title_results_this_page']" />
 					</xsl:attribute>
 					<xsl:attribute name="href">
-						<xsl:value-of select="$site_strings[@id='page_root']" />
-						<xsl:value-of select="$site_strings[@id='page_results']" />
+						<xsl:value-of select="$site_strings[@id='path_root']" />
+						<xsl:value-of select="$site_strings[@id='path_results']" />
 						<xsl:value-of select="//results/@query" />
 						&amp;pagesize=<xsl:value-of select="//results/@pagesize" />
 						&amp;page=<xsl:value-of select="//results/@page" />
@@ -97,8 +97,8 @@
 						<xsl:value-of select="$locale_strings[@id='rss_title_results_all_pages']" />
 					</xsl:attribute>
 					<xsl:attribute name="href">
-						<xsl:value-of select="$site_strings[@id='page_root']" />
-						<xsl:value-of select="$site_strings[@id='page_results']" />
+						<xsl:value-of select="$site_strings[@id='path_root']" />
+						<xsl:value-of select="$site_strings[@id='path_results']" />
 						<xsl:value-of select="//results/@query" />
 						&amp;pagesize=99999
 						&amp;page=1
@@ -113,7 +113,7 @@
 				type="application/opensearchdescription+xml"
 			>
 				<xsl:attribute name="href">
-					<xsl:value-of select="$site_strings[@id='page_root']" />?xslt=opensearch
+					<xsl:value-of select="$site_strings[@id='path_root']" />?xslt=opensearch
 				</xsl:attribute>
 				<xsl:attribute name="title">
 					<xsl:value-of select="$site_strings[@id='site_name']" />
@@ -160,21 +160,21 @@
 	
 					<a class="header latest-additions">
 						<xsl:attribute name="href">
-							<xsl:value-of select="$site_strings[@id='page_query_latestadditions']" />
+							<xsl:value-of select="$site_strings[@id='path_query_latestadditions']" />
 						</xsl:attribute>
 						<xsl:value-of select="$locale_strings[@id='query_latestadditions']" />
 					</a>
 
 					<a class="header most-views">
 						<xsl:attribute name="href">
-							<xsl:value-of select="$site_strings[@id='page_query_mostviews']" />
+							<xsl:value-of select="$site_strings[@id='path_query_mostviews']" />
 						</xsl:attribute>
 						<xsl:value-of select="$locale_strings[@id='query_mostviews']" />
 					</a>
 
 					<a class="header most-downloads">
 						<xsl:attribute name="href">
-							<xsl:value-of select="$site_strings[@id='page_query_mostdownloads']" />
+							<xsl:value-of select="$site_strings[@id='path_query_mostdownloads']" />
 						</xsl:attribute>
 						<xsl:value-of select="$locale_strings[@id='query_mostdownloads']" />
 					</a>
@@ -185,28 +185,28 @@
 	<!--
 							<a class="header">
 								<xsl:attribute name="href">
-									<xsl:value-of select="$site_strings[@id='page_login']" />
+									<xsl:value-of select="$site_strings[@id='path_login']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='header_login-to-upload']" />
 							</a>
 	-->
 							<a class="header register">
 								<xsl:attribute name="href">
-									<xsl:value-of select="$site_strings[@id='page_register']" />
+									<xsl:value-of select="$site_strings[@id='path_register']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='register']" />
 							</a>
 	
 							<a class="header login">
 								<xsl:attribute name="href">
-									<xsl:value-of select="$site_strings[@id='page_login']" />
+									<xsl:value-of select="$site_strings[@id='path_login']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='login']" />
 							</a>
 	
 							<a class="header login-openid">
 								<xsl:attribute name="href">
-									<xsl:value-of select="$site_strings[@id='page_login-openid']" />
+									<xsl:value-of select="$site_strings[@id='path_login-openid']" />
 								</xsl:attribute>
 								<img class="openid-icon" src="/images/openid-icon.png" alt="open id logo" />
 								<xsl:value-of select="$locale_strings[@id='login_openid']" />
@@ -217,14 +217,14 @@
 
 							<a class="header upload-video">
 								<xsl:attribute name="href">
-									<xsl:value-of select="$site_strings[@id='page_upload']" />
+									<xsl:value-of select="$site_strings[@id='path_upload']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='header_upload-video']" />
 							</a>
 
 							<a class="header preferences">
 								<xsl:attribute name="href">
-									<xsl:value-of select="$site_strings[@id='page_settings']" />
+									<xsl:value-of select="$site_strings[@id='path_settings']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='settings_details']" />
 							</a>
@@ -242,7 +242,7 @@
 
 							<a class="header logout">
 								<xsl:attribute name="href">
-									<xsl:value-of select="$site_strings[@id='page_logout']" />
+									<xsl:value-of select="$site_strings[@id='path_logout']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='logout']" />
 							</a>
@@ -299,21 +299,21 @@
 
 					<a class="footer view-license">
 						<xsl:attribute name="href">
-							<xsl:value-of select="$site_strings[@id='page_license']" />
+							<xsl:value-of select="$site_strings[@id='path_license']" />
 						</xsl:attribute>
 						<xsl:value-of select="$locale_strings[@id='footer_license']" />
 					</a>
 
 					<a class="footer view-source-code">
 						<xsl:attribute name="href">
-							<xsl:value-of select="$site_strings[@id='page_source-code']" />
+							<xsl:value-of select="$site_strings[@id='path_source-code']" />
 						</xsl:attribute>
 					<xsl:value-of select="$locale_strings[@id='footer_source_code']" />
 					</a>
 
 					<a class="footer report-bug">
 						<xsl:attribute name="href">
-							<xsl:value-of select="$site_strings[@id='page_report_bug']" />
+							<xsl:value-of select="$site_strings[@id='path_report_bug']" />
 						</xsl:attribute>
 						<xsl:value-of select="$locale_strings[@id='footer_report_bug']" />
 					</a>
@@ -362,7 +362,7 @@
 	<div class="search-small">
 		<form method="get" enctype="text/plain">
 			<xsl:attribute name="action">
-				<xsl:value-of select="$site_strings[@id='page_results']" />
+				<xsl:value-of select="$site_strings[@id='path_results']" />
 			</xsl:attribute>
 			<fieldset>
 				<xsl:value-of select="$locale_strings[@id='search']" />:
@@ -418,7 +418,7 @@
 					font-size:<xsl:value-of select="round((32-12)*(number(count)-number($min))div (number($max)-number($min)))+12" />px
 				</xsl:attribute>
 				<xsl:attribute name="href">
-					<xsl:value-of select="$site_strings[@id='page_results']" />
+					<xsl:value-of select="$site_strings[@id='path_results']" />
 					tag:
 					<xsl:value-of select="text" />
 				</xsl:attribute>
diff --git a/trunk/xsl/xhtml/frontpage.xsl b/trunk/xsl/xhtml/frontpage.xsl
index 781d0a4..f728290 100644
--- a/trunk/xsl/xhtml/frontpage.xsl
+++ b/trunk/xsl/xhtml/frontpage.xsl
@@ -14,7 +14,7 @@
 	<div class="search">
 		<form method="get" enctype="text/plain">
 			<xsl:attribute name="action">
-				<xsl:value-of select="$site_strings[@id='page_results']" />
+				<xsl:value-of select="$site_strings[@id='path_results']" />
 			</xsl:attribute>
 			<fieldset>
 				<input type="text" name="query" size="40" /><br />
@@ -40,21 +40,21 @@
 	<div class="toplists">
 		<a>
 			<xsl:attribute name="href">
-				<xsl:value-of select="$site_strings[@id='page_query_latestadditions']" />
+				<xsl:value-of select="$site_strings[@id='path_query_latestadditions']" />
 			</xsl:attribute>
 			<xsl:value-of select="$locale_strings[@id='query_latestadditions']" />
 		</a>
 		<xsl:value-of select="$locale_strings[@id='separator']" />
 		<a>
 			<xsl:attribute name="href">
-				<xsl:value-of select="$site_strings[@id='page_query_mostdownloads']" />
+				<xsl:value-of select="$site_strings[@id='path_query_mostdownloads']" />
 			</xsl:attribute>
 			<xsl:value-of select="$locale_strings[@id='query_mostdownloads']" />
 		</a>
 		<xsl:value-of select="$locale_strings[@id='separator']" />
 		<a>
 			<xsl:attribute name="href">
-				<xsl:value-of select="$site_strings[@id='page_query_mostviews']" />
+				<xsl:value-of select="$site_strings[@id='path_query_mostviews']" />
 			</xsl:attribute>
 			<xsl:value-of select="$locale_strings[@id='query_mostviews']" />
 		</a>
diff --git a/trunk/xsl/xhtml/loginform.xsl b/trunk/xsl/xhtml/loginform.xsl
index fd30130..29a8749 100644
--- a/trunk/xsl/xhtml/loginform.xsl
+++ b/trunk/xsl/xhtml/loginform.xsl
@@ -13,7 +13,7 @@
 			<xsl:when test="//loginform/@action='openid'">
 				<form method="post">
 					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_login']" />
+						<xsl:value-of select="$site_strings[@id='path_login']" />
 					</xsl:attribute>
 					<fieldset>
 						<input name="action" type="hidden" value="openid" />
@@ -31,7 +31,7 @@
 						<br />
 						<a>
 							<xsl:attribute name="href">
-								<xsl:value-of select="$site_strings[@id='page_login']" />
+								<xsl:value-of select="$site_strings[@id='path_login']" />
 							</xsl:attribute>
 							login with normal account
 						</a>
@@ -41,7 +41,7 @@
 			<xsl:otherwise>
 				<form method="post">
 					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_login']" />
+						<xsl:value-of select="$site_strings[@id='path_login']" />
 					</xsl:attribute>
 					<fieldset>
 						<input name="action" type="hidden" value="login" />
@@ -61,7 +61,7 @@
 						<br />
 						<a>
 							<xsl:attribute name="href">
-								<xsl:value-of select="$site_strings[@id='page_login-openid']" />
+								<xsl:value-of select="$site_strings[@id='path_login-openid']" />
 							</xsl:attribute>
 							login with openid
 						</a>
diff --git a/trunk/xsl/xhtml/register.xsl b/trunk/xsl/xhtml/register.xsl
index 5e1611a..a641cf0 100644
--- a/trunk/xsl/xhtml/register.xsl
+++ b/trunk/xsl/xhtml/register.xsl
@@ -12,7 +12,7 @@
 
 		<form method="post">
 			<xsl:attribute name="action">
-				<xsl:value-of select="$site_strings[@id='page_register']" />
+				<xsl:value-of select="$site_strings[@id='path_register']" />
 			</xsl:attribute>
 			<fieldset>
 				<xsl:value-of select="$locale_strings[@id='username']" />:
diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl
index e0baf23..b6bae19 100644
--- a/trunk/xsl/xhtml/results.xsl
+++ b/trunk/xsl/xhtml/results.xsl
@@ -78,7 +78,7 @@
 </xsl:template>
 
 <xsl:template name="pagination-arrows">
-	<xsl:variable name="query_string" select="concat($site_strings[@id='page_results'], //results/@query, '&amp;pagesize=', //results/@pagesize)" />
+	<xsl:variable name="query_string" select="concat($site_strings[@id='path_results'], //results/@query, '&amp;pagesize=', //results/@pagesize)" />
 	<div>
 		<a>
 			<xsl:attribute name="href">
diff --git a/trunk/xsl/xhtml/settings.xsl b/trunk/xsl/xhtml/settings.xsl
index 7d9f9ab..d31bcec 100644
--- a/trunk/xsl/xhtml/settings.xsl
+++ b/trunk/xsl/xhtml/settings.xsl
@@ -17,7 +17,7 @@
 
 		<form method="POST">
 			<xsl:attribute name="action">
-				<xsl:value-of select="$site_strings[@id='page_settings']" />
+				<xsl:value-of select="$site_strings[@id='path_settings']" />
 			</xsl:attribute>
 
 			<xsl:value-of select="$locale_strings[@id='settings_instruction_locale']" />
diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl
index 3827a0e..e9e8681 100644
--- a/trunk/xsl/xhtml/upload.xsl
+++ b/trunk/xsl/xhtml/upload.xsl
@@ -26,7 +26,7 @@
 				<form method="post">
 
 					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
+						<xsl:value-of select="$site_strings[@id='path_upload']" />
 					</xsl:attribute>
 
 					<input name="DC.Creator" type="hidden">
@@ -125,7 +125,7 @@
 				<form method="post">
 
 					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
+						<xsl:value-of select="$site_strings[@id='path_upload']" />
 					</xsl:attribute>
 
 					<input name="DC.Title" type="hidden">
@@ -216,7 +216,7 @@
 				<form method="post">
 
 					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
+						<xsl:value-of select="$site_strings[@id='path_upload']" />
 					</xsl:attribute>
 
 					<input name="DC.Title" type="hidden">
@@ -327,7 +327,7 @@
 				</span>
 				<form method="post">
 					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
+						<xsl:value-of select="$site_strings[@id='path_upload']" />
 					</xsl:attribute>
 					<input name="DC.Title" type="hidden">
 						<xsl:attribute name="value">
@@ -466,7 +466,7 @@
 				</span>
 				<form method="post">
 					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_upload']" />
+						<xsl:value-of select="$site_strings[@id='path_upload']" />
 					</xsl:attribute>
 					<input name="DC.Title" type="hidden">
 						<xsl:attribute name="value">
@@ -633,7 +633,7 @@
 				</form>
 				<form method="post" enctype="multipart/form-data">
 					<xsl:attribute name="action">
-						<xsl:value-of select="$site_strings[@id='page_uploader']" />
+						<xsl:value-of select="$site_strings[@id='path_uploader']" />
 					</xsl:attribute>
 					<input name="DC.Title" type="hidden">
 						<xsl:attribute name="value">