basic styling Donate page

diff --git a/templates/donate.html b/templates/donate.html
index 6a42d07a38b594d032e934537ac32f6c47c8cb76..7ec0cdaab4decbe19461ec17443e3ed07f1b114c 100644 (file)
--- a/templates/donate.html
+++ b/templates/donate.html
@@ -3,104 +3,107 @@
 {% block title %}{{ _("Donate") }}{% end block %}
  
 {% block container %}
 {% block title %}{{ _("Donate") }}{% end block %}
  
 {% block container %}

-       <section class="container content-section text-center">
-               <div class="page-header">
-                       <h1>{{ _("Donate now") }}</h1>
+       <div class="container">
+               <div class="row">
+                       <section class="features-content col-12 text-center">
+                               <h2 class="display-2">{{ _("Donate now") }}</h2>
+                               
+                               {% if lang == "de" %}
+                                       <p class="lead">
+                                               IPFire ist ein Open-Source-Softwareprojekt.
+                                       </p>
+               
+                                       <p class="lead">
+                                               Die Entwicklung und die Fortführung des Projekts wird allein
+                                               von einer Gruppe von Freiwilligen getragen, die ein Produkt
+                                               entwickelt hat, das tagtäglich von Hunderttausenden genutzt
+                                               wird.
+                                       </p>
+               
+                                       <p class="lead">
+                                               Jede einzelne Spende hilft IPFire noch weiter zu verbessern...
+                                       </p>
+                               {% else %}
+                                       <p class="lead">
+                                               IPFire is an Open Source software project.
+                                       </p>
+               
+                                       <p class="lead">
+                                               Development and keeping the project healthy is carried out by a
+                                               group of volunteers who have built a very successful product,
+                                               which hundreds of thousands of people use every day.
+                                       </p>
+               
+                                       <p class="lead">
+                                               Your donation helps us to make IPFire even better...
+                                       </p>
+                               {% end %}
+                       </section>

                </div>
                </div>

-
-               {% if lang == "de" %}
-                       <p class="lead">
-                               IPFire ist ein Open-Source-Softwareprojekt.
-                       </p>
-
-                       <p class="lead">
-                               Die Entwicklung und die Fortführung des Projekts wird allein
-                               von einer Gruppe von Freiwilligen getragen, die ein Produkt
-                               entwickelt hat, das tagtäglich von Hunderttausenden genutzt
-                               wird.
-                       </p>
-
-                       <p class="lead">
-                               Jede einzelne Spende hilft IPFire noch weiter zu verbessern...
-                       </p>
-               {% else %}
-                       <p class="lead">
-                               IPFire is an Open Source software project.
-                       </p>
-
-                       <p class="lead">
-                               Development and keeping the project healthy is carried out by a
-                               group of volunteers who have built a very successful product,
-                               which hundreds of thousands of people use every day.
-                       </p>
-
-                       <p class="lead">
-                               Your donation helps us to make IPFire even better...
-                       </p>
-               {% end %}
-       </section>
-
-       <section class="container content-section text-center">
-               {% module DonationInputBox() %}
-       </section>
-
-       {% if wishlist_items %}
-               <section class="container content-section">
-                       <div class="row">
-                               <div class="col-md-8 col-md-offset-2">
-                                       <div class="panel panel-default">
-                                               <div class="panel-heading">
-                                                       <h3 class="panel-title text-center">
-                                                               {{ _("Current crowd funding projects on the IPFire Wishlist") }}
-                                                       </h3>
-                                               </div>
-                                               <div class="panel-body">
-                                                       {% module WishlistItems(wishlist_items) %}
+               
+               <div class="row mb-6 d-flex justify-content-center">
+                       <section class="col-6 d-flex justify-content-center">
+                               {% module DonationInputBox() %}
+                       </section>
+               </div>
+               
+               <div class="row">
+                       {% if wishlist_items %}
+                               <section class="container content-section">
+                                       <div class="row">
+                                               <div class="col-md-8 col-md-offset-2">
+                                                       <div class="panel panel-default">
+                                                               <div class="panel-heading">
+                                                                       <h3 class="panel-title text-center">
+                                                                               {{ _("Current crowd funding projects on the IPFire Wishlist") }}
+                                                                       </h3>
+                                                               </div>
+                                                               <div class="panel-body">
+                                                                       {% module WishlistItems(wishlist_items) %}
+                                                               </div>
+                                                       </div>

                                                </div>
                                        </div>
                                                </div>
                                        </div>

-                               </div>
-                       </div>
-               </section>
-       {% end %}
-
-       <section id="recurring-donations" class="lighter-background text-center">
-               <div class="container">
+                               </section>
+                       {% end %}
+               </div>
+                       

                        <div class="row">
                        <div class="row">

-                               <div class="col-md-6">
-                                       <h4>{{ _("Donate by Bank Transfer") }}</h4>
-
-                                       <dl class="dl-horizontal">
-                                               <dt>{{ _("IBAN") }}</dt>
-                                               <dd>DE86 4265 0150 1020 0768 89</dd>
-
-                                               <dt>{{ _("BIC-/SWIFT-Code") }}</dt>
-                                               <dd>WELADED1REK</dd>
-
+                               <section class="col-5">
+                                       <h3 class="pb-3">{{ _("Donate by Bank Transfer") }}</h3>
+                                       <p><strong>{{ _("IBAN") }}</strong><br>
+                                               DE86 4265 0150 1020 0768 89</p>
+                                               
+                                       <p><strong>{{ _("BIC-/SWIFT-Code") }}</strong><br>
+                                               WELADED1REK</p>
+                                               
+                                       <p>

                                                {% if reason_for_transfer %}
                                                {% if reason_for_transfer %}

-                                                       <dt>{{ _("Reason for transfer") }}</dt>
-                                                       <dd>{{ reason_for_transfer }}</dd>
+                                                       {{ _("Reason for transfer") }}
+                                                       {{ reason_for_transfer }}

                                                {% end %}
                                                {% end %}

-                                       </dl>
-
-                                       {% if lang == "de" %}
-                                               <small>
-                                                       Da das IPFire-Projekt keine registrierte gemeinnützige Organisation
-                                                       ist, können keine steuerlich abzugsfähige Spendenquittungen erstellt
-                                                       werden.
-                                               </small>
-                                       {% else %}
-                                               <small>
-                                                       The IPFire project is not a registered non-profit organisation.
-                                                       <br>
-                                                       Hence we are not able to issue a tax-deductible contribution receipt
-                                                       for your donation.
-                                               </small>
-                                       {% end %}
-                               </div>
-
-                               <div class="col-md-6">
-                                       <h4>{{ _("Recurring Donations") }}</h4>
-
+                                       </p>
+                                       
+                                       <p>
+                                               {% if lang == "de" %}
+                                                       <small>
+                                                               Da das IPFire-Projekt keine registrierte gemeinnützige Organisation
+                                                               ist, können keine steuerlich abzugsfähige Spendenquittungen erstellt
+                                                               werden.
+                                                       </small>
+                                               {% else %}
+                                                       <small>
+                                                               The IPFire project is not a registered non-profit organisation.
+                                                               <br>
+                                                               Hence we are not able to issue a tax-deductible contribution receipt
+                                                               for your donation.
+                                                       </small>
+                                               {% end %}
+                                       </p>
+                               </section>
+                               
+                               <section class="col-5 offset-2">
+                                       <h3 class="pb-3">{{ _("Recurring Donations") }}</h3>

                                        {% if lang == "de" %}
                                                <p>
                                                        Monatliche Spenden helfen uns das Projekt auf eine solide Basis zu stellen
                                        {% if lang == "de" %}
                                                <p>
                                                        Monatliche Spenden helfen uns das Projekt auf eine solide Basis zu stellen


@@ -129,8 +132,9 @@
                                                        want to donate by using bank transfer.
                                                </p>
                                        {% end %}
                                                        want to donate by using bank transfer.
                                                </p>
                                        {% end %}

-                               </div>
+                               </section>

                        </div>
                </div>
                        </div>
                </div>

-       </section>
+       </div>
+       

 {% end block %}
 {% end block %}

diff --git a/templates/download.html b/templates/download.html
index e336458ff67a3279c3407c77efa4a0ac0da9cde2..68b24d5f40937582ff70f724214942a3d479c4e9 100644 (file)
--- a/templates/download.html
+++ b/templates/download.html
@@ -3,15 +3,17 @@
 {% block title %}{{ _("Download IPFire") }}{% end block %}
 
 {% block container %}
 {% block title %}{{ _("Download IPFire") }}{% end block %}
 
 {% block container %}

-       <div class="container features-content">
-               <section class="content col-12">
-                       <h3 class="headline mb-5">Download IP<strong>Fire</strong></h3>
-                       
-                       <div class="d-flex justify-content-center">
-                               {% module DownloadButton(release) %}
-                       </div>
-                       
-                       <h5 class="subheadline mt-5"><a href="//downloads.ipfire.org/release/{{ release.sname }}">{{ _("Other download options") }}</a></h5>
-               </section>
+       <div class="container">
+               <div class="row">
+                       <section id="download" class="features-content col-12">
+                               <h2 class="display-2 text-center">Download IP<strong>Fire</strong></h2>
+                               
+                               <div class="d-flex justify-content-center">
+                                       {% module DownloadButton(release) %}
+                               </div>
+                               
+                               <h5 class="subheadline mt-5"><a href="//downloads.ipfire.org/release/{{ release.sname }}">{{ _("Other download options") }}</a></h5>
+                       </section>
+               </div>

        </div>
 {% end block %}
        </div>
 {% end block %}

diff --git a/templates/modules/donation-input-box.html b/templates/modules/donation-input-box.html
index 235addae9e64123e317ea8ede8e3af9497fe5e69..d56e7e6d2b59ab441631d8b20c6a037a43c3dcfb 100644 (file)
--- a/templates/modules/donation-input-box.html
+++ b/templates/modules/donation-input-box.html
@@ -8,11 +8,11 @@
        <input type="hidden" name="no_shipping" value="1">
        <input type="hidden" name="bn" value="PP-DonationsBF:btn_donate_LG.gif:NonHosted">
 
        <input type="hidden" name="no_shipping" value="1">
        <input type="hidden" name="bn" value="PP-DonationsBF:btn_donate_LG.gif:NonHosted">
 

-       <div class="form-group">
+       <div class="form-group d-flex justify-content-center flex-column d-inline-flex">

                <label class="sr-only" for="InputAmount">{{ _("Amount") }}</label>
                <label class="sr-only" for="InputAmount">{{ _("Amount") }}</label>

-               <div class="input-group">
+               <div class="input-group d-flex flex-row-reverse justify-content-center">

                        <div class="input-group-addon">
                        <div class="input-group-addon">

-                               <select class="form-control" name="currency_code">
+                               <select class="form-control mx-3" name="currency_code">

                                        {% for c in currencies %}
                                                <option value="{{ c }}">
                                                        {% if c == "EUR" %}
                                        {% for c in currencies %}
                                                <option value="{{ c }}">
                                                        {% if c == "EUR" %}


@@ -33,6 +33,6 @@
                                name="amount" placeholder="{{ _("Amount") }}">
                </div>
 
                                name="amount" placeholder="{{ _("Amount") }}">
                </div>
 

-               <button type="submit" class="btn btn-danger btn-lg">{{ _("Donate with PayPal") }}</button>
+               <button type="submit" class="btn btn-lg btn-primary mt-3">{{ _("Donate with PayPal") }}</button>

        </div>
 </form>
        </div>
 </form>

diff --git a/templates/static/get-involved.html b/templates/static/get-involved.html
index acc59c04f1cece0a31433cf3822a325e9998c7ac..559aab2c5fd04ca59ae5079d47eb59224b1a8f3f 100644 (file)
--- a/templates/static/get-involved.html
+++ b/templates/static/get-involved.html
@@ -3,194 +3,189 @@
 {% block title %}{{ _("Get Involved") }}{% end block %}
 
 {% block container %}
 {% block title %}{{ _("Get Involved") }}{% end block %}
 
 {% block container %}

-       <div class="container features-content">
-               <section class="content col-12">
-                       <h3 class="headline mb-5">{{ _("Join the IPFire Community") }}</h3>
-                       
-                       <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="http://lists.ipfire.org" class="link-normal">
-                                               <span class="fa fa-4x fa-envelope-o"></span>
-                                               <h3>{{ _("Mailing Lists") }}</h3>
-                                       </a>
-                               </div>
-                       </div>
-               </section>
-               
-               <section class="content col-12">
-                       <h3 class="headline mb-5">{{ _("Contribute") }}</h3>
-                       
-                       <section id="community_support">                                
-                               <h4 class="secondHeadline">{{ _("Provide Community Support") }}</h4>
-                               <p class="copy">
-                                       {% if lang == "de" %}
-                                               Werde Teil der wundervollen Gemeinschaft von IPFire und helfe
-                                               Einsteigern bei ihren ersten Schritten. Bring dich ein in Diskussionen
-                                               rund um das Projekt in <a href="/chat">Chaträumen</a>, dem
-                                               <a href="//forum.ipfire.org">IPFire Forum</a>, und
-                                               den <a href="//lists.ipfire.org/">Mailinglisten</a>.
-                                       {% else %}
-                                               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>.
-                                       {% end %}
-                               </p>
+       <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="btn-toolbar">
-                                       <a class="btn btn-default" href="http://forum.ipfire.org/search.php?search_id=unanswered">
-                                               {{ _("Unanswered questions on the forums") }}
-                                       </a>
-                                       <a class="btn btn-default" href="/chat">{{ _("On our Jabber/IRC channels") }}</a>
+                               <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="http://lists.ipfire.org" class="link-normal">
+                                                       <span class="fa fa-4x fa-envelope-o"></span>
+                                                       <h3>{{ _("Mailing Lists") }}</h3>
+                                               </a>
+                                       </div>

                                </div>
                        </section>
                                </div>
                        </section>

-                       
-                       <div class="divider"></div>
-                               
-                       <section id="documentation">
-                               <h4 class="secondHeadline">{{ _("Improve our Documentation") }}</h4>
-                               <p class="copy">
-                                       {% if lang == "de" %}
-                                               Das <a href="//wiki.ipfire.org">IPFire Wiki</a> beinhaltet Dokumentation
-                                               über IPFire und beantwortet alle Fragen. Hast du etwas gefunden, das
-                                               undokumentiert, nicht vollständig ist oder Überarbeitung bedarf?
-                                               Logge dich ein und editiere gleich los.
-                                       {% else %}
-                                               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!
-                                       {% end %}
-                               </p>
-                               
-                               <a class="btn btn-default" href="http://wiki.ipfire.org">{{ _("IPFire Wiki") }}</a>
-                       </section>
+               </div>

                
                

-                       <div class="divider"></div>
-                       
-                       <section id="translation">
-                               <h4 class="secondHeadline">{{ _("Translate") }}</h4>
-                               <p class="copy">
-                                       {% if lang == "de" %}
-                                               IPFire wird in vielen Ländern der Welt eingesetzt.
-                                               Die Software zu übersetzen hilft dabei IPFire leichter
-                                               bedienbar zu machen. Trage dazu bei IPFire in eine
-                                               neue Sprache zu übersetzen, oder verbessere bestehende
-                                               Übersetzungen.
-                                       {% else %}
-                                               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.
-                                       {% end %}
-                               </p>
-                       </section>
-                       
-                       <div class="divider"></div>
-                       
-                       <section id="maintain">
-                               <h4 class="secondHeadline">{{ _("Maintain Packages") }}</h4>
-                               <p class="copy">
-                                       {% if lang == "de" %}
-                                               Werde Experte in einem Subsystem der IPFire-Distribution und
-                                               helfe dabei Funktionen auf aktuellem Stand zu erhalten und
-                                               Bugs zu beseitigen.
-                                               Die Wartung von Paketen ist ein essentieller Teil des Projekts
-                                               und unerlässlich, um die großartige Stabilität und Sicherheit
-                                               von IPFire zu erhalten, die es heute hat.
-                                       {% else %}
-                                               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.
-                                       {% end %}
-                               </p>
+               <div class="row">                       
+                       <section class="col-12">
+                               <h2 class="display-2 text-center">{{ _("Contribute") }}</h2>

                                
                                

-                               <div class="btn-toolbar">
-                                       <a class="btn btn-default" href="http://wiki.ipfire.org/devel/submit-patches">{{ _("Submit Patches") }}</a>
-                                       <a class="btn btn-default" href="https://pakfire.ipfire.org/">{{ _("Pakfire Build Service") }}</a>
+                               <div class="row mb-6">                  
+                                       <section id="community_support" class="col-5">                          
+                                               <h4>{{ _("Provide Community Support") }}</h4>
+                                               <p>
+                                                       {% if lang == "de" %}
+                                                               Werde Teil der wundervollen Gemeinschaft von IPFire und helfe
+                                                               Einsteigern bei ihren ersten Schritten. Bring dich ein in Diskussionen
+                                                               rund um das Projekt in <a href="/chat">Chaträumen</a>, dem
+                                                               <a href="//forum.ipfire.org">IPFire Forum</a>, und
+                                                               den <a href="//lists.ipfire.org/">Mailinglisten</a>.
+                                                       {% else %}
+                                                               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>.
+                                                       {% end %}
+                                               </p>
+                                               
+                                                       <a class="btn btn-default" href="http://forum.ipfire.org/search.php?search_id=unanswered">
+                                                               {{ _("Unanswered questions on the forums") }}
+                                                       </a>
+                                                       <a class="btn btn-default" href="/chat">{{ _("On our Jabber/IRC channels") }}</a>
+                                       </section>
+                                                                       
+                                       <section id="documentation" class="col-5 offset-2">
+                                               <h4>{{ _("Improve our Documentation") }}</h4>
+                                               <p>
+                                                       {% if lang == "de" %}
+                                                               Das <a href="//wiki.ipfire.org">IPFire Wiki</a> beinhaltet Dokumentation
+                                                               über IPFire und beantwortet alle Fragen. Hast du etwas gefunden, das
+                                                               undokumentiert, nicht vollständig ist oder Überarbeitung bedarf?
+                                                               Logge dich ein und editiere gleich los.
+                                                       {% else %}
+                                                               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!
+                                                       {% end %}
+                                               </p>
+                                               
+                                               <a class="btn btn-default" href="http://wiki.ipfire.org">{{ _("IPFire Wiki") }}</a>
+                                       </section>

                                </div>
                                </div>

-                       </section>

                        
                        

-                       <div class="divider"></div>
-                       
-                       <section id="bugs">
-                               <h4 class="secondHeadline">{{ _("Report & Resolve Bugs") }}</h4>
-                               <p class="copy">
-                                       {% if lang == "de" %}
-                                               Solltest du einen Fehler in IPFire gefunden haben, nimm dir einen Moment Zeit, um
-                                               ihn zu melden. Natürlich freuen wir uns über Lösungen für bereits gemeldete Bugs.
-                                       {% else %}
-                                               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.
-                                       {% end %}
-                               </p>
-                               
-                               <div class="btn-toolbar">
-                                       <a class="btn btn-default" href="http://bugzilla.ipfire.org">{{ _("IPFire Bugzilla") }}</a>
-                                       <a class="btn btn-default" href="http://wiki.ipfire.org/devel/bugzilla">{{ _("Dealing with bug reports") }}</a>
+                               <div class="row mb-6">                          
+                                       <section id="translation" class="col-5">
+                                               <h4>{{ _("Translate") }}</h4>
+                                               <p>
+                                                       {% if lang == "de" %}
+                                                               IPFire wird in vielen Ländern der Welt eingesetzt.
+                                                               Die Software zu übersetzen hilft dabei IPFire leichter
+                                                               bedienbar zu machen. Trage dazu bei IPFire in eine
+                                                               neue Sprache zu übersetzen, oder verbessere bestehende
+                                                               Übersetzungen.
+                                                       {% else %}
+                                                               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.
+                                                       {% end %}
+                                               </p>
+                                       </section>
+                                       
+                                       
+                                       <section id="maintain" class="col-5 offset-2">
+                                               <h4>{{ _("Maintain Packages") }}</h4>
+                                               <p>
+                                                       {% if lang == "de" %}
+                                                               Werde Experte in einem Subsystem der IPFire-Distribution und
+                                                               helfe dabei Funktionen auf aktuellem Stand zu erhalten und
+                                                               Bugs zu beseitigen.
+                                                               Die Wartung von Paketen ist ein essentieller Teil des Projekts
+                                                               und unerlässlich, um die großartige Stabilität und Sicherheit
+                                                               von IPFire zu erhalten, die es heute hat.
+                                                       {% else %}
+                                                               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.
+                                                       {% end %}
+                                               </p>
+                                               
+                                               <a class="btn btn-default" href="http://wiki.ipfire.org/devel/submit-patches">{{ _("Submit Patches") }}</a>
+                                               <a class="btn btn-default" href="https://pakfire.ipfire.org/">{{ _("Pakfire Build Service") }}</a>
+                                       </section>

                                </div>
                                </div>

-                       </section>
-                       
-                       <div class="divider"></div>
-                       
-                       <section id="infrastructure">
-                               <h4 class="secondHeadline">{{ _("Provide Infrastructure") }}</h4>
-                               <p class="copy">
-                                       {% if lang == "de" %}
-                                               Das IPFire-Projekt unterhält eine Menge Infrastruktur für verschiedene Dienste für die Nutzer.
-                                               Für schnelle Downloads und eine hohe Zuverlässigkeit der Dienste zu gewährleisten arbeitet
-                                               das IPFire Infrastructure-Team, das sich über Unterstützung freut.
-                                       {% else %}
-                                               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.
-                                       {% end %}
-                               </p>

                                
                                

-                               <a class="btn btn-default" href="http://wiki.ipfire.org/en/project/mirror">{{ _("Host a mirror") }}</a>
-                       </section>
-                       
-                       <div class="divider"></div>
-                       
-                       <section id="donate">
-                               <h4 class="secondHeadline">{{ _("Donate") }}</h4>
-                               <p class="copy">
-                                       {% if lang == "de" %}
-                                               Die Unterstützung vieler Freiwillige, die zur Entwicklung oder anderen
-                                               Bereichen des Projekts beitragen ist unerlässlich für den Erfolg dieses
-                                               Projekts.
-                                               Wenn du kein Experte im Schreiben von Dokumentation, oder Technologie bist,
-                                               aber trotzdem zum Projekt beitragen möchtest, kannst du die Arbeit anderer
-                                               finanziell unterstützen, um laufende Kosten zu decken.
-                                       {% else %}
-                                               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.
-                                       {% end %}
-                               </p>
+                               <div class="row mb-6">                          
+                                       <section id="bugs" class="col-5">
+                                               <h4>{{ _("Report & Resolve Bugs") }}</h4>
+                                               <p>
+                                                       {% if lang == "de" %}
+                                                               Solltest du einen Fehler in IPFire gefunden haben, nimm dir einen Moment Zeit, um
+                                                               ihn zu melden. Natürlich freuen wir uns über Lösungen für bereits gemeldete Bugs.
+                                                       {% else %}
+                                                               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.
+                                                       {% end %}
+                                               </p>
+                                               
+                                               <a class="btn btn-default" href="http://bugzilla.ipfire.org">{{ _("IPFire Bugzilla") }}</a>
+                                               <a class="btn btn-default" href="http://wiki.ipfire.org/devel/bugzilla">{{ _("Dealing with bug reports") }}</a>
+                                       </section>
+                                       
+                                       <section id="infrastructure" class="col-5 offset-2">
+                                               <h4>{{ _("Provide Infrastructure") }}</h4>
+                                               <p>
+                                                       {% if lang == "de" %}
+                                                               Das IPFire-Projekt unterhält eine Menge Infrastruktur für verschiedene Dienste für die Nutzer.
+                                                               Für schnelle Downloads und eine hohe Zuverlässigkeit der Dienste zu gewährleisten arbeitet
+                                                               das IPFire Infrastructure-Team, das sich über Unterstützung freut.
+                                                       {% else %}
+                                                               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.
+                                                       {% end %}
+                                               </p>
+                                               
+                                               <a class="btn btn-default" href="http://wiki.ipfire.org/en/project/mirror">{{ _("Host a mirror") }}</a>
+                                       </section>
+                               </div>

                                
                                

-                               <a class="btn btn-default" href="/donate">{{ _("Donate") }}</a>
+                               <div class="row justify-content-center mb-6">                                                   
+                                       <section id="donate" class="col-5 text-center">
+                                               <h4>{{ _("Donate") }}</h4>
+                                               <p>
+                                                       {% if lang == "de" %}
+                                                               Die Unterstützung vieler Freiwillige, die zur Entwicklung oder anderen
+                                                               Bereichen des Projekts beitragen ist unerlässlich für den Erfolg dieses
+                                                               Projekts.
+                                                               Wenn du kein Experte im Schreiben von Dokumentation, oder Technologie bist,
+                                                               aber trotzdem zum Projekt beitragen möchtest, kannst du die Arbeit anderer
+                                                               finanziell unterstützen, um laufende Kosten zu decken.
+                                                       {% else %}
+                                                               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.
+                                                       {% end %}
+                                               </p>
+                                               
+                                               <a class="btn btn-default" href="/donate">{{ _("Donate") }}</a>
+                                       </section>
+                               </div>

                        </section>
                        </section>

-               </section>
+               </div>

        </div>
        
 {% end block %}
        </div>
        
 {% end block %}

diff --git a/templates/static/get-support.html b/templates/static/get-support.html
index ec3b4f332a4f677d7a8050c846a9908706c4285a..002ec4e26ec1b20f837256e4dff1ef445d7aab4a 100644 (file)
--- a/templates/static/get-support.html
+++ b/templates/static/get-support.html
@@ -3,68 +3,72 @@
 {% block title %}{{ _("Get Support") }}{% end block %}
 
 {% block container %}
 {% block title %}{{ _("Get Support") }}{% end block %}
 
 {% block container %}

-       <div class="container features-content">
-               <section class="content col-12">
-                       <h3 class="headline mb-5">{{ _("Get Support") }}</h3>
-                       
-                       <div class="row m-5">
-                               <div class="col-md-4 text-center">
-                                       <a href="//wiki.ipfire.org" class="link-normal">
-                                               <span class="fa fa-4x fa-pencil-square-o"></span>
-                                               <h3>{{ _("Documentation") }}</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 class="container">
+               <div class="row">
+                       <section class="features-content col-12">
+                               <h2 class="display-2 text-center">{{ _("Get Support") }}</h2>
+                               
+                               <div class="row m-5">
+                                       <div class="col-md-4 text-center">
+                                               <a href="//wiki.ipfire.org" class="link-normal">
+                                                       <span class="fa fa-4x fa-pencil-square-o"></span>
+                                                       <h3>{{ _("Documentation") }}</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="/chat" class="link-normal">
+                                                       <span class="fa fa-4x fa-wechat"></span>
+                                                       <h3>{{ _("Chat") }}</h3>
+                                               </a>
+                                       </div>

                                </div>
                                </div>

-       
-                               <div class="col-md-4 text-center">
-                                       <a href="/chat" class="link-normal">
-                                               <span class="fa fa-4x fa-wechat"></span>
-                                               <h3>{{ _("Chat") }}</h3>
+                       </section>
+               </div>
+               
+               <div class="row">               
+                       <section id="professinal" class="features-content col-12">
+                               <h3 class="headline mb-5">{{ _("Get Professional Support") }}</h3>
+                               
+                               <p class="lead">
+                                       {% if lang == "de" %}
+                                               <a href="//www.lightningwirelabs.com">Lightning Wire Labs</a>
+                                               bietet professionelle Supportdienstleistungen rund um IPFire für
+                                               Unternehmen an.
+                                       {% else %}
+                                               <a href="//www.lightningwirelabs.com">Lightning Wire Labs</a>
+                                               provides professional support services for companies that use IPFire.
+                                       {% end %}
+                               </p>
+               
+                               <p class="lead">
+                                       {% if lang == "de" %}
+                                               Das Entwicklerteam erarbeitet individuelle Lösungen basierend auf
+                                               IPFire und neue Funktionen. Bei der Planung von sicheren Netzwerken
+                                               und der Integration von IPFire stehen sie unterstützend zur Seite.
+                                       {% else %}
+                                               Their team of developers implements custom solutions based on IPFire
+                                               and carries out development of new features. They will help you
+                                               with designing a secure network that is tailored to the specific
+                                               needs of your business and support you with the integration of
+                                               IPFire.
+                                       {% end %}
+                               </p>
+                               
+                               <div class="d-flex justify-content-center">
+                                       <a class="btn btn-lg mt-5" href="//www.lightningwirelabs.com">
+                                               {{ _("Go to Lightning Wire Labs") }}

                                        </a>
                                </div>
                                        </a>
                                </div>

-                       </div>
-               </section>
-                       
-               <section id="professinal" class="content col-12">
-                       <h3 class="headline mb-5">{{ _("Get Professional Support") }}</h3>
-                       
-                       <p class="lead">
-                               {% if lang == "de" %}
-                                       <a href="//www.lightningwirelabs.com">Lightning Wire Labs</a>
-                                       bietet professionelle Supportdienstleistungen rund um IPFire für
-                                       Unternehmen an.
-                               {% else %}
-                                       <a href="//www.lightningwirelabs.com">Lightning Wire Labs</a>
-                                       provides professional support services for companies that use IPFire.
-                               {% end %}
-                       </p>
-       
-                       <p class="lead">
-                               {% if lang == "de" %}
-                                       Das Entwicklerteam erarbeitet individuelle Lösungen basierend auf
-                                       IPFire und neue Funktionen. Bei der Planung von sicheren Netzwerken
-                                       und der Integration von IPFire stehen sie unterstützend zur Seite.
-                               {% else %}
-                                       Their team of developers implements custom solutions based on IPFire
-                                       and carries out development of new features. They will help you
-                                       with designing a secure network that is tailored to the specific
-                                       needs of your business and support you with the integration of
-                                       IPFire.
-                               {% end %}
-                       </p>
-                       
-                       <div class="d-flex justify-content-center">
-                               <a class="btn btn-lg mt-5" href="//www.lightningwirelabs.com">
-                                       {{ _("Go to Lightning Wire Labs") }}
-                               </a>
-                       </div>
-               </section>
+                       </section>
+               </div>

        </div>
 
 {% end block %}
        </div>
 
 {% end block %}