Changes on download page.

diff --git a/www/include/style.css b/www/include/style.css
index d75e08124fc7978ba0309593f3f807fd7011d2b7..3b36d52bc6575f4e37d89124a735cfef430a2eda 100644 (file)
--- a/www/include/style.css
+++ b/www/include/style.css
@@ -852,3 +852,25 @@ table.translate td.lang {
 .even { 
        background-color: #F1F1F1;
 }
+
+/* IPFire Download Button */
+.button {
+    background: url(/images/buttons/download_core_96x320.png);
+    background-repeat: no-repeat;
+    background-position: right;
+    width: 700px;
+    height: 96px;
+}
+.button a, .button a:link, .button  a:visited {
+       color:#333;
+       text-decoration:none;
+}
+.button a:hover {
+       text-decoration: underline;
+}
+.button_text {
+       color:#333; 
+       font-size: 20px !important;
+       text-shadow: #666 1px 2px 2px;
+    padding: 51px 0px 0px 430px;
+}
\ No newline at end of file

diff --git a/www/pages/static/download.xml b/www/pages/static/download.xml
index 2151da083dc4b10439cf209828df536990b05cf6..12bc5c55495eaea0dc198aaead7bbf1f2638ee39 100644 (file)
--- a/www/pages/static/download.xml
+++ b/www/pages/static/download.xml
@@ -13,23 +13,27 @@
                                ]]></Content>
 
                        <Content lang="en"><![CDATA[
-                               Here you can find all the downloads of the ipfire project.<br />
-                               The brand new release <b>2.5</b> and the
-                               good old stables <b>2.3</b>, <b>2.1</b> and     <b>1.4.9</b>.
+                               Here you can find the latest downloads of the ipfire project.<br />
                                ]]></Content>
                        <Content lang="de"><![CDATA[
-                               Hier findet ihr alle Downloads des IPFire-Projektes.<br />
-                               Die stabile Version <b>2.5</b> sowie die guten alten
-                               Versionen <b>2.3</b>, <b>2.1</b> und <b>1.4.9</b>.
+                               Hier findet ihr die neusten Downloads des IPFire-Projektes.<br />
                                ]]></Content>
                        
                        <Content lang="en"><![CDATA[
                                We would like to say thanks to all the people that support this project by
-                               lending their bandwidth.
+                               lending their bandwidth.<br /><br /><br /><br /><br />
                                ]]></Content>
                        <Content lang="de"><![CDATA[
                                Ebenso möchten wir uns an dieser Stelle bei den Personen bedanken, die die zahlreichen Mirrorserver
-                               für das Projekt zur Verfügung stellen.
+                               für das Projekt zur Verfügung stellen.<br /><br /><br /><br />
+                               ]]></Content>
+                       
+                       <Content raw="1"><![CDATA[
+                               <div class="button">
+                                       <div class="button_text">
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.5.i586-full-core31.iso">&nbsp;IPFire 2.5 - Core 31&nbsp; </a>
+                                       </div>
+                               </div>
                                ]]></Content>
                </Paragraph>
                
@@ -71,117 +75,15 @@
                </Paragraph>
                
                <Paragraph>
-                       <Heading>IPFire 2.5</Heading>
-
-                       <Content lang="en"><![CDATA[
-                               This is the very new <strong>stable</strong> 2.5 with kernel 2.6.27.25.
-                               ]]></Content>
-                       <Content lang="de"><![CDATA[
-                               Die neue <strong>stabile</strong> Version vom 22. Juni 2009 mit Kernel 2.6.27.25.
-                               ]]></Content>
-                       
-                       <Content raw="1"><![CDATA[
-                               <div align="right">
-                                       <a href="http://download.ipfire.org/torrent/ipfire-2.5.i586-full-core28.iso.torrent">IPFire 2.5 - TORRENT - DISK</a><br />
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.5.i586-full-core28.iso">IPFire 2.5 - HTTP - DISK</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.5.i586-full-core28.iso.md5">MD5</a><br /><br />
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.5-install-usb-hdd.i586-full-core28.img.gz">IPFire 2.5 - HTTP - USB (HDD)</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.5-install-usb-hdd.i586-full-core28.img.gz.md5">MD5</a><br />
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.5-install-usb-fdd.i586-full-core28.img.gz">IPFire 2.5 - HTTP - USB (FDD)</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.5-install-usb-fdd.i586-full-core28.img.gz.md5">MD5</a><br /><br />
-                               </div>
-                               ]]></Content>
-                       <Content lang="en"><![CDATA[
-                               <div align="right">
-                                       For <a href="http://www.pcengines.ch" target="_blank" >Alix Boards</a>: <a href="http://download.ipfire.org/iso/ipfire-2.5.1gb-ext2-scon.i586-full-core28.img.gz">IPFire 2.5 - HTTP - FLASH 1G</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.5.1gb-ext2-scon.i586-full-core28.img.gz.md5">MD5</a>
-                               </div>
-                               ]]></Content>
-                       <Content lang="de"><![CDATA[
-                               <div align="right">
-                                       F&uuml;r <a href="http://www.pcengines.ch" target="_blank" >Alix Boards</a>: <a href="http://download.ipfire.org/iso/ipfire-2.5.1gb-ext2-scon.i586-full-core28.img.gz">IPFire 2.5 - HTTP - FLASH 1G</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.5.1gb-ext2-scon.i586-full-core28.img.gz.md5">MD5</a>
-                               </div>
-                               ]]></Content>                                   
-               </Paragraph>
-
-               <Paragraph>
-                       <Heading>IPFire 2.3</Heading>
-
-                       <Content lang="en"><![CDATA[
-                               This is the <strong>old stable</strong> 2.3 with kernel 2.6.25.19.
-                               ]]></Content>
-                       <Content lang="de"><![CDATA[
-                               Die alte <strong>stabile</strong> Version vom 8. November 2008 mit Kernel 2.6.25.19.
-                               ]]></Content>
-                       
-                       <Content raw="1"><![CDATA[
-                               <div align="right">
-                                       <a href="http://download.ipfire.org/torrent/ipfire-2.3.i586-full.iso.torrent">IPFire 2.3 - TORRENT - DISK</a><br />
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.3.i586-full.iso">IPFire 2.3 - HTTP - DISK</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.3.i586-full.iso.md5">MD5</a><br /><br />
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.3-install-usb-hdd.i586.img.gz">IPFire 2.3 - HTTP - USB (HDD)</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.3-install-usb-hdd.i586.img.gz.md5">MD5</a><br />
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.3-install-usb-fdd.i586.img.gz">IPFire 2.3 - HTTP - USB (FDD)</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.3-install-usb-fdd.i586.img.gz.md5">MD5</a>
-                               </div>
-                               ]]></Content>   
-               </Paragraph>
-               
-               <Paragraph>
-                       <Heading>IPFire 2.1</Heading>
-
-                       <Content lang="en"><![CDATA[
-                               This is the old stable 2.1 with kernel 2.6.16.57.
-                               ]]></Content>
-                       <Content lang="de"><![CDATA[
-                               Die stabile Version vom 8. November 2007 mit Kernel 2.6.16.57.
-                               ]]></Content>
-                        <Content lang="en"><![CDATA[
-                                <b>The team recommends using IPFire 2.3.</b>
-                                ]]></Content>
-                        <Content lang="de"><![CDATA[
-                                <b>Das Team empfielt den Einsatz von IPFire 2.3.</b>
-                                ]]></Content>
-                       
-                       <Content raw="1"><![CDATA[
-                               <div align="right">
-                                       <a href="http://download.ipfire.org/torrent/ipfire-2.1.i586-full.iso.torrent">IPFire 2.1 - TORRENT - DISK</a><br />
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.1.i586-full.iso">IPFire 2.1 - HTTP - DISK</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.1.i586-full.iso.md5">MD5</a><br /><br />
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.1-install-usb-hdd.i586.img.gz">IPFire 2.1 - HTTP - USB (HDD)</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.1-install-usb-hdd.i586.img.gz.md5">MD5</a><br />
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.1-install-usb-fdd.i586.img.gz">IPFire 2.1 - HTTP - USB (FDD)</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-2.1-install-usb-fdd.i586.img.gz.md5">MD5</a>
-                               </div>
-                               ]]></Content>   
-               </Paragraph>
-               
-               <Paragraph>
-                       <Heading>IPFire 1.4.9</Heading>
+                       <Heading lang="en">ancient IPFire builds</Heading>
+                       <Heading lang="de">ältere IPFire Versionen</Heading>
 
                        <Content lang="en"><![CDATA[
-                               The final version was released in August 2005.
+                               Ancient versions can be found by browsing to <a href="ancient_download">here</a>.
                                ]]></Content>
                        <Content lang="de"><![CDATA[
-                               Die finale Version des IPFire wurde im August 2005 veröffentlicht.
+                               Ältere Versionen findet man <a href="ancient_download">hier</a>.
                                ]]></Content>
-                       
-                       <Content lang="en"><![CDATA[
-                               <b>After 4 years, the team has decided to cease support for this release.</b>
-                               ]]></Content>
-                       <Content lang="de"><![CDATA[
-                               <b>Nach 4 Jahren produktivem Einsatz hat das Team sich entschlossen<br />
-                                  den Support für diese Version einzustellen.</b>
-                               ]]></Content>
-                       
-                       <Content raw="1"><![CDATA[
-                               <div align="right">
-                                       <a href="http://download.ipfire.org/torrent/IPFire-1.4.9-FINAL.iso.torrent">IPFire 1.4.9 - TORRENT</a><br />
-                                       <a href="http://download.ipfire.org/iso/IPFire-1.4.9-FINAL.iso">IPFire 1.4.9 - HTTP</a>&nbsp;
-                                       <a href="http://download.ipfire.org/iso/IPFire-1.4.9-FINAL.iso.md5">MD5</a>
-                               </div>
-                               ]]></Content>   
                </Paragraph>
                
                <Paragraph>
@@ -203,7 +105,17 @@
                                <div align="right">
                                        <a href="http://download.ipfire.org/iso/ipfire-3.0-alpha1.i686.iso">IPFire 3 - Alpha1</a>
                                        &nbsp;
-                                       <a href="http://download.ipfire.org/iso/ipfire-3.0-alpha1.i686.iso.md5">MD5</a>
+                                       <a href="http://download.ipfire.org/iso/ipfire-3.0-alpha1.i686.iso.md5">MD5</a><br />
+                                       </div>
+                               ]]></Content>
+                       <Content raw="1" lang="en"><![CDATA[
+                               <div align="right">
+                                       <a href="builds">nightly builds</a>
+                                       </div>
+                               ]]></Content>
+                       <Content raw="1" lang="de"><![CDATA[
+                               <div align="right">
+                                       <a href="builds">Nightly Builds</a>
                                        </div>
                                ]]></Content>
                </Paragraph>
@@ -224,26 +136,6 @@
                                </ul>
                                ]]></Content>
                </Paragraph>
-               
-               <!-- <Paragraph>
-                       <Heading lang="en"><![CDATA[<span>Other</span> Tools]]></Heading>
-                       <Heading lang="de"><![CDATA[<span>Andere</span> Tools]]></Heading>
-
-                       <Content lang="en"><![CDATA[
-                               <ul class="links">
-                                       <li class="first"><a href="http://wiki.ipfire.org/en/tools/windows">Windows</a></li>
-                                       <li><a href="http://wiki.ipfire.org/en/tools/linux">Linux</a></li>
-                                       <li><a href="http://wiki.ipfire.org/en/tools/mac_os">Mac OS</a></li>
-                               </ul>
-                               ]]></Content>
-                   <Content lang="de"><![CDATA[
-                               <ul class="links">
-                                       <li class="first"><a href="http://wiki.ipfire.org/de/tools/windows">Windows</a></li>
-                                       <li><a href="http://wiki.ipfire.org/de/tools/linux">Linux</a></li>
-                                       <li><a href="http://wiki.ipfire.org/de/tools/mac_os">Mac OS</a></li>
-                               </ul>
-                               ]]></Content>
-               </Paragraph> -->
 
                <Paragraph banner="1" />