From 0088db58fdd35f97e8e96fd97a87f24b5c4a42d9 Mon Sep 17 00:00:00 2001
From: erlehmann <erlehmann@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Fri, 19 Oct 2007 20:21:29 +0000
Subject: [PATCH] forgot cc no-derivs icon hell, why should one use /that/ ?

git-svn-id: http://yolanda.mister-muffin.de/svn@95 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/images/cc/cc-noderivatives.png | Bin 0 -> 4417 bytes
 trunk/style/gnutube.css              |   3 +-
 trunk/video-test.xml                 |   2 +
 trunk/xsl/xhtml.xsl                  |  82 +++++++++++++++------------
 4 files changed, 49 insertions(+), 38 deletions(-)
 create mode 100644 trunk/images/cc/cc-noderivatives.png

diff --git a/trunk/images/cc/cc-noderivatives.png b/trunk/images/cc/cc-noderivatives.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd648671488871d76ef40b7defbad734e470f6e2
GIT binary patch
literal 4417
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
Hu0mjf5Wrn6

literal 0
HcmV?d00001

diff --git a/trunk/style/gnutube.css b/trunk/style/gnutube.css
index 8259dec..76cd2cd 100755
--- a/trunk/style/gnutube.css
+++ b/trunk/style/gnutube.css
@@ -151,7 +151,8 @@ div
 
 		div.videoccdata img
 		{
-			margin:			0.5em;
+			border-width:		0px;
+			margin:				0.5em;
 		}
 
 	div.videometadata
diff --git a/trunk/video-test.xml b/trunk/video-test.xml
index 714f682..18d456e 100644
--- a/trunk/video-test.xml
+++ b/trunk/video-test.xml
@@ -30,6 +30,7 @@
 				<dc:rights>VIVA 2</dc:rights>
 			</cc:Work>
 			<cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+				<!-- this is entirely inconsistent, i just try out everything that's available -->
 				<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" />
@@ -37,6 +38,7 @@
 				<cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
 				<cc:requires rdf:resource="http://web.resource.org/cc/SourceCode" />
 				<cc:prohibits rdf:resource="http://web.resource.org/cc/CommercialUse" />
+				<cc:prohibits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
 			</cc:License>
 		</rdf:RDF>
 	</video>
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index cee0367..65fc74c 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -344,48 +344,56 @@
 			<xsl:value-of select="$locale_strings/str[@id='license_conditions']" />:
 		</a>
 		<br />
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="rdf:RDF/cc:License/@rdf:about" />
+			</xsl:attribute>
 <!--
-		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'">
-				<img src="./images/cc/cc-share.png" />
+			unfinished bizness
+			<xsl:value-of select="@rdf:about" />
+			<xsl:if test="true()">
+				<img src="./images/cc/somerights.png" />
 			</xsl:if>
 -->
-			<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Distribution'">
-				<img src="./images/cc/cc-share.png" />
-			</xsl:if>
-			<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
-				<img src="./images/cc/cc-remix.png" />
-			</xsl:if>
-		</xsl:for-each>
-		<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" />
-			</xsl:if>
-			<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/ShareAlike'">
-				<img src="./images/cc/cc-sharealike.png" />
-			</xsl:if>
+			<xsl:for-each select="rdf:RDF/cc:License/cc:permits">
 <!--
-			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>
+				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'">
+					<img src="./images/cc/cc-share.png" />
+				</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-noncommercial.png" />
-			</xsl:if>
-		</xsl:for-each>
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Distribution'">
+					<img src="./images/cc/cc-share.png" />
+				</xsl:if>
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
+					<img src="./images/cc/cc-remix.png" />
+				</xsl:if>
+			</xsl:for-each>
+			<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" />
+				</xsl:if>
+				<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-noncommercial.png" />
+				</xsl:if>
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
+					<img src="./images/cc/cc-noderivatives.png" />
+				</xsl:if>
+			</xsl:for-each>
+		</a>
 	</div>
 
 	<div class="videometadata">