From ab66924a0257ded5b33e07e6fc2c146394156a81 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 22 Jan 2010 16:22:28 +0100 Subject: [PATCH] Add draft of download page. --- www/static/css/style.css | 34 ++++++++++ www/static/images/download_button.png | Bin 0 -> 4043 bytes www/static/images/download_type_alix.png | Bin 0 -> 238 bytes www/static/images/download_type_iso.png | Bin 0 -> 769 bytes www/static/images/download_type_torrent.png | Bin 0 -> 970 bytes www/static/images/download_type_usbfdd.png | Bin 0 -> 761 bytes www/static/images/download_type_usbhdd.png | Bin 0 -> 689 bytes www/static/images/download_type_xen.png | Bin 0 -> 482 bytes www/templates/downloads.html | 66 +++++++++++++++++--- www/translations/de_DE.csv | 17 +++++ www/webapp/releases.py | 7 +++ 11 files changed, 114 insertions(+), 10 deletions(-) create mode 100644 www/static/images/download_button.png create mode 100644 www/static/images/download_type_alix.png create mode 100644 www/static/images/download_type_iso.png create mode 100644 www/static/images/download_type_torrent.png create mode 100644 www/static/images/download_type_usbfdd.png create mode 100644 www/static/images/download_type_usbhdd.png create mode 100644 www/static/images/download_type_xen.png 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 0000000000000000000000000000000000000000..1b5505a871c172e64b028b188d855f41a82c5855 GIT binary patch literal 4043 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 literal 0 Hc-jL100001 diff --git a/www/static/images/download_type_alix.png b/www/static/images/download_type_alix.png new file mode 100644 index 0000000000000000000000000000000000000000..4b0e05d57913e079324e3f33b9d3a7cd8675abfe GIT binary patch literal 238 zc-jH(01^L*P)01ONa4 literal 0 Hc-jL100001 diff --git a/www/static/images/download_type_iso.png b/www/static/images/download_type_iso.png new file mode 100644 index 0000000000000000000000000000000000000000..f3e679c9dac0269b885a48dddec1bf38a3f5516c GIT binary patch literal 769 zc-jF01OEJpP)Y6YA z{5~}uil}jp#uBW?6C8^#aXgXa#FEBS)3YN-&$UdK9ILNb$s=Y))v2Z&WYS3c^=tD^ zhr>lg5CjlWngawvB(gYq;$o{cso7kE0e?&YfUt_zx+B%!vaD8@CM7goho;LkPsLKg zo^2~?sI6JZu*5EzLliADG@TbQ39Atp@#DVF|^ zW1q__4tmUqJM-2TdMm3TQn4l_2+M%p!B9d`M9`dpVX&{eH@GLPsv%A4&{F;C`kEJ! z5)0Aj@T=~3TQfNGjtL0(Z_Ow|X@2zV`KHLC8q#zLT}l(Q;^9bi*yn$^SuieiJ-!|J z?JJ*bxq6(5@0B0$jPKjE(`L8Zb`S}uvDnwqPvgnAeZg%KXzaZ2d;P~<0Dv=1SMrk< zrIiR?gW1i@(g2278o^Ag^L6-dg#Wrs|6;!Y6P;vmnstPv00000NkvXXu0mjfNkm&G literal 0 Hc-jL100001 diff --git a/www/static/images/download_type_torrent.png b/www/static/images/download_type_torrent.png new file mode 100644 index 0000000000000000000000000000000000000000..a70def0e0e0304e518a88143500b9b2f7736159c GIT binary patch literal 970 zc-jHV12z1KP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igG@ z6*C$(GUg=!00T-%L_t(I%T1C?Ok8ys#ed)bzGfI;1_-Z~@+e|yKx(Z;g-S|ojHIS@ zp)rQoSmH`eH=2gTg^xsIOln;iQDYjTb?3%*;X)JRqk^^xXdwlaM_`}@rZ^14aJhHx z{ks5+-|png`JLqC$U_%jVzBQ6c;iv$?7l~i7DTM)tD>b(qQcM!H2@wO!?0B{y*Lnr zT)Oc6gs&u)m?miGUIjcenBoV@25645elEL`LA#8)h4=TR8A z0VpNp^LZ2+itQLR#k&ZVpmm6+1D-nA$49@s!?`PGm`zXf-VUi+qx#kC|#gs(?GA(fqBHa$wjHqaUh%z%h(Vp>2&EKbz1 ziC7WJi%Pf3(o2*ST01%Xx$-md0!4_zHZ-f7TJMgPDYHCQGUIE%-nIl$f-*IxvZzQT zaP!&i0c`D3w(3F%Fhon*UA?5dkatIyrYUwx^;CKoLkVs^%kjoDSeC}I6pk%8mSEco zWk9G!-^qnwL_RkXC))p>SekpWdrzygxc--JsqB)`#UE)%9HgW6X$s8>92F;Glu~F` z61VDgUHp)Yr~IkwsoUoSpzF*2y`*oAyxiVXwCpB1)^vi2)G(RNEJyY}Msc(hL9_<( zf`H#1zyJUM07*qoM6N<$f<|<{v;Y7A literal 0 Hc-jL100001 diff --git a/www/static/images/download_type_usbfdd.png b/www/static/images/download_type_usbfdd.png new file mode 100644 index 0000000000000000000000000000000000000000..32632c39c1106b17772ca705f81476b8296ebd5f GIT binary patch literal 761 zc-jH^0tWqwP)z^;_j}LFcZ5=kEE+qzEiK>IqwBh+3sC8`=+OOJci9H|UuVlGuj$)!yu)8=!PKjV zGr;x&jh)^548ypjNg+L^iIAG*t*pV93!0%9H+P-837}94g`4HBt6ax%`gLGeUT)6$ zw$|nxDFlO)A;gAyf!FJ6?>c=^lL8^-=Dkwz==p#hj>ewqKt;rMtQS*Jq?^Xrv3Jv+ zzp{$YbKi)BR`7asu3f%BVSYZEl)QX9oC-%{LIPil@^X_=kDqW$FJ?nK2oS)LlV@n_ z?m++xfgo3I+~VWdICg3+J3~kSOJn_*Cx~a}{g#m4Jb6H0Zx45_UnQAb<=(Ra63JvH z5kLaUaa~#)4p6l?Ogb=|d8>elk=G=`D|{H6ptPizQ!Pydf*~em=h^5N5>T$|qJR_i zwHTw1S&N5>EKEaaj;8v<489v7o=DJesE*tmi>2>DHugv8Spkn}5KpYqR9D5w;BAtI z;A}@LMfrK`EH5J#Pw;7c5`T%0>dJ~g1aOrSy40}OQaFyo(dttC#f8M;KT%3i;PtYw z9ANs(BKxa%qZC^mEQfy3aIlu;U!OrGN)0ImmTBU+4njz@afuLuNGxt;9W1S{r~4f#f!xoWbM00000NkvXXu0mjfIILFi literal 0 Hc-jL100001 diff --git a/www/static/images/download_type_usbhdd.png b/www/static/images/download_type_usbhdd.png new file mode 100644 index 0000000000000000000000000000000000000000..196f8c79918a47c266f78676e9ca0018c0875315 GIT binary patch literal 689 zc-jH60#5yjP)j&Wz)XGis8c)imUohKPtoM6@Xa zDT3Mr(V|^T|A+nq_q7OGWuV}qRY8LEV`1d77HXMO>Nqp+z4486?`bhl(Y1@t=3Kt# z-oy7CK39ndCkcI`*MOS5`>+sii%n~-wFoxSMUd86kSGaJT@bNWtTATB1^P4T^pi*T zrjk}HB7#zy!_h=&HVuyJ9BLx)YHne#T&cd%fOKU$!=VcWl8GcuQG`vyb2Fz1=z5VlE$-R~YC!&5g?wtZi)a z_QMkIKYd|ydz)v|Pf<#7&;Vl$nN*6f(V*t}3^L@Ur{$%0Z zB8t{-bjyKd-|VB5qFk-9Td7g?eEgu!i`jXezn((@x36EN?^F-JN`K&p12NWsD1v$& zF9^^|p|qkWn`P``k&V({08+^$eZ4(&q}q>-AjVkI?d|+nU1Q%^RMbE#O)-C#@sS|_ zb}ChRyK|f$=to5uXaHla0--CHC8+OVt);s&gHllSe7qo_w6#s9BSkioW@2>sxC3h~ zrJXW^`7;dV&#_ypvA$U%nMja`$7vcvP_Gj^!dP;<_#h z&|2X*4vyBuVlJR?w8n8Xj@E4LloJOIeus_5%;&EwElOJvAqhwEM#M(i!M#=W-+$vj XNg@PxR^j;)00000NkvXXu0mjfI@~uz literal 0 Hc-jL100001 diff --git a/www/static/images/download_type_xen.png b/www/static/images/download_type_xen.png new file mode 100644 index 0000000000000000000000000000000000000000..394a8acf21360b4b4a5996101a96e414a0343c0d GIT binary patch literal 482 zc-jHt0UiE{P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igG@ z6*~)*TTI^o00Cl2L_t(I%k7dqYg$nNhM#-yIdB{<_DoVp5QGR0B9~634i|(BS)3#y z9ZJy2wIC!z{)1C!AcGX7gM;AWC=!SvnGA^3k3s^0lsjMI$30!Tw*G-UKj3*^cwczK z0%)~bQfvK1DRm~L+z-R>cC}i4Ef$N{y97?B(-F(%@Tc{aq*&lK-vH>-9d*=X2BV_l=a& z*tTr|@%kQi>o5a2$vAdQB#ipYgNyJoXVrBX4j>*9GHlgY%)W;1fRTm&2eXTS}R1nz-H;63mI;4l`8 zJ@~$F27`f_PNz{mpEucT*0kI0)14~-&syuNMx$YAtv_rw8|iu8b1IcOsaC7s-k!dj YKV#5-2K;r>1^@s607*qoM6N<$g5ZC}C;$Ke literal 0 Hc-jL100001 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"], -- 2.47.3