]> git.ipfire.org Git - people/shoehn/ipfire.org.git/commitdiff
Update website layout.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 18 Feb 2013 02:47:32 +0000 (03:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 18 Feb 2013 02:47:32 +0000 (03:47 +0100)
31 files changed:
static/css/style.css
static/js/site.js
templates/base.html
templates/downloads.html
templates/index.html
templates/static/artwork.html
templates/static/cebit.html
templates/static/chat.html
templates/static/development.html
templates/static/donation.html
templates/static/features.html
templates/static/features/dialup.html [deleted file]
templates/static/features/firewall.html [deleted file]
templates/static/features/hardware.html [deleted file]
templates/static/features/ids.html [deleted file]
templates/static/features/itsfree.html [deleted file]
templates/static/features/pakfire.html [deleted file]
templates/static/features/proxy.html [deleted file]
templates/static/features/proxy/content-filter.html [deleted file]
templates/static/features/proxy/update-accelerator.html [deleted file]
templates/static/features/proxy/virus-scanner.html [deleted file]
templates/static/features/qos.html [deleted file]
templates/static/features/security.html [deleted file]
templates/static/features/updates.html [deleted file]
templates/static/features/virtualization.html [deleted file]
templates/static/features/vpn.html [deleted file]
templates/static/features/vpn/ipsec.html [deleted file]
templates/static/features/vpn/openvpn.html [deleted file]
templates/static/features/wireless.html [deleted file]
templates/static/getinvolved.html
templates/static/imprint.html

index 63663c365eacb06453b10fbe52f38f7165ddd802..883e690735836f65746dbf8306a9d6e32d7e5f4c 100644 (file)
@@ -1,42 +1,5 @@
 body {
-       padding-top: 55px;
-
-       /* SVG as background image (IE9/Chrome/Safari/Opera) */ 
-       background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2ODQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMTAwJSIgeTE9IjEwMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgo8c3RvcCBzdG9wLWNvbG9yPSIjMDAwMDAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjODgwNDAwIiBvZmZzZXQ9IjU3JSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2c2ODQpIiAvPgo8L3N2Zz4=);
-
-       background-image: linear-gradient(
-               bottom,
-               #000000 0%,
-               #880400 57%
-       );
-       background-image: -o-linear-gradient(
-               bottom,
-               #000000 0%,
-               #880400 57%
-       );
-       background-image: -moz-linear-gradient(
-               bottom,
-               #000000 0%,
-               #880400 57%
-       );
-       background-image: -webkit-linear-gradient(
-               bottom,
-               #000000 0%,
-               #880400 57
-       );
-       background-image: -ms-linear-gradient(
-               bottom,
-               #000000 0%,
-               #880400 57%
-       );
-       background-image: -webkit-gradient(
-               linear,
-               left bottom,
-               left top,
-               color-stop(0, #000000),
-               color-stop(0.57, #880400)
-       );
-       background-attachment: fixed;
+       padding-top: 45px;
 }
 
 .container-body {
@@ -78,6 +41,316 @@ table.table-fireinfo td.val {
        padding-right: 2em;
 }
 
-.download-button {
+section {
+       padding-top: 40px;
+}
+
+section > .page-header, section > .lead {
+       color: #5a5a5a;
+}
+
+section > ul li {
+       margin-bottom: 5px;
+}
+
+.jumbotron {
+       position: relative;
+       padding: 40px 0;
+       color: #fff;
+       text-align: center;
+       text-shadow: 0 1px 3px rgba(0,0,0,.4), 0 0 30px rgba(0,0,0,.075);
+       background: #880400; /* Old browsers */
+       background: -moz-linear-gradient(45deg, #000000 0%, #880400 100%); /* FF3.6+ */
+       background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#000000), color-stop(100%,#880400)); /* Chrome,Safari4+ */
+       background: -webkit-linear-gradient(45deg, #000000 0%,#880400 100%); /* Chrome10+,Safari5.1+ */
+       background: -o-linear-gradient(45deg, #000000 0%, #880400 100%); /* Opera 11.10+ */
+       background: -ms-linear-gradient(45deg, #000000 0%, #880400 100%); /* IE10+ */
+       background: linear-gradient(45deg,  #000000 0%, #880400 100%); /* W3C */
+       filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000000', endColorstr='#880400',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */
+       -webkit-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
+          -moz-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
+                   box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
        margin-bottom: 1em;
 }
+
+.jumbotron h1 {
+       font-size: 80px;
+       font-weight: bold;
+       letter-spacing: -1px;
+       line-height: 1;
+}
+
+.jumbotron p {
+       font-size: 24px;
+       font-weight: 300;
+       line-height: 1.25;
+       margin-bottom: 30px;
+}
+
+.jumbotron a {
+       color: #fff;
+       color: rgba(255,255,255,.5);
+}
+
+.jumbotron a:hover {
+       color: #fff;
+       text-shadow: 0 0 10px rgba(255,255,255,.25);
+}
+
+/* Download button */
+.masthead .btn, .download-button {
+  padding: 19px 24px;
+  font-size: 24px;
+  font-weight: 200;
+  color: #fff;
+}
+
+.jumbotron .container {
+       position: relative;
+       z-index: 2;
+}
+
+.masthead {
+       padding: 70px 0 60px;
+       margin-bottom: 0;
+       color: #fff;
+}
+
+.masthead h1 {
+       font-size: 120px;
+       line-height: 1;
+       letter-spacing: -2px;
+}
+
+.masthead p {
+       font-size: 40px;
+       font-weight: 200;
+       line-height: 1.25;
+}
+
+.masthead-links {
+       margin: 0;
+       list-style: none;
+}
+
+.masthead-links li {
+       display: inline;
+       padding: 0 10px;
+       color: rgba(255,255,255,.5);
+}
+
+.subhead {
+       text-align: left;
+       border-bottom: 1px solid #ddd;
+}
+
+.subhead h1 {
+       font-size: 60px;
+}
+
+.subhead p {
+       margin-bottom: 20px;
+}
+
+.subhead .navbar {
+       display: none;
+}
+
+.footer {
+/*     text-align: center; */
+       padding: 30px 0;
+       margin-top: 70px;
+       border-top: 1px solid #e5e5e5;
+       background-color: #f8f8f8;
+}
+
+.footer p {
+       margin-bottom: 0;
+       color: #777;
+}
+
+.footer-links {
+       margin: 10px 0;
+}
+
+.footer-links li {
+       display: inline;
+       padding: 0 2px;
+}
+
+.footer-links li:first-child {
+       padding-left: 0;
+}
+
+.sidenav {
+       width: 228px;
+       margin: 30px 0 0;
+       padding: 0;
+       background-color: #fff;
+       -webkit-border-radius: 6px;
+          -moz-border-radius: 6px;
+               border-radius: 6px;
+       -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065);
+          -moz-box-shadow: 0 1px 4px rgba(0,0,0,.065);
+               box-shadow: 0 1px 4px rgba(0,0,0,.065);
+}
+
+.sidenav > li > a {
+       display: block;
+       width: 190px \9;
+       margin: 0 0 -1px;
+       padding: 8px 14px;
+       border: 1px solid #e5e5e5;
+}
+
+.sidenav > li:first-child > a {
+       -webkit-border-radius: 6px 6px 0 0;
+          -moz-border-radius: 6px 6px 0 0;
+               border-radius: 6px 6px 0 0;
+}
+
+.sidenav > li:last-child > a {
+       -webkit-border-radius: 0 0 6px 6px;
+          -moz-border-radius: 0 0 6px 6px;
+               border-radius: 0 0 6px 6px;
+}
+
+.sidenav > .active > a {
+       position: relative;
+       z-index: 2;
+       padding: 9px 15px;
+       border: 0;
+       text-shadow: 0 1px 0 rgba(0,0,0,.15);
+       -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+          -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+               box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+}
+
+.sidenav .icon-chevron-left {
+       float: left;
+       margin-top: 2px;
+       margin-left: -6px;
+       opacity: .25;
+}
+
+.sidenav > li > a:hover {
+       background-color: #f5f5f5;
+}
+
+.sidenav a:hover .icon-chevron-left {
+       opacity: .5;
+}
+
+.sidenav .active .icon-chevron-left, .sidenav .active a:hover .icon-chevron-left {
+  background-image: url(../img/glyphicons-halflings-white.png);
+  opacity: 1;
+}
+
+.sidenav.affix {
+       top: 40px;
+}
+
+.sidenav.affix-bottom {
+       position: absolute;
+       top: auto;
+       bottom: 270px;
+}
+
+
+@media (min-width: 768px) and (max-width: 979px) {
+       body {
+               padding-top: 0;
+       }
+       .jumbotron {
+               margin-top: -25px; /* Offset bottom margin on .navbar */
+       }
+
+       .sidenav {
+               width: 166px;
+               margin-top: 20px;
+       }
+       .sidenav.affix {
+               top: 0;
+       }
+}
+
+@media (max-width: 767px) {
+       body {
+               padding-top: 0;
+       }
+
+       .jumbotron {
+               padding: 40px 20px;
+               margin-top:   -25px; /* Offset bottom margin on .navbar */
+               margin-right: -20px;
+               margin-left:  -20px;
+       }
+
+       .masthead h1 {
+               font-size: 90px;
+       }
+
+       .masthead p, .masthead .btn {
+               font-size: 24px;
+       }
+
+       .sidenav {
+               width: auto;
+               margin-bottom: 20px;
+       }
+
+       .sidenav.affix {
+               position: static;
+               width: auto;
+               top: 0;
+       }
+
+       .footer {
+               margin-left: -20px;
+               margin-right: -20px;
+               padding-left: 20px;
+               padding-right: 20px;
+       }
+
+       .footer p {
+               margin-bottom: 9px;
+       }
+}
+
+@media (max-width: 480px) {
+       body {
+               padding-top: 0;
+       }
+
+       h2 small {
+               display: block;
+       }
+
+       .jumbotron h1 {
+               font-size: 45px;
+       }
+
+       .jumbotron p, .jumbotron .btn {
+               font-size: 18px;
+       }
+
+       .jumbotron .btn {
+               display: block;
+               margin: 0 auto;
+       }
+
+       .subhead h1, .subhead p {
+               text-align: center;
+       }
+
+       table code {
+               white-space: normal;
+               word-wrap: break-word;
+               word-break: break-all;
+       }
+
+       .footer {
+               padding-top: 20px;
+               padding-bottom: 20px;
+       }
+}
index 6dc07c6f870e6c85d2e84f736f948ae611cc1538..f7ddd39b5803b5c608318c9aeb59a0dd05de6209 100644 (file)
@@ -10,6 +10,15 @@ $("a.download-splash").click(function(event) {
        window.location = "http://downloads.ipfire.org/download-splash?file="+linkLocation;
 });
 
+var $window = $(window);
+
+$(".sidenav").affix({
+       offset: {
+               top: function () { return $window.width() <= 980 ? 290 : 210 }
+               , bottom: 270
+       }
+});
+
 if (/.*download-splash.*/i.test(window.location.href)) {
        $("p.download-path").ready(function(){
                var valid = false;
index c5e813ffa6a1448f1bbb3474355071d86425989e..3a921f4dbac28e1e54776780c486db619ab9f084 100644 (file)
@@ -23,7 +23,7 @@
                {% end %}
        </head>
 
-       <body>
+       <body data-spy="scroll" data-target=".sidebar">
                <div class="navbar navbar-fixed-top">
                        <div class="navbar-inner">
                                <div class="container">
                </div>
 
                {% block container %}
+                       {% block header %}{% end block %}
+
                        <div class="container container-body">
                                {% block body %}EMPTY BODY{% end block %}
+                       </div>
+               {% end block %}
 
-                               <footer class="footer hidden-phone">
-                                       <hr>
-
-                                       {% if not hostname == "planet.ipfire.org" %}
-                                               <div class="pull-right">
-                                                       <p>
-                                                               {% for l in ("en", "de") %}
-                                                                       {% if not l == lang %}
-                                                                               <a href="?locale={{ l }}">
-                                                                                       <img src="{{ static_url("images/flags/%s.png" % l) }}" alt="{{ l }}">
-                                                                               </a>
-                                                                       {% end %}
-                                                               {% end %}
-                                                       </p>
-                                               </div>
-                                       {% end %}
+               {% block footer %}
+                       <footer class="footer">
+                               <div class="container">
+                                       <div class="pull-right">
+                                               <a href="https://www.facebook.com/IPFire.org"><img src="{{ static_url("images/icons/social/facebook.png") }}" alt="Facebook"></a>
+                                               <a href="https://twitter.com/ipfire"><img src="{{ static_url("images/icons/social/twitter.png") }}" alt="Twitter"></a>
+                                               <a href="/news.rss"><img src="{{ static_url("images/icons/social/rss.png") }}" alt="RSS"></a>
+                                       </div>
 
                                        <p>
-                                               &copy; {{ year }} - <a href="http://www.ipfire.org/">IPFire.org</a> -
+                                               &copy; {{ year }} - {{ _("IPFire is free software") }}
+                                       </p>
+
+                                       <ul class="footer-links">
                                                {% if hostname in ("www.ipfire.org", "dev.ipfire.org") %}
-                                                       <a href="/press">{{ _("Press") }}</a> -
+                                                       <li>
+                                                               <a href="/press">{{ _("Press") }}</a>
+                                                       </li>
+                                                       <li class="muted">&middot;</li>
                                                {% end %}
-                                               <a href="http://www.ipfire.org/imprint">{{ _("imprint") }}</a>
+                                               <a href="http://www.ipfire.org/imprint">{{ _("Imprint") }}</a>
 
                                                {% if hostname == "wishlist.ipfire.org" %}
-                                                       - <a href="/terms">{{ _("Terms & Conditions") }}</a>
+                                                       <li class="muted">&middot;</li>
+                                                       <li>
+                                                               <a href="/terms">{{ _("Terms & Conditions") }}</a>
+                                                       </li>
                                                {% end %}
-                                       </p>
-                               </footer>
-                       </div>
+
+                                               {% if not hostname == "planet.ipfire.org" %}
+                                                       {% for l in ("en", "de") %}
+                                                               {% if not l == lang %}
+                                                                       <li class="muted">&middot;</li>
+                                                                       <li>
+                                                                               <a href="?locale={{ l }}">
+                                                                                       <img src="{{ static_url("images/flags/%s.png" % l) }}" alt="{{ l }}">
+                                                                               </a>
+                                                                       </li>
+                                                               {% end %}
+                                                       {% end %}
+                                               {% end %}
+                                       </ul>
+                               </div>
+                       </footer>
                {% end block %}
 
                <script src="{{ static_url("js/jquery.js") }}"></script>
index e0260c791b596a01deae49b8b7d48248587f696e..54eff99e2832d1cf2997363a343c180e6ca696b2 100644 (file)
@@ -2,34 +2,26 @@
 
 {% block title %}{{ _("Get IPFire") }}{% end block %}
 
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Get IPFire") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span6 offset3">
-                       <ul class="thumbnails">
-                               <li class="span6">
-                                       <div class="thumbnail download-box ac">
-                                               <h4>
-                                                       {{ release.name }}
-                                                       <br>
-                                                       <small>{{ locale.format_date(release.date, shorter=True) }}</small>
-                                               </h4>
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>{{ _("Get IPFire") }}</h1>
+                       <p class="lead">
+                               {{ _("IPFire is completely free to download and use") }}
+                       </p>
+               </div>
+       </header>
+{% end header %}
 
-                                               <hr>
+{% block body %}
+       <div class="ac">
+               {% module DownloadButton(release) %}
 
-                                               {% module DownloadButton(release) %}
-                                               <br>
+               <br>
 
-                                               <a href="http://downloads.ipfire.org/latest">
-                                                       <small>{{ _("More download options") }}</small>
-                                               </a>
-                                       </div>
-                               </li>
-                       </ul>
-               </div>
+               <a href="http://downloads.ipfire.org/latest">
+                       {{ _("More download options") }}
+               </a>
        </div>
 
        <hr>
index 74e7fdf751f0c1bd125660f8ad5d3cac31084db6..c9273013c2c8acbe622ee8cb73f7a7c539ddab7a 100644 (file)
@@ -2,56 +2,42 @@
 
 {% block title %}{{ _("Home") }}{% end block %}
 
-{% block body %}
-       <div class="pull-right hidden-phone">
-               <a href="https://www.facebook.com/IPFire.org"><img src="{{ static_url("images/icons/social/facebook.png") }}" alt="Facebook"></a>
-               <a href="https://twitter.com/ipfire"><img src="{{ static_url("images/icons/social/twitter.png") }}" alt="Twitter"></a>
-               <a href="/news.rss"><img src="{{ static_url("images/icons/social/rss.png") }}" alt="RSS"></a>
-       </div>
-
-       <br style="clear: both;"><br><br><br>
-
-       <div class="row hidden-phone">
-               <div class="span7 ac">
-                       <br><br><br><br>
-
-                       <p class="lead">
-                               <strong>IPFire</strong> - {{ _("An Open Source Firewall Solution") }}
-                       </p>
-
-                       {% if latest_release %}
-                               <p>
-                                       <strong>{{ _("Latest release") }}:</strong>
-                                       <a href="/download">{{ latest_release.name }}</a>
-                               </p>
-                       {% end %}
-               </div>
-
-               <div class="span5">
-                       <img src="{{ static_url("images/tux/ipfire_tux_256x256.png") }}" alt="IPFire Logo" />
-                       <br><br>
-               </div>
-       </div>
-
-       <div class="row visible-phone">
-               <div class="span12 ac">
-                       <img src="{{ static_url("images/tux/ipfire_tux_256x256.png") }}" alt="IPFire Logo" />
-                       <br><br>
-
-                       <p class="lead">
-                               <strong>IPFire</strong> - {{ _("An Open Source Firewall Solution") }}
-                       </p>
-
-                       {% if latest_release %}
-                               <p>
-                                       <strong>{{ _("Latest release") }}:</strong>
-                                       <a href="/download">{{ latest_release.name }}</a>
-                               </p>
-                       {% end %}
+{% block header %}
+       <div class="jumbotron masthead">
+               <div class="container">
+                       <div class="row">
+                               <div class="span4">
+                                       <img src="{{ static_url("images/tux/ipfire_tux_512x512.png") }}" alt="IPFire Logo" />
+                               </div>
+
+                               <div class="span8">
+                                       <h1>IPFire</h1>
+                                       <p class="lead">An Open Source Firewall Distribution</p>
+
+                                       <p>
+                                               <a class="btn btn-primary btn-large" href="/download">{{ _("Download IPFire") }}</a>
+                                       </p>
+
+                                       <ul class="masthead-links">
+                                               {% if latest_release %}
+                                                       <li>
+                                                               {{ _("Latest release") }}:
+                                                               {{ latest_release.name }}<br>
+                                                               {{ locale.format_date(latest_release.date, relative=False, shorter=True) }}
+                                                       </li>
+                                               {% end %}
+                                               <li>
+                                                       <a href="/donate">{{ _("Donate") }}</a>
+                                               </li>
+                                       </ul>
+                               </div>
+                       </div>
                </div>
        </div>
+{% end block %}
 
-       <hr>
+{% block body %}
+       <br>
 
        <p class="ac muted">
                <strong>{{ _("New!") }}</strong>
                                        {% end %}
                                </ul>
                        </div>
-
-                       <p class="ac">
-                               <a class="btn btn-primary" href="/donate">{{ _("Support this project with your donation!") }}</a>
-                       </p>
                </div>
 
                <div class="span6 objectives">
index c4328c27b4aeaa4448dd6933d6c29dd5d31a1229..4da0aadf3fce74647033f5bdfac4835e1cc2d433 100644 (file)
@@ -1,12 +1,16 @@
-{% extends "../base-2.html" %}
+{% extends "../base.html" %}
                
 {% block title %}{{ _("Artwork") }}{% end block %}
+
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>{{ _("Artwork") }}</h1>
+               </div>
+       </header>
+{% end header %}
  
 {% block body %}
-       <div class="page-header">
-               <h1>{{ _("Artwork") }}</h1>
-       </div>
-
        {% if lang == "de" %}
                <p>
                        Auf dieser Seite befinden sich Logos und Printvorlagen.
                </p>
        {% end %}
 
-       <h2>{{ _("The IPFire Logo") }}</h2>
+       <div class="page-header">
+               <h1>{{ _("The IPFire Logo") }}</h1>
+       </div>
+
        <ul class="thumbnails">
                {% for i in ("512x512", "256x256", "128x128", "64x64", "32x32") %}
                        <li class="span4">
                        </li>
                {% end %}
        </ul>
-       <hr>
 
-       <h2>{{ _("Flyers, Rollups, CDs and more") }}</h2>
+       <div class="page-header">
+               <h2>{{ _("Flyers, Rollups, CDs and more") }}</h2>
+       </div>
+
        {% if lang == "de" %}
                <p>
                        Diese Arbeiten wurden erstellt von
index 64900ce23ed84ecc55a04bdd0d82fd16ccce2ce5..de94a0de8765dfbb93854fa4dc58dbdf77f3a12b 100644 (file)
@@ -2,11 +2,15 @@
                
 {% block title %}{{ _("CeBIT special") }}{% end block %}
 
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("IPFire at CeBIT 2010") }}</h1>
-       </div>
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>{{ _("IPFire at CeBIT 2010") }}</h1>
+               </div>
+       </header>
+{% end header %}
 
+{% block body %}
        <img class="pull-right" src="{{ static_url("images/cebit-177px_schatten.png") }}" alt="CeBIT">
 
        {% if lang == "de" %}
        <hr>
 
        <div class="row">
-               <div class="span8 offset2">
+               <div class="span8 offset2 ac">
                        <iframe width="640" height="360" src="http://www.youtube.com/embed/9zUcQouQ1sE?rel=0" frameborder="0" allowfullscreen></iframe>
-                       <a class="pull-right" href="http://eine-minute.blogspot.com/2010/03/ipfire-eine-utm-auf-opensource-basis.html">"eine-minute" Blog</a>
+                       <br>
+                       <a href="http://eine-minute.blogspot.com/2010/03/ipfire-eine-utm-auf-opensource-basis.html">"eine-minute" Blog</a>
                </div>
        </div>
 
        <hr>
 
-       <div class="row">
-               <div class="span8 offset2">
-                       <ul class="thumbnails">
-                               {% for i in range(1, 5) %}
-                                       <li class="span4">
-                                               <a class="thumbnail" href="{{ static_url("images/cebit/cebit_2010_%d.jpg" % i) }}">
-                                                       <img src="{{ static_url("images/cebit/cebit_2010_%d_tn.jpg" % i) }}" alt="{{ _("CeBIT") }}">
-                                               </a>
-                                       </li>
-                               {% end %}
-                       </ul>
-               </div>
-       </div>
+       <ul class="thumbnails">
+               {% for i in range(1, 5) %}
+                       <li class="span3">
+                               <a class="thumbnail" href="{{ static_url("images/cebit/cebit_2010_%d.jpg" % i) }}">
+                                       <img src="{{ static_url("images/cebit/cebit_2010_%d_tn.jpg" % i) }}" alt="{{ _("CeBIT") }}">
+                               </a>
+                       </li>
+               {% end %}
+       </ul>
 {% end block %}
index 0afe8e463d25be837a6b61836b69348da8c0a93e..4df6ff6e60560ac3dfa2a77550b9f52d3517ba05 100644 (file)
@@ -1,12 +1,16 @@
 {% extends "../base-1.html" %}
                
 {% block title %}{{ _("Chat") }}{% end block %}
+
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>{{ _("Chat") }}</h1>
+               </div>
+       </header>
+{% end header %}
  
 {% block body %}
-       <div class="page-header">
-               <h1>{{ _("Chat") }}</h1>
-       </div>
-
        {% if lang == "de" %}
                <p>
                        Wer Fragen rund um IPFire hat, findet in unserem IRC-Channel rund
index d237801c0669a81d8192dbf84aeeca5c6a566b11..2b12df488ffaaeb8b113f04edd898ffa527600d5 100644 (file)
                
 {% block title %}{{ _("Development") }}{% end block %}
 
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>{{ _("Development") }}</h1>
+               </div>
+       </header>
+{% end header %}
+
 {% block body %}
-       <img src="{{ static_url("images/icons/development.png") }}" class="pull-right" alt="{{ _("Development") }}">
+       <div class="row">
+               <div class="span9">
+                       <section id="intro">
+                               {% if lang == "de" %}   
+                                       <p>
+                                               Der Entwicklungsprozess der IPFire Distribution ist offen.
+                                               Das bedeutet, dass Diskussionen öffentlich geführt werden,
+                                               Entscheidungen transparent sein sollen und jeder eingeladen ist
+                                               mitzumachen.
+                                               Die Entwickler empfinden dieses Vorgehen als das Beste,
+                                               um ein Softwareprojekt dieser Größe zu führen.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               The development process of IPFire is open. This means that we discuss things openly,
+                                               make decisions transparently and that everyone is welcome to join.
+                                               The developers believe that this is the best way to run a software project as big as the IPFire project is.
+                                       </p>
+                               {% end %}
+                       </section>
 
-       <div class="page-header">
-               <h2>{{ _("Development") }}</h2>
-       </div>
+                       <section id="tools">
+                               <div class="page-header">
+                                       <h1>{{ _("Development tools") }}</h1>
+                               </div>
 
-       {% if lang == "de" %}   
-               <p>
-                       Der Entwicklungsprozess der IPFire Distribution ist offen.
-                       Das bedeutet, dass Diskussionen öffentlich geführt werden,
-                       Entscheidungen transparent sein sollen und jeder eingeladen ist
-                       mitzumachen.
-                       Die Entwickler empfinden dieses Vorgehen als das Beste,
-                       um ein Softwareprojekt dieser Größe zu führen.
-               </p>
-       {% else %}
-               <p>
-                       The development process of IPFire is open. This means that we discuss things openly,
-                       make decisions transparently and that everyone is welcome to join.
-                       The developers believe that this is the best way to run a software project as big as the IPFire project is.
-               </p>
-       {% end %}
-
-       <hr>
-
-       <h3>{{ _("Development tools") }}</h3>
-       {% if lang == "de" %}
-               <p>
-                       Dies sind die Werkzeuge, welche die IPFire Entwickler nutzen
-                       um Diskussionen zu führen:
-               </p>
-       {% else %}
-               <p>
-                       The tools the IPFire team uses to create software, make discussions are
-                       the bugtracker, the mailing list and IRC channel:
-               </p>
-       {% end %}
+                               {% if lang == "de" %}
+                                       <p>
+                                               Dies sind die Werkzeuge, welche die IPFire Entwickler nutzen
+                                               um Diskussionen zu führen:
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               The tools the IPFire team uses to create software, make discussions are
+                                               the bugtracker, the mailing list and IRC channel:
+                                       </p>
+                               {% end %}
 
-       <div class="row">
-               <div class="span6">
-                       <h4>
-                               <a href="http://bugtracker.ipfire.org/">{{ _("Bugtracker") }}</a>
-                       </h4>
-                       {% if lang == "de" %}
-                               <p>
-                                       Der Bugtracker ist ein Tool, welches helfen soll bei
-                                       der Fehlerbehebung nicht den Faden zu verlieren.
-                                       Jeder Schritt, der unternommen wird, kann hier nachverfolgt
-                                       werden.
-                               </p>
-                       {% else %}
-                               <p>
-                                       The bug tracker is a tool which helps to keep track of issues that
-                                       are currently going on in the development process.
-                                       You can find the history of a bug and what has been done to fix it,
-                                       as well as the integration process of new features.
-                               </p>
-                       {% end %}
-               </div>
+                               <hr class="separator">
 
-               <div class="span6">
-                       <h4>
-                               <a href="http://lists.ipfire.org/mailman/listinfo/development">{{ _("Development Mailing List") }}</a>
-                       </h4>
-                       {% if lang == "de" %}
-                               <p>
-                                       Diskussionen rund um den Entwicklungsprozess werden
-                                       auf der IPFire Entwicklungsmailingliste geführt.
-                               </p>
-                       {% else %}
-                               <p>
-                                       The place for discussions around the development of IPFire
-                                       is the IPFire development mailing list.
-                                       Everyone is welcome to subscribe and take part in the conversation.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
+                               <h2>
+                                       <a href="http://bugtracker.ipfire.org/">{{ _("Bugtracker") }}</a>
+                               </h2>
 
-       <hr>
+                               {% if lang == "de" %}
+                                       <p>
+                                               Der Bugtracker ist ein Tool, welches helfen soll bei
+                                               der Fehlerbehebung nicht den Faden zu verlieren.
+                                               Jeder Schritt, der unternommen wird, kann hier nachverfolgt
+                                               werden.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               The bug tracker is a tool which helps to keep track of issues that
+                                               are currently going on in the development process.
+                                               You can find the history of a bug and what has been done to fix it,
+                                               as well as the integration process of new features.
+                                       </p>
+                               {% end %}
 
-       <h3>{{ _("Source code") }}</h3>
-       <div class="row">
-               <div class="span6">
-                       <h4>{{ _("Git") }}</h4>
-
-                       {% if lang == "de" %}
-                               <p>
-                                       Die IPFire Entwickler nutzen <a href="http://www.git-scm.com/">Git</a>
-                                       für die Quellcodeverwaltung.
-                                       Jeder darf den Code unter den Bedingungen der beigelegten
-                                       Lizenzen herunterladen.
-                               </p>
-                       {% else %}
-                               <p>
-                                       The IPFire developers use <a href="http://www.git-scm.com/">Git</a>
-                                       for source code management.
-                                       Anyone may download the source code under terms of the accompanying, provided licenses.
-                               </p>
-                       {% end %}
+                               <hr class="separator">
 
-                       <p class="ac">
-                               <a class="btn" href="http://git.ipfire.org/" target="_blank">
-                                       {{ _("IPFire Git repositories") }}
-                               </a>
-                       </p>
-               </div>
+                               <h2>
+                                       <a href="http://lists.ipfire.org/mailman/listinfo/development">{{ _("Development Mailing List") }}</a>
+                               </h2>
 
-               <div class="span6">
-                       <h4>{{ _("GitHub") }}</h4>
+                               {% if lang == "de" %}
+                                       <p>
+                                               Diskussionen rund um den Entwicklungsprozess werden
+                                               auf der IPFire Entwicklungsmailingliste geführt.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               The place for discussions around the development of IPFire
+                                               is the IPFire development mailing list.
+                                               Everyone is welcome to subscribe and take part in the conversation.
+                                       </p>
+                               {% end %}
+                       </section>
 
-                       {% if lang == "de" %}
-                               <p>
-                                       Seit Januar 2013 wird der IPFire Quellcode und verwandte Projekt
-                                       auf GitHub gespiegelt. Damit ist es ganz einfach sich eine Kopie
-                                       des Codes zu erstellen und ihn zu bearbeiten.
-                                       Pull-Requests sind gern willkommen!
-                               </p>
-                       {% else %}
-                               <p>
-                                       Since January 2013, the IPFire source code and related projects are mirrored on GitHub.
-                                       So it is easier to get your own working copy of the IPFire source and start hacking on it.
-                                       Pull requests are welcome!
-                               </p>
-                       {% end %}
+                       <section id="sources">
+                               <div class="page-header">
+                                       <h1>{{ _("Source code") }}</h1>
+                               </div>
 
-                       <p class="ac">
-                               <a class="btn" href="https://github.com/ipfire" target="_blank">
-                                       {{ _("ipfire on GitHub") }}
-                               </a>
-                       </p>
-               </div>
-       </div>
+                               <h2>{{ _("Git") }}</h2>
 
-       <hr>
+                               {% if lang == "de" %}
+                                       <p>
+                                               Die IPFire Entwickler nutzen <a href="http://www.git-scm.com/">Git</a>
+                                               für die Quellcodeverwaltung.
+                                               Jeder darf den Code unter den Bedingungen der beigelegten
+                                               Lizenzen herunterladen.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               The IPFire developers use <a href="http://www.git-scm.com/">Git</a>
+                                               for source code management.
+                                               Anyone may download the source code under terms of the accompanying, provided licenses.
+                                       </p>
+                               {% end %}
 
-       <div class="row">
-               <div class="span4">
-                       <h4>{{ _("How to build IPFire?") }}</h4>
-                       {% if lang == "de" %}
-                               <p>
-                                       IPFire zu kompilieren ist ganz einfach, aber dauert seine
-                                       Zeit.
-                               </p>
-                               <p>
-                                       Einen Einblick dazu gibt es in der
-                                       <a href="http://wiki.ipfire.org/{{ lang }}/development/build">Bauanleitung</a>
-                                       im Wiki, welche Schritt für Schritt vorgeht.
+                               <p class="ac">
+                                       <a class="btn" href="http://git.ipfire.org/" target="_blank">
+                                               {{ _("IPFire Git repositories") }}
+                                       </a>
                                </p>
-                               <p>
-                                       Addonentwicklung ist erwünscht. Die Vorgehensweise
-                                       dafür findet sich in der entsprechenden
-                                       <a href="http://wiki.ipfire.org/{{ lang }}/development/addon#building_addon_-_howto">Anleitung</a>.
-                               </p>
-                       {% else %}
-                               <p>
-                                       Building IPFire is actually very easy, but it does take some time.
-                               </p>
-                               <p>
-                                       Have a look at the
-                                       <a href="http://wiki.ipfire.org/{{ lang }}/development/build">guide on our wiki</a>
-                                       and work through it at your own pace, step by step.
-                               </p>
-                               <p>
-                                       Add-on development is encouraged. Have a look at the
-                                       <a href="http://wiki.ipfire.org/{{ lang }}/development/addon#building_addon_-_howto">building an add-on guide on our wiki</a>
-                                       for more information.
-                               </p>
-                       {% end %}
-               </div>
 
-               <div class="span4">
-                       <h4>{{ _("How to submit patches?") }}</h4>
-                       {% if lang == "de" %}
-                               <p>
-                                       Die IPFire Entwickler freuen sich über jeden Beitrag zur Software.
-                                       Patches, welche Fehler beheben, Verbesserungen implementieren
-                                       oder neue Funktionen hinzufügen sind willkommen.
-                               </p>
-                               <p>
-                                       Um den Integrationsprozess in die Distribution verfolgen
-                                       zu können, bitten wir einen <a href="http://bugtracker.ipfire.org/">Bugreport</a>
-                                       zu eröffnen, an welchen der Patch angehangen worden ist, sowie alle
-                                       anderen benötigten Daten.
-                               </p>
-                       {% else %}
-                               <p>
-                                       The IPFire developers appreciate any and all contributions to the software.
-                                       Patches that fix bugs, add enhancements, or create new features are welcome.
-                               </p>
-                               <p>
-                                       To track the integration into the distribution properly,
-                                       we request that you create a new bug report in the
-                                       <a href="http://bugtracker.ipfire.org/">bugtracker</a>
-                                       and attach the patch file, as well as everything else that is needed.
-                               </p>
-                       {% end %}
-               </div>
+                               <hr class="separator">
 
-               <div class="span4">
-                       <h4>{{ _("How to translate IPFire?") }}</h4>
+                               <h2>{{ _("GitHub") }}</h2>
 
-                       {% if lang == "de" %}
-                               <h5>IPFire 2.x</h5>
-                               <p>
-                                       In der <a href="http://wiki.ipfire.org/{{ lang }}/development/language">Übersetzungsanleitung</a>
-                                       finden sich Informationen darüber, wie man das Webinterface von IPFire 2
-                                       übersetzt.
-                               </p>
+                               {% if lang == "de" %}
+                                       <p>
+                                               Seit Januar 2013 wird der IPFire Quellcode und verwandte Projekt
+                                               auf GitHub gespiegelt. Damit ist es ganz einfach sich eine Kopie
+                                               des Codes zu erstellen und ihn zu bearbeiten.
+                                               Pull-Requests sind gern willkommen!
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               Since January 2013, the IPFire source code and related projects are mirrored on GitHub.
+                                               So it is easier to get your own working copy of the IPFire source and start hacking on it.
+                                               Pull requests are welcome!
+                                       </p>
+                               {% end %}
 
-                               <h5>IPFire 3.x</h5>
-                               <p>
-                                       Auf <a href="http://www.transifex.net/projects/p/ipfire/">Transifex</a>
-                                       findet sich eine Reihe von Übersetzungsprojekten in Verbindung
-                                       mit IPFire 3.
+                               <p class="ac">
+                                       <a class="btn" href="https://github.com/ipfire" target="_blank">
+                                               {{ _("ipfire on GitHub") }}
+                                       </a>
                                </p>
+                       </section>
 
-                               <div class="alert alert-info">
-                                       Hilf dem <a href="http://wiki.ipfire.org/projects/translation/start">IPFire Übersetzungsteam</a>!
+                       <section id="build">
+                               <div class="page-header">
+                                       <h1>{{ _("How to build IPFire?") }}</h1>
                                </div>
-                       {% else %}
-                               <h5>IPFire 2.x</h5>
-                               <p>
-                                       Please read the <a href="http://wiki.ipfire.org/en/development/language">translation guide</a>
-                                       to learn how to translate the web interface of IPFire 2.
-                               </p>
 
-                               <h5>IPFire 3.x</h5>
-                               <p>
-                                       Head over to <a href="http://www.transifex.net/projects/p/ipfire/">Transifex</a>
-                                       to see a list of our translation projects and feel free to join.
-                               </p>
+                               {% if lang == "de" %}
+                                       <p>
+                                               IPFire zu kompilieren ist ganz einfach, aber dauert seine
+                                               Zeit.
+                                       </p>
+                                       <p>
+                                               Einen Einblick dazu gibt es in der
+                                               <a href="http://wiki.ipfire.org/{{ lang }}/development/build">Bauanleitung</a>
+                                               im Wiki, welche Schritt für Schritt vorgeht.
+                                       </p>
+                                       <p>
+                                               Addonentwicklung ist erwünscht. Die Vorgehensweise
+                                               dafür findet sich in der entsprechenden
+                                               <a href="http://wiki.ipfire.org/{{ lang }}/development/addon#building_addon_-_howto">Anleitung</a>.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               Building IPFire is actually very easy, but it does take some time.
+                                       </p>
+                                       <p>
+                                               Have a look at the
+                                               <a href="http://wiki.ipfire.org/{{ lang }}/development/build">guide on our wiki</a>
+                                               and work through it at your own pace, step by step.
+                                       </p>
+                                       <p>
+                                               Add-on development is encouraged. Have a look at the
+                                               <a href="http://wiki.ipfire.org/{{ lang }}/development/addon#building_addon_-_howto">building an add-on guide on our wiki</a>
+                                               for more information.
+                                       </p>
+                               {% end %}
 
-                               <div class="alert alert-info">
-                                       Join the <a href="http://wiki.ipfire.org/projects/translation/start">IPFire translation team</a>!
-                               </div>
-                       {% end %}
+                               <hr class="separator">
+
+                               <h2>{{ _("How to submit patches?") }}</h2>
+                               {% if lang == "de" %}
+                                       <p>
+                                               Die IPFire Entwickler freuen sich über jeden Beitrag zur Software.
+                                               Patches, welche Fehler beheben, Verbesserungen implementieren
+                                               oder neue Funktionen hinzufügen sind willkommen.
+                                       </p>
+                                       <p>
+                                               Um den Integrationsprozess in die Distribution verfolgen
+                                               zu können, bitten wir einen <a href="http://bugtracker.ipfire.org/">Bugreport</a>
+                                               zu eröffnen, an welchen der Patch angehangen worden ist, sowie alle
+                                               anderen benötigten Daten.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               The IPFire developers appreciate any and all contributions to the software.
+                                               Patches that fix bugs, add enhancements, or create new features are welcome.
+                                       </p>
+                                       <p>
+                                               To track the integration into the distribution properly,
+                                               we request that you create a new bug report in the
+                                               <a href="http://bugtracker.ipfire.org/">bugtracker</a>
+                                               and attach the patch file, as well as everything else that is needed.
+                                       </p>
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <h2>{{ _("How to translate IPFire?") }}</h2>
+
+                               {% if lang == "de" %}
+                                       <h3>IPFire 2.x</h3>
+                                       <p>
+                                               In der <a href="http://wiki.ipfire.org/{{ lang }}/development/language">Übersetzungsanleitung</a>
+                                               finden sich Informationen darüber, wie man das Webinterface von IPFire 2
+                                               übersetzt.
+                                       </p>
+
+                                       <h3>IPFire 3.x</h3>
+                                       <p>
+                                               Auf <a href="http://www.transifex.net/projects/p/ipfire/">Transifex</a>
+                                               findet sich eine Reihe von Übersetzungsprojekten in Verbindung
+                                               mit IPFire 3.
+                                       </p>
+
+                                       <div class="alert alert-info">
+                                               Hilf dem <a href="http://wiki.ipfire.org/projects/translation/start">IPFire Übersetzungsteam</a>!
+                                       </div>
+                               {% else %}
+                                       <h3>IPFire 2.x</h3>
+                                       <p>
+                                               Please read the <a href="http://wiki.ipfire.org/en/development/language">translation guide</a>
+                                               to learn how to translate the web interface of IPFire 2.
+                                       </p>
+
+                                       <h3>IPFire 3.x</h3>
+                                       <p>
+                                               Head over to <a href="http://www.transifex.net/projects/p/ipfire/">Transifex</a>
+                                               to see a list of our translation projects and feel free to join.
+                                       </p>
+
+                                       <div class="alert alert-info">
+                                               Join the <a href="http://wiki.ipfire.org/projects/translation/start">IPFire translation team</a>!
+                                       </div>
+                               {% end %}
+                       </section>
+               </div>
+
+               <div class="span3 sidebar">
+                       <ul class="nav nav-list sidenav">
+                               <li>
+                                       <a href="#tools">
+                                               <i class="icon-chevron-left"></i> {{ _("Development tools") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#sources">
+                                               <i class="icon-chevron-left"></i> {{ _("Source Code") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#build">
+                                               <i class="icon-chevron-left"></i> {{ _("How to build IPFire?") }}
+                                       </a>
+                               </li>
+                       </ul>
                </div>
        </div>
 {% end block %}
index f2cce6d7f58e452eb0719120600344af5a170bb3..d6d0311e78358eb818322e1d2cb1d59349313a53 100644 (file)
@@ -1,13 +1,24 @@
 {% extends "../base-1.html" %}
                
-{% block title %}{{ _("Donation") }}{% end block %}
+{% block title %}{{ _("Donate") }}{% end block %}
+
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>{{ _("Donate") }}</h1>
+                       <p class="lead">
+                               {{ _("We need your help!") }}
+                       </p>
+               </div>
+       </header>
+{% end header %}
  
 {% block body %}
-       <div class="page-header">
-               <h1>{{ _("Donation") }}</h1>
-       </div>
-
        {% if lang == "de" %}
+               <p class="lead ac">
+                       Wir möchten jeden, der IPFire einsetzt, ermutigen einen Beitrag zu leisten.
+                       Danke dafür.
+               </p>
                <p>
                        IPFire ist ein Open Source-Projekt.
                        Nutzer und die Gemeinschaft sind das wertvollste und wichtigste
                        zu erreichen, das Projekt finanziell gesund zu erhalten und
                        somit langfristig abzusichern.
                </p>
-               <p>
-                       Deshalb ermutigen wir jeden, der IPFire einsetzt einen Beitrag zu leisten.
-                       Danke dafür.
-               </p>
        {% else %}
+               <p class="lead ac">
+                       We encourage anyone who downloads and uses IPFire to donate.
+                       It is very much appreciated.
+               </p>
                <p>
                        IPFire is an Open Source project.
                        The users and the community are the most valuable and most important factor,
                        improvement and promotion of the IPFire project.
                        Sponsorship is a good way to ensure the longevity and overall health of the project.
                </p>
-               <p>
-                       So we encourage anyone who downloads and uses IPFire to donate.
-                       It is very much appreciated.
-               </p>
        {% end %}
 
        <hr>
@@ -57,9 +64,7 @@
                <div class="span10 offset1">
                        {% module DonationBox() %}
 
-                       <hr>
-
-                       <div class="ac">
+                       <p class="ac">
                                <strong>{{ _("Did you know...?") }}</strong>
 
                                {% if lang == "de" %}
                                        You can support the implementation of your favorite feature on the
                                        <a href="http://wishlist.ipfire.org/">IPFire wishlist</a>!
                                {% end %}
-                       </div>
+                       </p>
                </div>
        </div>
 
        <br>
 
        <div class="page-header">
-               <h4>{{ _("How do we use financial support?") }}</h4>
+               <h3>{{ _("How do we use financial support?") }}</h3>
        </div>
 
-       <div class="row">
-               <div class="span6">
-                       {% if lang == "de" %}
-                               <p>
-                                       Die gesammelten Spenden werden direkt dazu verwendet,
-                                       das Projekt zu verbessern und das hohe Level an Qualität
-                                       zu erhalten.
-                               </p>
-                       {% else %}
-                               <p>
-                                       The sponsored funds will be directly spent to improve
-                                       and maintain the high quality code base that IPFire is built upon.
-                               </p>
-                       {% end %}
+       {% if lang == "de" %}
+               <p>
+                       Die gesammelten Spenden werden direkt dazu verwendet,
+                       das Projekt zu verbessern und das hohe Level an Qualität
+                       zu erhalten.
+               </p>
+       {% else %}
+               <p>
+                       The sponsored funds will be directly spent to improve
+                       and maintain the high quality code base that IPFire is built upon.
+               </p>
+       {% end %}
 
-                       {% if lang == "de" %}
-                               <p>
-                                       Ebenfalls sammeln wir um die folgenden Aktivitäten zu unterstützen:
-                               </p>
-                               <ul>
-                                       <li>
-                                               Entwickler, die neue Funktion implementieren und Fehler in IPFire beseitigen
-                                       </li>
-                                       <li>
-                                               Verbessung von Dokumentation, Tutorials und des Community-Supports
-                                       </li>
-                                       <li>
-                                               Die Bekanntheit von IPFire durch Werbung zu fördern
-                                       </li>
-                               </ul>
-                       {% else %}
-                               <p>
-                                       We would also like to fund the following activities:
-                               </p>
-                               <ul>
-                                       <li>
-                                               Developers implementing new features and fixing bugs in IPFire
-                                       </li>
-                                       <li>
-                                               Improve documentation, tutorials and community support
-                                       </li>
-                                       <li>
-                                               Promote IPFire and do advertising
-                                       </li>
-                               </ul>
-                       {% end %}
-               </div>
+       {% if lang == "de" %}
+               <p>
+                       Ebenfalls sammeln wir um die folgenden Aktivitäten zu unterstützen:
+               </p>
+               <ul>
+                       <li>
+                               Entwickler, die neue Funktion implementieren und Fehler in IPFire beseitigen
+                       </li>
+                       <li>
+                               Verbessung von Dokumentation, Tutorials und des Community-Supports
+                       </li>
+                       <li>
+                               Die Bekanntheit von IPFire durch Werbung zu fördern
+                       </li>
+               </ul>
+       {% else %}
+               <p>
+                       We would also like to fund the following activities:
+               </p>
+               <ul>
+                       <li>
+                               Developers implementing new features and fixing bugs in IPFire
+                       </li>
+                       <li>
+                               Improve documentation, tutorials and community support
+                       </li>
+                       <li>
+                               Promote IPFire and do advertising
+                       </li>
+               </ul>
+       {% end %}
 
-               <div class="span6">
-                       <h4>{{ _("Research & Development") }}</h4>
+       <h4>{{ _("Research & Development") }}</h4>
 
-                       {% if lang == "de" %}
-                               <p>
-                                       Forschung und Entwicklung sind uns sehr wichtig,
-                                       um IPFire auch den Weg für die Zukunft zu bereiten.
-                                       Ein Beispiel dafür ist die Portierung auf neue Architekturen.
-                               </p>
-                               <p>
-                                       Einige Themen, in welchen wir uns engagieren wollen sind unter anderem
-                                       ARM, IPv6 und eine neuartige Weboberfläche.
-                               </p>
-                       {% else %}
-                               <p>
-                                       We would also like to do some research and development to
-                                       make IPFire ready for the future.
-                                       One example is we'd like to acquire new hardware platforms
-                                       and port IPFire to them.
-                               </p>
-                               <p>
-                                       Some of the big things we would like to dig in are ARM, IPv6 and a new WUI.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
+       {% if lang == "de" %}
+               <p>
+                       Forschung und Entwicklung sind uns sehr wichtig,
+                       um IPFire auch den Weg für die Zukunft zu bereiten.
+                       Ein Beispiel dafür ist die Portierung auf neue Architekturen.
+               </p>
+               <p>
+                       Einige Themen, in welchen wir uns engagieren wollen sind unter anderem
+                       ARM, IPv6 und eine neuartige Weboberfläche.
+               </p>
+       {% else %}
+               <p>
+                       We would also like to do some research and development to
+                       make IPFire ready for the future.
+                       One example is we'd like to acquire new hardware platforms
+                       and port IPFire to them.
+               </p>
+               <p>
+                       Some of the big things we would like to dig in are ARM, IPv6 and a new WUI.
+               </p>
+       {% end %}
 {% end block %}
index 49b8d97b5faed33dfa4178ffc2ff6bdb561af0c0..9374d3ebfc120e25afd0d0c9a6be56eda786341f 100644 (file)
-{% extends "../base-feature.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("About IPFire") }}{% end block %}
 
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("About IPFire") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span5 offset2">
-                       <img src="{{ static_url("images/tux/ipfire_tux_512x512.png") }}" alt="IPFire Logo" />
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>{{ _("About IPFire") }}</h1>
+                       <p class="lead">
+                               {{ _("Because IPFire is more than just a firewall") }}
+                       </p>
                </div>
-       </div>
-
-       <hr>
+       </header>
+{% end header %}
 
+{% block body %}
        <div class="row">
                <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       <strong>IPFire</strong> wurde mit Augenmerk auf Modularität und einem hohen
-                                       Level an Flexibilität entwickelt. Es ist kinderleicht verschiedene Konfigurationen
-                                       zu installieren, wie zum Beispiel eine Firewall, einen Proxy-Server oder ein
-                                       VPN-Gateway.
-                                       Das modulare Design stellt sicher, dass nur exakt die Module laufen, die auch
-                                       benötigt werden und nichts weiter.
-                                       Erweiterungen und Updates lasses sich durch einen Paketmanager einfach
-                                       verwalten und aktualisieren.
-                               </p>
-                               <p>
-                                       Das IPFire Entwicklerteam ist sich im Klaren, dass Sicherheit von Anwendungsfall
-                                       zu Anwendungsfall ganz verschieden aussehen kann und sich auch über die Zeit
-                                       verändert.
-                                       Für diesen Fall erlaubt die Modularität und Flexibilität eine einfache
-                                       Integration in jede bestehende Sicherheitsarchitektur.
-                                       Nicht zu vergessen ist, dass Einfachheit in der Bedienung eine
-                                       Schlüsseleigenschaft ist.
-                                       Wenn all dies im Moment ein wenig viel klingt, so ist ein sinnvoller
-                                       Einsatz von IPFire schon sofort nach der Installation möglich.
-                               </p>
-                               <p>
-                                       <em>
-                                               Die Links in der Sidebar zeigen, was mit IPFire alles möglich ist
-                                               und sind einen genaueren Blick wert.
-                                       </em>
-                               </p>
-                       {% else %}
-                               <p>
-                                       <strong>IPFire</strong> was designed with both modularity and a high-level of
-                                       flexibility in mind. You can easily deploy many variations of it, such as a firewall,
-                                       a proxy server or a VPN gateway.
-                                       The modular design ensures that it runs exactly what you've configured it for and
-                                       nothing more. Everything is simple to manage and update through the package manager,
-                                       making maintenance a breeze.
-                               </p>
-                               <p>
-                                       The IPFire development team understands that security means different things to
-                                       different people and certainly can change over time.
-                                       The fact that IPFire is modular and flexible make it perfect for integrating
-                                       into any existing security architecture.
-                                       Don't forget that ease-of-use is a key principle.
-                                       If all this sounds a little too much for you, IPFire comes with great default
-                                       settings out-of-the-box, meaning it's a snap to get going quickly!
-                               </p>
-                               <p>
-                                       <em>
-                                               Above are some links that we encourage you to click through.
-                                               Please take a look at all of the features and possibilities
-                                               which IPFire offers for your network. 
-                                       </em>
+                       <section id="about">
+                               <div class="page-header">
+                                       <h1>
+                                               {{ _("IPFire") }} <small>{{ _("An Open Source Firewall Distribution") }}</small>
+                                       </h1>
+                               </div>
+
+                               <p class="ac">
+                                       <img src="{{ static_url("images/tux/ipfire_tux_512x512.png") }}" alt="IPFire Logo" />
                                </p>
-                       {% end %}
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               <strong>IPFire</strong> wurde mit Augenmerk auf Modularität und einem hohen
+                                               Level an Flexibilität entwickelt. Es ist kinderleicht verschiedene Konfigurationen
+                                               zu installieren, wie zum Beispiel eine Firewall, einen Proxy-Server oder ein
+                                               VPN-Gateway.
+                                               Das modulare Design stellt sicher, dass nur exakt die Module laufen, die auch
+                                               benötigt werden und nichts weiter.
+                                               Erweiterungen und Updates lasses sich durch einen Paketmanager einfach
+                                               verwalten und aktualisieren.
+                                       </p>
+                                       <p>
+                                               Das IPFire Entwicklerteam ist sich im Klaren, dass Sicherheit von Anwendungsfall
+                                               zu Anwendungsfall ganz verschieden aussehen kann und sich auch über die Zeit
+                                               verändert.
+                                               Für diesen Fall erlaubt die Modularität und Flexibilität eine einfache
+                                               Integration in jede bestehende Sicherheitsarchitektur.
+                                               Nicht zu vergessen ist, dass Einfachheit in der Bedienung eine
+                                               Schlüsseleigenschaft ist.
+                                               Wenn all dies im Moment ein wenig viel klingt, so ist ein sinnvoller
+                                               Einsatz von IPFire schon sofort nach der Installation möglich.
+                                       </p>
+                                       <p>
+                                               <em>
+                                                       Die Links in der Sidebar zeigen, was mit IPFire alles möglich ist
+                                                       und sind einen genaueren Blick wert.
+                                               </em>
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               <strong>IPFire</strong> was designed with both modularity and a high-level of
+                                               flexibility in mind. You can easily deploy many variations of it, such as a firewall,
+                                               a proxy server or a VPN gateway.
+                                               The modular design ensures that it runs exactly what you've configured it for and
+                                               nothing more. Everything is simple to manage and update through the package manager,
+                                               making maintenance a breeze.
+                                       </p>
+                                       <p>
+                                               The IPFire development team understands that security means different things to
+                                               different people and certainly can change over time.
+                                               The fact that IPFire is modular and flexible make it perfect for integrating
+                                               into any existing security architecture.
+                                               Don't forget that ease-of-use is a key principle.
+                                               If all this sounds a little too much for you, IPFire comes with great default
+                                               settings out-of-the-box, meaning it's a snap to get going quickly!
+                                       </p>
+                                       <p>
+                                               <em>
+                                                       Above are some links that we encourage you to click through.
+                                                       Please take a look at all of the features and possibilities
+                                                       which IPFire offers for your network. 
+                                               </em>
+                                       </p>
+                               {% end %}
+                       </section>
+
+                       <section id="security">
+                               <div class="page-header">
+                                       <h1>{{ _("Security") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               Das Hauptaugenmerk von IPFire liegt bei Sicherheit.
+                                               Gerade bei einem solch umfangreichen Thema gibt es nicht nur einen einzigen
+                                               Weg, um ein maximales Maß an Sicherheit zu erlangen. Mindestens genauso
+                                               wichtig ist es für den Netzwerkadministrator seine Bedürfnisse zu verstehen
+                                               und entsprechend zu handeln. IPFire stellt für diesen Zweck eine Basis bereit,
+                                               die einzelne Netzwerksegmente nach ihren Sicherheitslevels unterteilt und erlaubt diese
+                                               anschließend nach eigenen Erfordernissen anzupassen
+                                               (mehr dazu unter <a href="/features/firewall">Firewall</a>).
+                                       </p>
+                                       <p>
+                                               Eine ebenso hohe Priorität genießt die Sicherheit der modularen Komponenten.
+                                               Aktualisierungen werden digital signiert, verschlüsselt
+                                               und können automatisch über das <a href="/features/pakfire">Pakfire
+                                               Paketmanagement-System</a> installiert werden.
+                                               Typischerweise ist IPFire direkt mit dem Internet verbunden und macht es
+                                               somit zu einem Ziel für Hacker und andere Gefahren.
+                                               Das Paketmanagement-System unterstützt den Administrator darin,
+                                               sicher zu sein, dass alle wichtigen Lücken gestopft und Fehler
+                                               in allen eingesetzten Komponenten beseitigt sind.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               The primary objective of IPFire is security.
+                                               As there is of course no one, single way to achieve network security, it is important
+                                               for a network administrator to understand their environment and what the term
+                                               <em>security</em> means in the context of their own network.
+                                               IPFire forms the base of a secure network.
+                                               It has the power to segment networks based on their respective security levels
+                                               and makes it easy to create custom policies that manage each segment
+                                               (see the Firewall page for more information).
+                                       </p>
+                                       <p>
+                                               Security of the modular components is a top priority.
+                                               Updates are digitally signed and encrypted, as well as can be automatically installed
+                                               by Pakfire (<a href="/features/updates">the IPFire package management system</a>).
+                                               Since IPFire is typically directly connected to the Internet, it is going to be a
+                                               primary target for hackers and other threats.
+                                               The simple Pakfire package manager helps administrators feel confident that
+                                               they are running the latest security updates and bug fixes for all of the
+                                               components they utilize.
+                                       </p>
+                               {% end %}
+                       </section>
+
+                       <section id="firewall">
+                               <div class="page-header">
+                                       <h1>{{ _("Firewall") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               IPFire nutzt eine Stateful-Packet-Inspection-Firewall (SPI),
+                                               welche auf das Linux Paketfilter-Framework <em>netfilter</em> aufsetzt.
+                                       </p>
+                                       <p>
+                                               Während des IPFire Installationsprozesses, wird das Netzwerk in
+                                               mehrere separate Segmente unterteilt.
+                                               Dieses Sicherheitsschema impliziert einen perfekten Platz für
+                                               jedes System im Netzwerk.
+                                               Jedes Segment kann nach Bedarf zugeschaltet werden, abhängig vom
+                                               Einsatzort und -zweck und alle Systeme in einem Segment werden
+                                               mit der gleichen Sicherheitspolicy behandelt:
+                                       </p>
+
+                                       <table class="table table-striped table-bordered">
+                                               <tbody>
+                                                       <tr>
+                                                               <td style="background-color: green; color: white;">
+                                                                       <strong>Green</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Grün repräsentiert die "sichere" Zone.
+                                                                       In diese Zone gelangen alle herkömmlichen
+                                                                       Clients, welche meist mit dem Kabelnetzwerk
+                                                                       verbunden sind. Von hier aus können die Clients
+                                                                       uneingeschränkt auf alle anderen Zonen zugreifen.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td style="background-color: red; color: white;">
+                                                                       <strong>Red</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Rot impliziert "Gefahr" - also die Verbindung zum
+                                                                       Internet.
+                                                                       Nichts von hier aus darf die Firewall passieren,
+                                                                       außer dies ist explizit vom Administrator erlaubt.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td style="background-color: darkblue; color: white;">
+                                                                       <strong>Blue</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Blau repräsentiert das drahtlose Segment des
+                                                                       Netzwerks (aufgrund der Farbe des Himmels).
+                                                                       Da Wireless-Clients von Natur aus ein größeres
+                                                                       Gefahrenpotential sind, muss für jedes System
+                                                                       in diesem Teil der Zugang zum Internet gesondert
+                                                                       erlaubt werden.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td style="background-color: orange; color: white;">
+                                                                       <strong>Orange</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Das orangene Netzwerk wird auch als demilitarisierte
+                                                                       Zone (DMZ) bezeichnet.
+                                                                       Alle Server, die aus dem Internet erreichbar sind
+                                                                       gehören in dieses Netz um kein Sicherheitsrisiko
+                                                                       für andere lokale Systeme zu sein.
+                                                               </td>
+                                                       </tr>
+                                               </tbody>
+                                       </table>
+
+                                       <p>
+                                               Zusätzlich zu den oben genannten Policies kann auch der ausgehende
+                                               Netzwerkverkehr für jedes Segment geregelt werden.
+                                               Diese Funktion gibt dem Netzwerkadministrator vollständige
+                                               Kontrolle über das Netzwerk.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               IPFire employs a Stateful Packet Inspection (SPI) firewall,
+                                               which is built on top of netfilter (the Linux packet filtering framework).
+                                       </p>
+                                       <p>
+                                               During the installation of IPFire, the network is configured into different,
+                                               separate segments.
+                                               This segmented security scheme means that there is a perfect place for each
+                                               machine in the network.
+                                               These different segments may be enabled separately, depending on your requirements.
+                                               Each segment represents a group of computers who share a common security level:
+                                       </p>
+
+                                       <table class="table table-striped table-bordered">
+                                               <tbody>
+                                                       <tr>
+                                                               <td style="background-color: green; color: white;">
+                                                                       <strong>Green</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Green represents a "safe" area.
+                                                                       This is where all regular clients will reside.
+                                                                       It is usually comprised of a wired, local network.
+                                                                       Clients on Green can access all other network
+                                                                       segments without restriction.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td style="background-color: red; color: white;">
+                                                                       <strong>Red</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Red indicates "danger" or the connection to the Internet.
+                                                                       Nothing from Red is permitted to pass through the
+                                                                       firewall unless specifically configured by the
+                                                                       administrator.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td style="background-color: darkblue; color: white;">
+                                                                       <strong>Blue</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Blue represents the "wireless" part of the local
+                                                                       network (chosen because it's the color of the sky).
+                                                                       Since the wireless network has the potential for abuse,
+                                                                       it is uniquely identified and specific rules govern
+                                                                       clients on it.
+                                                                       Clients on this network segment must be explicitly
+                                                                       allowed before they may access the network.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td style="background-color: orange; color: white;">
+                                                                       <strong>Orange</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Orange is referred to as the "demilitarized zone" (DMZ).
+                                                                       Any servers which are publicly accessible are separated
+                                                                       from the rest of the network here to limit security
+                                                                       breaches.
+                                                               </td>
+                                                       </tr>
+                                               </tbody>
+                                       </table>
+
+                                       <p>
+                                               Additionally, the firewall can be used to control outbound Internet
+                                               access from any segment.
+                                               This feature gives the network administrator complete control
+                                               over how their network is configured and secured. 
+                                       </p>
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <ul class="thumbnails">
+                                       <li class="span3">
+                                               <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/edit-portfw-rule-1.png") }}">
+                                                       <img src="{{ static_url("images/screenshots/en/firewall/edit-portfw-rule-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
+                                               </a>
+                                       </li>
+                                       <li class="span3">
+                                               <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/dmz-holes-1.png") }}">
+                                                       <img src="{{ static_url("images/screenshots/en/firewall/dmz-holes-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
+                                               </a>
+                                       </li>
+                                       <li class="span3">
+                                               <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/connections-1.png") }}">
+                                                       <img src="{{ static_url("images/screenshots/en/firewall/connections-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
+                                               </a>
+                                       </li>
+                               </ul>
+                       </section>
+
+                       <section id="pakfire">
+                               <div class="page-header">
+                                       <h1>
+                                               Pakfire <small>{{ _("The IPFire package management system") }}</small>
+                                       </h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               Vom technischen Standpunkt aus ist IPFire ein schlankes, gehärtetes
+                                               Firewall-System, welches den Paketmanager Pakfire mitbringt.
+                                               Die primäre Aufgabe von Pakfire ist es, Systemupdates mit nur einem Klick
+                                               einspielen zu können.
+                                               Somit ist es ganz leicht <a href="/features/updates">Sicherheitslücken
+                                               zu schließen und Bugfixes sowie neue Funktionen zu installieren</a>.
+                                               Dies macht IPFIre sicherer und schneller - oder einfach: besser.
+                                       </p>
+                                       <p>
+                                               Eine weitere Aufgabe ist es, zusätzliche Addons zu installieren, welche die
+                                               Funktionen des Systems erweitern.
+
+                                               Einige beliebte sind unter anderen:
+
+                                               <ul>
+                                                       <li>Datei- und Druckdienste wie <em>samba</em> und <em>vsftpd</em></li>
+                                                       <li>Kommunikationslösungen wie <em>Asterisk</em></li>
+                                                       <li>
+                                                               Verschiedene Kommandozeilenhelfer wie
+                                                               <em>tcpdump</em>, <em>nmap</em>, <em>traceroute</em>
+                                                               und viele mehr.
+                                                       </li>
+                                               </ul>
+                                       </p>
+
+                                       <hr class="separator">
+
+                                       <h2>Pakfire als Buildsystem</h2>
+                                       <p>
+                                               Das kommende Major-Release von IPFire wird eine neue
+                                               Generation des Pakfire Paketmanagementsystems mitbringen.
+                                               Diese ist schneller, sicherer und einfacher zu bedienen.
+                                               Dazu kommen unzählige neue Funktionen.
+                                       </p>
+                                       <p>
+                                               Eine der neuen Funktionen ist, dass <em>pakfire</em>
+                                               nun auch als Buildsystem fungiert.
+                                               Ein auf die IPFire-Distribution angepasstes Buildsystem
+                                               hat die Produktivität der Entwickler immens gesteigert.
+                                               Neue Pakete zu bauen ist nun einfacher und nimmt weniger
+                                               Zeit in Anspruch.
+                                       </p>
+                                       <p>
+                                               Qualitätssicherung ist jetzt eine Aufgabe für alle.
+                                               Mehr dazu auf <a href="http://pakfire.ipfire.org/">pakfire.ipfire.org</a>.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               From a technical point of view, IPFire is a minimalistic, hardened firewall system
+                                               which comes with an integrated package manager called Pakfire.
+                                               The primary task of Pakfire is to update the system with only a single click.
+                                               It is very easy to install <a href="/features/updates">security patches,
+                                               bugfixes and feature enhancements</a>, which make IPFire safer and faster
+                                               - or simply: better.
+                                       </p>
+                                       <p>
+                                               Another task of Pakfire is to install additional software that adds new
+                                               functionality to the IPFire system.
+
+                                               Some useful of them are:
+                                       
+                                               <ul>
+                                                       <li>File sharing services such as Samba and vsftpd</li>
+                                                       <li>Communications server using Asterisk</li>
+                                                       <li>
+                                                               Various command-line tools as <em>tcpdump</em>,
+                                                               <em>nmap</em>, <em>traceroute</em> and many more.
+                                                       </li>
+                                               </ul>
+                                       </p>
+
+                                       <hr class="separator">
+
+                                       <h2>Pakfire as a build system</h2>
+                                       <p>
+                                               The next major release of IPFire will also ship a new generation
+                                               of the Pakfire packagement system.
+                                               This new generation has been made faster, more secure, more
+                                               easy to handle and adds a whole bunch of new features.
+                                       </p>
+                                       <p>
+                                               One of this features is that <em>pakfire</em> is now the
+                                               buildsystem as well. Having a customized build system for
+                                               the needs of IPFire and the IPFire developers improved
+                                               the development process very much. Building new packages
+                                               became a lot more easy and less time-consuming.
+                                       </p>
+                                       <p>
+                                               Quality assurance became more social right now. Check it
+                                               out at <a href="http://pakfire.ipfire.org/">pakfire.ipfire.org</a>.
+                                       </p>
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <ul class="thumbnails">
+                                       <li class="span3">
+                                               <a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1.png") }}">
+                                                       <img src="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
+                                               </a>
+                                       </li>
+                                       <li class="span3">
+                                               <a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/addon-services-1.png") }}">
+                                                       <img src="{{ static_url("images/screenshots/en/pakfire/addon-services-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
+                                               </a>
+                                       </li>
+                               </ul>
+                       </section>
+
+                       <section id="updates">
+                               <div class="page-header">
+                                       <h1>{{ _("Updates") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               IPFire basiert auf Linux, dem besten Open-Source-Kernel, den es gibt.
+                                               Ebenso basiert IPFire <strong>nicht</strong> auf irgendeiner Distribution
+                                               wie z.B. Knoppix auf Debian basiert sondern wird aus den Sourcen einer
+                                               großen Anzahl von Paketen gebaut. Dieser Prozess der Entwicklung kostet
+                                               viel Zeit, gibt allerdings die Möglichkeit nicht von Updatezyklen anderer
+                                               abzuhängen. Dagegen hat es den Vorteil besonders zuverlässige Versionen
+                                               eines Softwarepakets auszuwählen und den größten Teil der Distribution
+                                               daraus aufzubauen. Der Kernel hingegen wird laufend aktualisiert und
+                                               gepatcht um aktuelle und eine möglichst breite Palette an Hardware zu
+                                               unterstützen - und viel wichtiger, Sicherheitsupdates zeitnah zur
+                                               Verfügung zu stellen.
+                                       </p>
+                                       <p>
+                                               Das macht IPFire zu einem sehr leistungsfähigen und gleichzeitig
+                                               gehärtetem System.
+                                       </p>
+                                       <p>
+                                               Um dies beizubehalten und kompatibel zu der Vielzahl an Hardware auf
+                                               dem Markt zu bleiben, werden sogenannte "Core Updates" in einem Abstand
+                                               von etwa vier Wochen herausgegegen, um gesammelte Patches auszuliefern.
+                                               Im Falle eines kritischen Sicherheitsproblems in einem der Pakete gibt
+                                               es Sicherheitsupdates innerhalb weniger als 24 Stunden.
+                                       </p>
+                                       <p>
+                                               Alle Updates können mittels des Paketmanagementsystems eingespielt werden
+                                               und die Benutzer werden per Email über eben diese informiert. So ist
+                                               in allen Fällen das Update nach einem einzigen Klick installiert und
+                                               das System ist wieder gesichert im Internet.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               IPFire is based on Linux, which is the best Open Source kernel around.
+                                               Additionally, IPFire is <strong>not</strong> based on any other
+                                               distribution like Knoppix is on Debian. It is compiled from the sources
+                                               of every single package. This comsumes a lot of work, but finally
+                                               gives the opportunity to not rely on the update cycles of others.
+                                               The advantages we gain is that we are able to select very stable
+                                               versions of software and build the distribution from them. For example
+                                               is the most part of the distribution quite well tested and long maintained
+                                               - in contrast to the kernel which is very recent and regularly updated
+                                               with patches to support as much hardware as possible and more importantly
+                                               fix security errors.
+                                       </p>
+                                       <p>
+                                               This is what makes IPFire a very strong and hardened system.
+                                       </p>
+                                       <p>
+                                               To keep up that strength and be prepared for new
+                                               <a href="/features/hardware">hardware</a>, we give
+                                               out the so called <strong>Core Updates</strong> which are issued in
+                                               about every four weeks and updating collected fixes. If there is a
+                                               security emergency,     we provide updates in less than a day to overcome
+                                               zero-day holes in the system.
+                                       </p>
+                                       <p>
+                                               All of the updates can be installed by the
+                                               <a href="/features/pakfire">package management system</a>
+                                               and users are notified by mail. So in all cases, the update is just
+                                               a simple click and your system is running safe again.
+                                       </p>
+                               {% end %}
+                       </section>
+
+                       <section id="dialup">
+                               <div class="page-header">
+                                       <h1>{{ _("Dialup") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               IPFire ist als Internet-Gateway in der Lage über verschiedene
+                                               (Einwahl-)Techniken eine Verbindung zum Internet aufzubauen.
+                                       </p>
+                                       <p>
+                                               Es werden alle gängigen Breitbandzugangsarten wie auch mobile Zugänge unterstützt:
+                                       </p>
+
+                                       <table class="table table-striped table-bordered">
+                                               <tbody>
+                                                       <tr>
+                                                               <td>
+                                                                       <strong>VDSL</strong>
+                                                               </td>
+                                                               <td>
+                                                                       VDSL ist die Abkürzung für <em>Very High Data Rate Digital Subscriber Line</em> und
+                                                                       bietet in Deutschland derzeit Bandbreiten bis zu 50 MBit/s im Downstream und 10 MBit/s im Upstream.
+                                                                       Damit eignet sich VDSL für die Zukunft und bringt auch IPTV mit sich. Mit IPFire kann der herkömmliche
+                                                                       Router ausgetauscht werden und auf ein vollwertiges System gesetzt werden, das den IPTV-Stream ins
+                                                                       eigene Netz bringt.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>
+                                                                       <strong>ADSL/SDSL</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Selbstverständlich wird auch herkömmliches DSL unterstützt, wobei es sich
+                                                                       technisch um PPPoE oder PPPoA handelt. In einigen Ländern ist auch PPTP als Protokoll verbreitet und
+                                                                       wird ebenso unterstützt.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>
+                                                                       <strong>Ethernet</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Über Ethernet kann IPFire ebenfalls mit dem Internet verbunden werden und
+                                                                       eine IP-Adresse entweder per DHCP beziehen oder statisch konfiguriert werden. Das wird u.a. bei
+                                                                       Verbindungen über Kabel genutzt.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>
+                                                                       <strong>3. Generation</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Über USB-Modems wird auch jede Art von mobilen Breitbandverbindungen
+                                                                       unterstützt, welche bekannt sind unter den Bezeichnungen UMTS, 3G, CDMA, HSDPA oder LTE.
+                                                               </td>
+                                                       </tr>
+                                               </tbody>
+                                       </table>
+                               {% else %}
+                                       <p>
+                                               IPFire as an Internet Gateway is able to dialup through various techniques
+                                               to connect to the Internet.
+                                       </p>
+                                       <p>
+                                               It supports all popular types of broadband access, as well as mobile access:
+                                       </p>
+
+                                       <table class="table table-striped table-bordered">
+                                               <tbody>
+                                                       <tr>
+                                                               <td>
+                                                                       <strong>VDSL</strong>
+                                                               </td>
+                                                               <td>
+                                                                       VDSL is short for <em>Very High Data Rate Digital Subscriber Line</em> and
+                                                                       it currently offers bandwidth up to 50 Mbit/s downstream and 10 Mbit/s upstream.
+                                                                       VDSL brings the possibility of using new technologies such as IPTV. With IPFire, a conventional
+                                                                       router can be replaced by a full-fledged system that brings the IPTV stream into your own home network.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>
+                                                                       <strong>ADSL/SDSL</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Conventional DSL is also supported, although it is technically
+                                                                       called also PPPoE or PPPoA. In some countries, the PPTP protocol is also widely used and it is also fully
+                                                                       supported by IPFire.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>
+                                                                       <strong>Ethernet</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Over Ethernet, IPFire can also be connected to the Internet and obtain
+                                                                       an IP address either via DHCP or static configuration.
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>
+                                                                       <strong>3rd Generation</strong>
+                                                               </td>
+                                                               <td>
+                                                                       Mobile broadband connections over USB modems, which are also known by the names
+                                                                       UMTS, 3G, CDMA, HSDPA or LTE are also supported by IPFire.
+                                                               </td>
+                                                       </tr>
+                                               </tbody>
+                                       </table>
+                               {% end %}
+                       </section>
+
+                       <section id="proxy">
+                               <div class="page-header">
+                                       <h1>{{ _("Web proxy") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               Der Webproxy in IPFire, die Open-Source-Software Squid, ist der Linux und UNIX-Welt nicht unbekannt
+                                               und steht unter der GNU General Public License. Nicht nur ISPs, Universitäten, Schulen und grosse
+                                               Firmen nutzen diesen Proxy, denn seine Vielfältigkeit, Stabilität und ausgereifte Entwicklung macht
+                                               ihn auch für kleine Heimnetzwerke zu einem nutzvollen Partner. Ergänzend zur zustandsgesteuerten
+                                               Paketfilterung auf TCP/IP Ebene der Firewall können somit auch Inhalte, die über das HTTP-Protokoll
+                                               übertragen werden, analysiert und geregelt werden. Dabei können sowohl  HTTP-, HTTPS- sowie
+                                               FTP-Inhalte über Squid angefordert werden.
+                                       </p>
+                                       <ul>
+                                               <li>
+                                                       <strong>Sicherheit:</strong> Der Client fragt nicht selbst, er lässt seinen Proxy fragen.
+                                                       Die Antwort des Servers geht wieder an den Proxy und nicht an den Client. Der Client tritt
+                                                       somit nicht selbst in Erscheinung. Ein damit verbundener Angriff würde also in erster Linie
+                                                       den Proxy und nicht den Client treffen. Es stehen auch Funktionen zum Datenschutz zur Verfügung,
+                                                       was einen Vorteil gegenüber einem reinen NAT Router darstellt.
+                                               </li>
+                                               <li>
+                                                       <strong>Authentifizierung:</strong> Über Access-Listen kann Squid auch veranlasst werden,
+                                                       Zugriffe nur nach einer Benutzerauthentifizierung zuzulassen. Hierbei stehen LDAP, identd,
+                                                       Windows, Radius oder Lokale Authentifizierungsmethoden zur Verfügung, womit sich der Webproxy
+                                                       zum Beispiel an einen Microsoft Windows Domänencontroller anbinden lässt und nur Mitarbeitern
+                                                       der Zugang zum Internet gewährt werden kann.
+                                               </li>
+                                               <li>
+                                                       <strong>Kontrolle der Zugriffe:</strong> Soll der Internetzugriff nur zu speziellen Tageszeiten
+                                                       oder auch komplett für einzelne oder mehrere Clients eingeschränkt werden, kann dies über die
+                                                       “Netzwerkbasierten Zugriffskontrolle” geschehen, welche man im Webinterface findet. Ein sinnvoller
+                                                       Anwendungsbereich dafür sind z.B. Schulen.
+                                               </li>
+                                               <li>
+                                                       <strong>Protokollierung:</strong> Da jeder Zugriff über den Proxy protokolliert werden kann, bieten
+                                                       sich Möglichkeiten zur Überprüfung der Zugriffe im Nachhinein an und es können auch Statistiken
+                                                       und Abrechnungen erstellt werden. Durch das Analyseprogramm Calamaris lassen sich die Logdateien
+                                                       in unterschiedlichsten Kriterien über das IPFire Webinterface übersichtlich darstellen.
+                                               </li>
+                                               <li>
+                                                       <strong>Bandbreitenmanagement:</strong> Das Downloadmanagement lässt eine Kontrolle der Bandbreite
+                                                       für spezifizierte Bereiche zu. So können inhaltsbasierte Drosselungen zum Beispiel für Binärdateien,
+                                                       CD-Images oder Multimediadaten ebenso konfiguriert werden wie eine Download Drosselung der einzelnen
+                                                       Zonen oder für Hosts in den jeweiligen Zonen.
+                                               </li>
+                                       </ul>
+                               {% else %}
+                                       <p>
+                                               IPFire includes a full-fledged web proxy, which is the well-known, open-source software Squid. It is used by ISPs, universities, schools and large companies use because of its diversity, stability and mature development. Even for small home networks, it
+                                               is a useful feature. In addition to the stateful paket inspection (SPI) filtering by the firewall on
+                                               the TCP/IP layer, the web content which is transmitted over HTTP, HTTPS or FTP can be analyzed
+                                               and filtered as well.
+                                       </p>
+                                       <ul>
+                                               <li>
+                                                       <strong>Security:</strong> The client does not query web servers directly, it queries the proxy first.
+                                                       The server response goes back to the proxy and not to the client, which actually does not technically even appear on the
+                                                       Internet. A related attack would therefore primarily reach the proxy and not the client. There are also
+                                                       functions available for data privacy, which is an significant advantage in comparison to a pure NAT router.
+                                               </li>
+                                               <li>
+                                                       <strong>Authentication:</strong> Using the access lists, the web proxy can also be configured to allow
+                                                       access only after a user has been authenticated. At this point you have the choice between LDAP, identd,
+                                                       Windows, Radius or local authentication methods. The web proxy can connect, for example to a
+                                                       Microsoft Windows domain controller and only the users of that Windows domain can be granted access to the Internet.
+                                               </li>
+                                               <li>
+                                                       <strong>Authorization:</strong> If the Internet access needs to  be limited to specific time of a day,
+                                                       or if it should be even completely disabled for any clients, is this easily configured by the
+                                                       “network-based access control”, which can also be found on the IPFire web interface. A useful application for this feature can be for example, a school classroom.
+                                               </li>
+                                               <li>
+                                                       <strong>Logging:</strong> Since each access can be logged over the proxy, possibilities for the
+                                                       examination of the accessed content can be very useful, as well as statistics and bills can be issued afterwards.
+                                                       Through the use of a logfile analyzer named Calamaris, log files can be charted by varying criteria
+                                                       on the IPFire web interface.
+                                               </li>
+                                               <li>
+                                                       <strong>Bandwidth management:</strong> The download management function allows for control of the bandwidth
+                                                       to specified zones. Thus, content-based throttling (for example for binary files, CD images or
+                                                       multimedia content) is configurable with bandwidth limitations for individual zones or for each host
+                                                       in a particular zone.
+                                               </li>
+                                       </ul>
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <h2>{{ _("Content filter") }}</h2>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               SquidGuard ist ein URL-Filter, der über den Redirektor-Mechanismus an den Proxy angebunden wird.
+                                               Das Herz stellen sogenannte Blacklists dar, die von offizieller Seite erstellt, eine Reihe von
+                                               klassifizierten Webseiten enthalten und über das Webinterface automatisch auf dem neuesten Stand
+                                               gehalten werden. Es stehen unterschiedliche, freie Quellen für vorgefertigte Blacklists zur Verfügung,
+                                               die erlauben unter anderem jugendgefährdende Inhalte, Shopping-, Warez-, Social-Networking- oder
+                                               gewaltverherrlichende Seiten zu filtern.
+                                       </p>
+                                       <p>
+                                               Individuelle Erweiterungen einzelner Domains oder URLs können für Blacklists und ebenso für Whitelists
+                                               über das Webinterface eingerichtet werden. IPFire bietet auch einen Blacklist-Editor, der das Editieren
+                                               und erstellen eigener Blacklists über das Webinterface anbietet.
+                                       </p>
+                                       <p>
+                                               Mögliche Anwendungsbereiche für SquidGuard auf dem IPFire sind:
+                                       </p>
+                                       <ul>
+                                               <li>
+                                                       Sperren oder Einschränken spezieller Internet Inhalte in Abhängigkeit von Uhrzeit, Benutzer
+                                                       und verwendetem Rechner.
+                                               </li>
+                                               <li>
+                                                       Verhinderung des Zugriffs auf bestimmte (z.B. jugendgefährdende) Seiten.
+                                               </li>
+                                               <li>
+                                                       Ausblenden von Werbung.
+                                               </li>
+                                       </ul>
+                               {% else %}
+                                       <p>
+                                               SquidGuard is a URL filter add-on which is connected via the redirector mechanism of the proxy.
+                                               The heart of SquidGuard is something called a "blacklist." This is a content control list created by the official site. These lists contain a number of categorically-classified websites and can be kept up-to-date automatically. There are different, independent
+                                               sources for pre-built blacklists available, which allow among other classes filtering for adult
+                                               content, shopping, warez, social networking, or sites containing violent/abusive content.
+                                       </p>
+                                       <p>
+                                               Individual extensions for particular domains or URLs can be set up on the IPFire web interface for
+                                               blacklists and whitelists as well. IPFire also offers a black list editor, that makes the editing
+                                               and creating your own blacklists quite easy.
+                                       </p>
+                                       <p>
+                                               Possible areas of application for the SquidGuard on IPFire are:
+                                       </p>
+                                       <ul>
+                                               <li>
+                                                       Block or restrict Internet content conditionally by time, user and/or computers.
+                                               </li>
+                                               <li>
+                                                       Preventing access to certain (eg. youth-endangering) pages and content categories.
+                                               </li>
+                                               <li>
+                                                       Hiding advertising.
+                                               </li>
+                                       </ul>
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <h2>{{ _("Update accelerator") }}</h2>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               Der Update-Accelerator ist ein System, das Updates für z.B. Betriebssysteme erheblich beschleunigen
+                                               kann. Dazu werden alle heruntergeladenen Updates zwischengespeichert und bei einem weiteren Download
+                                               aus dem lokalen Cache ausgeliefert.
+                                       </p>
+                                       <p>
+                                               Bei Service Packs für Microsoft Windows, die oft einige hundert Megabytes haben, lohnt sich dieses
+                                               Speichern massiv, aber auch Virenscanner und andere Produkte profitieren hiervon und machen ein Update von
+                                               allen Workstations in der Firma zu einer schnell erledigten Aufgabe.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               The Update Accelerator is a feature that can greatly accelerate deploying updates for operating systems.
+                                               All downloaded updates are cached and if requested another time, are delivered from the cache.
+                                       </p>
+                                       <p>
+                                               For example, Service Packs for Microsoft Windows (which often are several hundred megabytes) are cached for future retrieval, as well as virus scanner definition updates and other product updates which the system automatically identifies. This saves a massive amount of time when updating large amounts of computers (such as corporate networks). 
+                                       </p>
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <h2>{{ _("Transparent virus scanner") }}</h2>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               Das Paketmanagement bietet das Addon “SquidClamAV” zur Erweiterung an. Somit steht dem Webproxy
+                                               ein Virenscanner zur Verfügung, der in Echtzeit den Datenverkehr nach Viren mit Hilfe des bekannten
+                                               ClamAV prüft.
+                                       </p>
+                                       <p>
+                                               Der zusätzliche Schutz zu einem herkömmlichen Virenscanner besteht vor allem darin, dass die Dateien
+                                               nicht erst auf den Client-Rechner gelangen, bevor der Virenscan ausgeführt werden kann. Potentielle
+                                               Schädlinge werden vor dem Download durch SquidClamAV geblockt.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               The package manager Pakfire offers the addon SquidClamAV - a virus scanner for the web proxy. This checks in real-time all web traffic for viruses, utilizing the ClamAV virus definitions and scanning engine.
+                                       </p>
+                                       <p>
+                                               The additional protection to a conventional virus scanner lies in the fact that the files are transparently checked before ever making it to the client machine before the client machine's virus scan can be performed. So potentially-malicious files are blocked by
+                                               SquidClamAV before the client's actual download.
+                                       </p>
+                               {% end %}
+                       </section>
+
+                       <section id="vpn">
+                               <div class="page-header">
+                                       <h1>
+                                               {{ _("VPN") }} <small>{{ _("Virtual Private Networks") }}</small>
+                                       </h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               IPFire kann zu einem VPN-Gateway (virtal private network - virtuelles, privates Netzwerk)
+                                               ausgebaut werden, welches Personen mit unterschiedlichem Standort untereinander verbindet.
+                                               Dies können zum Beispiel Mitarbeiter, Freunde oder Personen sein mit denen man Daten sicher
+                                               austauschen möchte, aber auch eine Filiale, Außenstelle, wichtige Kunden oder andere Unternehmen
+                                               mit denen kommuniziert wird.
+                                       </p>
+                                       <p>
+                                               Um sich über verschiedene Technologien verbinden zu können unterstützt IPFire die VPN Protokolle
+                                               IPsec und OpenVPN. Dies erlaubt dem Administrator große Freiheiten bei der Konfiguration des VPNs.
+                                               Die Verwendung dieser Protokolle erlaubt es IPFire auch sich mit VPN Endpunkten verschiedenster
+                                               Hardwarehersteller, wie Cisco, Juniper, Checkpoint, etc. zu verbinden.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               IPFire also includes functionality to create virtual private networks (VPN).
+                                               A VPN is a gateway which connects remote networks to the local one using an
+                                               encrypted link.
+                                               Uses for a VPN include business connections to branch offices or datacenters,
+                                               as well as providing traveling staff with a secure portal to the corporate network.
+                                       </p>
+                                       <p>
+                                               For maximum flexibility, IPFire uses both IPsec and OpenVPN protocols,
+                                               giving administrators maximum flexibility when configuring their VPN.
+                                               Use of these protocols allows IPFire to connect to a variety of VPN endpoint
+                                               devices by manufacturers such as Cisco, Juniper, Checkpoint, etc. 
+                                       </p>
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <h2>{{ _("IPsec") }}</h2>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               IPsec ist ein Standard, der unter den VPN-Technologien weit bekannt
+                                               ist und im IPv6-Protokoll entwickelt wurde. Da IPv6 allerdings erst
+                                               langsam seinen Weg in die Welt findet, wurde das IPsec-Protokoll
+                                               auf IPv4 zurückzuportiert.
+                                       </p>
+
+                                       <p>
+                                               Im Gegensatz zu den ebenfalls eingesetzten SSL-VPNs gilt IPsec als
+                                               schwer einzurichten. Diese Hürde wurde in IPFire beseitigt - zur
+                                               Verfügung steht ein einfach zu bedienendes User-Interface,
+                                               in welches man einige Konfigurationsparameter eingibt, welches dann
+                                               den Rest übernimmt. Ebenso wird automatsich dafür gesorgt, dass die
+                                               Tunnel geöffnet sind und, dass diese von allein wieder aufgebaut werden,
+                                               sollte einmal ein Tunnelpartner seine Internetverbindung verlieren.
+                                               So wird eine sichere und stabile Verbindung zu Filialen, Partnern oder
+                                               dem Zuhause innerhalb von Minuten eingerichtet und sie ist auch
+                                               kompatibel zu denen anderer Anbieter.
+                                       </p>
+
+                                       <p>
+                                               Der hohe Grad der Kompatibilität zu anderen Herstellern wird durch
+                                               die Verwendung der freien Implementierung 
+                                               <a href="http://www.strongswan.org" target="_blank">strongSwan</a>
+                                               möglich, welches von Andreas Steffen, einem Professor für Sicherheit
+                                               in der Kommunikationstechnik und Leiter des Instituts für
+                                               Internetechnologien und -applikationen an der Universität der
+                                               angewandten Wissenschaften Rapperswil in der Schweiz entwickelt wird.
+                                               StrongSwan arbeitet besonders gut mit Produkten wie Microsoft Windows 7,
+                                               Microsoft Windows Vista und Mac OS X zusammen.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               IPsec is a widely-deployed VPN solution that was originally developed to be used in conjunction with IPv6. Because it was so secure and IPv6 was so slowly deployed, it was backported to secure IPv4 traffic as well.
+                                       </p>
+
+                                       <p>
+                                               In contrast to SSL-VPNs, IPsec is hard to set-up. In IPFire, we
+                                               thought about how to make this technology easy-to-use and as a result, there
+                                               is a web user interface that handles all settings and takes care of the rest
+                                               of the configuration for you. It also keeps the tunnels alive and
+                                               re-establishes them automatically after a remote site has lost the connection. A secure connection to a branch office, a
+                                               business partner, or a home office is done within a couple of minutes
+                                               and compatible with all other implementations.
+                                       </p>
+
+                                       <p>
+                                               This high-level of compatibility is achieved by using the free
+                                               implementation called
+                                               <a href="http://www.strongswan.org" target="_blank">strongSwan</a>. It is maintained by Andreas Steffen, who is a professor for security in communications and head of the Institute for Internet Technologies
+                                               and Applications at the University of Applied Sciences Rapperswil, in
+                                               Switzerland. StrongSwan also works with all current, major operating systems, such as Microsoft
+                                               Windows 7, Microsoft Windows Vista and Mac OS X.
+                                       </p>
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <h2>{{ _("OpenVPN") }}</h2>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               Unter den Open Source SSL-VPNs ist OpenVPN ein häufig angetroffener und
+                                               beliebter Vertreter, dessen einfache Konfiguration über das IPFire-
+                                               Webinterface noch einmal erleichtert wird. Die Firewall-Einstellungen
+                                               werden von IPFire automatisch geregelt, ebenso werden die benötigten
+                                               Zertifikate mit wenigen Mausklicks erzeugt und können als kompaktes
+                                               Client-Paket heruntergeladen, verteilt und mit einem weiteren Klick
+                                               ausgeführt werden.
+                                       </p>
+                                       <p>
+                                               Durch die hohe Kompatibilität zu anderen Betriebssystemen
+                                               (Microsoft Windows, Mac OSX, Linux, Android, uvam.)
+                                               eignet sich OpenVPN bestens zur Anbindung sogenannter Roadwarrior-Clients.
+                                               Eine leicht zu konfigurierende, durch Zertifikate gesicherte,
+                                               verschlüsselte Anbindung aus dem Internet
+                                               auf Firmendaten oder das Zuhause liegende Netzwerk kann nicht
+                                               nur über Notebooks, sondern unter anderem auch über PDAs, Smartphones
+                                               oder Tablets hergestellt werden.
+                                       </p>
+                                       <p>
+                                               Doch neben der Anbindung von Laptops und anderen Handgeräten, kann
+                                               mit OpenVPN auch eine transparente Verbindung zu Filialen, Partnern
+                                               und für jeden beliebigen anderen Einsatz erstellt werden.
+                                               Das ermöglicht sicheren Zugriff auf ein gesamtes Netzwerk ohne
+                                               aufwändige Konfiguration.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               OpenVPN is a frequently-encountered and most popular representative
+                                               of the class of Open Source SSL VPNs.
+                                               Its relative ease of configuration has again, been made easier
+                                               by the IPFire web interface. The firewall settings are controlled
+                                               by IPFire automatically, as well as the required certificates will be
+                                               generated with a few mouse clicks and can be downloaded and distributed
+                                               as a very compact client package.
+                                       </p>
+                                       <p>
+                                               Due to its high compatibility to all sorts of operating systems,
+                                               such as Microsoft Windows, Mac OSX, Linux, Android and many more,
+                                               it is perfectly useful for roadwarrior connections.
+                                               With those, it is easy to connect your laptop, phone, tablet or
+                                               other devices to your company network, which makes it easy to
+                                               work from anywhere in the world.
+                                       </p>
+                                       <p>
+                                               But besides connecting portable devices, OpenVPN can also be used
+                                               to securely connect branches to the headquater.
+                                               This makes it easy to access resources on other networks
+                                               remotely without any complicated configuration on each client
+                                               on your local network.
+                                       </p>
+                               {% end %}
+                       </section>
+
+                       <section id="ids">
+                               <div class="page-header">
+                                       <h1>{{ _("Intrusion detection system") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               Ein Intrusion Dection System, kurz IDS, dient zur Erkennung von Angriffen gegen Computersysteme
+                                               oder Computernetze. Dabei analysiert das IDS den Netzwerktraffic und durchsucht diesen nach Angriffsmustern.
+                                               Wird zum Beispiel ein einfacher Portscan auf ein IPFire-System ausgeführt um angebotene Dienste auszuspähen,
+                                               dann wird dies sofort erkannt.
+                                       </p>
+                                       <p>
+                                               Ein IPS, Intrusion Prevention System, hat zusätzlich zu der Erkennung die Aufgabe Aktionen auszuführen.
+                                               Dabei nimmt es Informationen zum Angriff vom IDS entgegen und handelt entsprechend. Bei dem Beispiel des
+                                               Portscans würde es den Angreifer blocken damit keine Daten mehr ausgetauscht werden.
+                                       </p>
+                                       <p>
+                                               Arbeiten wie in IPFire beide Systeme zusammen nennt man dies ein IDPS (Intrusion detection and prevention
+                                               system). Ein sehr bekannter Vertreter dafür ist Snort. Das freie Netzwerk Intrusion Dection System (NIDS)
+                                               analysiert den Datenverkehr und sofern es etwas Auffälliges findet, logt es dieses. IPFire bietet die
+                                               Möglichkeit die erkannten Angriffe im Webinterface detailliert durchzusehen.
+                                       </p>
+                                       <p>
+                                               Automatische Gegenmaßnahmen verrichtet in IPFire Guardian, was optional nachinstalliert werden kann.
+                                       </p>
+                                       <p>
+                                               Somit ist ein IDPS ein sinnvoller Zusatz zum herkömmlichen Paketfilter um intelligente Entscheidungen
+                                               über einkommende Daten zu treffen.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               An Intrusion Dection System (or IDS), is a piece of software designed to detect attacks against computer systems
+                                               and networks. Thereby the IDS will analyze the network traffic and search for attack samples. If someone
+                                               scans the ports of the IPFire-System to see which services are available, the IDS will immediately notice it.
+                                       </p>
+                                       <p>
+                                               An Intrusion Prevention System (or IPS), in addition to the detection system, will perform actions.
+                                               The IPS gets the information from the IDS and reacts accordingly. That means, recalling the example above with
+                                               the portscan, the system would automatically block the attacker immediately in order to prevent further inquiries.
+                                       </p>
+                                       <p>
+                                               It is possible to use IDS and IPS on the IPFire system. We call this system "Intrusion Detection
+                                               and Prevention System" (or IDPS). A very important deputy of this system is Snort, the free Network Intrusion Dection System
+                                               (NIDS). It analyzes the network traffic and if something abnormal happens, it will log the event. IPFire gives you
+                                               the possibility to see it very explicitly in the web interface.
+                                       </p>
+                                       <p>
+                                               For automatic prevention, IPFire has an add-on called Guardian which can be installed optionally.
+                                       </p>
+                                       <p>
+                                               An IDPS is a wise addition to the normal packet filter. It makes intelligent decisions about
+                                               incoming and outgoing network traffic and how to deal with it.
+                                       </p>
+                               {% end %}
+                       </section>
+
+                       <section id="qos">
+                               <div class="page-header">
+                                       <h1>{{ _("Quality of Service") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               Ein Quality of Service, oder kurz QoS, ist in der Lage die Qualität eines Dienstes über eine
+                                               Internetleitung sicherzustellen. Das bedeutet, dass auf einer stark belasteten Internetverbindung
+                                               einem Dienst, wie zum Beispiel einem VoIP-Telefonats, ein gewisses Maß an Bandbreite zugesichert
+                                               werden kann, damit alle Sprachdaten ohne Verzögerung und verlustfrei übertragen werden können.
+                                               Das geht allerdings zu Lasten der anderen Datenströme auf der Leitung, welche es aber durchaus
+                                               vertragen, dass Daten langsamer übertragen werden, wie z.B. ein Upload auf einen FTP-Server.
+                                       </p>
+                                       <p>
+                                               Ein QoS bietet aber nicht nur bei Echtzeitdiensten Vorteile und macht sie besser benutzbar, sondern
+                                               bringt auch kleine Verbesserungen mit, die sich angenehm bemerkbar machen. Dazu gehören unter anderem:
+                                       </p>
+                                       <ul>
+                                               <li>
+                                                       <strong>Schnellerer Verbindungsaufbau:</strong> Verbindungen werden immer rasch aufgebaut und
+                                                       dann nach Dienst eingeordnet und wenn möglich abgebremst. Das verbessert das Arbeitsgefühl.
+                                               </li>
+                                               <li>
+                                                       <strong>Stabilere Verbindungen:</strong> da jedem Dienst ein Mindestmaß an Bandbreite zugesichert wird.
+                                               </li>
+                                       </ul>
+                                       <p>
+                                               Für die Klassifizierung der Pakete, die das System wissen lässt mit welcher Art von Daten es zu tun hat,
+                                               kommt ein Layer-7-Filter zum Einsatz. Dabei wird auch der Inhalt und nicht nur Quell-Ports, -IPs und
+                                               Ziel-Ports und -IPs eines Pakets untersucht. Mit dem Wissen, ob es sich z.B. um einen langen Download
+                                               oder um ein Echtzeitprotokoll handelt, kann es Entscheidungen zur optimalen Auslastung der
+                                               Internetverbindung treffen.
+                                       </p>
+                                       <p>
+                                               Zusammengefasst ist das Endergebnis eines QoS, eine Leitung mit geringer Latenzzeit und geringer
+                                               Paketverlustrate. Eine Funktion, die man schnell nicht mehr vermissen möchte, wo die Bandbreite knapp ist.
+                                       </p>
+                                       <p>
+                                               Perfekte Kontrolle über die getätigten Einstellungen, findet man in der graphischen Darstellung der
+                                               Leitungsauslastung.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               Quality of Service (QoS) is able to save the quality of a service on one internet connection. This
+                                               means that on a highly-utilized internet connection, a service (for example VoIP) gets a stable size of bandwidth,
+                                               to transfer the information without delay and without loss. This is at the expense of the other
+                                               data flows on the line, which is tolerated, albeit transmitted more slowly (such as a file upload to an FTP server).
+                                       </p>
+                                       <p>
+                                               QoS does not only increase the functionality of real-time services, but also offers a little bit of overall improvement. For example:
+                                       </p>
+                                       <ul>
+                                               <li>
+                                                       <strong>Connections establish much faster.</strong>
+                                                       This is works very well on busy links.
+                                               </li>
+                                               <li>
+                                                       <strong>Connections are much more stable.</strong>
+                                                       Every service gets a minimum, guaranteed amount of bandwidth.
+                                               </li>
+                                       </ul>
+                                       <p>
+                                               For the classification of the packets, a Level-7-Filter is used. It also analyses the content, as well as the source-ports/IPs, and destination-ports/IPs of the packets. With that analysis, it will decide if it's a long download or a real-time
+                                               protocol and then subsequently determines the optimal use of the connection.
+                                       </p>
+                                       <p>
+                                               To put all in a nutshell, QoS reduces the latency and packet loss of an
+                                               internet connection. This is certainly a function that you don't want to miss where bandwidth is limited.
+                                       </p>
+                               {% end %}
+                       </section>
+
+                       <section id="hardware">
+                               <div class="page-header">
+                                       <h1>{{ _("Hardware") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               Da IPFire auf einer aktuellen Version des Linux Kernels basiert, ist es möglich
+                                               eine Breite Palette an neuer Hardware, wie 10-Gigabit-Netzwerkkarten und
+                                               Wireless-Hardware, ohne zusätzlichen Aufwand zu betreiben.
+                                               Den Entwicklern ist es ein Anliegen, IPFire auf einer möglichst breiten Palette von
+                                               Hardware lauffähig zu machen. Dadurch lässt sich IPFire auf alter, günster Hardware
+                                               genauso hervoragend verwenden, wie auf High-Performance-Systemen.
+                                       </p>
+                                       <p>
+                                               Dabei belaufen sich die Mindestanforderungen bei einem Pentium I (i568), 128MB RAM
+                                               und 2 GB Festplattenspeicher.
+                                       </p>
+                                       <p>
+                                               Einige Erweiterungen haben zuätzliche Anforderungen an die Hardware um korrekt
+                                               funktionieren zu können. Ein System welches alle Anforderungen erfüllt, ist in der
+                                               Lage hunderte Clients zur selben Zeit zu bedienen.
+                                       </p>
+                                       <h3>Heads up: Zusätzliche Architekturen in Entwicklung</h3>
+                                       <p>
+                                               Das IPFire Projekt ist auch interessiert Ressorcen schonende Systeme zu unterstützen.
+                                               In diesem Zusammenhang, ist die ARM Architektur erwähnenswert, welche äußerst wenig Strom
+                                               benötigt und ein großes Zukunftspotential aufweist.
+                                       </p>
+                                       <!-- <p>
+                                               Mehr zu diesem Thema kann auf der <a href="/features/ports/arm">ARM Projekt Seite</a> gefunden 
+                                               werden.
+                                       </p> -->
+                               {% else %}
+                                       <p>
+                                               Since IPFire is based on a recent version of the Linux kernel, it supports most
+                                               of the latest hardware such as 10Gbit network cards and a variety of wireless
+                                               hardware out of the box.
+                                               The IPFire developers are very concerned with the ability to run IPFire as many
+                                               system variations as possible.
+                                               This helps IPFire to run on older or cheap hardware, as well as high-performance systems.
+                                       </p>
+                                       <p>
+                                               Minimum system requirements are an Intel Pentium I (i586),
+                                               128MB RAM and 2GB hard drive space.
+                                       </p>
+                                       <p>
+                                               Some add-ons have extra requirements to perform smoothly.
+                                               On a system that fits the hardware requirements, IPFire
+                                               is able to serve hundreds of clients simultaneously.
+                                       </p>
+
+                                       <h3>Heads up: More architectures in development!</h3>
+                                       <p>
+                                               The IPFire project is always interested in creating systems
+                                               which save the environment. The ARM architecture consumes
+                                               much less power and certainly has a lot of potentional.
+                                       </p>
+                                       <!-- <p>
+                                               More about this may be found on the
+                                               <a href="/features/ports/arm">ARM project page</a>.
+                                       </p> -->
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <ul class="thumbnails">
+                                       <li class="span3">
+                                               <a class="thumbnail" href="{{ static_url("images/screenshots/en/hardware/hwtemp-1.png") }}">
+                                                       <img src="{{ static_url("images/screenshots/en/hardware/hwtemp-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
+                                               </a>
+                                       </li>
+                               </ul>
+                       </section>
+
+                       <section id="virtualization">
+                               <div class="page-header">
+                                       <h1>{{ _("Virtualization") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               IPFire bringt einige Frontend-Treiber für High-Performance-Virtualisierung
+                                               mit sich und arbeitet hervorragend als Gast auf den folgenden
+                                               Virtualisierungsplattformen.
+                                       </p>
+
+                                       <h2>Unterstützte Hypervisoren</h2>
+                                       <h3>KVM</h3>
+                                       <p>
+                                               <a href="http://www.linux-kvm.org">KVM</a> ist die Abkürzung
+                                               für Kernel-based Virtual Machine und wird von
+                                               <a href="http://www.redhat.com">Red Hat Inc.</a> entwickelt.
+                                               Es ist die derzeit am häufigsten eingesetzte, freie Virtualisierungslösung
+                                               und löst Xen zunehmend ab.
+                                       </p>
+                                       <p>
+                                               Der IPFire-Kernel verfügt über die <em>virtio</em> Module,
+                                               welche hervorragende Leistung bei wenig Virtualisierungsoverhead
+                                               bieten.
+                                       </p>
+
+                                       <h3>VMware</h3>
+                                       <p>
+                                               IPFire arbeitet auf verschiedenen VMware Produkten wie
+                                               <em>vSphere</em>, <em>ESXi</em> und <em>VMware workstation</em>.
+                                               Das optionale Paket <em>open-vm-tools</em> verbessert die
+                                               Integration zusätzlich.
+                                       </p>
+
+                                       <h3>Xen</h3>
+                                       <p>
+                                               Xen war der de-facto Open-Source-Hypervisor, wird
+                                               allerdings immer öfter durch KVM ersetzt.
+                                       </p>
+                                       <p>
+                                               IPFire bringt für den Einsatz auf einem Xen-Host einen
+                                               paravirtualisierten Kernel mit.
+                                               Die Installation ist sehr einfach, da bereits ein
+                                               vorinstalliertes Image auf der Downloadseite heruntergeladen
+                                               werden kann.
+                                       </p>
+
+                                       <h3>Andere</h3>
+                                       <p>
+                                               IPFire ist nicht auf die oben genannten Lösungen beschränkt.
+                                               Ebenso läuft die Distribution auch unter <em>Qemu</em>,
+                                               <em>Microsoft Hyper-V</em> und <em>Oracle Virtualbox</em>.
+                                       </p>
+
+                                       <h3>Ein Hinweis zu Virtualisierung</h3>
+                                       <p>
+                                               Virtualisierung hat Vorteile, allerdings nicht ohne Nachteile.
+                                               Es besteht die Möglichkeit, dass die VM-Container-Sicherheit
+                                               umgangen werden kann und somit ein Angreifer Zugang über die
+                                               virtuelle Maschine heraus erlangen kann.
+                                               Aus diesen Gründen empfehlen wir nicht IPFire virtuell
+                                               in produktiven Umgebungen einzusetzen.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               IPFire brings many front-end drivers for high-performance virtualization
+                                               and can be run as virtual guest operating system on the following
+                                               virtualization platforms.
+                                               It has also been optimized to some of the mostly distributed ones to bring
+                                               the best possible performance without impacting the hardware very much.
+                                       </p>
+
+                                       <h2>Supported hypervisors</h2>
+                                       <h3>KVM</h3>
+                                       <p>
+                                               <a href="http://www.linux-kvm.org">KVM</a> is short for
+                                               Kernel-based Virtual Machine and is developed by
+                                               <a href="http://www.redhat.com">Red Hat Inc.</a>.
+                                               It is becoming the most advanced hypervisor and succeeding Xen, which
+                                               has been used so far.
+                                       </p>
+                                       <p>
+                                               IPFire is coming with the <em>virtio</em> kernel modules, that have best
+                                               performance due to very less virtualization overhead.
+                                       </p>
+
+                                       <h3>VMware</h3>
+                                       <p>
+                                               IPFire runs on different VMware products like <em>vSphere</em>,
+                                               <em>ESXi</em> and <em>VMware workstation</em>. The additional package
+                                               <em>open-vm-tools</em> offers tools for a better integration.
+                                       </p>
+
+                                       <h3>Xen</h3>
+                                       <p>
+                                               Xen has recently been the de-facto Open Source hypervisor but is now
+                                               succeeded by KVM.
+                                       </p>
+                                       <p>
+                                               IPFire can optionally be run with a paravirtualized kernel, which has very
+                                               less virtualization overhead as well. To make the installation very easy,
+                                               a pregenerated Xen image can be downloaded from the download page.
+                                       </p>
+
+                                       <h3>Others</h2>
+                                       <p>
+                                               IPFire is not limited to the hypervisors described above. It runs perfectly on
+                                               <em>Qemu</em>, <em>Microsoft Hyper-V</em> or <em>Oracle VirtualBox</em>, too.
+                                       </p>
+
+                                       <h3>A note on virtualization</h3>
+                                       <p>
+                                               Virtualization does have advantages, but it is not without disadavantages.
+                                               There is always the possibility that the VM container security can be
+                                               bypassed in some way and a hacker can gain access beyond the VM.
+                                               Because of this, it is not suggested to use IPFire as a virtual machine
+                                               in a production-level environment.
+                                       </p>
+                               {% end %}
+
+                               <hr class="separator">
+
+                               <ul class="thumbnails">
+                                       <li class="span3">
+                                               <a class="thumbnail" href="{{ static_url("images/screenshots/en/virtualization/virt-manager-1.png") }}">
+                                                       <img src="{{ static_url("images/screenshots/en/virtualization/virt-manager-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
+                                               </a>
+                                       </li>
+                               </ul>
+                       </section>
+
+                       <section id="wlanap">
+                               <div class="page-header">
+                                       <h1>{{ _("Wireless Access Point") }}</h1>
+                               </div>
+
+                               {% if lang == "de" %}
+                                       <p>
+                                               IPFire bietet mehrere Möglichkeiten zur Einbindung von Wireless-Clients. Zum einen kann ein
+                                               Accesspoint über eine LAN Karte angeschlossen werden. Hier bietet IPFire einen MAC/IP Addressfilter,
+                                               um nur erlaubte Clients zuzulassen. Die Clients dürfen in der Standardeinstellung zwar ins Internet,
+                                               aber nicht auf das lokale Lan zugreifen. Als zweite Möglichkeit kann man eine WLAN-Karte in den IPFire
+                                               einbauen, die über das Addon “hostapd” Funktionalität des Accesspoints übernimmt. Unterstützt werden
+                                               dann unverschlüsselte sowie WPA/WPA2 verschlüsselte Verbindungen. Auch die Nutzung des 5 GHz Bandes
+                                               (802.11a) ist möglich, wenn die WLAN-Karte dies unterstützt.
+                                       </p>
+                                       <p>
+                                               Die Unterstützung von Wireless-Karten in IPFire ist exzellent, da in dem stabilen Kernel die Treiber
+                                               trotzdem auf neuestem Stand sind und somit möglichst viele Karten unterstützt werden.
+                                       </p>
+                               {% else %}
+                                       <p>
+                                               IPFire offers several options for the integration of wireless clients. First, an access point can
+                                               be connected via a LAN card. In this scenario, IPFire offers MAC/IP address filtering to allow only authorized
+                                               clients. The clients are allowed by default to access the Internet, but they are not allowed access the local LAN.
+                                               The second option is to install a wireless LAN (WLAN) card in the IPFire machine that takes the functionality of the access
+                                               point over, using the add-on "hostapd". This add-on supports both unencrypted and WPA/WPA2-encrypted connections. Also
+                                               the use of 5 GHz (802.11a standard) is possible if the wireless card supports it.
+                                       </p>
+                                       <p>
+                                               Wireless card support in IPFire is excellent. The drivers in the stable kernel are very up-to-date
+                                               and IPFire therefore supports a significant amount of WLAN cards.
+                                       </p>
+                               {% end %}
+                       </section>
+               </div>
+
+               <div class="span3 sidebar">
+                       <ul class="nav nav-list sidenav">
+                               <li>
+                                       <a href="#about">
+                                               <i class="icon-chevron-left"></i> {{ _("About IPFire") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#security">
+                                               <i class="icon-chevron-left"></i> {{ _("Security") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#firewall">
+                                               <i class="icon-chevron-left"></i> {{ _("Firewall") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#pakfire">
+                                               <i class="icon-chevron-left"></i> {{ _("Pakfire") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#updates">
+                                               <i class="icon-chevron-left"></i> {{ _("Updates") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#dialup">
+                                               <i class="icon-chevron-left"></i> {{ _("Dialup") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#proxy">
+                                               <i class="icon-chevron-left"></i> {{ _("Web Proxy") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#vpn">
+                                               <i class="icon-chevron-left"></i> {{ _("VPN") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#ids">
+                                               <i class="icon-chevron-left"></i> {{ _("Intrusion Detection") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#qos">
+                                               <i class="icon-chevron-left"></i> {{ _("Quality of Service") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#hardware">
+                                               <i class="icon-chevron-left"></i> {{ _("Hardware") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#virtualization">
+                                               <i class="icon-chevron-left"></i> {{ _("Virtualization") }}
+                                       </a>
+                               </li>
+                               <li>
+                                       <a href="#wlanap">
+                                               <i class="icon-chevron-left"></i> {{ _("Wireless Access Point") }}
+                                       </a>
+                               </li>
+                       </ul>
                </div>
        </div>
 {% end block %}
diff --git a/templates/static/features/dialup.html b/templates/static/features/dialup.html
deleted file mode 100644 (file)
index 840cb08..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("Dialup") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("Dialup") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       IPFire ist als Internet-Gateway in der Lage über verschiedene
-                                       (Einwahl-)Techniken eine Verbindung zum Internet aufzubauen.
-                               </p>
-                               <p>
-                                       Es werden alle gängigen Breitbandzugangsarten wie auch mobile Zugänge unterstützt:
-                               </p>
-
-                               <table class="table table-striped table-bordered">
-                                       <tbody>
-                                               <tr>
-                                                       <td>
-                                                               <strong>VDSL</strong>
-                                                       </td>
-                                                       <td>
-                                                               VDSL ist die Abkürzung für <em>Very High Data Rate Digital Subscriber Line</em> und
-                                                               bietet in Deutschland derzeit Bandbreiten bis zu 50 MBit/s im Downstream und 10 MBit/s im Upstream.
-                                                               Damit eignet sich VDSL für die Zukunft und bringt auch IPTV mit sich. Mit IPFire kann der herkömmliche
-                                                               Router ausgetauscht werden und auf ein vollwertiges System gesetzt werden, das den IPTV-Stream ins
-                                                               eigene Netz bringt.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>ADSL/SDSL</strong>
-                                                       </td>
-                                                       <td>
-                                                               Selbstverständlich wird auch herkömmliches DSL unterstützt, wobei es sich
-                                                               technisch um PPPoE oder PPPoA handelt. In einigen Ländern ist auch PPTP als Protokoll verbreitet und
-                                                               wird ebenso unterstützt.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>Ethernet</strong>
-                                                       </td>
-                                                       <td>
-                                                               Über Ethernet kann IPFire ebenfalls mit dem Internet verbunden werden und
-                                                               eine IP-Adresse entweder per DHCP beziehen oder statisch konfiguriert werden. Das wird u.a. bei
-                                                               Verbindungen über Kabel genutzt.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>3. Generation</strong>
-                                                       </td>
-                                                       <td>
-                                                               Über USB-Modems wird auch jede Art von mobilen Breitbandverbindungen
-                                                               unterstützt, welche bekannt sind unter den Bezeichnungen UMTS, 3G, CDMA, HSDPA oder LTE.
-                                                       </td>
-                                               </tr>
-                                       </tbody>
-                               </table>
-                       {% else %}
-                               <p>
-                                       IPFire as an Internet Gateway is able to dialup through various techniques
-                                       to connect to the Internet.
-                               </p>
-                               <p>
-                                       It supports all popular types of broadband access, as well as mobile access:
-                               </p>
-
-                               <table class="table table-striped table-bordered">
-                                       <tbody>
-                                               <tr>
-                                                       <td>
-                                                               <strong>VDSL</strong>
-                                                       </td>
-                                                       <td>
-                                                               VDSL is short for <em>Very High Data Rate Digital Subscriber Line</em> and
-                                                               it currently offers bandwidth up to 50 Mbit/s downstream and 10 Mbit/s upstream.
-                                                               VDSL brings the possibility of using new technologies such as IPTV. With IPFire, a conventional
-                                                               router can be replaced by a full-fledged system that brings the IPTV stream into your own home network.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>ADSL/SDSL</strong>
-                                                       </td>
-                                                       <td>
-                                                               Conventional DSL is also supported, although it is technically
-                                                               called also PPPoE or PPPoA. In some countries, the PPTP protocol is also widely used and it is also fully
-                                                               supported by IPFire.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>Ethernet</strong>
-                                                       </td>
-                                                       <td>
-                                                               Over Ethernet, IPFire can also be connected to the Internet and obtain
-                                                               an IP address either via DHCP or static configuration.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>3rd Generation</strong>
-                                                       </td>
-                                                       <td>
-                                                               Mobile broadband connections over USB modems, which are also known by the names
-                                                               UMTS, 3G, CDMA, HSDPA or LTE are also supported by IPFire.
-                                                       </td>
-                                               </tr>
-                                       </tbody>
-                               </table>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/firewall.html b/templates/static/features/firewall.html
deleted file mode 100644 (file)
index 3212c2f..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("Firewall") }}{% end block %}
-
-{% block bodyA %}
-       <img src="{{ static_url("images/icons/firewall.png") }}" class="pull-right" alt="{{ _("Firewall") }}" />
-
-       <div class="page-header">
-               <h1>{{ _("Firewall") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       IPFire nutzt eine Stateful-Packet-Inspection-Firewall (SPI),
-                                       welche auf das Linux Paketfilter-Framework <em>netfilter</em> aufsetzt.
-                               </p>
-                               <p>
-                                       Während des IPFire Installationsprozesses, wird das Netzwerk in
-                                       mehrere separate Segmente unterteilt.
-                                       Dieses Sicherheitsschema impliziert einen perfekten Platz für
-                                       jedes System im Netzwerk.
-                                       Jedes Segment kann nach Bedarf zugeschaltet werden, abhängig vom
-                                       Einsatzort und -zweck und alle Systeme in einem Segment werden
-                                       mit der gleichen Sicherheitspolicy behandelt:
-                               </p>
-
-                               <table class="table table-striped table-bordered">
-                                       <tbody>
-                                               <tr>
-                                                       <td style="background-color: green; color: white;">
-                                                               <strong>Green</strong>
-                                                       </td>
-                                                       <td>
-                                                               Grün repräsentiert die "sichere" Zone.
-                                                               In diese Zone gelangen alle herkömmlichen
-                                                               Clients, welche meist mit dem Kabelnetzwerk
-                                                               verbunden sind. Von hier aus können die Clients
-                                                               uneingeschränkt auf alle anderen Zonen zugreifen.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td style="background-color: red; color: white;">
-                                                               <strong>Red</strong>
-                                                       </td>
-                                                       <td>
-                                                               Rot impliziert "Gefahr" - also die Verbindung zum
-                                                               Internet.
-                                                               Nichts von hier aus darf die Firewall passieren,
-                                                               außer dies ist explizit vom Administrator erlaubt.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td style="background-color: darkblue; color: white;">
-                                                               <strong>Blue</strong>
-                                                       </td>
-                                                       <td>
-                                                               Blau repräsentiert das drahtlose Segment des
-                                                               Netzwerks (aufgrund der Farbe des Himmels).
-                                                               Da Wireless-Clients von Natur aus ein größeres
-                                                               Gefahrenpotential sind, muss für jedes System
-                                                               in diesem Teil der Zugang zum Internet gesondert
-                                                               erlaubt werden.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td style="background-color: orange; color: white;">
-                                                               <strong>Orange</strong>
-                                                       </td>
-                                                       <td>
-                                                               Das orangene Netzwerk wird auch als demilitarisierte
-                                                               Zone (DMZ) bezeichnet.
-                                                               Alle Server, die aus dem Internet erreichbar sind
-                                                               gehören in dieses Netz um kein Sicherheitsrisiko
-                                                               für andere lokale Systeme zu sein.
-                                                       </td>
-                                               </tr>
-                                       </tbody>
-                               </table>
-
-                               <p>
-                                       Zusätzlich zu den oben genannten Policies kann auch der ausgehende
-                                       Netzwerkverkehr für jedes Segment geregelt werden.
-                                       Diese Funktion gibt dem Netzwerkadministrator vollständige
-                                       Kontrolle über das Netzwerk.
-                               </p>
-                       {% else %}
-                               <p>
-                                       IPFire employs a Stateful Packet Inspection (SPI) firewall,
-                                       which is built on top of netfilter (the Linux packet filtering framework).
-                               </p>
-                               <p>
-                                       During the installation of IPFire, the network is configured into different,
-                                       separate segments.
-                                       This segmented security scheme means that there is a perfect place for each
-                                       machine in the network.
-                                       These different segments may be enabled separately, depending on your requirements.
-                                       Each segment represents a group of computers who share a common security level:
-                               </p>
-
-                               <table class="table table-striped table-bordered">
-                                       <tbody>
-                                               <tr>
-                                                       <td style="background-color: green; color: white;">
-                                                               <strong>Green</strong>
-                                                       </td>
-                                                       <td>
-                                                               Green represents a "safe" area.
-                                                               This is where all regular clients will reside.
-                                                               It is usually comprised of a wired, local network.
-                                                               Clients on Green can access all other network
-                                                               segments without restriction.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td style="background-color: red; color: white;">
-                                                               <strong>Red</strong>
-                                                       </td>
-                                                       <td>
-                                                               Red indicates "danger" or the connection to the Internet.
-                                                               Nothing from Red is permitted to pass through the
-                                                               firewall unless specifically configured by the
-                                                               administrator.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td style="background-color: darkblue; color: white;">
-                                                               <strong>Blue</strong>
-                                                       </td>
-                                                       <td>
-                                                               Blue represents the "wireless" part of the local
-                                                               network (chosen because it's the color of the sky).
-                                                               Since the wireless network has the potential for abuse,
-                                                               it is uniquely identified and specific rules govern
-                                                               clients on it.
-                                                               Clients on this network segment must be explicitly
-                                                               allowed before they may access the network.
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td style="background-color: orange; color: white;">
-                                                               <strong>Orange</strong>
-                                                       </td>
-                                                       <td>
-                                                               Orange is referred to as the "demilitarized zone" (DMZ).
-                                                               Any servers which are publicly accessible are separated
-                                                               from the rest of the network here to limit security
-                                                               breaches.
-                                                       </td>
-                                               </tr>
-                                       </tbody>
-                               </table>
-
-                               <p>
-                                       Additionally, the firewall can be used to control outbound Internet
-                                       access from any segment.
-                                       This feature gives the network administrator complete control
-                                       over how their network is configured and secured. 
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-
-       <hr>
-
-       <div class="well">
-               <h3>{{ _("Further reading") }}</h3>
-               <ul>
-                       <li>
-                               <a href="http://wiki.ipfire.org/{{ lang }}/configuration/firewall/outgoingfirewall">{{ _("Outgoing firewall configuration") }}</a>
-                       </li>
-               </ul>
-       </div>
-
-       <ul class="thumbnails">
-               <li class="span3">
-                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/edit-portfw-rule-1.png") }}">
-                               <img src="{{ static_url("images/screenshots/en/firewall/edit-portfw-rule-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
-                       </a>
-               </li>
-               <li class="span3">
-                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/dmz-holes-1.png") }}">
-                               <img src="{{ static_url("images/screenshots/en/firewall/dmz-holes-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
-                       </a>
-               </li>
-               <li class="span3">
-                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/connections-1.png") }}">
-                               <img src="{{ static_url("images/screenshots/en/firewall/connections-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
-                       </a>
-               </li>
-       </ul>
-{% end block %}
diff --git a/templates/static/features/hardware.html b/templates/static/features/hardware.html
deleted file mode 100644 (file)
index a9822d1..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("Hardware") }}{% end block %}
-
-{% block bodyA %}
-       <img src="{{ static_url("images/icons/hardware.png") }}" class="pull-right" alt="{{ _("Hardware") }}" />
-       <div class="page-header">
-               <h1>{{ _("Hardware") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Da IPFire auf einer aktuellen Version des Linux Kernels basiert, ist es möglich
-                                       eine Breite Palette an neuer Hardware, wie 10-Gigabit-Netzwerkkarten und
-                                       Wireless-Hardware, ohne zusätzlichen Aufwand zu betreiben.
-                                       Den Entwicklern ist es ein Anliegen, IPFire auf einer möglichst breiten Palette von
-                                       Hardware lauffähig zu machen. Dadurch lässt sich IPFire auf alter, günster Hardware
-                                       genauso hervoragend verwenden, wie auf High-Performance-Systemen.
-                               </p>
-                               <p>
-                                       Dabei belaufen sich die Mindestanforderungen bei einem Pentium I (i568), 128MB RAM
-                                       und 2 GB Festplattenspeicher.
-                               </p>
-                               <p>
-                                       Einige Erweiterungen haben zuätzliche Anforderungen an die Hardware um korrekt
-                                       funktionieren zu können. Ein System welches alle Anforderungen erfüllt, ist in der
-                                       Lage hunderte Clients zur selben Zeit zu bedienen.
-                               </p>
-                               <h3>Heads up: Zusätzliche Architekturen in Entwicklung</h3>
-                               <p>
-                                       Das IPFire Projekt ist auch interessiert Ressorcen schonende Systeme zu unterstützen.
-                                       In diesem Zusammenhang, ist die ARM Architektur erwähnenswert, welche äußerst wenig Strom
-                                       benötigt und ein großes Zukunftspotential aufweist.
-                               </p>
-                               <!-- <p>
-                                       Mehr zu diesem Thema kann auf der <a href="/features/ports/arm">ARM Projekt Seite</a> gefunden 
-                                       werden.
-                               </p> -->
-                       {% else %}
-                               <p>
-                                       Since IPFire is based on a recent version of the Linux kernel, it supports most
-                                       of the latest hardware such as 10Gbit network cards and a variety of wireless
-                                       hardware out of the box.
-                                       The IPFire developers are very concerned with the ability to run IPFire as many
-                                       system variations as possible.
-                                       This helps IPFire to run on older or cheap hardware, as well as high-performance systems.
-                               </p>
-                               <p>
-                                       Minimum system requirements are an Intel Pentium I (i586),
-                                       128MB RAM and 2GB hard drive space.
-                               </p>
-                               <p>
-                                       Some add-ons have extra requirements to perform smoothly.
-                                       On a system that fits the hardware requirements, IPFire
-                                       is able to serve hundreds of clients simultaneously.
-                               </p>
-
-                               <h3>Heads up: More architectures in development!</h3>
-                               <p>
-                                       The IPFire project is always interested in creating systems
-                                       which save the environment. The ARM architecture consumes
-                                       much less power and certainly has a lot of potentional.
-                               </p>
-                               <!-- <p>
-                                       More about this may be found on the
-                                       <a href="/features/ports/arm">ARM project page</a>.
-                               </p> -->
-                       {% end %}
-               </div>
-       </div>
-
-       <hr>
-
-       <div class="well">
-               <h3>{{ _("Further reading") }}</h3>
-               <ul>
-                       <li>
-                               <a href="http://fireinfo.ipfire.org/">{{ _("Fireinfo") }}</a>
-                       </li>
-                       <li>
-                               <a href="http://wiki.ipfire.org/{{ lang }}/hardware/start">
-                                       {{ _("Hardware section on the wiki") }}
-                               </a>
-                       </li>
-                       <li>
-                               <a href="http://wiki.ipfire.org/{{ lang }}/hardware/networking">
-                                       {{ _("Hardware compatibility list") }} ({{ _("networking") }})
-                               </a>
-                       </li>
-               </ul>
-       </div>
-
-       <ul class="thumbnails">
-               <li class="span3">
-                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/hardware/hwtemp-1.png") }}">
-                               <img src="{{ static_url("images/screenshots/en/hardware/hwtemp-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
-                       </a>
-               </li>
-       </ul>
-{% end block %}
diff --git a/templates/static/features/ids.html b/templates/static/features/ids.html
deleted file mode 100644 (file)
index 36aeeb8..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("Intrusion detection system") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("Intrusion detection system") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Ein Intrusion Dection System, kurz IDS, dient zur Erkennung von Angriffen gegen Computersysteme
-                                       oder Computernetze. Dabei analysiert das IDS den Netzwerktraffic und durchsucht diesen nach Angriffsmustern.
-                                       Wird zum Beispiel ein einfacher Portscan auf ein IPFire-System ausgeführt um angebotene Dienste auszuspähen,
-                                       dann wird dies sofort erkannt.
-                               </p>
-                               <p>
-                                       Ein IPS, Intrusion Prevention System, hat zusätzlich zu der Erkennung die Aufgabe Aktionen auszuführen.
-                                       Dabei nimmt es Informationen zum Angriff vom IDS entgegen und handelt entsprechend. Bei dem Beispiel des
-                                       Portscans würde es den Angreifer blocken damit keine Daten mehr ausgetauscht werden.
-                               </p>
-                               <p>
-                                       Arbeiten wie in IPFire beide Systeme zusammen nennt man dies ein IDPS (Intrusion detection and prevention
-                                       system). Ein sehr bekannter Vertreter dafür ist Snort. Das freie Netzwerk Intrusion Dection System (NIDS)
-                                       analysiert den Datenverkehr und sofern es etwas Auffälliges findet, logt es dieses. IPFire bietet die
-                                       Möglichkeit die erkannten Angriffe im Webinterface detailliert durchzusehen.
-                               </p>
-                               <p>
-                                       Automatische Gegenmaßnahmen verrichtet in IPFire Guardian, was optional nachinstalliert werden kann.
-                               </p>
-                               <p>
-                                       Somit ist ein IDPS ein sinnvoller Zusatz zum herkömmlichen Paketfilter um intelligente Entscheidungen
-                                       über einkommende Daten zu treffen.
-                               </p>
-                       {% else %}
-                               <p>
-                                       An Intrusion Dection System (or IDS), is a piece of software designed to detect attacks against computer systems
-                                       and networks. Thereby the IDS will analyze the network traffic and search for attack samples. If someone
-                                       scans the ports of the IPFire-System to see which services are available, the IDS will immediately notice it.
-                               </p>
-                               <p>
-                                       An Intrusion Prevention System (or IPS), in addition to the detection system, will perform actions.
-                                       The IPS gets the information from the IDS and reacts accordingly. That means, recalling the example above with
-                                       the portscan, the system would automatically block the attacker immediately in order to prevent further inquiries.
-                               </p>
-                               <p>
-                                       It is possible to use IDS and IPS on the IPFire system. We call this system "Intrusion Detection
-                                       and Prevention System" (or IDPS). A very important deputy of this system is Snort, the free Network Intrusion Dection System
-                                       (NIDS). It analyzes the network traffic and if something abnormal happens, it will log the event. IPFire gives you
-                                       the possibility to see it very explicitly in the web interface.
-                               </p>
-                               <p>
-                                       For automatic prevention, IPFire has an add-on called Guardian which can be installed optionally.
-                               </p>
-                               <p>
-                                       An IDPS is a wise addition to the normal packet filter. It makes intelligent decisions about
-                                       incoming and outgoing network traffic and how to deal with it.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/itsfree.html b/templates/static/features/itsfree.html
deleted file mode 100644 (file)
index 7ebd9e9..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("IPFire is free software") }}{% end block %}
-
-{% block bodyA %}
-       <img src="{{ static_url("images/icons/itsfree.png") }}" class="pull-right" alt="{{ _("It's free") }}" />
-
-       <div class="page-header">
-               <h1>
-                       {{ _("IPFire is free software") }}
-                       <small>{{ _("Free as in freedom") }}</small>
-               </h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Die Komponenten aus denen IPFire sich zusammensetzt sind
-                                       ausschließlich unter <em>freien Softwarelizenzen</em> lizenziert.
-                                       Das bedeutet widerum, dass IPFire selbst <em>freie Software</em> ist.
-                               </p>
-                               <p>
-                                       Freie Software bietet wesentliche Vorteile im Vergleich zu
-                                       Closed-Source Entwicklungen.
-                                       Beispielweise ist es jederzeit möglich Quellcode
-                                       anzusehen und zu verbessern.
-                                       Die IPFire Entwickler erhalten laufend Patches, welche
-                                       Fehler beseitigen und neue Funktionen hinzufügen.
-                               </p>
-                               <p>
-                                       IPFire kann von jederman egal ob im Büro oder zu Hause
-                                       vollkommen unlimitiert verwendet werden,
-                                       auch ist es erlaubt Kopien an Freunde oder Kollegen
-                                       weiterzugeben.
-                               </p>
-                               <p>
-                                       Für sämtliche Software die in IPFire eingesetzt wird, ist
-                                       ebenfalls der Quellcode verfügbar.
-                               </p>
-
-                               <h2>Spenden</h2>
-                               <p>
-                                       Der Erfolg von IPFire basiert überwiegend auf Spenden und
-                                       der Arbeit, welche die Community beisteuert.
-                                       Wir möchten jeden der unsere Software herunterlädt oder
-                                       verwendet, dazu ermutigen auch ein Teil dieser Gemeinschaft
-                                       zu werden - sei es durch Hilfestellung im Forum,
-                                       Erweiterung/Korrektur der Dokumentation oder durch eine
-                                       <a href="/donation">Spende</a>.
-                                       Je mehr Leute sich einbringen, desto mehr Ressourcen
-                                       stehen zur Verfügung für Fortschritt und Entwicklung.
-                               </p>
-                       {% else %}
-                               <p>
-                                       IPFire is assembled with software that is licensed under
-                                       <em>free software</em> licences. That basically means IPFire
-                                       itself is <em>free software</em>.
-                               </p>
-                               <p>
-                                       Free software has huge advantages in difference to closed source developments.
-                                       At this project, it is possible to review the code and make it better. In fact,
-                                       IPFire is receiving a lot of code contributions that make the whole distribution
-                                       a little bit better every day.
-                               </p>
-                               <p>
-                                       People who simply use IPFire in their offices or homes can use it for an unlimited
-                                       amount of time, make copies of it and give them to friends or colleges.
-                               </p>
-                               <p>
-                                       As IPFire is including many different software packages, all of them are also
-                                       availble in source code and distributed under a free license.
-                               </p>
-
-                               <h2>Donations</h2>
-                               <p>
-                                       The ultimate success of the project is dependent on donations and community
-                                       interaction.
-                                       We encourage anyone who downloads and uses IPFire to get involved, whether
-                                       it be on the forum, adding/editing the wiki, or <a href="/donation">donating</a>.
-                                       The more we foster community development, the more resources we have
-                                       available to continue and expand development.
-                               </p>
-                       {% end %}
-
-                       <a class="btn btn-success pull-right" href="/donate">{{ _("Donate") }}!</a>
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/pakfire.html b/templates/static/features/pakfire.html
deleted file mode 100644 (file)
index 24e69b5..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("Pakfire") }}{% end block %}
-
-{% block bodyA %}
-       <img src="{{ static_url("images/icons/pakfire.png") }}" class="pull-right" alt="{{ _("Pakfire") }}" />
-
-       <div class="page-header">
-               <h1>
-                       Pakfire
-                       <small>{{ _("The IPFire package management system") }}</small>
-               </h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Vom technischen Standpunkt aus ist IPFire ein schlankes, gehärtetes
-                                       Firewall-System, welches den Paketmanager Pakfire mitbringt.
-                                       Die primäre Aufgabe von Pakfire ist es, Systemupdates mit nur einem Klick
-                                       einspielen zu können.
-                                       Somit ist es ganz leicht <a href="/features/updates">Sicherheitslücken
-                                       zu schließen und Bugfixes sowie neue Funktionen zu installieren</a>.
-                                       Dies macht IPFIre sicherer und schneller - oder einfach: besser.
-                               </p>
-                               <p>
-                                       Eine weitere Aufgabe ist es, zusätzliche Addons zu installieren, welche die
-                                       Funktionen des Systems erweitern.
-
-                                       Einige beliebte sind unter anderen:
-
-                                       <ul>
-                                               <li>Datei- und Druckdienste wie <em>samba</em> und <em>vsftpd</em></li>
-                                               <li>Kommunikationslösungen wie <em>Asterisk</em></li>
-                                               <li>
-                                                       Verschiedene Kommandozeilenhelfer wie
-                                                       <em>tcpdump</em>, <em>nmap</em>, <em>traceroute</em>
-                                                       und viele mehr.
-                                               </li>
-                                       </ul>
-                               </p>
-
-                               <h2>Pakfire als Buildsystem</h2>
-                               <p>
-                                       Das kommende Major-Release von IPFire wird eine neue
-                                       Generation des Pakfire Paketmanagementsystems mitbringen.
-                                       Diese ist schneller, sicherer und einfacher zu bedienen.
-                                       Dazu kommen unzählige neue Funktionen.
-                               </p>
-                               <p>
-                                       Eine der neuen Funktionen ist, dass <em>pakfire</em>
-                                       nun auch als Buildsystem fungiert.
-                                       Ein auf die IPFire-Distribution angepasstes Buildsystem
-                                       hat die Produktivität der Entwickler immens gesteigert.
-                                       Neue Pakete zu bauen ist nun einfacher und nimmt weniger
-                                       Zeit in Anspruch.
-                               </p>
-                               <p>
-                                       Qualitätssicherung ist jetzt eine Aufgabe für alle.
-                                       Mehr dazu auf <a href="http://pakfire.ipfire.org/">pakfire.ipfire.org</a>.
-                               </p>
-                       {% else %}
-                               <p>
-                                       From a technical point of view, IPFire is a minimalistic, hardened firewall system
-                                       which comes with an integrated package manager called Pakfire.
-                                       The primary task of Pakfire is to update the system with only a single click.
-                                       It is very easy to install <a href="/features/updates">security patches,
-                                       bugfixes and feature enhancements</a>, which make IPFire safer and faster
-                                       - or simply: better.
-                               </p>
-                               <p>
-                                       Another task of Pakfire is to install additional software that adds new
-                                       functionality to the IPFire system.
-
-                                       Some useful of them are:
-                                       
-                                       <ul>
-                                               <li>File sharing services such as Samba and vsftpd</li>
-                                               <li>Communications server using Asterisk</li>
-                                               <li>
-                                                       Various command-line tools as <em>tcpdump</em>,
-                                                       <em>nmap</em>, <em>traceroute</em> and many more.
-                                               </li>
-                                       </ul>
-                               </p>
-
-                               <h2>Pakfire as a build system</h2>
-                               <p>
-                                       The next major release of IPFire will also ship a new generation
-                                       of the Pakfire packagement system.
-                                       This new generation has been made faster, more secure, more
-                                       easy to handle and adds a whole bunch of new features.
-                               </p>
-                               <p>
-                                       One of this features is that <em>pakfire</em> is now the
-                                       buildsystem as well. Having a customized build system for
-                                       the needs of IPFire and the IPFire developers improved
-                                       the development process very much. Building new packages
-                                       became a lot more easy and less time-consuming.
-                               </p>
-                               <p>
-                                       Quality assurance became more social right now. Check it
-                                       out at <a href="http://pakfire.ipfire.org/">pakfire.ipfire.org</a>.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-
-       <hr>
-
-       <div class="well">
-               <h3>{{ _("Further reading") }}</h3>
-               <ul>
-                       <li>
-                               <a href="http://wiki.ipfire.org/{{ lang }}/configuration/ipfire/pakfire/start">
-                                       {{ _("How to install a package?") }}
-                               </a>
-                       </li>
-                       <li>
-                               <a href="http://wiki.ipfire.org/{{ lang }}/addons/start">
-                                       {{ _("List of add-ons") }}
-                               </a>
-                       </li>
-                       <li>
-                               <a href="http://pakfire.ipfire.org/">
-                                       {{ _("Pakfire Build System") }}
-                               </a>
-                       </li>
-               </ul>
-       </div>
-
-       <ul class="thumbnails">
-               <li class="span3">
-                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1.png") }}">
-                               <img src="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
-                       </a>
-               </li>
-               <li class="span3">
-                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/addon-services-1.png") }}">
-                               <img src="{{ static_url("images/screenshots/en/pakfire/addon-services-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
-                       </a>
-               </li>
-       </ul>
-{% end block %}
diff --git a/templates/static/features/proxy.html b/templates/static/features/proxy.html
deleted file mode 100644 (file)
index 931392e..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("Web proxy") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("Web proxy") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Der Webproxy in IPFire, die Open-Source-Software Squid, ist der Linux und UNIX-Welt nicht unbekannt
-                                       und steht unter der GNU General Public License. Nicht nur ISPs, Universitäten, Schulen und grosse
-                                       Firmen nutzen diesen Proxy, denn seine Vielfältigkeit, Stabilität und ausgereifte Entwicklung macht
-                                       ihn auch für kleine Heimnetzwerke zu einem nutzvollen Partner. Ergänzend zur zustandsgesteuerten
-                                       Paketfilterung auf TCP/IP Ebene der Firewall können somit auch Inhalte, die über das HTTP-Protokoll
-                                       übertragen werden, analysiert und geregelt werden. Dabei können sowohl  HTTP-, HTTPS- sowie
-                                       FTP-Inhalte über Squid angefordert werden.
-                               </p>
-                               <ul>
-                                       <li>
-                                               <strong>Sicherheit:</strong> Der Client fragt nicht selbst, er lässt seinen Proxy fragen.
-                                               Die Antwort des Servers geht wieder an den Proxy und nicht an den Client. Der Client tritt
-                                               somit nicht selbst in Erscheinung. Ein damit verbundener Angriff würde also in erster Linie
-                                               den Proxy und nicht den Client treffen. Es stehen auch Funktionen zum Datenschutz zur Verfügung,
-                                               was einen Vorteil gegenüber einem reinen NAT Router darstellt.
-                                       </li>
-                                       <li>
-                                               <strong>Authentifizierung:</strong> Über Access-Listen kann Squid auch veranlasst werden,
-                                               Zugriffe nur nach einer Benutzerauthentifizierung zuzulassen. Hierbei stehen LDAP, identd,
-                                               Windows, Radius oder Lokale Authentifizierungsmethoden zur Verfügung, womit sich der Webproxy
-                                               zum Beispiel an einen Microsoft Windows Domänencontroller anbinden lässt und nur Mitarbeitern
-                                               der Zugang zum Internet gewährt werden kann.
-                                       </li>
-                                       <li>
-                                               <strong>Kontrolle der Zugriffe:</strong> Soll der Internetzugriff nur zu speziellen Tageszeiten
-                                               oder auch komplett für einzelne oder mehrere Clients eingeschränkt werden, kann dies über die
-                                               “Netzwerkbasierten Zugriffskontrolle” geschehen, welche man im Webinterface findet. Ein sinnvoller
-                                               Anwendungsbereich dafür sind z.B. Schulen.
-                                       </li>
-                                       <li>
-                                               <strong>Protokollierung:</strong> Da jeder Zugriff über den Proxy protokolliert werden kann, bieten
-                                               sich Möglichkeiten zur Überprüfung der Zugriffe im Nachhinein an und es können auch Statistiken
-                                               und Abrechnungen erstellt werden. Durch das Analyseprogramm Calamaris lassen sich die Logdateien
-                                               in unterschiedlichsten Kriterien über das IPFire Webinterface übersichtlich darstellen.
-                                       </li>
-                                       <li>
-                                               <strong>Bandbreitenmanagement:</strong> Das Downloadmanagement lässt eine Kontrolle der Bandbreite
-                                               für spezifizierte Bereiche zu. So können inhaltsbasierte Drosselungen zum Beispiel für Binärdateien,
-                                               CD-Images oder Multimediadaten ebenso konfiguriert werden wie eine Download Drosselung der einzelnen
-                                               Zonen oder für Hosts in den jeweiligen Zonen.
-                                       </li>
-                               </ul>
-                       {% else %}
-                               <p>
-                                       IPFire includes a full-fledged web proxy, which is the well-known, open-source software Squid. It is used by ISPs, universities, schools and large companies use because of its diversity, stability and mature development. Even for small home networks, it
-                                       is a useful feature. In addition to the stateful paket inspection (SPI) filtering by the firewall on
-                                       the TCP/IP layer, the web content which is transmitted over HTTP, HTTPS or FTP can be analyzed
-                                       and filtered as well.
-                               </p>
-                               <ul>
-                                       <li>
-                                               <strong>Security:</strong> The client does not query web servers directly, it queries the proxy first.
-                                               The server response goes back to the proxy and not to the client, which actually does not technically even appear on the
-                                               Internet. A related attack would therefore primarily reach the proxy and not the client. There are also
-                                               functions available for data privacy, which is an significant advantage in comparison to a pure NAT router.
-                                       </li>
-                                       <li>
-                                               <strong>Authentication:</strong> Using the access lists, the web proxy can also be configured to allow
-                                               access only after a user has been authenticated. At this point you have the choice between LDAP, identd,
-                                               Windows, Radius or local authentication methods. The web proxy can connect, for example to a
-                                               Microsoft Windows domain controller and only the users of that Windows domain can be granted access to the Internet.
-                                       </li>
-                                       <li>
-                                               <strong>Authorization:</strong> If the Internet access needs to  be limited to specific time of a day,
-                                               or if it should be even completely disabled for any clients, is this easily configured by the
-                                               “network-based access control”, which can also be found on the IPFire web interface. A useful application for this feature can be for example, a school classroom.
-                                       </li>
-                                       <li>
-                                               <strong>Logging:</strong> Since each access can be logged over the proxy, possibilities for the
-                                               examination of the accessed content can be very useful, as well as statistics and bills can be issued afterwards.
-                                               Through the use of a logfile analyzer named Calamaris, log files can be charted by varying criteria
-                                               on the IPFire web interface.
-                                       </li>
-                                       <li>
-                                               <strong>Bandwidth management:</strong> The download management function allows for control of the bandwidth
-                                               to specified zones. Thus, content-based throttling (for example for binary files, CD images or
-                                               multimedia content) is configurable with bandwidth limitations for individual zones or for each host
-                                               in a particular zone.
-                                       </li>
-                               </ul>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/proxy/content-filter.html b/templates/static/features/proxy/content-filter.html
deleted file mode 100644 (file)
index 76908b9..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-{% extends "../../../base-feature.html" %}
-               
-{% block title %}{{ _("Content filter") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("Web proxy: Content filter") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       SquidGuard ist ein URL-Filter, der über den Redirektor-Mechanismus an den Proxy angebunden wird.
-                                       Das Herz stellen sogenannte Blacklists dar, die von offizieller Seite erstellt, eine Reihe von
-                                       klassifizierten Webseiten enthalten und über das Webinterface automatisch auf dem neuesten Stand
-                                       gehalten werden. Es stehen unterschiedliche, freie Quellen für vorgefertigte Blacklists zur Verfügung,
-                                       die erlauben unter anderem jugendgefährdende Inhalte, Shopping-, Warez-, Social-Networking- oder
-                                       gewaltverherrlichende Seiten zu filtern.
-                               </p>
-                               <p>
-                                       Individuelle Erweiterungen einzelner Domains oder URLs können für Blacklists und ebenso für Whitelists
-                                       über das Webinterface eingerichtet werden. IPFire bietet auch einen Blacklist-Editor, der das Editieren
-                                       und erstellen eigener Blacklists über das Webinterface anbietet.
-                               </p>
-                               <p>
-                                       Mögliche Anwendungsbereiche für SquidGuard auf dem IPFire sind:
-                               </p>
-                               <ul>
-                                       <li>
-                                               Sperren oder Einschränken spezieller Internet Inhalte in Abhängigkeit von Uhrzeit, Benutzer
-                                               und verwendetem Rechner.
-                                       </li>
-                                       <li>
-                                               Verhinderung des Zugriffs auf bestimmte (z.B. jugendgefährdende) Seiten.
-                                       </li>
-                                       <li>
-                                               Ausblenden von Werbung.
-                                       </li>
-                               </ul>
-                       {% else %}
-                               <p>
-                                       SquidGuard is a URL filter add-on which is connected via the redirector mechanism of the proxy.
-                                       The heart of SquidGuard is something called a "blacklist." This is a content control list created by the official site. These lists contain a number of categorically-classified websites and can be kept up-to-date automatically. There are different, independent
-                                       sources for pre-built blacklists available, which allow among other classes filtering for adult
-                                       content, shopping, warez, social networking, or sites containing violent/abusive content.
-                               </p>
-                               <p>
-                                       Individual extensions for particular domains or URLs can be set up on the IPFire web interface for
-                                       blacklists and whitelists as well. IPFire also offers a black list editor, that makes the editing
-                                       and creating your own blacklists quite easy.
-                               </p>
-                               <p>
-                                       Possible areas of application for the SquidGuard on IPFire are:
-                               </p>
-                               <ul>
-                                       <li>
-                                               Block or restrict Internet content conditionally by time, user and/or computers.
-                                       </li>
-                                       <li>
-                                               Preventing access to certain (eg. youth-endangering) pages and content categories.
-                                       </li>
-                                       <li>
-                                               Hiding advertising.
-                                       </li>
-                               </ul>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/proxy/update-accelerator.html b/templates/static/features/proxy/update-accelerator.html
deleted file mode 100644 (file)
index 0d4c8fe..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "../../../base-feature.html" %}
-               
-{% block title %}{{ _("Update accelerator") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("Web proxy: Update accelerator") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Der Update-Accelerator ist ein System, das Updates für z.B. Betriebssysteme erheblich beschleunigen
-                                       kann. Dazu werden alle heruntergeladenen Updates zwischengespeichert und bei einem weiteren Download
-                                       aus dem lokalen Cache ausgeliefert.
-                               </p>
-                               <p>
-                                       Bei Service Packs für Microsoft Windows, die oft einige hundert Megabytes haben, lohnt sich dieses
-                                       Speichern massiv, aber auch Virenscanner und andere Produkte profitieren hiervon und machen ein Update von
-                                       allen Workstations in der Firma zu einer schnell erledigten Aufgabe.
-                               </p>
-                       {% else %}
-                               <p>
-                                       The Update Accelerator is a feature that can greatly accelerate deploying updates for operating systems.
-                                       All downloaded updates are cached and if requested another time, are delivered from the cache.
-                               </p>
-                               <p>
-                                       For example, Service Packs for Microsoft Windows (which often are several hundred megabytes) are cached for future retrieval, as well as virus scanner definition updates and other product updates which the system automatically identifies. This saves a massive amount of time when updating large amounts of computers (such as corporate networks). 
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/proxy/virus-scanner.html b/templates/static/features/proxy/virus-scanner.html
deleted file mode 100644 (file)
index da1f2a4..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "../../../base-feature.html" %}
-               
-{% block title %}{{ _("Virus scanner") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("Web proxy: Transparent virus scanner") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Das Paketmanagement bietet das Addon “SquidClamAV” zur Erweiterung an. Somit steht dem Webproxy
-                                       ein Virenscanner zur Verfügung, der in Echtzeit den Datenverkehr nach Viren mit Hilfe des bekannten
-                                       ClamAV prüft.
-                               </p>
-                               <p>
-                                       Der zusätzliche Schutz zu einem herkömmlichen Virenscanner besteht vor allem darin, dass die Dateien
-                                       nicht erst auf den Client-Rechner gelangen, bevor der Virenscan ausgeführt werden kann. Potentielle
-                                       Schädlinge werden vor dem Download durch SquidClamAV geblockt.
-                               </p>
-                       {% else %}
-                               <p>
-                                       The package manager Pakfire offers the addon SquidClamAV - a virus scanner for the web proxy. This checks in real-time all web traffic for viruses, utilizing the ClamAV virus definitions and scanning engine.
-                               </p>
-                               <p>
-                                       The additional protection to a conventional virus scanner lies in the fact that the files are transparently checked before ever making it to the client machine before the client machine's virus scan can be performed. So potentially-malicious files are blocked by
-                                       SquidClamAV before the client's actual download.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/qos.html b/templates/static/features/qos.html
deleted file mode 100644 (file)
index f9a9c13..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("Quality of Service") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("Quality of Service") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Ein Quality of Service, oder kurz QoS, ist in der Lage die Qualität eines Dienstes über eine
-                                       Internetleitung sicherzustellen. Das bedeutet, dass auf einer stark belasteten Internetverbindung
-                                       einem Dienst, wie zum Beispiel einem VoIP-Telefonats, ein gewisses Maß an Bandbreite zugesichert
-                                       werden kann, damit alle Sprachdaten ohne Verzögerung und verlustfrei übertragen werden können.
-                                       Das geht allerdings zu Lasten der anderen Datenströme auf der Leitung, welche es aber durchaus
-                                       vertragen, dass Daten langsamer übertragen werden, wie z.B. ein Upload auf einen FTP-Server.
-                               </p>
-                               <p>
-                                       Ein QoS bietet aber nicht nur bei Echtzeitdiensten Vorteile und macht sie besser benutzbar, sondern
-                                       bringt auch kleine Verbesserungen mit, die sich angenehm bemerkbar machen. Dazu gehören unter anderem:
-                               </p>
-                               <ul>
-                                       <li>
-                                               <strong>Schnellerer Verbindungsaufbau:</strong> Verbindungen werden immer rasch aufgebaut und
-                                               dann nach Dienst eingeordnet und wenn möglich abgebremst. Das verbessert das Arbeitsgefühl.
-                                       </li>
-                                       <li>
-                                               <strong>Stabilere Verbindungen:</strong> da jedem Dienst ein Mindestmaß an Bandbreite zugesichert wird.
-                                       </li>
-                               </ul>
-                               <p>
-                                       Für die Klassifizierung der Pakete, die das System wissen lässt mit welcher Art von Daten es zu tun hat,
-                                       kommt ein Layer-7-Filter zum Einsatz. Dabei wird auch der Inhalt und nicht nur Quell-Ports, -IPs und
-                                       Ziel-Ports und -IPs eines Pakets untersucht. Mit dem Wissen, ob es sich z.B. um einen langen Download
-                                       oder um ein Echtzeitprotokoll handelt, kann es Entscheidungen zur optimalen Auslastung der
-                                       Internetverbindung treffen.
-                               </p>
-                               <p>
-                                       Zusammengefasst ist das Endergebnis eines QoS, eine Leitung mit geringer Latenzzeit und geringer
-                                       Paketverlustrate. Eine Funktion, die man schnell nicht mehr vermissen möchte, wo die Bandbreite knapp ist.
-                               </p>
-                               <p>
-                                       Perfekte Kontrolle über die getätigten Einstellungen, findet man in der graphischen Darstellung der
-                                       Leitungsauslastung.
-                               </p>
-                       {% else %}
-                               <p>
-                                       Quality of Service (QoS) is able to save the quality of a service on one internet connection. This
-                                       means that on a highly-utilized internet connection, a service (for example VoIP) gets a stable size of bandwidth,
-                                       to transfer the information without delay and without loss. This is at the expense of the other
-                                       data flows on the line, which is tolerated, albeit transmitted more slowly (such as a file upload to an FTP server).
-                               </p>
-                               <p>
-                                       QoS does not only increase the functionality of real-time services, but also offers a little bit of overall improvement. For example:
-                               </p>
-                               <ul>
-                                       <li>
-                                               <strong>Connections establish much faster.</strong>
-                                               This is works very well on busy links.
-                                       </li>
-                                       <li>
-                                               <strong>Connections are much more stable.</strong>
-                                               Every service gets a minimum, guaranteed amount of bandwidth.
-                                       </li>
-                               </ul>
-                               <p>
-                                       For the classification of the packets, a Level-7-Filter is used. It also analyses the content, as well as the source-ports/IPs, and destination-ports/IPs of the packets. With that analysis, it will decide if it's a long download or a real-time
-                                       protocol and then subsequently determines the optimal use of the connection.
-                               </p>
-                               <p>
-                                       To put all in a nutshell, QoS reduces the latency and packet loss of an
-                                       internet connection. This is certainly a function that you don't want to miss where bandwidth is limited.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/security.html b/templates/static/features/security.html
deleted file mode 100644 (file)
index b88be8c..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-{% extends "../../base-feature.html" %}
-
-{% block title %}{{ _("Security") }}{% end block %}
-
-{% block bodyA %}
-       <img src="{{ static_url("images/icons/security.png") }}" class="pull-right" alt="{{ _("Security") }}" />
-
-       <div class="page-header">
-               <h1>{{ _("Security") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Das Hauptaugenmerk von IPFire liegt bei Sicherheit.
-                                       Gerade bei einem solch umfangreichen Thema gibt es nicht nur einen einzigen
-                                       Weg, um ein maximales Maß an Sicherheit zu erlangen. Mindestens genauso
-                                       wichtig ist es für den Netzwerkadministrator seine Bedürfnisse zu verstehen
-                                       und entsprechend zu handeln. IPFire stellt für diesen Zweck eine Basis bereit,
-                                       die einzelne Netzwerksegmente nach ihren Sicherheitslevels unterteilt und erlaubt diese
-                                       anschließend nach eigenen Erfordernissen anzupassen
-                                       (mehr dazu unter <a href="/features/firewall">Firewall</a>).
-                               </p>
-                               <p>
-                                       Eine ebenso hohe Priorität genießt die Sicherheit der modularen Komponenten.
-                                       Aktualisierungen werden digital signiert, verschlüsselt
-                                       und können automatisch über das <a href="/features/pakfire">Pakfire
-                                       Paketmanagement-System</a> installiert werden.
-                                       Typischerweise ist IPFire direkt mit dem Internet verbunden und macht es
-                                       somit zu einem Ziel für Hacker und andere Gefahren.
-                                       Das Paketmanagement-System unterstützt den Administrator darin,
-                                       sicher zu sein, dass alle wichtigen Lücken gestopft und Fehler
-                                       in allen eingesetzten Komponenten beseitigt sind.
-                               </p>
-                       {% else %}
-                               <p>
-                                       The primary objective of IPFire is security.
-                                       As there is of course no one, single way to achieve network security, it is important
-                                       for a network administrator to understand their environment and what the term
-                                       <em>security</em> means in the context of their own network.
-                                       IPFire forms the base of a secure network.
-                                       It has the power to segment networks based on their respective security levels
-                                       and makes it easy to create custom policies that manage each segment
-                                       (see the Firewall page for more information).
-                               </p>
-                               <p>
-                                       Security of the modular components is a top priority.
-                                       Updates are digitally signed and encrypted, as well as can be automatically installed
-                                       by Pakfire (<a href="/features/updates">the IPFire package management system</a>).
-                                       Since IPFire is typically directly connected to the Internet, it is going to be a
-                                       primary target for hackers and other threats.
-                                       The simple Pakfire package manager helps administrators feel confident that
-                                       they are running the latest security updates and bug fixes for all of the
-                                       components they utilize.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/updates.html b/templates/static/features/updates.html
deleted file mode 100644 (file)
index 2d31f48..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-{% extends "../../base-feature.html" %}
-
-{% block title %}{{ _("Updates") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("Updates") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       IPFire basiert auf Linux, dem besten Open-Source-Kernel, den es gibt.
-                                       Ebenso basiert IPFire <strong>nicht</strong> auf irgendeiner Distribution
-                                       wie z.B. Knoppix auf Debian basiert sondern wird aus den Sourcen einer
-                                       großen Anzahl von Paketen gebaut. Dieser Prozess der Entwicklung kostet
-                                       viel Zeit, gibt allerdings die Möglichkeit nicht von Updatezyklen anderer
-                                       abzuhängen. Dagegen hat es den Vorteil besonders zuverlässige Versionen
-                                       eines Softwarepakets auszuwählen und den größten Teil der Distribution
-                                       daraus aufzubauen. Der Kernel hingegen wird laufend aktualisiert und
-                                       gepatcht um aktuelle und eine möglichst breite Palette an Hardware zu
-                                       unterstützen - und viel wichtiger, Sicherheitsupdates zeitnah zur
-                                       Verfügung zu stellen.
-                               </p>
-                               <p>
-                                       Das macht IPFire zu einem sehr leistungsfähigen und gleichzeitig
-                                       gehärtetem System.
-                               </p>
-                               <p>
-                                       Um dies beizubehalten und kompatibel zu der Vielzahl an Hardware auf
-                                       dem Markt zu bleiben, werden sogenannte "Core Updates" in einem Abstand
-                                       von etwa vier Wochen herausgegegen, um gesammelte Patches auszuliefern.
-                                       Im Falle eines kritischen Sicherheitsproblems in einem der Pakete gibt
-                                       es Sicherheitsupdates innerhalb weniger als 24 Stunden.
-                               </p>
-                               <p>
-                                       Alle Updates können mittels des Paketmanagementsystems eingespielt werden
-                                       und die Benutzer werden per Email über eben diese informiert. So ist
-                                       in allen Fällen das Update nach einem einzigen Klick installiert und
-                                       das System ist wieder gesichert im Internet.
-                               </p>
-                       {% else %}
-                               <p>
-                                       IPFire is based on Linux, which is the best Open Source kernel around.
-                                       Additionally, IPFire is <strong>not</strong> based on any other
-                                       distribution like Knoppix is on Debian. It is compiled from the sources
-                                       of every single package. This comsumes a lot of work, but finally
-                                       gives the opportunity to not rely on the update cycles of others.
-                                       The advantages we gain is that we are able to select very stable
-                                       versions of software and build the distribution from them. For example
-                                       is the most part of the distribution quite well tested and long maintained
-                                       - in contrast to the kernel which is very recent and regularly updated
-                                       with patches to support as much hardware as possible and more importantly
-                                       fix security errors.
-                               </p>
-                               <p>
-                                       This is what makes IPFire a very strong and hardened system.
-                               </p>
-                               <p>
-                                       To keep up that strength and be prepared for new
-                                       <a href="/features/hardware">hardware</a>, we give
-                                       out the so called <strong>Core Updates</strong> which are issued in
-                                       about every four weeks and updating collected fixes. If there is a
-                                       security emergency,     we provide updates in less than a day to overcome
-                                       zero-day holes in the system.
-                               </p>
-                               <p>
-                                       All of the updates can be installed by the
-                                       <a href="/features/pakfire">package management system</a>
-                                       and users are notified by mail. So in all cases, the update is just
-                                       a simple click and your system is running safe again.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/virtualization.html b/templates/static/features/virtualization.html
deleted file mode 100644 (file)
index 415c7df..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("Virtualization") }}{% end block %}
-
-{% block bodyA %}
-       <img src="{{ static_url("images/icons/virtualization.png") }}" class="pull-right" alt="{{ _("Virtualization") }}" />
-       <div class="page-header">
-               <h1>{{ _("Virtualization") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       IPFire bringt einige Frontend-Treiber für High-Performance-Virtualisierung
-                                       mit sich und arbeitet hervorragend als Gast auf den folgenden
-                                       Virtualisierungsplattformen.
-                               </p>
-
-                               <h2>Unterstützte Hypervisoren</h2>
-                               <h3>KVM</h3>
-                               <p>
-                                       <a href="http://www.linux-kvm.org">KVM</a> ist die Abkürzung
-                                       für Kernel-based Virtual Machine und wird von
-                                       <a href="http://www.redhat.com">Red Hat Inc.</a> entwickelt.
-                                       Es ist die derzeit am häufigsten eingesetzte, freie Virtualisierungslösung
-                                       und löst Xen zunehmend ab.
-                               </p>
-                               <p>
-                                       Der IPFire-Kernel verfügt über die <em>virtio</em> Module,
-                                       welche hervorragende Leistung bei wenig Virtualisierungsoverhead
-                                       bieten.
-                               </p>
-
-                               <h3>VMware</h3>
-                               <p>
-                                       IPFire arbeitet auf verschiedenen VMware Produkten wie
-                                       <em>vSphere</em>, <em>ESXi</em> und <em>VMware workstation</em>.
-                                       Das optionale Paket <em>open-vm-tools</em> verbessert die
-                                       Integration zusätzlich.
-                               </p>
-
-                               <h3>Xen</h3>
-                               <p>
-                                       Xen war der de-facto Open-Source-Hypervisor, wird
-                                       allerdings immer öfter durch KVM ersetzt.
-                               </p>
-                               <p>
-                                       IPFire bringt für den Einsatz auf einem Xen-Host einen
-                                       paravirtualisierten Kernel mit.
-                                       Die Installation ist sehr einfach, da bereits ein
-                                       vorinstalliertes Image auf der Downloadseite heruntergeladen
-                                       werden kann.
-                               </p>
-
-                               <h3>Andere</h3>
-                               <p>
-                                       IPFire ist nicht auf die oben genannten Lösungen beschränkt.
-                                       Ebenso läuft die Distribution auch unter <em>Qemu</em>,
-                                       <em>Microsoft Hyper-V</em> und <em>Oracle Virtualbox</em>.
-                               </p>
-
-                               <h3>Ein Hinweis zu Virtualisierung</h3>
-                               <p>
-                                       Virtualisierung hat Vorteile, allerdings nicht ohne Nachteile.
-                                       Es besteht die Möglichkeit, dass die VM-Container-Sicherheit
-                                       umgangen werden kann und somit ein Angreifer Zugang über die
-                                       virtuelle Maschine heraus erlangen kann.
-                                       Aus diesen Gründen empfehlen wir nicht IPFire virtuell
-                                       in produktiven Umgebungen einzusetzen.
-                               </p>
-                       {% else %}
-                               <p>
-                                       IPFire brings many front-end drivers for high-performance virtualization
-                                       and can be run as virtual guest operating system on the following
-                                       virtualization platforms.
-                                       It has also been optimized to some of the mostly distributed ones to bring
-                                       the best possible performance without impacting the hardware very much.
-                               </p>
-
-                               <h2>Supported hypervisors</h2>
-                               <h3>KVM</h3>
-                               <p>
-                                       <a href="http://www.linux-kvm.org">KVM</a> is short for
-                                       Kernel-based Virtual Machine and is developed by
-                                       <a href="http://www.redhat.com">Red Hat Inc.</a>.
-                                       It is becoming the most advanced hypervisor and succeeding Xen, which
-                                       has been used so far.
-                               </p>
-                               <p>
-                                       IPFire is coming with the <em>virtio</em> kernel modules, that have best
-                                       performance due to very less virtualization overhead.
-                               </p>
-
-                               <h3>VMware</h3>
-                               <p>
-                                       IPFire runs on different VMware products like <em>vSphere</em>,
-                                       <em>ESXi</em> and <em>VMware workstation</em>. The additional package
-                                       <em>open-vm-tools</em> offers tools for a better integration.
-                               </p>
-
-                               <h3>Xen</h3>
-                               <p>
-                                       Xen has recently been the de-facto Open Source hypervisor but is now
-                                       succeeded by KVM.
-                               </p>
-                               <p>
-                                       IPFire can optionally be run with a paravirtualized kernel, which has very
-                                       less virtualization overhead as well. To make the installation very easy,
-                                       a pregenerated Xen image can be downloaded from the download page.
-                               </p>
-
-                               <h3>Others</h2>
-                               <p>
-                                       IPFire is not limited to the hypervisors described above. It runs perfectly on
-                                       <em>Qemu</em>, <em>Microsoft Hyper-V</em> or <em>Oracle VirtualBox</em>, too.
-                               </p>
-
-                               <h3>A note on virtualization</h3>
-                               <p>
-                                       Virtualization does have advantages, but it is not without disadavantages.
-                                       There is always the possibility that the VM container security can be
-                                       bypassed in some way and a hacker can gain access beyond the VM.
-                                       Because of this, it is not suggested to use IPFire as a virtual machine
-                                       in a production-level environment.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-
-       <hr>
-
-       <ul class="thumbnails">
-               <li class="span3">
-                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/virtualization/virt-manager-1.png") }}">
-                               <img src="{{ static_url("images/screenshots/en/virtualization/virt-manager-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
-                       </a>
-               </li>
-       </ul>
-{% end block %}
diff --git a/templates/static/features/vpn.html b/templates/static/features/vpn.html
deleted file mode 100644 (file)
index 0a6c9c0..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("VPN") }}{% end block %}
-
-{% block bodyA %}
-       <img src="{{ static_url("images/icons/vpn.png") }}" class="pull-right" alt="{{ _("VPN") }}" />
-       <div class="page-header">
-               <h1>
-                       {{ _("VPN") }}
-                       <small>{{ _("Virtual Private Networks") }}</small>
-               </h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       IPFire kann zu einem VPN-Gateway (virtal private network - virtuelles, privates Netzwerk)
-                                       ausgebaut werden, welches Personen mit unterschiedlichem Standort untereinander verbindet.
-                                       Dies können zum Beispiel Mitarbeiter, Freunde oder Personen sein mit denen man Daten sicher
-                                       austauschen möchte, aber auch eine Filiale, Außenstelle, wichtige Kunden oder andere Unternehmen
-                                       mit denen kommuniziert wird.
-                               </p>
-                               <p>
-                                       Um sich über verschiedene Technologien verbinden zu können unterstützt IPFire die VPN Protokolle
-                                       IPsec und OpenVPN. Dies erlaubt dem Administrator große Freiheiten bei der Konfiguration des VPNs.
-                                       Die Verwendung dieser Protokolle erlaubt es IPFire auch sich mit VPN Endpunkten verschiedenster
-                                       Hardwarehersteller, wie Cisco, Juniper, Checkpoint, etc. zu verbinden.
-                               </p>
-                       {% else %}
-                               <p>
-                                       IPFire also includes functionality to create virtual private networks (VPN).
-                                       A VPN is a gateway which connects remote networks to the local one using an
-                                       encrypted link.
-                                       Uses for a VPN include business connections to branch offices or datacenters,
-                                       as well as providing traveling staff with a secure portal to the corporate network.
-                               </p>
-                               <p>
-                                       For maximum flexibility, IPFire uses both IPsec and OpenVPN protocols,
-                                       giving administrators maximum flexibility when configuring their VPN.
-                                       Use of these protocols allows IPFire to connect to a variety of VPN endpoint
-                                       devices by manufacturers such as Cisco, Juniper, Checkpoint, etc. 
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-
-       <p class="links">
-               <!-- XXX a link to the wiki goes here -->
-               <a href="http://wiki.ipfire.org">{{ _("Learn more about configuring a VPN connection") }}</a>
-       </p>
-{% end block %}
diff --git a/templates/static/features/vpn/ipsec.html b/templates/static/features/vpn/ipsec.html
deleted file mode 100644 (file)
index f6fce64..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-{% extends "../../../base-feature.html" %}
-               
-{% block title %}{{ _("VPN") }}: {{ _("IPsec") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("VPN: IPsec") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       IPsec ist ein Standard, der unter den VPN-Technologien weit bekannt
-                                       ist und im IPv6-Protokoll entwickelt wurde. Da IPv6 allerdings erst
-                                       langsam seinen Weg in die Welt findet, wurde das IPsec-Protokoll
-                                       auf IPv4 zurückzuportiert.
-                               </p>
-
-                               <p>
-                                       Im Gegensatz zu den ebenfalls eingesetzten SSL-VPNs gilt IPsec als
-                                       schwer einzurichten. Diese Hürde wurde in IPFire beseitigt - zur
-                                       Verfügung steht ein einfach zu bedienendes User-Interface,
-                                       in welches man einige Konfigurationsparameter eingibt, welches dann
-                                       den Rest übernimmt. Ebenso wird automatsich dafür gesorgt, dass die
-                                       Tunnel geöffnet sind und, dass diese von allein wieder aufgebaut werden,
-                                       sollte einmal ein Tunnelpartner seine Internetverbindung verlieren.
-                                       So wird eine sichere und stabile Verbindung zu Filialen, Partnern oder
-                                       dem Zuhause innerhalb von Minuten eingerichtet und sie ist auch
-                                       kompatibel zu denen anderer Anbieter.
-                               </p>
-
-                               <p>
-                                       Der hohe Grad der Kompatibilität zu anderen Herstellern wird durch
-                                       die Verwendung der freien Implementierung 
-                                       <a href="http://www.strongswan.org" target="_blank">strongSwan</a>
-                                       möglich, welches von Andreas Steffen, einem Professor für Sicherheit
-                                       in der Kommunikationstechnik und Leiter des Instituts für
-                                       Internetechnologien und -applikationen an der Universität der
-                                       angewandten Wissenschaften Rapperswil in der Schweiz entwickelt wird.
-                                       StrongSwan arbeitet besonders gut mit Produkten wie Microsoft Windows 7,
-                                       Microsoft Windows Vista und Mac OS X zusammen.
-                               </p>
-                       {% else %}
-                               <p>
-                                       IPsec is a widely-deployed VPN solution that was originally developed to be used in conjunction with IPv6. Because it was so secure and IPv6 was so slowly deployed, it was backported to secure IPv4 traffic as well.
-                               </p>
-
-                               <p>
-                                       In contrast to SSL-VPNs, IPsec is hard to set-up. In IPFire, we
-                                       thought about how to make this technology easy-to-use and as a result, there
-                                       is a web user interface that handles all settings and takes care of the rest
-                                       of the configuration for you. It also keeps the tunnels alive and
-                                       re-establishes them automatically after a remote site has lost the connection. A secure connection to a branch office, a
-                                       business partner, or a home office is done within a couple of minutes
-                                       and compatible with all other implementations.
-                               </p>
-
-                               <p>
-                                       This high-level of compatibility is achieved by using the free
-                                       implementation called
-                                       <a href="http://www.strongswan.org" target="_blank">strongSwan</a>. It is maintained by Andreas Steffen, who is a professor for security in communications and head of the Institute for Internet Technologies
-                                       and Applications at the University of Applied Sciences Rapperswil, in
-                                       Switzerland. StrongSwan also works with all current, major operating systems, such as Microsoft
-                                       Windows 7, Microsoft Windows Vista and Mac OS X.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/vpn/openvpn.html b/templates/static/features/vpn/openvpn.html
deleted file mode 100644 (file)
index c4cad02..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-{% extends "../../../base-feature.html" %}
-               
-{% block title %}{{ _("VPN") }}: {{ _("OpenVPN") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("VPN: OpenVPN") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Unter den Open Source SSL-VPNs ist OpenVPN ein häufig angetroffener und
-                                       beliebter Vertreter, dessen einfache Konfiguration über das IPFire-
-                                       Webinterface noch einmal erleichtert wird. Die Firewall-Einstellungen
-                                       werden von IPFire automatisch geregelt, ebenso werden die benötigten
-                                       Zertifikate mit wenigen Mausklicks erzeugt und können als kompaktes
-                                       Client-Paket heruntergeladen, verteilt und mit einem weiteren Klick
-                                       ausgeführt werden.
-                               </p>
-                               <p>
-                                       Durch die hohe Kompatibilität zu anderen Betriebssystemen
-                                       (Microsoft Windows, Mac OSX, Linux, Android, uvam.)
-                                       eignet sich OpenVPN bestens zur Anbindung sogenannter Roadwarrior-Clients.
-                                       Eine leicht zu konfigurierende, durch Zertifikate gesicherte,
-                                       verschlüsselte Anbindung aus dem Internet
-                                       auf Firmendaten oder das Zuhause liegende Netzwerk kann nicht
-                                       nur über Notebooks, sondern unter anderem auch über PDAs, Smartphones
-                                       oder Tablets hergestellt werden.
-                               </p>
-                               <p>
-                                       Doch neben der Anbindung von Laptops und anderen Handgeräten, kann
-                                       mit OpenVPN auch eine transparente Verbindung zu Filialen, Partnern
-                                       und für jeden beliebigen anderen Einsatz erstellt werden.
-                                       Das ermöglicht sicheren Zugriff auf ein gesamtes Netzwerk ohne
-                                       aufwändige Konfiguration.
-                               </p>
-                       {% else %}
-                               <p>
-                                       OpenVPN is a frequently-encountered and most popular representative
-                                       of the class of Open Source SSL VPNs.
-                                       Its relative ease of configuration has again, been made easier
-                                       by the IPFire web interface. The firewall settings are controlled
-                                       by IPFire automatically, as well as the required certificates will be
-                                       generated with a few mouse clicks and can be downloaded and distributed
-                                       as a very compact client package.
-                               </p>
-                               <p>
-                                       Due to its high compatibility to all sorts of operating systems,
-                                       such as Microsoft Windows, Mac OSX, Linux, Android and many more,
-                                       it is perfectly useful for roadwarrior connections.
-                                       With those, it is easy to connect your laptop, phone, tablet or
-                                       other devices to your company network, which makes it easy to
-                                       work from anywhere in the world.
-                               </p>
-                               <p>
-                                       But besides connecting portable devices, OpenVPN can also be used
-                                       to securely connect branches to the headquater.
-                                       This makes it easy to access resources on other networks
-                                       remotely without any complicated configuration on each client
-                                       on your local network.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
diff --git a/templates/static/features/wireless.html b/templates/static/features/wireless.html
deleted file mode 100644 (file)
index 9550759..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends "../../base-feature.html" %}
-               
-{% block title %}{{ _("Wireless Access Point") }}{% end block %}
-
-{% block bodyA %}
-       <div class="page-header">
-               <h1>{{ _("Wireless Access Point") }}</h1>
-       </div>
-
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       IPFire bietet mehrere Möglichkeiten zur Einbindung von Wireless-Clients. Zum einen kann ein
-                                       Accesspoint über eine LAN Karte angeschlossen werden. Hier bietet IPFire einen MAC/IP Addressfilter,
-                                       um nur erlaubte Clients zuzulassen. Die Clients dürfen in der Standardeinstellung zwar ins Internet,
-                                       aber nicht auf das lokale Lan zugreifen. Als zweite Möglichkeit kann man eine WLAN-Karte in den IPFire
-                                       einbauen, die über das Addon “hostapd” Funktionalität des Accesspoints übernimmt. Unterstützt werden
-                                       dann unverschlüsselte sowie WPA/WPA2 verschlüsselte Verbindungen. Auch die Nutzung des 5 GHz Bandes
-                                       (802.11a) ist möglich, wenn die WLAN-Karte dies unterstützt.
-                               </p>
-                               <p>
-                                       Die Unterstützung von Wireless-Karten in IPFire ist exzellent, da in dem stabilen Kernel die Treiber
-                                       trotzdem auf neuestem Stand sind und somit möglichst viele Karten unterstützt werden.
-                               </p>
-                       {% else %}
-                               <p>
-                                       IPFire offers several options for the integration of wireless clients. First, an access point can
-                                       be connected via a LAN card. In this scenario, IPFire offers MAC/IP address filtering to allow only authorized
-                                       clients. The clients are allowed by default to access the Internet, but they are not allowed access the local LAN.
-                                       The second option is to install a wireless LAN (WLAN) card in the IPFire machine that takes the functionality of the access
-                                       point over, using the add-on "hostapd". This add-on supports both unencrypted and WPA/WPA2-encrypted connections. Also
-                                       the use of 5 GHz (802.11a standard) is possible if the wireless card supports it.
-                               </p>
-                               <p>
-                                       Wireless card support in IPFire is excellent. The drivers in the stable kernel are very up-to-date
-                                       and IPFire therefore supports a significant amount of WLAN cards.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
-{% end block %}
index 70d27c8de124d81e0641d8facb987c75b5ca22fa..5f7f960242bf1b014eaa68fa7a71980fce8b5502 100644 (file)
@@ -2,19 +2,18 @@
 
 {% block title %}{{ _("Get involved") }}{% end block %}
 
-{% block body %}
-       <div class="page-header">
-               <h1>
-                       {% if lang == "de" %}
-                               {{ _("Get involved") }},
-                               <small>weil es so leicht sein kann etwas zu bewirken</small>
-                       {% else %}
-                               {{ _("Get involved") }}
-                               <small>because making a difference is easy</small>
-                       {% end %}
-               </h1>
-       </div>
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>{{ _("Get involved") }}</h1>
+                       <p class="lead">
+                               {{ _("Because making a difference is easy") }}
+                       </p>
+               </div>
+       </header>
+{% end header %}
 
+{% block body %}
        <div class="row">
                <div class="span7">
                        {% if lang == "de" %}
index cb0a574972243e67bb4a3ac38ecf52f1558cb222..d7ecb7a0a142626477ddc4e1119f31f188645e93 100644 (file)
@@ -2,11 +2,15 @@
 
 {% block title %}{{ _("Imprint") }}{% end block %}
 
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Imprint") }}</h1>
-       </div>
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>{{ _("Imprint") }}</h1>
+               </div>
+       </header>
+{% end header %}
 
+{% block body %}
        {% if lang == "de" %}
                <h4>Verantwortlich im Sinne von §5 TMG, §55 RfStV</h4>
        {% else %}