From b1d68209f7fbb011c7480d883848ef2ba6737bc3 Mon Sep 17 00:00:00 2001
From: erlehmann <erlehmann@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Sun, 21 Oct 2007 04:01:44 +0000
Subject: [PATCH] simple extended upload form seems i didn't break the uploader
 this time

also, all dublin core entities changed to upper case
(e.g. "DC.Title" instead of "DC.title")



git-svn-id: http://yolanda.mister-muffin.de/svn@108 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/locale/en-US.xml  | 20 +++++++++-------
 trunk/style/gnutube.css |  4 +++-
 trunk/uploader.pl       |  2 +-
 trunk/xsl/xhtml.xsl     | 52 ++++++++++++++++++++++++++++-------------
 4 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/trunk/locale/en-US.xml b/trunk/locale/en-US.xml
index bfce6f9..32b2ca5 100755
--- a/trunk/locale/en-US.xml
+++ b/trunk/locale/en-US.xml
@@ -53,15 +53,17 @@
 	<str id="license_conditions">license conditions</str>
 
 	<!-- dublin core entities -->
-	<str id="DC.title">title</str>
-	<str id="DC.creator">author</str>
-	<str id="DC.subject">subject</str>
-	<str id="DC.description">description</str>
-	<str id="DC.publisher">uploader</str>
-	<str id="DC.contributor">contributor</str>
-	<str id="DC.date">date</str>
-	<str id="DC.source">source</str>
-	<str id="DC.rights">righs holder</str>
+	<str id="DC.Title">title</str>
+	<str id="DC.Creator">author</str>
+	<str id="DC.Subject">subject</str>
+	<str id="DC.Description">description</str>
+	<str id="DC.Publisher">uploader</str>
+	<str id="DC.Contributor">contributor</str>
+	<str id="DC.Date">date</str>
+	<str id="DC.Source">source</str>
+	<str id="DC.Language">language</str>
+	<str id="DC.Coverage">coverage</str>
+	<str id="DC.Rights">righs holder</str>
 
 </strings>
 
diff --git a/trunk/style/gnutube.css b/trunk/style/gnutube.css
index 612ce33..7471bd5 100755
--- a/trunk/style/gnutube.css
+++ b/trunk/style/gnutube.css
@@ -152,7 +152,9 @@ div
 		div.videoccdata img
 		{
 			border-width:		0px;
-			margin:				0.5em;
+			margin-left:		0.5em;
+			margin-right:		0.5em;
+			margin-top:			0.5em;
 		}
 
 	table.videometadata
diff --git a/trunk/uploader.pl b/trunk/uploader.pl
index fa71564..e947fb9 100644
--- a/trunk/uploader.pl
+++ b/trunk/uploader.pl
@@ -27,7 +27,7 @@ if($userid)
 	
 	#make new entry for video into the databse
 	my $sth = $dbh->prepare(qq{insert into uploaded (title, description, userid, timestamp) values ( ?, ?, ?, unix_timestamp())}) or die $dbh->errstr;
-	$sth->execute($query->param("title"), $query->param("description"), $userid) or die $dbh->errstr;
+	$sth->execute($query->param("DC.Title"), $query->param("DC.Description"), $userid) or die $dbh->errstr;
 	$sth->finish() or die $dbh->errstr;
 	
 	#get the id of the inserted db entry
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index d3c40d3..6fca6b1 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -282,9 +282,9 @@
 					</a>
 				</td>
 				<td>
-					<xsl:value-of select="$locale_strings/str[@id='DC.title']" />: <xsl:value-of select="rdf:RDF/cc:Work/dc:title" /><br />
-					<xsl:value-of select="$locale_strings/str[@id='DC.creator']" />: <xsl:value-of select="rdf:RDF/cc:Work/dc:creator" /><br />
-					<xsl:value-of select="$locale_strings/str[@id='DC.publisher']" />: <xsl:value-of select="rdf:RDF/cc:Work/dc:publisher" />
+					<xsl:value-of select="$locale_strings/str[@id='DC.Title']" />: <xsl:value-of select="rdf:RDF/cc:Work/dc:title" /><br />
+					<xsl:value-of select="$locale_strings/str[@id='DC.Creator']" />: <xsl:value-of select="rdf:RDF/cc:Work/dc:creator" /><br />
+					<xsl:value-of select="$locale_strings/str[@id='DC.Publisher']" />: <xsl:value-of select="rdf:RDF/cc:Work/dc:publisher" />
 				</td>
 			</tr>
 		</xsl:for-each>
@@ -399,7 +399,7 @@
 	<table class="videometadata">
 		<tr>
 			<td class="leftcell">
-				<xsl:value-of select="$locale_strings/str[@id='DC.title']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Title']" />:
 			</td>
 			<td class="rightcell">
 				<xsl:value-of select="rdf:RDF/cc:Work/dc:title" />
@@ -407,7 +407,7 @@
 		</tr>
 		<tr>
 			<td class="leftcell">
-				<xsl:value-of select="$locale_strings/str[@id='DC.creator']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Creator']" />:
 			</td>
 			<td class="rightcell">
 				<xsl:value-of select="rdf:RDF/cc:Work/dc:creator" />
@@ -415,7 +415,7 @@
 		</tr>
 		<tr>
 			<td class="leftcell">
-				<xsl:value-of select="$locale_strings/str[@id='DC.subject']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Subject']" />:
 			</td>
 			<td class="rightcell">
 				<xsl:value-of select="rdf:RDF/cc:Work/dc:subject" />
@@ -423,7 +423,7 @@
 		</tr>
 		<tr>
 			<td class="leftcell">
-				<xsl:value-of select="$locale_strings/str[@id='DC.description']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Description']" />:
 			</td>
 			<td class="rightcell">
 				<xsl:value-of select="rdf:RDF/cc:Work/dc:description" />
@@ -431,7 +431,7 @@
 		</tr>
 		<tr>
 			<td class="leftcell">
-				<xsl:value-of select="$locale_strings/str[@id='DC.publisher']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Publisher']" />:
 			</td>
 			<td class="rightcell">
 				<xsl:value-of select="rdf:RDF/cc:Work/dc:publisher" />
@@ -439,7 +439,7 @@
 		</tr>
 		<tr>
 			<td class="leftcell">
-				<xsl:value-of select="$locale_strings/str[@id='DC.date']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Date']" />:
 			</td>
 			<td class="rightcell">
 				<xsl:value-of select="rdf:RDF/cc:Work/dc:date" />
@@ -447,7 +447,7 @@
 		</tr>
 		<tr>
 			<td class="leftcell">
-				<xsl:value-of select="$locale_strings/str[@id='DC.source']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Source']" />:
 			</td>
 			<td class="rightcell">
 				<xsl:value-of select="rdf:RDF/cc:Work/dc:source" />
@@ -455,7 +455,7 @@
 		</tr>
 		<tr>
 			<td class="leftcell">
-				<xsl:value-of select="$locale_strings/str[@id='DC.rights']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Rights']" />:
 			</td>
 			<td class="rightcell">
 				<xsl:value-of select="rdf:RDF/cc:Work/dc:rights" />
@@ -551,15 +551,35 @@
 			<fieldset>
 				<xsl:value-of select="$locale_strings/str[@id='file']" />:
 				<br />				
-				<input name="file" type="file" size="15" />
+				<input name="file" type="file" size="13" />
 				<br />
-				<xsl:value-of select="$locale_strings/str[@id='DC.title']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Title']" />:
 				<br />
-				<input name="title" type="text" size="30" />
+				<input name="DC.Title" type="text" size="30" />
 				<br />
-				<xsl:value-of select="$locale_strings/str[@id='DC.description']" />:
+				<xsl:value-of select="$locale_strings/str[@id='DC.Creator']" />:
 				<br />
-				<input name="description" type="text" size="30" />
+				<input name="DC.Creator" type="text" size="30" />
+				<br />
+				<xsl:value-of select="$locale_strings/str[@id='DC.Subject']" />:
+				<br />
+				<input name="DC.Subject" type="text" size="30" />
+				<br />
+				<xsl:value-of select="$locale_strings/str[@id='DC.Description']" />:
+				<br />
+				<input name="DC.Description" type="text" size="30" />
+				<br />
+				<xsl:value-of select="$locale_strings/str[@id='DC.Source']" />:
+				<br />
+				<input name="DC.Source" type="text" size="30" />
+				<br />
+				<xsl:value-of select="$locale_strings/str[@id='DC.Language']" />:
+				<br />
+				<input name="DC.Language" type="text" size="30" />
+				<br />
+				<xsl:value-of select="$locale_strings/str[@id='DC.Coverage']" />:
+				<br />
+				<input name="DC.Coverage" type="text" size="30" />
 				<br />
 				<input type="submit" name="submit" >
 					<xsl:attribute name="value">