]> git.ipfire.org Git - ipfire.org.git/commitdiff
Drop old static pages
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Oct 2018 20:57:29 +0000 (21:57 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Oct 2018 21:00:19 +0000 (22:00 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Makefile.am
src/templates/base.html
src/templates/index.html
src/templates/static/get-involved.html [deleted file]
src/templates/static/get-started.html [deleted file]
src/templates/static/hardware.html [deleted file]
src/web/__init__.py

index 60806a306b251b1d168fe57cb71c82a2654c3293..739ca836c8113c05dd33e4e78f7a0e720b29f712 100644 (file)
@@ -173,9 +173,6 @@ templates_people_modulesdir = $(templates_peopledir)/modules
 templates_static_DATA = \
        src/templates/static/chat.html \
        src/templates/static/features.html \
-       src/templates/static/get-involved.html \
-       src/templates/static/get-started.html \
-       src/templates/static/hardware.html \
        src/templates/static/legal.html \
        src/templates/static/support.html
 
index 71afbf27e81f709a76fda982d7aa2c7028cfb5cc..29fa21e333581df8dd0ffa3f31ebff35c1c92a51 100644 (file)
                                                        <li class="nav-item">
                                                                <a class="nav-link {% if request.path == "/support" %}active{% end %}" href="/support">{{ _("Support") }}</a>
                                                        </li>
-
-                                                       <li class="nav-item">
-                                                               <a class="nav-link {% if request.path == "/get-involved" %}active{% end %}" href="/get-involved">{{ _("Community") }}</a>
-                                                       </li>
                                                </ul>
                                        {% end block %}
                                </div>
index f413df6918f79c8a49f8cf4bbf05298a6fc11e3e..40c685c6b18363af1970c0c81e937b2d1cd29c42 100644 (file)
                                                        IPFire comes with a versatile and state of the art firewall engine
                                                        that makes even the most complex setups easy to administer.
                                                </p>
-
-                                               <div class="btn-toolbar">
-                                                       <a class="btn btn-primary mr-2" href="/get-started">{{ _("Get Started") }}</a>
-                                                       <a class="btn btn-secondary ml-2" href="/features">{{ _("Learn more") }}</a>
-                                               </div>
                                        </div>
                                </div>
 
                                        </div>
                                        <div class="col-sm-6 offset-sm-3 col-lg-4 offset-lg-1">
                                                <a class="btn btn-light btn-lg btn-block px-md-0 mb-4" href="https://www.lightningwirelabs.com/">{{ _("Get Professional Support") }}</a>
-                                               <a class="btn btn-light btn-lg btn-block px-md-0" href="/hardware">{{ _("Hardware Appliances") }}</a>
+                                               <a class="btn btn-light btn-lg btn-block px-md-0" href="https://www.lightningwirelabs.com/products/ipfire/appliances">{{ _("Hardware Appliances") }}</a>
                                        </div>
                                </div>
                                <div class="text-center">
diff --git a/src/templates/static/get-involved.html b/src/templates/static/get-involved.html
deleted file mode 100644 (file)
index cf4d4d2..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Get Involved") }}{% end block %}
-
-{% block container %}
-       <section id="support" class="content-section">
-               <div class="container">
-                       <div class="row mb-5">
-                               <section class="features-content col-12">
-                                       <h2 class="display-2 text-center">{{ _("Join the IPFire Community") }}</h2>
-                                       
-                                       <div class="row">
-                                               <div class="col-md-4 text-center">
-                                                       <a href="/chat" class="link-normal">
-                                                               <span class="fa fa-4x fa-wechat"></span>
-                                                               <h3>{{ _("Chat") }}</h3>
-                                                       </a>
-                                               </div>
-                       
-                                               <div class="col-md-4 text-center">
-                                                       <a href="//forum.ipfire.org" class="link-normal">
-                                                               <span class="fa fa-4x fa-users"></span>
-                                                               <h3>{{ _("Forums") }}</h3>
-                                                       </a>
-                                               </div>
-                       
-                                               <div class="col-md-4 text-center">
-                                                       <a href="https://lists.ipfire.org" class="link-normal">
-                                                               <span class="fa fa-4x fa-envelope-o"></span>
-                                                               <h3>{{ _("Mailing Lists") }}</h3>
-                                                       </a>
-                                               </div>
-                                       </div>
-                               </section>
-                       </div>
-               </div>
-       </section>
-       
-       <div class="container mt-6">    
-               <div class="row">                       
-                       <section class="col-12">
-                               <h2 class="display-2 text-center">{{ _("Contribute") }}</h2>
-                               
-                               <div class="row mb-6">                  
-                                       <section id="community_support" class="col-5">                          
-                                               <h4>{{ _("Provide Community Support") }}</h4>
-                                               <p>
-                                                       Join the wonderful IPFire Community and help other people getting started with IPFire.
-                                                       Take part in discussions all around the project on our <a href="/chat">channels</a>,
-                                                       the <a href="//forum.ipfire.org">IPFire Forums</a>, and
-                                                       <a href="//lists.ipfire.org/">Mailing Lists</a>.
-                                               </p>
-                                               
-                                               <a class="btn btn-white mb-3" href="https://forum.ipfire.org/search.php?search_id=unanswered">{{ _("Unanswered questions on the forums") }}</a>
-                                               <a class="btn btn-white" href="/chat">{{ _("On our Jabber/IRC channels") }}</a>
-                                       </section>
-                                                                       
-                                       <section id="documentation" class="col-5 offset-2">
-                                               <h4>{{ _("Improve our Documentation") }}</h4>
-                                               <p>
-                                                       The <a href="//wiki.ipfire.org">IPFire Wiki</a> is the source of documentation
-                                                       and answers all questions about IPFire. Found something that needs to be
-                                                       documented, improved, or rewritten? Sign up and get it done!
-                                               </p>
-                                               
-                                               <a class="btn btn-white" href="https://wiki.ipfire.org">{{ _("IPFire Wiki") }}</a>
-                                       </section>
-                               </div>
-                       
-                               <div class="row mb-6">                          
-                                       <section id="translation" class="col-5">
-                                               <h4>{{ _("Translate") }}</h4>
-                                               <p>
-                                                       IPFire is used in many countries all over the world.
-                                                       Translating the software helps us to make it usable for
-                                                       more and more people. Join our efforts and translate IPFire
-                                                       into a new language or improve already existing translations.
-                                               </p>
-                                       </section>
-                                       
-                                       
-                                       <section id="maintain" class="col-5 offset-2">
-                                               <h4>{{ _("Maintain Packages") }}</h4>
-                                               <p>
-                                                       Become an expert for a subsystem of the IPFire distribution and help
-                                                       to keep features up to date and fix bugs.
-                                                       Maintaining packages is an essential part of the project and needed
-                                                       to provide the great level of stability and security that IPFire does
-                                                       today.
-                                               </p>
-                                               
-                                               <a class="btn btn-white mr-3" href="https://wiki.ipfire.org/devel/submit-patches">{{ _("Submit Patches") }}</a>
-                                               <a class="btn btn-white" href="https://pakfire.ipfire.org/">{{ _("Pakfire Build Service") }}</a>
-                                       </section>
-                               </div>
-                               
-                               <div class="row mb-6">                          
-                                       <section id="bugs" class="col-5">
-                                               <h4>{{ _("Report & Resolve Bugs") }}</h4>
-                                               <p>
-                                                       If you have come across a flaw in the IPFire distribution, please take a moment and
-                                                       report it to us. Of course we appreciate any solutions for already existing bug
-                                                       reports.
-                                               </p>
-                                               
-                                               <a class="btn btn-white mr-3" href="https://bugzilla.ipfire.org">{{ _("IPFire Bugzilla") }}</a>
-                                               <a class="btn btn-white" href="https://wiki.ipfire.org/devel/bugzilla">{{ _("Dealing with bug reports") }}</a>
-                                       </section>
-                                       
-                                       <section id="infrastructure" class="col-5 offset-2">
-                                               <h4>{{ _("Provide Infrastructure") }}</h4>
-                                               <p>
-                                                       The IPFire project is hosted on a huge infrastructure and runs various services for the users.
-                                                       To keep access to IPFire download images as fast as possible and to keep our services running
-                                                       as reliable as possible, the IPFire Infrastructure team is operating this infrastructure and
-                                                       appreciates your support.
-                                               </p>
-                                               
-                                               <a class="btn btn-white" href="https://wiki.ipfire.org/en/project/mirror">{{ _("Host a mirror") }}</a>
-                                       </section>
-                               </div>
-                               
-                               <div class="row justify-content-center mb-6">                                                   
-                                       <section id="donate" class="col-5 text-center">
-                                               <h4>{{ _("Donate") }}</h4>
-                                               <p>
-                                                       Support by volunteers who engage in development or contribute themselves
-                                                       is is essential for this project. If you are not an expert in writing
-                                                       documentation, or technology but want to help out, you can support
-                                                       the work of the others by making a financial contribution which
-                                                       will help covering costs.
-                                               </p>
-                                               
-                                               <a class="btn btn-red900" href="/donate">{{ _("Donate") }}</a>
-                                       </section>
-                               </div>
-                       </section>
-               </div>
-       </div>
-       
-{% end block %}
diff --git a/src/templates/static/get-started.html b/src/templates/static/get-started.html
deleted file mode 100644 (file)
index 2c5ba8e..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-{% extends "../base.html" %}
-               
-{% block title %}{{ _("Get Started") }}{% end block %}
-
-{% block container %}
-       <section id="step-0" class="container content-section text-center">
-               <div class="page-header">
-                       <h1>{{ _("Get Started With IPFire") }}</h1>
-               </div>
-
-               <p class="lead">
-                       Deploying IPFire in any network environment is easily done within
-                       fifteen to twenty minutes. You will have to follow these three
-                       steps and you are ready to go...
-               </p>
-       </section>
-       
-       <section id="step-1" class="content-section lighter-background text-center">
-               <div class="container">
-                       <h2>{{ _("Hardware Selection") }}</h2>
-
-                       <p class="lead">
-                               IPFire is a free software distribution that you can install on
-                               any hardware that <a href="https://wiki.ipfire.org/en/hardware/start">fits the requirements</a>
-                               and is best for your environment's needs.
-                       </p>
-
-                       <p class="lead">
-                               You can also purchase a <a href="/hardware">hardware appliance</a>
-                               that is perfectly tailored for IPFire and comes pre-installed
-                               so that you can start setting up your new IPFire firewall right away.
-                       </p>
-               </div>
-       </section>
-
-       <section id="step-2" class="content-section light-background text-center">
-               <div class="container">
-                       <h2>{{ _("Installation") }}</h2>
-
-                       <p class="lead">
-                               The <a href="https://wiki.ipfire.org/en/installation/start">installation handbook</a>
-                               on the IPFire wiki will guide you through the entire installation process
-                               from the beginning to the end.
-                       </p>
-
-                       <div class="btn-toolbar">
-                               <a class="btn btn-primary btn-lg" href="/download">
-                                       {{ _("Download") }}
-                               </a>
-                               <a class="btn btn-info btn-lg" href="https://wiki.ipfire.org/en/installation/start">
-                                       {{ _("Installation Handbook") }}
-                               </a>
-                       </div>
-               </div>
-       </section>
-
-       <section id="step-3" class="content-section red-background text-center">
-               <div class="container">
-                       <h2>{{ _("Configuration") }}</h2>
-
-                       <p class="lead">
-                               IPFire is easy to set up and use. The IPFire wiki
-                               <a href="https://wiki.ipfire.org/en/configuration/start">has great documentation</a>
-                               about all features and answers almost any question.
-                       </p>
-
-                       <p class="lead">
-                               If you need professional support for your IPFire deployment the
-                               qualified consultants from
-                               <a href="/get-support#professional">Lightning Wire Labs</a>
-                               are there for you at any time.
-                       </p>
-               </div>
-       </section>
-
-       <section id="after-installation" class="container content-section text-center">
-               <h3>{{ _("After the installation...") }}</h3>
-
-               <div class="row">
-                       <div class="col-md-4 hidden-sm hidden-xs">
-                               <h4>
-                                       <span class="fa fa-wechat"></span>
-                                       {{ _("Communicate") }}
-                               </h4>
-
-                               Get in touch with the IPFire community on chat, the forums or
-                               mailing lists to ask questions or help out others.
-                       </div>
-
-                       <div class="col-md-4 hidden-sm hidden-xs">
-                               <h4>
-                                       <span class="fa fa-cog"></span>
-                                       {{ _("Contribute") }}
-                               </h4>
-
-                               There is always exciting things to do. You have the chance
-                               to shape the IPFire project and bring in your expertise in
-                               engineering, writing documentation or fixing bugs.
-                       </div>
-
-                       <div class="col-md-4 hidden-sm hidden-xs">
-                               <h4>
-                                       <span class="fa fa-heart"></span>
-                                       {{ _("Donate") }}
-                               </h4>
-
-                               Your support keeps the IPFire project running.
-                       </div>
-               </div>
-
-               <br>
-
-               <div class="row">
-                       <div class="col-md-4">
-
-                               <a class="btn btn-primary btn-block" href="/get-involved">
-                                       {{ _("Get Involved") }}
-                               </a>
-                       </div>
-
-                       <div class="col-md-4">
-                               <a class="btn btn-primary btn-block" href="/get-involved#contribute">
-                                       {{ _("Contribute") }}
-                               </a>
-                       </div>
-
-                       <div class="col-md-4">
-                               <a class="btn btn-primary btn-block" href="/donate">
-                                       {{ _("Donate") }}
-                               </a>
-                       </div>
-               </div>
-       </section>
-{% end block %}
diff --git a/src/templates/static/hardware.html b/src/templates/static/hardware.html
deleted file mode 100644 (file)
index cf146d2..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-{% extends "../base.html" %}
-               
-{% block title %}{{ _("Hardware") }}{% end block %}
-
-{% block container %}
-       <div class="container page-header">
-               <h1>{{ _("Hardware") }}</h1>
-       </div>
-
-       <section class="container content-section">
-               <p class="lead ac">
-                       IPFire is a dedicated firewall which needs its own hardware to run on.
-                       On this page we will recommend some ready-to-go solutions especially
-                       designed for IPFire. Get one and get started with IPFire right away
-                       or take this as an inspiration for your own individual system.
-               </p>
-       </section>
-
-       <section id="ipfire-professional" class="container content-section">
-               <h3 class="text-center">
-                       IPFire Premium/Professional Appliance {{ _("by") }}
-                       <a href="https://www.lightningwirelabs.com">Lightning Wire Labs</a>
-               </h3>
-
-               <p class="ac">
-                       IPFire is ready for running in companies. It powers many of them all around the world.
-                       Thousands of people accessing the Internet at the same time is not a problem if the
-                       hardware is powerful enough.
-                       Just as important as performance is reliability. If the firewall system fails, the
-                       entire company is disconnected from the Internet which hugely impacts work.
-                       Industrial components and great quality in all parts of the appliance is the first
-                       step to avoid downtimes caused by hardware failure which are usually very expensive.
-               </p>
-
-               <br>
-
-               <p class="ac">
-                       <strong>
-                               The <a href="https://www.lightningwirelabs.com/products/ipfire/appliances">IPFire Premium Appliance and IPFire Professional Appliance</a>
-                               by <a href="https://www.lightningwirelabs.com">Lightning Wire Labs</a> integrate well in every infrastructure of any company.
-                               They are reliable and deliver the performance that is needed at all times.
-                       </strong>
-               </p>
-
-               <img src="{{ static_url("images/LWL/appliance-pro.jpg") }}">
-
-               <div class="row">
-                       <div class="col-md-4">
-                               <dl>
-                                       <dt>{{ _("Network Controllers") }}</dt>
-                                       <dd>{{ _("Four active Intel Networking Processors") }}</dd>
-
-                                       <dt>{{ _("System Specifications") }}</dt>
-                                       <dd>{{ _("Dual-Core Intel(R) Processor, 8GB memory") }}</dd>
-                               </dl>
-
-                               <ul class="list-unstyled">
-                                       <li>
-                                               {{ _("Powers networks up to thousands of users") }}
-                                       </li>
-                                       <li>
-                                               {{ _("Redundant storage (RAID-1)") }}
-                                       </li>
-                                       <li>
-                                               {{ _("19\" rack-mountable") }}
-                                       </li>
-                               </ul>
-                       </div>
-
-                       <div class="col-md-4 ac">
-                               <h4>{{ _("Low-Latency Throughput") }}</h4>
-
-                               <p>
-                                       Networks in each company need to be fast and transfer data at
-                                       a high speed. Equally important is the ability to transfer this
-                                       data with a very small latency. Active network adapters will
-                                       take care of the data transfer whilst the IPFire system is
-                                       focussing on its job which is only letting packets through
-                                       which are permitted to pass the firewall.
-                               </p>
-                       </div>
-
-                       <div class="col-md-4 ac">
-                               <h4>{{ _("Content Filtering in Real-time") }}</h4>
-
-                               <p>
-                                       The built-in <a href="/features#proxy">web proxy</a> of IPFire filters
-                                       content in real-time. It can block malicious or inappropriate web pages.
-                                       If that should be happening user-friendly this must be fast so that it
-                                       is not noticeable.
-                                       A fast processor and lots of system memory speed up processing the huge
-                                       blacklists with the forbidden web sites.
-                               </p>
-                       </div>
-               </div>
-       </section>
-
-       <section id="ipfire-eco" class="container content-section">
-               <h3 class="text-center">
-                       IPFire Eco Appliance {{ _("by") }}
-                       <a href="https://www.lightningwirelabs.com">Lightning Wire Labs</a>
-               </h3>
-
-               <div class="row">
-                       <div class="col-md-5">
-                               <img class="img-responsive" src="{{ static_url("images/LWL/appliance-eco.jpg") }}">
-                       </div>
-
-                       <div class="col-md-7">
-                               <p class="ac">
-                                       For smaller companies, branch offices or start-ups:
-                                       Where there are not so many people accessing the Internet but throughput
-                                       is still important there are smaller alternatives which come with four
-                                       powerful network controllers but a smaller processor and therefore smaller
-                                       form-factor and less power consumption.
-                               </p>
-
-                               <table class="table table-condensed">
-                                       <tbody>
-                                               <tr>
-                                                       <td>
-                                                               <strong>{{ _("Processor") }}</strong>
-                                                       </td>
-                                                       <td>{{ _("Dual-Core Intel(R) Atom(TM) Processor") }}</td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>{{ _("Network Controllers") }}</strong>
-                                                       </td>
-                                                       <td>{{ _("Four active Intel Networking Processors") }}</td>
-                                               </tr>
-                                       </tbody>
-                               </table>
-                       </div>
-               </div>
-
-               <p class="ac">
-                       <strong>
-                               The <a href="https://www.lightningwirelabs.com/products/ipfire/appliances">IPFire Eco Appliance</a>
-                               by <a href="https://www.lightningwirelabs.com">Lightning Wire Labs</a> brings all the features<br>
-                               IPFire has to offer at a small form-factor and with great power-efficiency.
-                       </strong>
-               </p>
-       </section>
-
-       <section id="ipfire-prime" class="container content-section">
-               <div class="row">
-                       <div class="col-md-7">
-                               <h3>
-                                       IPFire Duo Box
-                                       {{ _("by") }} <a href="https://www.fountainnetworks.com">Fountain Networks</a>
-                               </h3>
-
-                               <table class="table table-condensed">
-                                       <tbody>
-                                               <tr>
-                                                       <td>
-                                                               <strong>{{ _("Processor") }}</stronG>
-                                                       </td>
-                                                       <td>{{ _("Intel(R) Haswell(R) 2957U Dual-Core @ 1.4 GHz") }}</td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>{{ _("Memory & Storage") }}</strong>
-                                                       </td>
-                                                       <td>{{ _("2G system memory, 32GB SSD storage") }}</td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>{{ _("Network Adapters") }}</strong>
-                                                       </td>
-                                                       <td>
-                                                               {{ _("Two Gigabit Ethernet Adapters") }}
-                                                               <br>& {{ _("one 802.11a/b/g/n Wireless Adapter") }}
-                                                               <br>({{ _("LTE/3G modem optional") }})
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td>
-                                                               <strong>{{ _("Power Consumption") }}</strong>
-                                                       </td>
-                                                       <td>{{ _("6-10 watts") }}</td>
-                                               </tr>
-                                       </tbody>
-                               </table>
-
-                               <p class="ac">
-                                       IPFire runs on the smallest systems. Power consumption is important but you still
-                                       want to use all the features? A system based on a small x86 processor with a decent
-                                       amount of memory is enough to power IPFire in your home for the family or office.
-                                       One Ethernet port for the Internet connection, one for the local network, and a
-                                       third wireless controller which makes IPFire to be used as a wireless access point
-                                       as well. In this configuration, IPFire will provide excellent network connectivity
-                                       to everywhere in your house or apartment so that you can use all of its features
-                                       from anywhere with your computer, laptop, tablet, or phone.
-                               </p>
-
-                               <p class="ac">
-                                       <strong>
-                                               The <a href="https://www.fountainnetworks.com/ipfire-duo-box">IPFire Duo Box</a>
-                                               by <a href="https://www.fountainnetworks.com/">Fountain Networks</a>
-                                               is a great system for starters who are searching for something small but still powerful.
-                                       </strong>
-                               </p>
-                       </div>
-
-                       <div class="col-md-4 col-md-offset-1">
-                               <a href="https://www.fountainnetworks.com/fountain-networks-products/ipfire-prime-box.html">
-                                       <img class="img-responsive" src="{{ static_url("images/LWL/appliance-prime.jpg") }}">
-                               </a>
-                       </div>
-               </div>
-       </section>
-
-       <section class="container content-section">
-               <p class="lead ac">
-                       You can find more example configurations, recommended hardware and information
-                       about individual components like the best network controllers and more in the
-                       <a href="https://wiki.ipfire.org/en/hardware/start">hardware section on the IPFire wiki</a>.
-               </p>
-       </section>
-{% end block %}
index ee51a85acbd8909030ced07b9e77ef783e24dfd3..01292fe06c3faa5ad230c6b250231245c6bde65e 100644 (file)
@@ -112,9 +112,6 @@ class Application(tornado.web.Application):
                        # Static Pages
                        (r"/chat", StaticHandler, { "template" : "chat.html" }),
                        (r"/features", StaticHandler, { "template" : "features.html" }),
-                       (r"/get-involved", StaticHandler, { "template" : "get-involved.html" }),
-                       (r"/get-started", StaticHandler, { "template" : "get-started.html" }),
-                       (r"/hardware", StaticHandler, { "template" : "hardware.html" }),
                        (r"/legal", StaticHandler, { "template" : "legal.html" }),
                        (r"/support", StaticHandler, { "template" : "support.html" }),