From 8c2351202895a89e307a6072bb5d339bece8c5e5 Mon Sep 17 00:00:00 2001
From: Jan Paul Tuecking <earl@ipfire.org>
Date: Sun, 24 Jan 2010 15:18:57 +0100
Subject: [PATCH] Edit download section - new icons - multilanguage...

---
 www/templates/downloads-all.html         |  4 ++--
 www/templates/downloads-development.html | 15 +++++++++------
 www/templates/downloads-mirrors.html     |  4 +++-
 www/templates/downloads-torrents.html    | 21 ++++++++++++++++-----
 www/templates/downloads.html             | 23 ++++++++++++++++-------
 5 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/www/templates/downloads-all.html b/www/templates/downloads-all.html
index 816491f4..257e4043 100644
--- a/www/templates/downloads-all.html
+++ b/www/templates/downloads-all.html
@@ -3,13 +3,13 @@
 {% block content %}
 	<div class="post">
 		<h3>{{ _("Download IPFire") }}</h3>
-
+		<img src="{{ static_url("images/page_icons/download-all.png") }}" class="floatTR" border="0" alt="{{ _("Download IPFire") }}" />
 		<p>
 			{{ _("These are the ancient downloads of IPFire. They are just saved for historical reasons and should not be used in a productive environment.") }}
 		</p>
 		
 		<p>
-			<a href="{{ link("downloads") }}">{{ _("Get back to latest downloads.") }}</a>
+			<a href="{{ link("downloads") }}">{{ _("Get back to latest stable downloads.") }}</a>
 		</p>
 
 		<br class="clear" />
diff --git a/www/templates/downloads-development.html b/www/templates/downloads-development.html
index cc841dc7..9ca26eed 100644
--- a/www/templates/downloads-development.html
+++ b/www/templates/downloads-development.html
@@ -3,15 +3,18 @@
 {% block content %}
 	<div class="post">
 		<h3>{{ _("Development Downloads") }}</h3>
-
-		<p>
-			NEED TO FILL IN TEXT
-		</p>
-		
+		<img src="{{ static_url("images/page_icons/download-developmemt.png") }}" class="floatTR" border="0" alt="{{ _("Development Downloads") }}" />
 		<p>
+			{% if lang == "de" %}
+			In regelmäßigen Abständen wird aus dem aktuellen Quellcode der Entwicklungsversion ein installationsfähiges Image erstellt.						Diese Versionen dienen dem Test und sind <strong>nicht</strong> für den Produktiveinsatz geeignet!
+            {% else %}
+            In regular intervals an image will be created from the current source of the development.
+			These versions are only for testing and are <strong>not</strong> for the productive use suitable!
+			{% end %}		
+			<br /><br />
 			<a href="{{ link("downloads") }}">{{ _("Get back to latest stable downloads.") }}</a>
 		</p>
-
+				
 		<br class="clear" />
 	</div>
 	
diff --git a/www/templates/downloads-mirrors.html b/www/templates/downloads-mirrors.html
index ed009888..46a2a20a 100644
--- a/www/templates/downloads-mirrors.html
+++ b/www/templates/downloads-mirrors.html
@@ -4,6 +4,7 @@
 	<div class="post">
 		<a name="latest"></a>
 		<h3>{{ _("IPFire Mirrors") }}</h3>
+		<img src="{{ static_url("images/page_icons/download-mirrors.png") }}" class="floatTR" border="0" alt="{{ _("IPFire Torrent Tracker") }}" />
 		
 		{% if lang == "de" %}
 			<p>
@@ -38,6 +39,7 @@
 				</li>
 			</ul>
 		{% end %}
+		<br class="clear" />
 		
 		<table class="download-mirrors">
 			<tr>
@@ -50,7 +52,7 @@
 					<td>{{ mirror.name }} ({{ mirror.hostname }})</td>
 					<td>
 						<img src="{{ static_url("images/flags/%s.png" % mirror.location["country_code"]) }}"
-							alt="{{ mirror.location["country_code"] }}" />
+							 align="absmiddle" alt="{{ mirror.location["country_code"] }}" />
 						{{ mirror.location["country"] }}, {{ mirror.location["city"] }}
 					</td>
 					<td class="latency">{{ mirror.latency }} ms</td>
diff --git a/www/templates/downloads-torrents.html b/www/templates/downloads-torrents.html
index e00af947..1c8d15b0 100644
--- a/www/templates/downloads-torrents.html
+++ b/www/templates/downloads-torrents.html
@@ -4,13 +4,11 @@
 	<div class="post">
 		<a name="latest"></a>
 		<h3>{{ _("IPFire Torrent Tracker") }}</h3>
-
-		<img class="floatTR" src="{{ static_url("images/bittorrent.png") }}"
-			alt="Bittorrent" />
+		<img src="{{ static_url("images/page_icons/download-torrents.png") }}" class="floatTR" border="0" alt="{{ _("IPFire Torrent Tracker") }}" />
 
 		{% if lang == "de" %}
 			<p>
-				Auf dieser Seite finden sie eine Liste fast aller Dateien, die
+				Auf dieser Seite finden Sie eine Liste fast aller Dateien, die
 				über den IPFire-Torrent-Tracker verteilt werden.
 			<p>
 			<p>
@@ -19,7 +17,7 @@
 				Downloads der Distributionsimages bereitzustellen.
 			</p>
 			<p>
-				Mehr Informationen zu Torrent-Netzwerken finden sie in der
+				Mehr Informationen zu Torrent-Netzwerken finden Sie in der
 				<a href="http://de.wikipedia.org/wiki/BitTorrent"
 				target="_blank">Wikipedia</a>.
 			</p>
@@ -40,6 +38,9 @@
 			</p>
 		{% end %}
 		
+				<br class="clear" />
+
+		
 		<table class="download-torrents">
 			<tr>
 				<th>{{ _("Release") }}</th>
@@ -68,3 +69,13 @@
 		<br class="clear" />
 	</div>
 {% end block %}
+
+{% block sidebar %}
+		<h4><span>{{ _("Torrent") }}</span> Clients</h4>
+		<ul class="links">
+			<li class="first"><img src="{{ static_url("images/win_icon.png") }}" alt="Windows" align="absmiddle"><img src="{{ static_url("images/mac_icon.png") }}" alt="Mac OS" align="absmiddle"> <a href="http://www.utorrent.com/" target="_blank"> &micro;torrent</a></li>
+			<li><img src="{{ static_url("images/linux_icon.png") }}" alt="Linux" align="absmiddle"><img src="{{ static_url("images/mac_icon.png") }}" alt="Mac OS" align="absmiddle"> <a href="http://www.transmissionbt.com/" target="_blank">Transmission</a></li>
+		</ul>
+ {{ modules.SidebarBanner(banner) }}
+
+{% end block %}
diff --git a/www/templates/downloads.html b/www/templates/downloads.html
index a30407a7..daf19334 100644
--- a/www/templates/downloads.html
+++ b/www/templates/downloads.html
@@ -25,7 +25,7 @@
 
 			<p>
 				Sollte Ihnen diese Software gefallen, würden sich die Betreiber
-				über ein kleines <a href="donate">Dankeschön</a> freuen.
+				über ein kleines <a href="donation">Dankeschön</a> freuen.
 			</p>
 		{% else %}
 			<p>
@@ -76,13 +76,22 @@
 	<div class="post">
 		<a name="other"></a>
 		<h3>{{ _("Other download options") }}</h3>
+		<div class=pr_li>
+			<ul>
+				<li><a href="{{ link("downloads/all") }}">{{ _("See older downloads...") }}</a></li>
+				<li><a href="{{ link("downloads/development") }}">{{ _("See development releases...") }}</a></li>
+				<li><a href="{{ link("downloads/torrents") }}">{{ _("See all torrents...") }}</a></li>
+			</ul>
+		</div>
+		<br class="clear" />
+	</div>
+{% end block %}
 
-		<ul>
-			<li><a href="{{ link("downloads/all") }}">{{ _("See older downloads...") }}</a></li>
-			<li><a href="{{ link("downloads/development") }}">{{ _("See development releases...") }}</a></li>
-			<li><a href="{{ link("downloads/torrents") }}">{{ _("See all torrents...") }}</a></li>
+{% block sidebar %}
+		<h4><span>IPFire</span> Mirrors</h4>
+		<ul class="links">
+			<li class="first"><img src="{{ static_url("images/page_icons/download-mirrors_16.png") }}" alt="{{ _("IPFire Mirrors") }}" align="absmiddle"> <a href="{{ link("downloads/mirrors") }}" target="_blank">Mirror-Server</a></li>
 		</ul>
+ {{ modules.SidebarBanner(banner) }}
 
-		<br class="clear" />
-	</div>
 {% end block %}
-- 
2.47.3