From 666fa10be9a3408d0a0656da2cb14a06488ca81a Mon Sep 17 00:00:00 2001
From: erlehmann <erlehmann@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Sun, 16 Dec 2007 06:06:59 +0000
Subject: [PATCH] search results now use css-property "display:inline-block"
 added (non-functional) button for "advanced" search

git-svn-id: http://yolanda.mister-muffin.de/svn@200 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/locale/en-us.xml        |   7 +-
 trunk/style/default.css       |  24 +++++++
 trunk/xsl/xhtml.xsl           |   2 +-
 trunk/xsl/xhtml/frontpage.xsl |   7 +-
 trunk/xsl/xhtml/results.xsl   | 130 +++++++++++-----------------------
 5 files changed, 79 insertions(+), 91 deletions(-)

diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index f3bf7c0..5c759ad 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -28,6 +28,7 @@
 	<!-- front page -->
 	<string id="button_find">Find</string>
 	<string id="button_lucky">Instant Access</string>
+	<string id="button_advanced">Avanced Search</string>
 
 	<string id="query_latestadditions">latest additions</string>
 	<string id="query_mostdownloads">most downloads</string>
@@ -53,6 +54,7 @@
 	<string id="error_insert_username">Please insert a username.</string>
 	<string id="error_insert_password">Please insert a password.</string>
 	<string id="error_repeat_password">Please repeat your password.</string>
+	<string id="information_no_results">There are no results satisfying your query.</string>
 	<string id=""></string>
 
 	<!-- information -->
@@ -67,7 +69,10 @@
 	<!-- warnings -->
 
 	<!-- results page-->
-	<string id="results_for_query">results for query</string>
+	<string id="results_heading_1">results</string>
+	<string id="results_heading_2">to</string>
+	<string id="results_heading_3">out of</string>
+	<string id="results_heading_4">for</string>
 	<string id="ordered_by">ordered by</string>
 	<string id="ascending">ascending</string>
 	<string id="descending">descending</string>
diff --git a/trunk/style/default.css b/trunk/style/default.css
index c51b4ed..a2bc339 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -115,6 +115,30 @@ div
 		{
 			margin:				0.75em;
 			vertical-align:		middle;
+			overflow:			visible;
+		}
+
+	div.page-number
+	{
+		display:			inline-block;
+		font-size:			40px;
+		height:				32px;
+		width:				32px;
+		overflow:			visible;
+	}
+
+	div.result
+	{
+		display:			inline-block;
+		margin:				0.75em;
+		width:				160px;
+		overflow:			visible;
+	}
+
+		div.result img
+		{
+			border-color:		black;
+			border-width:		1px;
 		}
 
 	div.search
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 165b275..659fa66 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -272,7 +272,7 @@
 			</xsl:attribute>
 			<fieldset>
 				<xsl:value-of select="$locale_strings[@id='search']" />:
-				<input type="text" name="query" size="20">
+				<input type="text" name="query" size="15">
 					<xsl:attribute name="value">
 						<xsl:if test="//results/@argument='query'">
 							<xsl:value-of select="//results/@value" />
diff --git a/trunk/xsl/xhtml/frontpage.xsl b/trunk/xsl/xhtml/frontpage.xsl
index 18d5061..d6020ad 100644
--- a/trunk/xsl/xhtml/frontpage.xsl
+++ b/trunk/xsl/xhtml/frontpage.xsl
@@ -22,12 +22,17 @@
 					<xsl:attribute name="value">
 						<xsl:value-of select="$locale_strings[@id='button_find']" />
 					</xsl:attribute>
-				</input>&#160;
+				</input>
 				<input type="submit" name="lucky">
 					<xsl:attribute name="value">
 						<xsl:value-of select="$locale_strings[@id='button_lucky']" />
 					</xsl:attribute>
 				</input>
+				<input type="submit" name="advanced">
+					<xsl:attribute name="value">
+						<xsl:value-of select="$locale_strings[@id='button_advanced']" />
+					</xsl:attribute>
+				</input>
 			</fieldset>
 		</form>
 	</div>
diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl
index 0404c4f..5cc9d61 100644
--- a/trunk/xsl/xhtml/results.xsl
+++ b/trunk/xsl/xhtml/results.xsl
@@ -10,7 +10,7 @@
 <xsl:template name="innerresults">
 
 	<xsl:for-each select="//results/result">
-		<div>
+		<div class="result">
 			<a>
 				<xsl:attribute name="href">
 					<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
@@ -30,6 +30,8 @@
 					<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
 				</xsl:attribute>
 				<xsl:value-of select="rdf:RDF/cc:Work/dc:title" />
+			</a>
+			<br />
 			<xsl:variable name="minutes" select="floor(@duration div 60)" />
 			<xsl:variable name="hours" select="floor(@duration div 3600)" />
 			<xsl:variable name="seconds" select="@duration - $minutes*60 - $hours*3600" />
@@ -41,48 +43,10 @@
 					(<xsl:value-of select="concat($hours, ':', format-number($minutes, '00'), ':', format-number($seconds, '00'))" />)
 				</xsl:otherwise>
 			</xsl:choose>
-			</a>
-			<br />
-			<xsl:choose>
-				<xsl:when test="@status=0">
-					processing, please wait....
-				</xsl:when>
-				<xsl:when test="@status=2">
-					invalid audio and/or video stream
-				</xsl:when>
-				<xsl:when test="@status=3">
-					file not found - contact the admin
-				</xsl:when>
-				<xsl:when test="@status=4">
-					file is not a video
-				</xsl:when>
-				<xsl:when test="@status=5">
-					same video was already uploaded
-				</xsl:when>
-			</xsl:choose>
-			<br />
-			<xsl:value-of select="@viewcount" />
-			<xsl:value-of select="$locale_strings[@id='viewcount']" />
-			<xsl:if test="@edit='true'">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:choose>
-						<xsl:when test="not(@status=1)">
-							<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="concat(rdf:RDF/cc:Work/dc:identifier, 'action=edit')" />
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-				<img src="/images/tango/accessories-text-editor.png" style="border:0;vertical-align:bottom;" />edit
-			</a>
-			</xsl:if>
 		</div>
 	</xsl:for-each>
 </xsl:template>
 
-<xsl:template name="results">
 	<div>
 		<xsl:choose>
 			<xsl:when test="//results/@value!=''">
@@ -178,17 +142,44 @@
 			</xsl:when>
 		</xsl:choose>
 	</div>
+
+<xsl:template name="results">
+
 	<div>
-		<xsl:value-of select="//results/@resultcount" />&#160;
-		<xsl:value-of select="$locale_strings[@id='results_on']" />&#160;
-		<xsl:value-of select="//results/@lastpage" />&#160;
-		<xsl:value-of select="$locale_strings[@id='pages']" />
+		<span class="heading">
+			<xsl:value-of select="$locale_strings[@id='results_heading_1']" />&#160;
+			<xsl:value-of select="//results/@pagesize * (//results/@currentpage - 1) + 1" />&#160;
+			<xsl:value-of select="$locale_strings[@id='results_heading_2']" />&#160;
+			<xsl:choose>
+				<xsl:when test="(//results/@pagesize * //results/@currentpage) &lt; //results/@resultcount">
+					<xsl:value-of select="//results/@pagesize * //results/@currentpage" />
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="//results/@resultcount" />
+				</xsl:otherwise>
+			</xsl:choose>&#160;
+			<xsl:value-of select="$locale_strings[@id='results_heading_3']" />&#160;
+			<xsl:value-of select="//results/@resultcount" />&#160;
+			<xsl:value-of select="$locale_strings[@id='results_heading_4']" />&#160;
+			"<xsl:value-of select="//results/@value" />"
+		</span>
 	</div>
 
 	<xsl:call-template name="innerresults"/>
-	<xsl:call-template name="pagination-arrows"/>
-	<xsl:call-template name="pagination-numbers"/>
-	
+
+	<xsl:if test="//results/@lastpage &gt; 1">
+		<xsl:call-template name="pagination-arrows"/>
+	</xsl:if>
+
+</xsl:template>
+
+
+<xsl:template name="results-ordering">
+
+<!--
+	this is deprecated - dont use it.
+-->
+
 	<div>
 		<form method="get">
 			<xsl:attribute name="action">
@@ -335,6 +326,11 @@
 			</xsl:if>
 			<img src="./images/tango/go-previous.png" />
 		</a>
+
+		<div class="page-number">
+			<xsl:value-of select="//results/@currentpage" />
+		</div>
+
 		<a>
 			<xsl:attribute name="href">
 				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
@@ -360,46 +356,4 @@
 	</div>
 </xsl:template>
 
-<xsl:template name="pagination-numbers">
-<!--
-	this template is currently unused,
-	it will probably be removed soon.
--->
-	<xsl:variable name="query_string" select="concat('/', //results/@scriptname, '?', //results/@argument, '=', //results/@value, '&amp;orderby=', //results/@orderby, '&amp;sort=', //results/@sort, '&amp;pagesize=', //results/@pagesize)" />
-	<xsl:if test="//results/@currentpage > 2">
-		<a>
-			<xsl:attribute name="href">
-				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 2)" />
-			</xsl:attribute>
-			<xsl:value-of select="//results/@currentpage - 2" />
-		</a>
-	</xsl:if>
-	<xsl:if test="//results/@currentpage > 1">
-		<a>
-			<xsl:attribute name="href">
-				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage - 1)" />
-			</xsl:attribute>
-			<xsl:value-of select="//results/@currentpage - 1" />
-		</a>
-	</xsl:if>
-	<xsl:value-of select="//results/@currentpage" />
-	<xsl:variable name="temp" select="//results/@lastpage - //results/@currentpage" />
-	<xsl:if test="$temp > 0">
-		<a>
-			<xsl:attribute name="href">
-				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 1)" />
-			</xsl:attribute>
-			<xsl:value-of select="//results/@currentpage + 1" />
-		</a>
-	</xsl:if>
-	<xsl:if test="$temp > 1">
-		<a>
-			<xsl:attribute name="href">
-				<xsl:value-of select="concat($query_string, '&amp;page=', //results/@currentpage + 2)" />
-			</xsl:attribute>
-			<xsl:value-of select="//results/@currentpage + 2" />
-		</a>
-	</xsl:if>
-</xsl:template>
-
 </xsl:stylesheet>