From 7ec5efa230ce7218442711636f5093f272f79807 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Apr 2010 22:47:41 +0200
Subject: [PATCH] Moved license information to top on artwork page and added
 link to screenshots site.

---
 www/templates/static/artwork.html     | 64 +++++++++++----------------
 www/templates/static/screenshots.html |  7 ++-
 2 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/www/templates/static/artwork.html b/www/templates/static/artwork.html
index deb0eadb..03025f23 100644
--- a/www/templates/static/artwork.html
+++ b/www/templates/static/artwork.html
@@ -2,11 +2,8 @@
 		
 {% block title %}{{ _("Artwork") }}{% end block %}
  
-
 {% block content %}
-	
-	
-	<div class=post>
+	<div class="post">
 		<h3>{{ _("Artwork") }}</h3>
 		<img src="{{ static_url("images/page_icons/artwork.png") }}") }}" class="floatTR" border="0" alt="{{ _("Artwork") }}" />
 		<p>
@@ -16,13 +13,29 @@
 			Here you will find logos and print templates of the IPFire project.			
 			{% end %}
 		</p>
+		
+		{% if lang == "de" %}
+			<p>
+				Alle Rechte an künstlerischen Werken bzw. deren Inhalte, die nicht explizit anders gekennzeichnet sind, 
+				gehören dem IPFire-Projekt und sind folglich urheberrechtlich geschützt und dürfen nur mit ausdrücklicher Genehmigung verwendet werden.
+				<br />
+				Für Presse und Berichterstattungen rund um das IPFire-Projekt sind die Inhalte dieser Seite auch ohne Genehmigung verwendbar.
+			</p>
+		{% else %}
+			<p>
+				All rights of artistic works and their content, which are not explicitly labled belong to the IPFire project 
+				and are protected by copyright and may not be used without explicit authorization.
+				<br />
+				For press releases around the IPFire project the contents of this page is usable without any permission.
+			</p>				
+		{% end %}
 	</div>
 	<br class="clear" />
 
-	<div class=post>
+	<div class="post">
 		<a name="{{ _("online") }}"></a><h3>{{ _("<strong>Online</strong> media") }}</h3>
 			<p>
-				<div class=pr_li>
+				<div class="pr_li">
 						 <img src="{{ static_url("images/tux/ipfire_tux_16x16.png") }}" align="bottom" border= "0"/>
 						 <img src="{{ static_url("images/tux/ipfire_tux_32x32.png") }}" align="bottom" border= "0"/>
 						 <img src="{{ static_url("images/tux/ipfire_tux_64x64.png") }}" align="bottom" border= "0"/>
@@ -43,12 +56,19 @@
 						 ipfire.png (512 x 512)</a>
 				</div>
 			</p>
+			<p>
+				{% if lang == "de" %}
+					Der Tux ist unter der GNU General Public License lizensiert.
+				{% else %}
+					The tux images is licensed under the GNU General Public License.
+				{% end %}
+			</p>
 	</div>
 	
 	<div class=post>
 		<a name="{{ _("print") }}"></a><h3>{{ _("<strong>Print</strong> media") }}</h3>
 			<p>
-				<div class=pr_li>				 
+				<div class="pr_li">
 						 <br /><a href="{{ static_url("images/artwork/cd_label.pdf") }}") }}" target="_blank" border="0">
 						 <img src="{{ static_url("images/artwork/cd_label_tn.png") }}" align="bottom" border= "0"/></a>
 						 &nbsp;&nbsp;&nbsp;
@@ -63,36 +83,6 @@
 				</div>
 			</p>
 	</div>
-	
-	<div class=post>
-		<a name="{{ _("Licenses") }}"></a><h3>{{ _("Licenses") }}</h3>
-			<p>
-
-					{% if lang == "de" %}
-					
-					<img src="{{ static_url("images/tux/ipfire_tux_32x32.png") }}" align="absmiddle" border= "0"/> Der Tux ist unter GPL lizensiert.
-					<br />
-					Alle Rechte an künstlerischen Werken bzw. deren Inhalte, die nicht explizit anders gekennzeichnet sind, 
-					gehören dem IPFire-Projekt und sind folglich urheberrechtlich geschützt und dürfen nur mit ausdrücklicher Genehmigung verwendet werden.
-					<br />Für Presse und Berichterstattungen rund um das IPFire-Projekt sind die Inhalte dieser Seite auch ohne Genehmigung verwendbar.
-					<br />
-					<img src="{{ static_url("images/page_icons/license.png") }}" align="absmiddle" border= "0"/> Das Icon Set wurde von 
-					<a href="http://www.jonasraskdesign.com/") }}" target="_blank" border="0">Jonas Rask Design</a> 
-					erstellt und lizensiert als frei für nicht-kommerzielle Nutzung.
-					{% else %}
-					<img src="{{ static_url("images/tux/ipfire_tux_64x64.png") }}" align="absmiddle" border= "0"/> The Tux is licensed under GPL.
-					<br />
-					All rights of artistic works and their content, which are not explicitly labled belong to the IPFire project 
-					and are protected by copyright and may not be used without explicit authorization.
-					<br />For press releases around the IPFire project the contents of this page is usable without any permission.
-					<br />
-					<img src="{{ static_url("images/page_icons/license.png") }}" align="absmiddle" border= "0"/> The icon set was created by 
-					<a href="http://www.jonasraskdesign.com/") }}" target="_blank" border="0">Jonas Rask Design</a> 
-					and licensed as free for non-commercial use.						
-					{% end %}
-			</p>
-	</div>	
-
 {% end block %}
 
 {{ modules.SidebarBanner(banner) }}
diff --git a/www/templates/static/screenshots.html b/www/templates/static/screenshots.html
index 411dde07..d8901ad7 100644
--- a/www/templates/static/screenshots.html
+++ b/www/templates/static/screenshots.html
@@ -10,9 +10,14 @@
 		<img src="{{ static_url("images/page_icons/screenshots.png") }}" class="floatTR" border="0" alt="{{ _("Sceenshots") }}" />
 		<p>
 			{% if lang == "de" %}
-				Hier findet ihr einen Einblick in das IPFire Webinterface.	
+				Hier findet ihr einen Einblick in das IPFire Webinterface.
+				<br /><br />
+				Eine Auswahl von Logos befindet sich im <a href="artwork">Artwork</a>-Bereich.
 			{% else %}
 				Here you will find an insight into the IPFire webinterface.
+				<br /><br />
+				A collection of project-related logos can be found in the
+				<a href="artwork">artwork</a> area.
 			{% end %}
 		</p>
 	</div>
-- 
2.47.3