From 37b75b580180a4e5f941704b7943c7626f1279a8 Mon Sep 17 00:00:00 2001
From: josch <josch@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Sat, 29 Dec 2007 04:51:14 +0000
Subject: [PATCH] added settings changed message, fixed NaN bug from last
 commit, fixed rights and license in the upload wizard, added message value

git-svn-id: http://yolanda.mister-muffin.de/svn@227 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/locale/en-us.xml     |  1 +
 trunk/settings.pl          |  3 +++
 trunk/xsl/xhtml.xsl        |  1 +
 trunk/xsl/xhtml/upload.xsl | 10 +++++-----
 trunk/xsl/xhtml/video.xsl  |  4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index eef4349..72b59bc 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -64,6 +64,7 @@
 	<string id="information_comment_created">Your comment has been submitted.</string>
 	<string id="information_registered">Your account has been created.</string>
 	<string id="information_uploaded">Your file has been uploaded.</string>
+	<string id="information_settings_changed">Your successfully changed your settings.</string>
 
 	<!-- warnings -->
 	<string id="warning_no_results">There are no results satisfying your query.</string>
diff --git a/trunk/settings.pl b/trunk/settings.pl
index 4bc0776..ec86bb7 100644
--- a/trunk/settings.pl
+++ b/trunk/settings.pl
@@ -12,6 +12,9 @@ if($userinfo->{'username'})
 	if($query->param('submit'))
 	{
 		$dbh->do(qq{update users set locale = ?, pagesize = ?, cortado = ? where id = ?}, undef, $query->param('locale'), $query->param('pagesize'), $query->param('cortado'), $userinfo->{'id'} ) or die $dbh->errstr;
+		
+		$page->{'message'}->{'type'} = "information";
+		$page->{'message'}->{'text'} = "information_settings_changed";
 	}
 }
 
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index c5bf555..daf2a94 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -335,6 +335,7 @@
 		</xsl:choose>
 		<xsl:variable name="messagetext" select="/page/message/@text" />
 		<xsl:value-of select="$locale_strings[@id=$messagetext]" />
+		<xsl:value-of select="/page/message/@value" />
 		<!-- probably one can do this on one line, dunno how -->
 	</div>
 
diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl
index c71889d..3827a0e 100644
--- a/trunk/xsl/xhtml/upload.xsl
+++ b/trunk/xsl/xhtml/upload.xsl
@@ -604,20 +604,20 @@
 						</xsl:attribute>
 					</input>
 					
-					<table class="videometadata">
+					<table class="metadata-upload">
 						<tr>
-							<td class="leftcell">
+							<td class="metadata-title">
 								<xsl:value-of select="$locale_strings[@id='DC.Rights']" />:
 							</td>
-							<td class="rightcell">
+							<td class="metadata-content">
 								<xsl:value-of select="//uploadform/@DC.Rights" />
 							</td>
 						</tr>
 						<tr>
-							<td class="leftcell">
+							<td class="metadata-title">
 								<xsl:value-of select="$locale_strings[@id='DC.License']" />:
 							</td>
-							<td class="rightcell">
+							<td class="metadata-content">
 								<xsl:value-of select="//uploadform/@DC.License" />
 							</td>
 						</tr>
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl
index 22d7c98..516923a 100644
--- a/trunk/xsl/xhtml/video.xsl
+++ b/trunk/xsl/xhtml/video.xsl
@@ -12,8 +12,8 @@
 	<xsl:if test="not(//@embed='true')">		
 		<div class="videotitle">
 			<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
-			<xsl:variable name="hours" select="floor(@duration div 3600)" />
-			<xsl:variable name="minutes" select="floor((@duration - $hours*3600) div 60)" />
+			<xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
+			<xsl:variable name="minutes" select="floor((//video/@duration - $hours*3600) div 60)" />
 			<xsl:variable name="seconds" select="//video/@duration - $minutes*60 - $hours*3600" />
 			<xsl:choose>
 				<xsl:when test="$hours=0">