Edit download section - new icons - multilanguage...

diff --git a/www/templates/downloads-all.html b/www/templates/downloads-all.html
index 816491f49e5428a6778dcdc6f93ff186232045dc..257e404375a1dc0dbef8bb876dfe445d1d93f441 100644 (file)
--- 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 cc841dc722e3bc1a9e97e7b7a52194daf323164e..9ca26eedec47c905a87039cd354433725059a67c 100644 (file)
--- 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 ed0098883bcd347d549d0d9563423dc60b472d68..46a2a20a8902602b08593825fe1aa34765acf2ec 100644 (file)
--- 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 e00af9473d73b5207b7f45510e5ade5af9afbae1..1c8d15b042c20d86b0a0aa92c053fe3b0ee4fe57 100644 (file)
--- 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 a30407a7df7460ef954668a17571862730c636b4..daf19334d3c40711d1f14456dc45048abfd22952 100644 (file)
--- 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 %}