From f12588fbc850c80df46f74cc7237402e0e4175d9 Mon Sep 17 00:00:00 2001
From: erlehmann <erlehmann@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Sun, 21 Oct 2007 22:02:39 +0000
Subject: [PATCH] messageboxes fully implemented there are 3 types: error,
 information and warning

git-svn-id: http://yolanda.mister-muffin.de/svn@115 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/locale/en-US.xml  |  9 +++++++++
 trunk/style/gnutube.css | 12 +++++++++++-
 trunk/video-test.xml    |  2 +-
 trunk/xsl/xhtml.xsl     | 22 ++++++++++++++++++----
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/trunk/locale/en-US.xml b/trunk/locale/en-US.xml
index 32b2ca5..54ef770 100755
--- a/trunk/locale/en-US.xml
+++ b/trunk/locale/en-US.xml
@@ -32,6 +32,15 @@
 	<str id="query_mostdownloads">most downloads</str>
 	<str id="query_bestrated">best rated</str>
 
+	<!-- errors -->
+	<str id="error_202c">Error 202c - Access forbidden by government.</str>
+
+	<!-- information -->
+	<str id="information_logged_in">You are now logged in.</str>
+	<str id="information_logged_out">You are now logged out.</str>
+
+	<!-- warnings -->
+
 	<!-- results page-->
 	<str id="results_for_query">results for query</str>
 	
diff --git a/trunk/style/gnutube.css b/trunk/style/gnutube.css
index b0212c5..01af683 100755
--- a/trunk/style/gnutube.css
+++ b/trunk/style/gnutube.css
@@ -64,13 +64,23 @@ div
 
 	div.messagebox
 	{
-		background-color:	#90f090;
 		border-color:		#606060;
 		border-style:		solid;
 		border-width:		1px;
 		margin:				1.5em;
 	}
 
+		div.messagebox#error,
+		div.messagebox#warning
+		{
+			background-color:	#f09090; 
+		}
+
+		div.messagebox#information
+		{
+			background-color:	#90f090;
+		}
+
 		div.messagebox img
 		{
 			margin:				0.5em;
diff --git a/trunk/video-test.xml b/trunk/video-test.xml
index 98bce9f..883138e 100644
--- a/trunk/video-test.xml
+++ b/trunk/video-test.xml
@@ -3,13 +3,13 @@
 
 <page
 	locale="en-US"
-	message="error_http_404"
 	stylesheet="./style/gnutube.css"
 	username="pedobear@myopenid.net"
 	xmlns:dc="http://purl.org/dc/elements/1.1/"
 	xmlns:cc="http://web.resource.org/cc/"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 >
+	<message type="information" text="information_logged_in" />
 	<video>
 		<rdf:RDF>
 			<cc:Work rdf:about="./videos/zwobot-01-test.ogg">
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index a53058e..f0852b4 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -133,7 +133,6 @@
 
 			<hr />
 
-			<xsl:call-template name="messagebox"/>
 			<xsl:apply-templates />
 
 			<div class="footer">
@@ -230,11 +229,26 @@
 
 </xsl:template>
 
-<xsl:template name="messagebox">
+<xsl:template match="message">
 
 	<div class="messagebox">
-		<img src="./images/tango/dialog-information.png" />
-		<span style="information">You are now logged in as "pedobear".</span>
+		<xsl:attribute name="id">
+			<xsl:value-of select="@type" />
+		</xsl:attribute>
+		<xsl:choose>
+			<xsl:when test="@type='error'">
+				<img src="./images/tango/dialog-error.png" />
+			</xsl:when>
+			<xsl:when test="@type='information'">
+				<img src="./images/tango/dialog-information.png" />
+			</xsl:when>
+			<xsl:when test="@type='warning'">
+				<img src="./images/tango/dialog-warning.png" />
+			</xsl:when>
+		</xsl:choose>
+		<xsl:variable name="messagetext" select="@text" />
+		<xsl:value-of select="$locale_strings/str[@id=$messagetext]" />
+		<!-- probably one can do this on one line, dunno how -->
 	</div>
 
 </xsl:template>