during the upgrade to feisty fawn, apache won't start

so i decided to submit part of xml creative commons support now
 


git-svn-id: http://yolanda.mister-muffin.de/svn@89 7eef14d0-6ed0-489d-bf55-20463b2d70db

trunk/README

@@ -1,9 +1,9 @@
 GNUtube - a free software video CMS
 
-Interface XML + XSL
+Frontend: XML + XSL + CSS
 (c) 2007 Nils Moskopp
 
-Background Perl
+Backend: Perl
 (c) 2007 Johannes Schauer
 
 License is the Affero General Public License version 3 or (at your option) any later version published by the Free Software Foundation.

trunk/locale/en-US.xml

@@ -50,6 +50,7 @@
 
 	<!-- video page -->
 	<str id="download">download</str>
+	<str id="video_license">License</str>
 
 	<!-- dublin core entities -->
 	<str id="DC.title">title</str>

trunk/video-test.xml

@@ -29,7 +29,7 @@
 				<dc:coverage>Monaco di Baviera</dc:coverage>
 				<dc:rights>VIVA 2</dc:rights>
 			</cc:Work>
-			<cc:License rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+			<cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
 				<cc:permits rdf:resource="http://web.resource.org/cc/Reproduction" />
 				<cc:permits rdf:resource="http://web.resource.org/cc/Distribution" />
 				<cc:requires rdf:resource="http://web.resource.org/cc/Notice" />

trunk/xsl/xhtml.xsl

@@ -327,12 +327,21 @@
 		</a>
 	</div>
 	<div class="videoccdata">
-		<!-- unfinished bizness -->
+<!--
-		Permits:<br />
+		unfinished bizness
+		<xsl:value-of select="@rdf:about" />
+		<xsl:if test="true()">
+			<img src="./images/cc/somerights.png" />
+		</xsl:if>
+-->
 		<xsl:for-each select="rdf:RDF/cc:License/cc:permits">
+<!--
+			since we are talking about digital media here, distribution actually /is/ reproduction
+			(also, i was too stupid to figure out how to test for both conditions).
 			<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Reproduction'">
-			REPRODUCTION
+				<img src="./images/cc/cc-share.png" />
 			</xsl:if>
+-->
 			<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Distribution'">
 				<img src="./images/cc/cc-share.png" />
 			</xsl:if>
@@ -340,8 +349,6 @@
 				<img src="./images/cc/cc-remix.png" />
 			</xsl:if>
 		</xsl:for-each>
-		<br />
-		Requires:<br />
 		<xsl:for-each select="rdf:RDF/cc:License/cc:requires">
 			<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Notice'">
 				<img src="./images/cc/cc-by.png" />
@@ -349,13 +356,17 @@
 			<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/ShareAlike'">
 				<img src="./images/cc/cc-sharealike.png" />
 			</xsl:if>
+<!--
+			source code doesn't make much sense in video context.
+			still, this is preserved for potential future use.
 			<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/SourceCode'">
 			SOURCE
 			</xsl:if>
+-->
 		</xsl:for-each>
 		<xsl:for-each select="rdf:RDF/cc:License/cc:prohibits">		
 			<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/CommercialUse'">
-				<img src="./images/cc/cc-nc.png" />
+				<img src="./images/cc/cc-noncommercial.png" />
 			</xsl:if>
 		</xsl:for-each>
 	</div>