Add draft of download page.

diff --git a/www/static/css/style.css b/www/static/css/style.css
index eab173be556133edeec74e77fc598b09cc3bf7cc..6c785b0f15e55f596adf43a7f44034685efd31e1 100644 (file)
--- 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 (file)
index 0000000..1b5505a
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 (file)
index 0000000..4b0e05d
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 (file)
index 0000000..f3e679c
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 (file)
index 0000000..a70def0
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 (file)
index 0000000..32632c3
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 (file)
index 0000000..196f8c7
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 (file)
index 0000000..394a8ac
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 78826df9378c93d441dba6ebc9f7bdc48ce0cb3f..a30407a7df7460ef954668a17571862730c636b4 100644 (file)
--- a/www/templates/downloads.html
+++ b/www/templates/downloads.html
@@ -1,26 +1,71 @@
 {% extends "base.html" %}
 
+{% block title %}{{ _("Downloads") }}{% end block %}
+
 {% block content %}
        <div class="post">
                <a name="latest"></a>
                <h3>{{ _("Download IPFire") }}</h3>
 
-               <p>
-                       {{ _("This is the latest version of the IPFire firewall distribution.") }}
-                       Need to fill in some more text at this place.
-               </p>
+               <img src="{{ static_url("images/box_ipfire.png") }}" alt="{{ _("CD-Box") }}" class="floatTR" />
 
-               <div class="bigdownload">
-                       <span>{{ _("Begin download") }}</span>
+               {% if lang == "de" %}
+                       <p>
+                               Auf dieser Seite können Sie <strong>kostenlos</strong> die neueste
+                               Version von IPFire herunterladen. Ältere Versionen oder
+                               andere Downloadoptionen finden Sie weiter unten auf der Seite.
+                       </p>
+
+                       <p>
+                               IPFire ist innerhalb von 15 bis 20 Minuten eingerichtet.
+                               Eine <a href="http://wiki.ipfire.org/{{ lang }}/installation/start"
+                               target="_blank">Installationsanleitung</a>
+                               ist in unserem Wiki zu finden.
+                       </p>
+
+                       <p>
+                               Sollte Ihnen diese Software gefallen, würden sich die Betreiber
+                               über ein kleines <a href="donate">Dankeschön</a> freuen.
+                       </p>
+               {% else %}
+                       <p>
+                               On this page one can download the latest version of IPFire
+                               <strong>for free</strong>. Older versions and other downloads
+                               can be retrieved on the linked pages below.
+                       </p>
+
+                       <p>
+                               IPFire can be installed within 15 to 20 minutes. An
+                               <a href="http://wiki.ipfire.org/{{ lang }}/installation/start"
+                               target="_blank">installation guide</a> can be found on our wiki.
+                       </p>
+
+                       <p>
+                               If you like this piece of software, developers appreciate your
+                               <a href="donate">donations</a>.
+                       </p>
+               {% end %}
 
+               <div class="bigdownload">
+                       <a href="{{ release.iso.url }}">
+                               {{ _("Begin download") }}<br />
+                               {{ release.name }}
+                       </a>
                </div>
 
                <table class="download">
                        {% for download in release.downloads %}
-                               <tr>
-                                       <td class="{{ download.type }}">
+                               <tr class="{{ download.type }}">
+                                       <td class="icon">
+                                               <img src="{{ static_url("images/download_type_%s.png" % download.type) }}"
+                                                       alt="{{ download.type }}" />
+                                       </td>
+                                       <td class="link">
                                                <a href="{{ download.url }}">{{ _(download.desc) }}</a>
                                        </td>
+                                       <td>
+                                               {{ _(download.rem) }}
+                                       </td>
                                </tr>
                        {% end %}
                </table>
@@ -31,12 +76,13 @@
        <div class="post">
                <a name="other"></a>
                <h3>{{ _("Other download options") }}</h3>
-               
-               <ul class="otherdownloads">
+
+               <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>
+
                <br class="clear" />
        </div>
 {% end block %}

diff --git a/www/translations/de_DE.csv b/www/translations/de_DE.csv
index 073c33ab2181c6884591b9a098781ed2648f80d2..76d191e407b12a02adbede4f4006e79fb69a9a45 100644 (file)
--- 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 81d04722583a13a97b7b85e53b79410e9776165d..5365ccffff47631aa4237a3dcf35f7cebb63d875 100644 (file)
--- 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"],