Moved the beta1.shtml to final.shtml and showed the source of version 3.x.

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

diff --git a/de/beta1.shtml b/de/final.shtml
similarity index 84%
rename from de/beta1.shtml
rename to de/final.shtml
index 12d605551ee56cc4f6a4f15d1ae4301b576272de..5c361a272638f8802715715a10c2dba8b816adc5 100644 (file)
--- a/de/beta1.shtml
+++ b/de/final.shtml
@@ -8,7 +8,7 @@
 
                        <div id="columnA_columnless">
                
-                               <h3>Beta 1</h3>
+                               <h3>IPFire 2.1 Final</h3>
 
                                <p>
                                        Zuerst einmal wollen wir das Webinterface vorstellen, was in einem neuen
@@ -18,9 +18,9 @@
                                        Zu finden sind hier:</p>
                                        
                                <a class="thumbnail">
-                                       <img class="floatTL" src="../images/screens/de/beta1/thumb/index.png" alt="Startseite" width="210" />
+                                       <img class="floatTL" src="../images/screens/de/final/thumb/index.png" alt="Startseite" width="210" />
                                        <span>
-                                               <img src="../images/screens/de/beta1/index.png" alt="Startseite" width="650" /><br />
+                                               <img src="../images/screens/de/final/index.png" alt="Startseite" width="650" /><br />
                                                Die Startseite des Webinterface
                                        </span>
                                </a>
@@ -54,9 +54,9 @@
                                <br class="clear" />
                                
                                <a class="thumbnail">
-                                       <img class="floatTL" src="../images/screens/de/beta1/thumb/system.png" alt="Status" width="210" />
+                                       <img class="floatTL" src="../images/screens/de/final/thumb/system.png" alt="Status" width="210" />
                                        <span>
-                                               <img src="../images/screens/de/beta1/system.png" alt="Status" width="640" /><br />
+                                               <img src="../images/screens/de/final/system.png" alt="Status" width="640" /><br />
                                                Status-Seite
                                        </span>
                                </a>
@@ -66,16 +66,16 @@
                                        In der gesamten Rubrik finden sie ein Dutzend an Diagrammen, welche den Admin-Alltag
                                        immens erleichtern können, da man hier Fehlfunktionen mit ein wenig Übung sofort
                                        erkennen kann.<br />
-                                       Unter <a class="thumbnail">Net-Traffic<span><img src="../images/screens/de/beta1/nettraffic.png" alt="Netttraffic" width="640" /><br />Net-Traffic</span></a>
+                                       Unter <a class="thumbnail">Net-Traffic<span><img src="../images/screens/de/final/nettraffic.png" alt="Netttraffic" width="640" /><br />Net-Traffic</span></a>
                                        behält man die die Übertragungsvolumina im Auge oder schaut sich
                                        die Netzwerkgraphen an um zu erkennen wie die 
-                                       <a class="thumbnail">Bandbreitenbelastung<span><img src="../images/screens/de/beta1/nw-internal.png" alt="Bandbreitenbelastung" width="640" /><br />Bandbreitenbelastung</span></a> 
+                                       <a class="thumbnail">Bandbreitenbelastung<span><img src="../images/screens/de/final/nw-internal.png" alt="Bandbreitenbelastung" width="640" /><br />Bandbreitenbelastung</span></a> 
                                        ausschaut.<br />Für die 
-                                       <a class="thumbnail">Aktivität der Firewall<span><img src="../images/screens/de/beta1/fwdiag.png" alt="Aktivität der Firewall" width="640" /><br />Aktivität der Firewall</span></a>
+                                       <a class="thumbnail">Aktivität der Firewall<span><img src="../images/screens/de/final/fwdiag.png" alt="Aktivität der Firewall" width="640" /><br />Aktivität der Firewall</span></a>
                                        finden sie ein Diagramm, welches auch Portscans anzeigt.<br />
                                        Bedanken möchten wir uns auch bei Arne Fitzenreiter für die Idee die Datenplatten automatisch
                                        abzuschalten. Wann eine Festplatte
-                                       <a class="thumbnail">"geschlafen"<span><img src="../images/screens/de/beta1/disk.png" alt="Disks" width="640" /><br />Festplattenbelastung</span></a>
+                                       <a class="thumbnail">"geschlafen"<span><img src="../images/screens/de/final/disk.png" alt="Disks" width="640" /><br />Festplattenbelastung</span></a>
                                        hat sieht man ebenfall in dieser Rubrik.<br />
                                        
                                        </p>
@@ -85,9 +85,9 @@
                                <br class="clear" />
                                
                                <a class="thumbnail">
-                                       <img class="floatTL" src="../images/screens/de/beta1/thumb/proxy.png" alt="Proxy" width="210" />
+                                       <img class="floatTL" src="../images/screens/de/final/thumb/proxy.png" alt="Proxy" width="210" />
                                        <span>
-                                               <img src="../images/screens/de/beta1/proxy.png" alt="Proxy" width="640" /><br />
+                                               <img src="../images/screens/de/final/proxy.png" alt="Proxy" width="640" /><br />
                                                WebProxy-Seite
                                        </span>
                                </a>
@@ -101,7 +101,7 @@
                                        Und durch die Erweiterungen zum Content-Filtering und dem Caching von z.B. Windows-Updates
                                        ist er noch attraktiver.<br />
                                        Mit dem
-                                       <a class="thumbnail">Connection Scheduler<span><img src="../images/screens/de/beta1/connsched.png" alt="ConnectionScheduler" width="640" /><br />ConnectionScheduler</span></a>
+                                       <a class="thumbnail">Connection Scheduler<span><img src="../images/screens/de/final/connsched.png" alt="ConnectionScheduler" width="640" /><br />ConnectionScheduler</span></a>
                                        lassen sich Aufgaben für das Verbinden und Trennen der roten Verbindung festlegen. Das ist eine
                                        Erweiterung des "MorningReconnects", aber es lassen sich auch zu bestimmten Uhrzeiten die Wähl-Profile
                                        auswechseln, sodass es LowCost-Router entsteht.
@@ -112,9 +112,9 @@
                                <br class="clear" />
                                
                                <a class="thumbnail">
-                                       <img class="floatTL" src="../images/screens/de/beta1/thumb/ipsec.png" alt="IPSec" width="210" />
+                                       <img class="floatTL" src="../images/screens/de/final/thumb/ipsec.png" alt="IPSec" width="210" />
                                        <span>
-                                               <img src="../images/screens/de/beta1/ipsec.png" alt="IPSec" width="640" /><br />
+                                               <img src="../images/screens/de/final/ipsec.png" alt="IPSec" width="640" /><br />
                                                IPSec-VPN
                                        </span>
                                </a>
@@ -136,7 +136,7 @@
                                                        <a class="thumbnail">
                                                                Dynamischer DNS
                                                                <span>
-                                                                       <img src="../images/screens/de/beta1/dyndns.png" alt="DynDNS" width="640" /><br />
+                                                                       <img src="../images/screens/de/final/dyndns.png" alt="DynDNS" width="640" /><br />
                                                                        DynDNS
                                                                </span>
                                                        </a>
@@ -145,7 +145,7 @@
                                                        <a class="thumbnail">
                                                                Intrusion Detection System
                                                                <span>
-                                                                       <img src="../images/screens/de/beta1/ids.png" alt="IDS" width="640" /><br />
+                                                                       <img src="../images/screens/de/final/ids.png" alt="IDS" width="640" /><br />
                                                                        Intrusion Detection System
                                                                </span>
                                                        </a>
@@ -158,9 +158,9 @@
                                <br class="clear" />
                                
                                <a class="thumbnail">
-                                       <img class="floatTL" src="../images/screens/de/beta1/thumb/qos-2.png" alt="QoS" width="210" />
+                                       <img class="floatTL" src="../images/screens/de/final/thumb/qos-2.png" alt="QoS" width="210" />
                                        <span>
-                                               <img src="../images/screens/de/beta1/qos-2.png" alt="QoS" width="640" /><br />
+                                               <img src="../images/screens/de/final/qos-2.png" alt="QoS" width="640" /><br />
                                                QoS
                                        </span>
                                </a>
@@ -179,7 +179,7 @@
                                                        <a class="thumbnail">
                                                                Externer Zugang
                                                                <span>
-                                                                       <img src="../images/screens/de/beta1/xtaccess.png" alt="XTAccess" width="640" /><br />
+                                                                       <img src="../images/screens/de/final/xtaccess.png" alt="XTAccess" width="640" /><br />
                                                                        Externer Zugang
                                                                </span>
                                                        </a>
@@ -188,7 +188,7 @@
                                                        <a class="thumbnail">
                                                                Ausgehende Firewall - Bild 1
                                                                <span>
-                                                                       <img src="../images/screens/de/beta1/outgoingfw-1.png" alt="Outgoingfw" width="640" /><br />
+                                                                       <img src="../images/screens/de/final/outgoingfw-1.png" alt="Outgoingfw" width="640" /><br />
                                                                        Ausgehende Firewall
                                                                </span>
                                                        </a>
@@ -197,7 +197,7 @@
                                                        <a class="thumbnail">
                                                                Ausgehende Firewall - Bild 2
                                                                <span>
-                                                                       <img src="../images/screens/de/beta1/outgoingfw-2.png" alt="Outgoingfw" width="640" /><br />
+                                                                       <img src="../images/screens/de/final/outgoingfw-2.png" alt="Outgoingfw" width="640" /><br />
                                                                        Ausgehende Firewall
                                                                </span>
                                                        </a>
@@ -210,9 +210,9 @@
                                <br class="clear" />
                                
                                <a class="thumbnail">
-                                       <img class="floatTL" src="../images/screens/de/beta1/thumb/pakfire-1.png" alt="Pakfire" width="210" />
+                                       <img class="floatTL" src="../images/screens/de/final/thumb/pakfire-1.png" alt="Pakfire" width="210" />
                                        <span>
-                                               <img src="../images/screens/de/beta1/pakfire-1.png" alt="Pakfire" width="640" /><br />
+                                               <img src="../images/screens/de/final/pakfire-1.png" alt="Pakfire" width="640" /><br />
                                                Pakfire
                                        </span>
                                </a>
@@ -225,7 +225,7 @@
                                                        <a class="thumbnail">
                                                                Pakfire-Log
                                                                <span>
-                                                                       <img src="../images/screens/de/beta1/pakfire-2.png" alt="Pakfire" width="640" /><br />
+                                                                       <img src="../images/screens/de/final/pakfire-2.png" alt="Pakfire" width="640" /><br />
                                                                        Pakfire
                                                                </span>
                                                        </a>
@@ -234,7 +234,7 @@
                                                        <a class="thumbnail">
                                                                Samba
                                                                <span>
-                                                                       <img src="../images/screens/de/beta1/samba.png" alt="Samba" width="640" /><br />
+                                                                       <img src="../images/screens/de/final/samba.png" alt="Samba" width="640" /><br />
                                                                        Samba
                                                                </span>
                                                        </a>
@@ -249,9 +249,9 @@
                                <br class="clear" />
                                
                                <a class="thumbnail">
-                                       <img class="floatTL" src="../images/screens/de/beta1/thumb/fwlog-port.png" alt="FWLog" width="210" />
+                                       <img class="floatTL" src="../images/screens/de/final/thumb/fwlog-port.png" alt="FWLog" width="210" />
                                        <span>
-                                               <img src="../images/screens/de/beta1/fwlog-port.png" alt="FWLog" width="640" /><br />
+                                               <img src="../images/screens/de/final/fwlog-port.png" alt="FWLog" width="640" /><br />
                                                Firewall-Log (Port)
                                        </span>
                                </a>

diff --git a/de/index.shtml b/de/index.shtml
index f2580bc99595e3be554c1a8ea12694ecf92dc71e..c0e451f40f92eae50181abfee82f1d95f200901b 100644 (file)
--- a/de/index.shtml
+++ b/de/index.shtml
@@ -63,7 +63,8 @@
                                                <li><a href="http://wiki.ipfire.org/Addons:Asterisk" target="_blank">=> Voice over IP-Lösung mittels Asterisk</a></li>
                                        </ul>
                                        <p>
-                                                       <a href="http://wiki.ipfire.org/Addons" target="blank">Hier finden Sie eine vollständige Liste der Addons.</a>
+                                                       <a href="http://wiki.ipfire.org/Addons" target="blank">Hier finden Sie eine vollständige Liste der Addons.</a><br />
+                                                       <a href="final.shtml">Hier</a> ist eine kurze Einführung in das Webinterface zu finden.
                                                        <br /><br /><b>Mitch</b> - für das Entwicklerteam von IPFire.org
                                        </p>
                                </div>                          

diff --git a/de/source.shtml b/de/source.shtml
index c02025b67d65138ec7c2279769ad253c2e0f94ae..61a93b527bf6819020782e9c90059b2200c5b8af 100644 (file)
--- a/de/source.shtml
+++ b/de/source.shtml
@@ -20,7 +20,20 @@
                                
                                <div class="post">
                                
-                                       <h3>Liste des Sourcecodes</h3>
+                                       <h3>Liste des Sourcecodes Version 3.x</h3>
+                                       <ul class="post_info">
+                                               <li class="date">Wie sieht's aus?</li>
+                                       </ul>                                   
+                                       <p>
+<!--#exec cmd="for i in $(ls -1 ../source-3.0); do echo -e \"\t\t\t\t\t\t<a href=\\"/source-3.0/$i\\">$i</a><br />\"; done" -->
+                                       </p>
+                               </div>
+                               
+                               <br class="clear" />
+                               
+                               <div class="post">
+                               
+                                       <h3>Liste des Sourcecodes Version 1.4.9 --> Version 2.1</h3>
                                        <ul class="post_info">
                                                <li class="date">Wie sieht's aus?</li>
                                        </ul>                                   

diff --git a/en/beta1.shtml b/en/final.shtml
similarity index 65%
rename from en/beta1.shtml
rename to en/final.shtml
index 96abdfc48b74696089e7f71c0bd7c82a17cc2717..ef138f83b479fdbfa8353c38ab8ed8dd49c5a3f6 100644 (file)
--- a/en/beta1.shtml
+++ b/en/final.shtml
@@ -11,8 +11,8 @@
                                <h3>Beta 1</h3>
 
                                <p>
-                                       We are very sorry but there is no version of the beta 1 introduction in english at the moment.<br />
-                                       Read the german one here: <a href="/de/beta1.shtml">Beta 1</a></p>
+                                       We are very sorry but there is no version of the introduction in english at the moment.<br />
+                                       Read the german one here: <a href="/de/final.shtml">IPFire 2.1</a></p>
                                        
                                <br class="clear" />
                

diff --git a/en/source.shtml b/en/source.shtml
index 7281ef6f91689501cb85ae42a8ebe8862ea2bdc0..3b51efc474cb2f1a379119802c473b11c743f652 100644 (file)
--- a/en/source.shtml
+++ b/en/source.shtml
@@ -21,7 +21,20 @@
                                
                                <div class="post">
                                
-                                       <h3>List of source code</h3>
+                                       <h3>Liste of source code version 3.x</h3>
+                                       <ul class="post_info">
+                                               <li class="date">What does it look like?</li>
+                                       </ul>                                   
+                                       <p>
+<!--#exec cmd="for i in $(ls -1 ../source-3.0); do echo -e \"\t\t\t\t\t\t<a href=\\"/source-3.0/$i\\">$i</a><br />\"; done" -->
+                                       </p>
+                               </div>
+                               
+                               <br class="clear" />
+                               
+                               <div class="post">
+                               
+                                       <h3>List of source code version 1.4.9 --> version 2.1</h3>
                                        <ul class="post_info">
                                                <li class="date">What does it look like?</li>
                                        </ul>                                   

diff --git a/images/screens/de/beta1/connsched.png b/images/screens/de/final/connsched.png
similarity index 100%
rename from images/screens/de/beta1/connsched.png
rename to images/screens/de/final/connsched.png

diff --git a/images/screens/de/beta1/disk.png b/images/screens/de/final/disk.png
similarity index 100%
rename from images/screens/de/beta1/disk.png
rename to images/screens/de/final/disk.png

diff --git a/images/screens/de/beta1/dyndns.png b/images/screens/de/final/dyndns.png
similarity index 100%
rename from images/screens/de/beta1/dyndns.png
rename to images/screens/de/final/dyndns.png

diff --git a/images/screens/de/beta1/fwdiag.png b/images/screens/de/final/fwdiag.png
similarity index 100%
rename from images/screens/de/beta1/fwdiag.png
rename to images/screens/de/final/fwdiag.png

diff --git a/images/screens/de/beta1/fwlog-port.png b/images/screens/de/final/fwlog-port.png
similarity index 100%
rename from images/screens/de/beta1/fwlog-port.png
rename to images/screens/de/final/fwlog-port.png

diff --git a/images/screens/de/beta1/fwlog.png b/images/screens/de/final/fwlog.png
similarity index 100%
rename from images/screens/de/beta1/fwlog.png
rename to images/screens/de/final/fwlog.png

diff --git a/images/screens/de/beta1/ids.png b/images/screens/de/final/ids.png
similarity index 100%
rename from images/screens/de/beta1/ids.png
rename to images/screens/de/final/ids.png

diff --git a/images/screens/de/beta1/index.png b/images/screens/de/final/index.png
similarity index 100%
rename from images/screens/de/beta1/index.png
rename to images/screens/de/final/index.png

diff --git a/images/screens/de/beta1/ipsec.png b/images/screens/de/final/ipsec.png
similarity index 100%
rename from images/screens/de/beta1/ipsec.png
rename to images/screens/de/final/ipsec.png

diff --git a/images/screens/de/beta1/nettraffic.png b/images/screens/de/final/nettraffic.png
similarity index 100%
rename from images/screens/de/beta1/nettraffic.png
rename to images/screens/de/final/nettraffic.png

diff --git a/images/screens/de/beta1/nw-internal.png b/images/screens/de/final/nw-internal.png
similarity index 100%
rename from images/screens/de/beta1/nw-internal.png
rename to images/screens/de/final/nw-internal.png

diff --git a/images/screens/de/beta1/outgoingfw-1.png b/images/screens/de/final/outgoingfw-1.png
similarity index 100%
rename from images/screens/de/beta1/outgoingfw-1.png
rename to images/screens/de/final/outgoingfw-1.png

diff --git a/images/screens/de/beta1/outgoingfw-2.png b/images/screens/de/final/outgoingfw-2.png
similarity index 100%
rename from images/screens/de/beta1/outgoingfw-2.png
rename to images/screens/de/final/outgoingfw-2.png

diff --git a/images/screens/de/beta1/pakfire-1.png b/images/screens/de/final/pakfire-1.png
similarity index 100%
rename from images/screens/de/beta1/pakfire-1.png
rename to images/screens/de/final/pakfire-1.png

diff --git a/images/screens/de/beta1/pakfire-2.png b/images/screens/de/final/pakfire-2.png
similarity index 100%
rename from images/screens/de/beta1/pakfire-2.png
rename to images/screens/de/final/pakfire-2.png

diff --git a/images/screens/de/beta1/proxy.png b/images/screens/de/final/proxy.png
similarity index 100%
rename from images/screens/de/beta1/proxy.png
rename to images/screens/de/final/proxy.png

diff --git a/images/screens/de/beta1/qos-2.png b/images/screens/de/final/qos-2.png
similarity index 100%
rename from images/screens/de/beta1/qos-2.png
rename to images/screens/de/final/qos-2.png

diff --git a/images/screens/de/beta1/samba.png b/images/screens/de/final/samba.png
similarity index 100%
rename from images/screens/de/beta1/samba.png
rename to images/screens/de/final/samba.png

diff --git a/images/screens/de/beta1/system.png b/images/screens/de/final/system.png
similarity index 100%
rename from images/screens/de/beta1/system.png
rename to images/screens/de/final/system.png

diff --git a/images/screens/de/beta1/thumb/fwlog-port.png b/images/screens/de/final/thumb/fwlog-port.png
similarity index 100%
rename from images/screens/de/beta1/thumb/fwlog-port.png
rename to images/screens/de/final/thumb/fwlog-port.png

diff --git a/images/screens/de/beta1/thumb/index.png b/images/screens/de/final/thumb/index.png
similarity index 100%
rename from images/screens/de/beta1/thumb/index.png
rename to images/screens/de/final/thumb/index.png

diff --git a/images/screens/de/beta1/thumb/ipsec.png b/images/screens/de/final/thumb/ipsec.png
similarity index 100%
rename from images/screens/de/beta1/thumb/ipsec.png
rename to images/screens/de/final/thumb/ipsec.png

diff --git a/images/screens/de/beta1/thumb/pakfire-1.png b/images/screens/de/final/thumb/pakfire-1.png
similarity index 100%
rename from images/screens/de/beta1/thumb/pakfire-1.png
rename to images/screens/de/final/thumb/pakfire-1.png

diff --git a/images/screens/de/beta1/thumb/proxy.png b/images/screens/de/final/thumb/proxy.png
similarity index 100%
rename from images/screens/de/beta1/thumb/proxy.png
rename to images/screens/de/final/thumb/proxy.png

diff --git a/images/screens/de/beta1/thumb/qos-2.png b/images/screens/de/final/thumb/qos-2.png
similarity index 100%
rename from images/screens/de/beta1/thumb/qos-2.png
rename to images/screens/de/final/thumb/qos-2.png

diff --git a/images/screens/de/beta1/thumb/system.png b/images/screens/de/final/thumb/system.png
similarity index 100%
rename from images/screens/de/beta1/thumb/system.png
rename to images/screens/de/final/thumb/system.png

diff --git a/images/screens/de/beta1/xtaccess.png b/images/screens/de/final/xtaccess.png
similarity index 100%
rename from images/screens/de/beta1/xtaccess.png
rename to images/screens/de/final/xtaccess.png