From: Michael Tremer Date: Fri, 22 Jan 2010 15:22:28 +0000 (+0100) Subject: Add draft of download page. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab66924a0257ded5b33e07e6fc2c146394156a81;p=ipfire.org.git Add draft of download page. --- diff --git a/www/static/css/style.css b/www/static/css/style.css index eab173be..6c785b0f 100644 --- a/www/static/css/style.css +++ b/www/static/css/style.css @@ -1014,3 +1014,37 @@ table.translate td.lang { padding: 0px 0px 0px 20px; line-height: 1.2em; } + +div.bigdownload { + margin-top: 50px; + margin-left: 100px; + padding-top: 15px; + background: url(../images/download_button.png) no-repeat; + height: 84px; + width: 255px; + text-align: center; +} + +div.bigdownload a { + color: white; + font-size: 1.3em; + font-weight: bold; + text-decoration: none; +} + +div.bigdownload a:hover { + text-decoration: underline; +} + +table.download { + width: 660px; + margin-left: 75px; +} + +table.download td.icon { + width: 50px; +} + +table.download td.link { + width: 180px; +} diff --git a/www/static/images/download_button.png b/www/static/images/download_button.png new file mode 100644 index 00000000..1b5505a8 Binary files /dev/null and b/www/static/images/download_button.png differ diff --git a/www/static/images/download_type_alix.png b/www/static/images/download_type_alix.png new file mode 100644 index 00000000..4b0e05d5 Binary files /dev/null and b/www/static/images/download_type_alix.png differ diff --git a/www/static/images/download_type_iso.png b/www/static/images/download_type_iso.png new file mode 100644 index 00000000..f3e679c9 Binary files /dev/null and b/www/static/images/download_type_iso.png differ diff --git a/www/static/images/download_type_torrent.png b/www/static/images/download_type_torrent.png new file mode 100644 index 00000000..a70def0e Binary files /dev/null and b/www/static/images/download_type_torrent.png differ diff --git a/www/static/images/download_type_usbfdd.png b/www/static/images/download_type_usbfdd.png new file mode 100644 index 00000000..32632c39 Binary files /dev/null and b/www/static/images/download_type_usbfdd.png differ diff --git a/www/static/images/download_type_usbhdd.png b/www/static/images/download_type_usbhdd.png new file mode 100644 index 00000000..196f8c79 Binary files /dev/null and b/www/static/images/download_type_usbhdd.png differ diff --git a/www/static/images/download_type_xen.png b/www/static/images/download_type_xen.png new file mode 100644 index 00000000..394a8acf Binary files /dev/null and b/www/static/images/download_type_xen.png differ diff --git a/www/templates/downloads.html b/www/templates/downloads.html index 78826df9..a30407a7 100644 --- a/www/templates/downloads.html +++ b/www/templates/downloads.html @@ -1,26 +1,71 @@ {% extends "base.html" %} +{% block title %}{{ _("Downloads") }}{% end block %} + {% block content %}

{{ _("Download IPFire") }}

-

- {{ _("This is the latest version of the IPFire firewall distribution.") }} - Need to fill in some more text at this place. -

+ {{ _( -
- {{ _("Begin download") }} + {% if lang == "de" %} +

+ Auf dieser Seite können Sie kostenlos die neueste + Version von IPFire herunterladen. Ältere Versionen oder + andere Downloadoptionen finden Sie weiter unten auf der Seite. +

+ +

+ IPFire ist innerhalb von 15 bis 20 Minuten eingerichtet. + Eine Installationsanleitung + ist in unserem Wiki zu finden. +

+ +

+ Sollte Ihnen diese Software gefallen, würden sich die Betreiber + über ein kleines Dankeschön freuen. +

+ {% else %} +

+ On this page one can download the latest version of IPFire + for free. Older versions and other downloads + can be retrieved on the linked pages below. +

+ +

+ IPFire can be installed within 15 to 20 minutes. An + installation guide can be found on our wiki. +

+ +

+ If you like this piece of software, developers appreciate your + donations. +

+ {% end %} +
+ + {{ _("Begin download") }}
+ {{ release.name }} +
{% for download in release.downloads %} - - + + + {% end %}
+
+ {{ download.type }} + {{ _(download.desc) }} + {{ _(download.rem) }} +
@@ -31,12 +76,13 @@

{{ _("Other download options") }}

- -
{% end block %} diff --git a/www/translations/de_DE.csv b/www/translations/de_DE.csv index 073c33ab..76d191e4 100644 --- a/www/translations/de_DE.csv +++ b/www/translations/de_DE.csv @@ -1,3 +1,4 @@ +"Begin download","Download starten" "by","von" "imprint","Impressum" "Home","Startseite" @@ -50,3 +51,19 @@ "CeBIT-Donation","CeBIT-Spende" "Development","Entwicklung" "Area","Bereich" +"Other download options","Weitere Downloadoptionen" +"Use this image to burn a CD and install IPFire from it.","Brennen Sie dieses Image und booten Sie die Installation davon." +"Installable CD image","Bootbares CD-Image" +"Torrent file","Torrent-Download" +"USB FDD Image","USB Floppy Image" +"USB HDD Image","USB Harddisk Image" +"Alix image","Alix-Image" +"Pregenerated Xen Image","Pregenerated Xen Image" +"Download the CD image from the torrent network.","Laden Sie das CD-Image über das Torrent Netzwerk." +"See older downloads...","Ältere Downloads anzeigen..." +"See development releases...","Entwicklungsversionen anzeigen..." +"See all torrents...","Alle Torrent-Downloads anzeigen..." +"An image that is meant to run on embedded devices.","Fertiges Image für Embedded-Geräte." +"Install IPFire from a floppy-formated USB key.","Installationsimage für USB-Sticks als Floppy formatiert." +"If the floppy image doesn't work, use this image instead.","USB-Stick-Image als Harddisk formatiert." +"A ready-to-run image for Xen.","Schlüsselfertiges Xen-Image." diff --git a/www/webapp/releases.py b/www/webapp/releases.py index 81d04722..5365ccff 100644 --- a/www/webapp/releases.py +++ b/www/webapp/releases.py @@ -10,31 +10,37 @@ class ReleaseItem(Item): "prio" : 10, "desc" : "Installable CD image", "url" : "http://download.ipfire.org/iso/", + "rem" : "Use this image to burn a CD and install IPFire from it.", }, "torrent" : { "prio" : 20, "desc" : "Torrent file", "url" : "http://download.ipfire.org/torrent/", + "rem" : "Download the CD image from the torrent network.", }, "alix" : { "prio" : 40, "desc" : "Alix image", "url" : "http://download.ipfire.org/iso/", + "rem" : "An image that is meant to run on embedded devices.", }, "usbfdd" : { "prio" : 30, "desc" : "USB FDD Image", "url" : "http://download.ipfire.org/iso/", + "rem" : "Install IPFire from a floppy-formated USB key.", }, "usbhdd" : { "prio" : 30, "desc" : "USB HDD Image", "url" : "http://download.ipfire.org/iso/", + "rem" : "If the floppy image doesn't work, use this image instead.", }, "xen" : { "prio" : 50, "desc" : "Pregenerated Xen Image", "url" : "http://download.ipfire.org/iso/", + "rem" : "A ready-to-run image for Xen.", }, } @@ -48,6 +54,7 @@ class ReleaseItem(Item): file = fileitem["name"], hash = fileitem.get("hash", None), prio = self.options[filetype]["prio"], + rem = self.options[filetype]["rem"], sha1 = fileitem.get("sha1", None), type = filetype, url = self.options[filetype]["url"] + fileitem["name"],