From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 22 Jan 2010 16:18:50 +0000 (+0100)
Subject: Add text to torrent download site.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6aa6e1dd61215cbbe635fcaa435a9931893a0d47;p=ipfire.org.git

Add text to torrent download site.
---

diff --git a/www/static/css/style.css b/www/static/css/style.css
index 6c785b0f..2f596a4e 100644
--- a/www/static/css/style.css
+++ b/www/static/css/style.css
@@ -1048,3 +1048,22 @@ table.download td.icon {
 table.download td.link {
 	width: 180px;
 }
+
+table.download-torrents {
+	margin-bottom: 25px;
+	margin-left: 50px;
+	margin-top: 25px;
+	width: 600px;
+}
+
+table.download-torrents tr {
+	height: 24px;
+}
+
+table.download-torrents td {
+	text-align: center;
+}
+
+table.download-torrents td.seeds,td.peers {
+	text-align: right;
+}
diff --git a/www/static/images/bittorrent.png b/www/static/images/bittorrent.png
new file mode 100644
index 00000000..1d48daeb
Binary files /dev/null and b/www/static/images/bittorrent.png differ
diff --git a/www/templates/downloads-torrents.html b/www/templates/downloads-torrents.html
index e256b20a..e00af947 100644
--- a/www/templates/downloads-torrents.html
+++ b/www/templates/downloads-torrents.html
@@ -5,10 +5,40 @@
 		<a name="latest"></a>
 		<h3>{{ _("IPFire Torrent Tracker") }}</h3>
 
-		<p>
-			{{ _("This is the latest version of the IPFire firewall distribution.") }}
-			Need to fill in some more text at this place.
-		</p>
+		<img class="floatTR" src="{{ static_url("images/bittorrent.png") }}"
+			alt="Bittorrent" />
+
+		{% if lang == "de" %}
+			<p>
+				Auf dieser Seite finden sie eine Liste fast aller Dateien, die
+				über den IPFire-Torrent-Tracker verteilt werden.
+			<p>
+			<p>
+				Das Torrentnetz ist ein Netzwerk, welches Dateien durch verteilte
+				Downloads schnell verbreitet. IPFire nutzt dieses System um
+				Downloads der Distributionsimages bereitzustellen.
+			</p>
+			<p>
+				Mehr Informationen zu Torrent-Netzwerken finden sie in der
+				<a href="http://de.wikipedia.org/wiki/BitTorrent"
+				target="_blank">Wikipedia</a>.
+			</p>
+		{% else %}
+			<p>
+				This page displays a list of files that are tracked by the
+				IPFire torrent tracker.
+			<p>
+			<p>
+				The bittorrent protocol transfers large files by a distributed
+				technology. IPFire uses this system to spread the distribution's
+				files.
+			</p>
+			<p>
+				Get more information on the bittorrent protocol on
+				<a href="http://en.wikipedia.org/wiki/BitTorrent_(protocol)"
+				target="_blank">Wikipedia</a>.
+			</p>
+		{% end %}
 		
 		<table class="download-torrents">
 			<tr>
@@ -21,13 +51,11 @@
 			{% for release in releases %}
 				<tr>
 					<td>{{ release.name }}</td>
-					<td>{{ release.torrent.file }}</td>
-					<td>{{ hashes[release.torrent.hash].get("seeds", _("N/A")) }}</td>
-					<td>{{ hashes[release.torrent.hash].get("peers", _("N/A")) }}</td>
-					<td>
-						<a href="{{ release.torrent.url }}">
-							<img src="{{ static_url("images/download_torrent.png") }}" alt="{{ _("Download") }}" />
-						</a>
+					<td>{{ release.torrent.file[:-8] }}</td>
+					<td class="seeds">{{ hashes[release.torrent.hash]["seeds"] }}</td>
+					<td class="peers">{{ hashes[release.torrent.hash]["peers"] }}</td>
+					<td class="download">
+						<a href="{{ release.torrent.url }}">{{ _("Download file") }}</a>
 					</td>
 				</tr>
 			{% end %}
@@ -39,5 +67,4 @@
 
 		<br class="clear" />
 	</div>
-
 {% end block %}
diff --git a/www/translations/de_DE.csv b/www/translations/de_DE.csv
index 53c0e93a..4d0346fd 100644
--- a/www/translations/de_DE.csv
+++ b/www/translations/de_DE.csv
@@ -14,6 +14,7 @@
 "Description","Beschreibung"
 "Development","Entwicklung"
 "DHCP Server","DHCP-Server"
+"Download file","Datei herunterladen"
 "Download the CD image from the torrent network.","Laden Sie das CD-Image über das Torrent Netzwerk."
 "File","Datei"
 "Firewall","Firewall"