Homepage aktualisiert.

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/www.ipfire.org/trunk@845 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/.htaccess b/.htaccess
new file mode 100644 (file)
index 0000000..0975e2c
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1 @@
+DirectoryIndex index.pl index.shtml

diff --git a/de/index.shtml b/de/index.shtml
index e3a6e4125aa69a38f3798f7c7bbae1f8343fc4c0..3ad7167bc4d31a6b1861bff3b18a72b06b468e95 100644 (file)
--- a/de/index.shtml
+++ b/de/index.shtml
@@ -93,15 +93,21 @@
                                
                                <h4><span>Download</span> IPFire <span>BETA 1</span></h4>
                                <ul class="links">
-                                       <li class="first"><a href="http://download.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 1</a></li>
+                                       <li class="first"><a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso.torrent">IPFire 2.0 Beta 1 - TORRENT</a></li>
+                                       <!-- <li><a href="http://download.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 1</a></li> -->
                                        <li><a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 2</a></li>
-                                       <li><a href="http://www.rowie.at/ipfire/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 3</a></li>
-                                       <li><a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso.torrent">IPFire 2.0 Beta 1 - TORRENT</a></li>
+                                       <li><a href="http://mirror3.ipfire.org/v2.0/beta/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 3</a></li>
+                                       <li><a href="http://www.rowie.at/ipfire/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 4</a></li>
                                </ul>
                                
                        </div>
                        
                        <div id="columnC_3columns">
+                               <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+                                       <input type="hidden" name="cmd" value="_s-xclick" />
+                                       <input type="image" src="https://www.paypal.com/de_DE/i/btn/x-click-but04.gif" border="0" name="submit" alt="Zahlen Sie mit PayPal - schnell, kostenlos und sicher!" />
+                                       <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHNwYJKoZIhvcNAQcEoIIHKDCCByQCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYADl4ZVbfFE5pPVEheHvQ1Ys/6HrtfFOJDVlLBeHS0WopCDAGhBl6WSq9c4wj8n5W6qnGQ8zcKtmfoFzgeAY8Av8jqbIYsARkS152DzvGCrdMO0549pCQxCymu/a3wOFSfifDnYq4c8eMm+kHeyahtdlzds8bVFbQGauB18fs7YGTELMAkGBSsOAwIaBQAwgbQGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIjkANetwOxWuAgZDzcUVuWuRBd6GxTkX10kmu9L0OolNYI8hrsEySiV3B3vtGaPuPl5LI08Nc7a7VoqO8ve+Ll9qGivJp6knmAtDFp6BeBex+I4uNTgtrxNpp7TTpNBaGjdoUzQZrJJCRSgHglAkriKrKEHlZTz5y3TkJCvQZAThUpV9cCx2i4xhjr+NnyrtRWMjDsRRQcIrgspOgggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS+Ndl72T7oKJ4u4uw+6awntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe/hJl66/RGqrj5rFb08sAABNTzDTiqqNpJeBsYs/c2aiGozptX2RlnBktH+SUNpAajW724Nv2Wvhif6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7BgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIFfOlaagFrl71+jq6OKidbWFSE+Q4FqROvdgIONth+8kSK//Y/4ihuE4Ymvzn5ceE3S/iBSQQMjyvb+s2TWbQYDwcp129OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa+u4qectsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wNjAyMjYyMDI1MTBaMCMGCSqGSIb3DQEJBDEWBBQ4Yw74CgweWpGlcmbj0zAA/Pl3xzANBgkqhkiG9w0BAQEFAASBgKjGjq1mblRc3rrgeChxwo69Yc9BSO4IwHIbi+rniZa9dYyuVDNLQesXQzB/pgnrd7B+xs9z6OS1ScdNVBkGa3Xpz/n8kTheWu803NXN0fah/6tG3cCsYhvgt77Ar1MGDeBguHHZXQUWCG+EhtU1QHCiTK72PSf4vcqnjhggbQmC-----END PKCS7-----" />
+                               </form>
                                <h4><span>Help</span> Me</h4>
                                <ul class="links">
                                        <li class="first"><a href="http://forum.ipfire.org/">Forum</a></li>

diff --git a/en/index.shtml b/en/index.shtml
index cc77685f3769b5dadd593f8a9b64035e974caef1..2a40db2a4b7a84addfd579e4bbd7b4d069263df2 100644 (file)
--- a/en/index.shtml
+++ b/en/index.shtml
@@ -86,15 +86,22 @@
                                
                                <h4><span>Download</span> IPFire <span>BETA 1</span></h4>
                                <ul class="links">
-                                       <li class="first"><a href="http://download.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 1</a></li>
+                                       <li class="first"><a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso.torrent">IPFire 2.0 Beta 1 - TORRENT</a></li>
+                                       <!-- <li><a href="http://download.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 1</a></li> -->
                                        <li><a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 2</a></li>
-                                       <li><a href="http://www.rowie.at/ipfire/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 3</a></li>
-                                       <li><a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso.torrent">IPFire 2.0 Beta 1 - TORRENT</a></li>
+                                       <li><a href="http://mirror3.ipfire.org/v2.0/beta/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 3</a></li>
+                                       <li><a href="http://www.rowie.at/ipfire/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 4</a></li>
                                </ul>
                                
                        </div>
                        
                        <div id="columnC_3columns">
+
+                               <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+                                       <input type="hidden" name="cmd" value="_s-xclick" />
+                                       <input type="image" src="https://www.paypal.com/de_DE/i/btn/x-click-but04.gif" border="0" name="submit" alt="Zahlen Sie mit PayPal - schnell, kostenlos und sicher!" />
+                                       <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----" />
+                               </form>
                                <h4><span>Help</span> Me</h4>
                                <ul class="links">
                                        <li class="first"><a href="http://forum.ipfire.org/">Forum</a></li>

diff --git a/header.shtml b/header.shtml
index 4a3363fc68fa6650df08626e003ec252c05cf09d..a6474c3b7b85d302be6e7544934609f5e798fe2f 100644 (file)
--- a/header.shtml
+++ b/header.shtml
@@ -19,8 +19,8 @@
                </div>
                
                <div id="lang">
-                       <a href="/en/" ><img src="/images/en.gif" /></a>
-                       <a href="/de/" ><img src="/images/de.gif" /></a>
+                       <a href="/en/" ><img src="/images/en.gif" alt="english" /></a>
+                       <a href="/de/" ><img src="/images/de.gif" alt="german" /></a>
                </div>
                
                <div id="menu">

diff --git a/images/pic.gif b/images/pic.gif
index ada8fde76b21788ab98de4be450cae33ad898901..b3405468eb84361b1bb74ea6334b19074a691baf 100644 (file)
Binary files a/images/pic.gif and b/images/pic.gif differ