]> git.ipfire.org Git - ipfire.org.git/commitdiff
about.html: meet the team-columns, download-button, list of features designed
authorRico Hoppe <rico.hoppe@ipfire.org>
Fri, 7 Apr 2023 00:08:29 +0000 (00:08 +0000)
committerRico Hoppe <rico.hoppe@ipfire.org>
Fri, 7 Apr 2023 00:08:29 +0000 (00:08 +0000)
src/templates/about.html
src/templates/static/legal.html

index 838582b724ec1025218ed68e1d0ca238c51d07da..7643aaca27b074e7988683d2bcf9fc594dd02ee8 100644 (file)
 
                        {% set core_team = backend.groups.get_by_gid("core-team") %}
 
-                       <div class="columns row-cols-1 row-cols-md-{{ len(core_team) // 2 }} row-cols-lg-{{ len(core_team) }} justify-content-center my-5"> <!-- Berechnungszeug nochmal fragen und so -->
+                       <div class="columns is-one-third is-multiline"> <!-- Berechnungszeug nochmal fragen und so -->
                                {% for account in sorted(core_team, key=lambda a: a.created_at) %}
-                                       <div class="col mb-4">
-                                               <div class="row justify-content-center mb-3">
-                                                       <div class="col-6 col-md-10">
-                                                               <figure class="image is-256x256">
-                                                                       <img class="is-rounded" src="{{ account.avatar_url(size=256) }}">
-                                                               </figure>
-                                                       </div>
-                                               </div>
+                                       <div class="column">
+                                               <figure class="image is-256x256">
+                                                       <img class="is-rounded" src="{{ account.avatar_url(size=256) }}">
+                                               </figure>
 
-                                               <h5 class="has-text-centered has-text-weight-bold">{{ account.name or account.nickname }}</h5>
+                                               <h4 class="title is-4 has-text-centered has-text-weight-bold">{{ account.name or account.nickname }}</h5>
                                        </div>
                                {% end %}
                        </div>
                        ] %}
 
                        {% if team %}
-                               <div class="columns row-cols-1 row-cols-md-2 row-cols-lg-4">
+                               <div class="columns is-one-fifth is-multiline">
                                        {% for account in sorted(team, key=lambda a: a.created_at) %}
-                                               <div class="col mb-4">
-                                                       <div class="row align-items-center">
-                                                               <div class="col-2 col-md-3">
-                                                                       <figure class="image is-64x64">
-                                                                               <img class="is-rounded" src="{{ account.avatar_url(size=64) }}">
-                                                                       </figure>
-                                                               </div>
-
-                                                               <div class="col">
-                                                                       <h6 class="has-text-weight-bold">{{ account.name or account.nickname }}</h6>
-                                                               </div>
-                                                       </div>
+                                               <div class="column is-2">
+                                                       <figure class="image is-64x64">
+                                                               <img class="is-rounded" src="{{ account.avatar_url(size=64) }}">
+                                                       </figure>
+
+                                                       <h6 class="title is-6 has-text-weight-bold">{{ account.name or account.nickname }}</h6>
                                                </div>
                                        {% end %}
                                </div>
        </div>
 
        <div class="container">
-               <div class="block">
-                       <h3 class="title is-3">{{ _("Features") }}</h3>
-
-                       <div class="columns">
-                               <div class="column is-one-fourth">
-                                       IPFire is not only an app that you install, it is a whole operating
-                                       system based on Linux, hardened and tuned to the maximum to serve
-                                       as a firewall.
-                                       Regular updates help keeping even the hardest kind of hacker out.
-                               </div>
+               <section class="section">
+                       <div class="block">
+                               <h3 class="title is-3">{{ _("Features") }}</h3>
+
+                               <div class="columns">
+                                       <div class="column is-one-fourth">
+                                               IPFire is not only an app that you install, it is a whole operating
+                                               system based on Linux, hardened and tuned to the maximum to serve
+                                               as a firewall.
+                                               Regular updates help keeping even the hardest kind of hacker out.
+                                       </div>
 
-                               <div class="column">
-                                       IPFire is being managed over a web user interface that is easy
-                                       to use, yet powerful.
-                                       Every feature is only one click away. Our detailed documentation
-                                       tells you how.
-                               </div>
+                                       <div class="column">
+                                               IPFire is being managed over a web user interface that is easy
+                                               to use, yet powerful.
+                                               Every feature is only one click away. Our detailed documentation
+                                               tells you how.
+                                       </div>
 
-                               <div class="column">
-                                       The stateful inspection firewall that is working inside IPFire
-                                       is one of the fastest of its kind.
-                                       Configuration of even complex rulesets becomes easy with
-                                       groups for hosts and services on the network and help you
-                                       to keep things in order, even when it gets complicated.
-                               </div>
+                                       <div class="column">
+                                               The stateful inspection firewall that is working inside IPFire
+                                               is one of the fastest of its kind.
+                                               Configuration of even complex rulesets becomes easy with
+                                               groups for hosts and services on the network and help you
+                                               to keep things in order, even when it gets complicated.
+                                       </div>
 
-                               <div class="column">
-                                        Network segmentation is the key to a secure network.
-                                        IPFire allows setting up a demilitarized zone (DMZ) on your
-                                        network to control any threats from services that are being hosted
-                                        on the internet.
+                                       <div class="column">
+                                               Network segmentation is the key to a secure network.
+                                               IPFire allows setting up a demilitarized zone (DMZ) on your
+                                               network to control any threats from services that are being hosted
+                                               on the internet.
+                                       </div>
                                </div>
                        </div>
-               </div>
+               </section>
 
                <!-- any screenshots go here -->
+               <section class="section is-medium">
+                       <div class="block">
+                               <button class="button is-fullwidth is-large is-primary">
+                                       <a href="/download" class="is-capitalized">
+                                               {{ _("DOWNLOAD IPFIRE NOW. IT'S FREE!") }}
+                                       </a>
+                               </button>
+                       </div>
+               </section>
 
-               <div class="block">
-                       <button class="button is-fullwidth is-medium is-primary">
-                               <a href="/download">
-                                       {{ _("Download IPFire now. It's free!") }}
-                               </a>
-                       </button>
-               </div>
-
-<!--   <div class="block">
+               <div class="block">                     <!-- Irgendwie fehlen heir Bullet Points ... Müssten laut Doc bei <ul> allerdings dabei sein-->
                        <div class="columns">
-                               <div class="column is-half">
+                               <div class="column is-one-third">
                                        <h6 class="title is-6">Network Security</h6>
 
                                        <ul>
                                        </ul>
                                </div>
 
-                               <div class="column is-half">
+                               <div class="column is-one-third">
                                        <h6 class="title is-6">WAN Features</h6>
 
                                        <ul>
                                        </ul>
                                </div>
 
-                               <div class="column is-half">
+                               <div class="column is-one-third">
                                        <h6 class="title is-6">Intrusion Prevention System</h6>
 
                                        <ul>
                                        </ul>
                                </div>
                        </div>
-               </div> -->
+               </div>
        </div>
 {% end block %}
index f75de1294ff64ef0d144016e86fb813911052448..d15bccf7e9719d8a5547ab2a3e95186d59340829 100644 (file)
@@ -2,10 +2,10 @@
 
 {% block title %}{{ _("Legal") }}{% end block %}
 
-{% block content %}
+{% block container %}
        <section class="hero has-background-primary-light">
                <div class="hero-body">
-                       <p class="title">
+                       <div class="container">
                                <nav class="breadcrumb is-medium" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
                                                </li>
                                        </ul>
                                </nav>
-                       </p>
-                       <h1 class="title is-1">{{ _("Legal") }}</h1>
+                               <h1 class="title is-1">{{ _("Legal") }}</h1>
+                       </div>
                </div>
        </section>
+       <div class="container">
+               <section class="section">
+                       <div class="block">
+                               <p class="is-size-5">
+                                       Information in accordance with section 5 TMG and
+                                       persons responsible for content in accordance with 55 Section. 2 RStV
+                               </p>
+                       </div>
 
-       <section class="section">
-               <div class="block">
-                       <p class="is-size-5">
-                               Information in accordance with section 5 TMG and
-                               persons responsible for content in accordance with 55 Section. 2 RStV
-                       </p>
-               </div>
+                       <div class="block">
+                               <address>
+                                       <strong>The IPFire Project</strong>
+                                       <br>
+                                       c/o Lightning Wire Labs GmbH
+                                       <br>
+                                       Gerhardstraße 8
+                                       <br>
+                                       45711 Datteln
+                                       <br>
+                                       GERMANY
+                               </address>
+                       </div>
+               </section>
 
-               <div class="block">
-                       <address>
-                               <strong>The IPFire Project</strong>
-                               <br>
-                               c/o Lightning Wire Labs GmbH
-                               <br>
-                               Gerhardstraße 8
-                               <br>
-                               45711 Datteln
-                               <br>
-                               GERMANY
-                       </address>
-               </div>
-       </section>
+               <section class="section">
+                       <div class="block">
+                               <h3 class="title is-3 has-text-weight-semibold">Disclaimer</h3>
+                               <h5 class="title is-5">Accountability for content</h5>
+                                       <p>
+                                               The contents of our pages have been created with the utmost care. However,
+                                               we cannot guarantee the contents' accuracy, completeness or topicality.
+                                               According to statutory provisions, we are furthermore responsible for our
+                                               own content on these web pages. In this context, please note that we are
+                                               accordingly not obliged to monitor merely the transmitted or saved information
+                                               of third parties, or investigate circumstances pointing to illegal activity.
+                                               Our obligations to remove or block the use of information under generally
+                                               applicable laws remain unaffected by this as per §§ 8 to 10 of the Telemedia
+                                               Act (TMG).
+                                       </p>
+                       </div>
 
-       <section class="section">
-               <div class="block">
-                       <h3 class="title is-3 has-text-weight-semibold">Disclaimer</h3>
-                       <h5 class="title is-5">Accountability for content</h5>
-                               <p>
-                                       The contents of our pages have been created with the utmost care. However,
-                                       we cannot guarantee the contents' accuracy, completeness or topicality.
-                                       According to statutory provisions, we are furthermore responsible for our
-                                       own content on these web pages. In this context, please note that we are
-                                       accordingly not obliged to monitor merely the transmitted or saved information
-                                       of third parties, or investigate circumstances pointing to illegal activity.
-                                       Our obligations to remove or block the use of information under generally
-                                       applicable laws remain unaffected by this as per §§ 8 to 10 of the Telemedia
-                                       Act (TMG).
-                               </p>
-               </div>
+                       <div class="block">
+                               <h5 class="title is-5">Accountability for links</h5>
+                                       <p>
+                                               Responsibility for the content of external links (to web pages of third parties)
+                                               lies solely with the operators of the linked pages. No violations were evident
+                                               to us at the time of linking. Should any legal infringement become known to us,
+                                               we will remove the respective link immediately.
+                                       </p>
+                       </div>
 
-               <div class="block">
-                       <h5 class="title is-5">Accountability for links</h5>
-                               <p>
-                                       Responsibility for the content of external links (to web pages of third parties)
-                                       lies solely with the operators of the linked pages. No violations were evident
-                                       to us at the time of linking. Should any legal infringement become known to us,
-                                       we will remove the respective link immediately.
-                               </p>
-               </div>
+                       <div class="block">
+                               <h5 class="title is-5">Copyright</h5>
+                                       <p>
+                                               Our web pages and their contents are subject to German copyright law. Unless
+                                               expressly permitted by law (§ 44a et seq. of the copyright law), every form
+                                               of utilizing, reproducing or processing works subject to copyright protection
+                                               on our web pages requires the prior consent of the respective owner of the rights.
+                                               Individual reproductions of a work are allowed only for private use, so must
+                                               not serve either directly or indirectly for earnings. Unauthorized utilization
+                                               of copyrighted works is punishable (§ 106 of the copyright law).
+                                       </p>
+                       </div>
+               </section>
+               <section class="section">
 
-               <div class="block">
-                       <h5 class="title is-5">Copyright</h5>
-                               <p>
-                                       Our web pages and their contents are subject to German copyright law. Unless
-                                       expressly permitted by law (§ 44a et seq. of the copyright law), every form
-                                       of utilizing, reproducing or processing works subject to copyright protection
-                                       on our web pages requires the prior consent of the respective owner of the rights.
-                                       Individual reproductions of a work are allowed only for private use, so must
-                                       not serve either directly or indirectly for earnings. Unauthorized utilization
-                                       of copyrighted works is punishable (§ 106 of the copyright law).
-                               </p>
-               </div>
-       </section>
-       <section class="section">
+                       <div class="block">
+                               <h3 class="title is-3">Privacy Statement</h3>
+                               <h5 class="title is-5">General</h5>
+                                       <p>
+                                               Your personal data (e.g. title, name, house address, e-mail address, phone number,
+                                               bank details, credit card number) are processed by us only in accordance with the
+                                               provisions of German data privacy laws. The following provisions describe the type,
+                                               scope and purpose of collecting, processing and utilizing personal data.
+                                               This data privacy policy applies only to our web pages. If links on our pages route
+                                               you to other pages, please inquire there about how your data are handled in such cases.
+                                       </p>
+                       </div>
 
-               <div class="block">
-                       <h3 class="title is-3">Privacy Statement</h3>
-                       <h5 class="title is-5">General</h5>
-                               <p>
-                                       Your personal data (e.g. title, name, house address, e-mail address, phone number,
-                                       bank details, credit card number) are processed by us only in accordance with the
-                                       provisions of German data privacy laws. The following provisions describe the type,
-                                       scope and purpose of collecting, processing and utilizing personal data.
-                                       This data privacy policy applies only to our web pages. If links on our pages route
-                                       you to other pages, please inquire there about how your data are handled in such cases.
-                               </p>
-               </div>
+                       <div class="block">
+                               <h5 class="title is-5">Inventory data</h5>
+                                               <ul>
+                                                       <li>
+                                                               1. Your personal data, insofar as these are necessary for this contractual
+                                                               relationship (inventory data) in terms of its establishment, organization of
+                                                               content and modifications, are used exclusively for fulfilling the contract.
+                                                               For goods to be delivered, for instance, your name and address must be relayed
+                                                               to the supplier of the goods.
+                                                       </li>
+                                                       <li>
+                                                               2. Without your explicit consent or a legal basis, your personal data are not passed
+                                                               on to third parties outside the scope of fulfilling this contract.
+                                                               After completion of the contract, your data are blocked against further use.
+                                                               After expiry of deadlines as per tax-related and commercial regulations, these data
+                                                               are deleted unless you have expressly consented to their further use.
+                                                       </li>
+                                               </ul>
+                       </div>
 
-               <div class="block">
-                       <h5 class="title is-5">Inventory data</h5>
+                       <div class="block">
+                               <h5 class="title is-5">Information about cookies</h5>
                                        <ul>
                                                <li>
-                                                       1. Your personal data, insofar as these are necessary for this contractual
-                                                       relationship (inventory data) in terms of its establishment, organization of
-                                                       content and modifications, are used exclusively for fulfilling the contract.
-                                                       For goods to be delivered, for instance, your name and address must be relayed
-                                                       to the supplier of the goods.
+                                                       1. To optimize our web presence, we use cookies. These are small text files stored
+                                                       in your computer's main memory. These cookies are deleted after you close the browser.
+                                                       Other cookies remain on your computer (long-term cookies) and permit its recognition
+                                                       on your next visit. This allows us to improve your access to our site.
                                                </li>
                                                <li>
-                                                       2. Without your explicit consent or a legal basis, your personal data are not passed
-                                                       on to third parties outside the scope of fulfilling this contract.
-                                                       After completion of the contract, your data are blocked against further use.
-                                                       After expiry of deadlines as per tax-related and commercial regulations, these data
-                                                       are deleted unless you have expressly consented to their further use.
+                                                       2. You can prevent storage of cookies by choosing a "disable cookies" option in your
+                                                       browser settings. But this can limit the functionality of our Internet offers as a result.
                                                </li>
                                        </ul>
-               </div>
-
-               <div class="block">
-                       <h5 class="title is-5">Information about cookies</h5>
-                               <ul>
-                                       <li>
-                                               1. To optimize our web presence, we use cookies. These are small text files stored
-                                               in your computer's main memory. These cookies are deleted after you close the browser.
-                                               Other cookies remain on your computer (long-term cookies) and permit its recognition
-                                               on your next visit. This allows us to improve your access to our site.
-                                       </li>
-                                       <li>
-                                               2. You can prevent storage of cookies by choosing a "disable cookies" option in your
-                                               browser settings. But this can limit the functionality of our Internet offers as a result.
-                                       </li>
-                               </ul>
-               </div>
+                       </div>
 
-               <div class="block">
-                       <h5 class="title is-5">Newsletter</h5>
-                               <p>
-                                       Following subscription to the newsletter, your e-mail address is used for our own
-                                       advertising purposes until you cancel the newsletter again.
-                                       Cancellation is possible at any time.
-                                       The following consent has been expressly granted by you separately, or possibly in the
-                                       course of an ordering process.
-                                       You may revoke your consent at any time with future effect.
-                                       If you no longer want to receive the newsletter, then unsubscribe.
-                               </p>
-               </div>
+                       <div class="block">
+                               <h5 class="title is-5">Newsletter</h5>
+                                       <p>
+                                               Following subscription to the newsletter, your e-mail address is used for our own
+                                               advertising purposes until you cancel the newsletter again.
+                                               Cancellation is possible at any time.
+                                               The following consent has been expressly granted by you separately, or possibly in the
+                                               course of an ordering process.
+                                               You may revoke your consent at any time with future effect.
+                                               If you no longer want to receive the newsletter, then unsubscribe.
+                                       </p>
+                       </div>
 
-               <div class="block">
-                       <h5 class="title is-5">Disclosure</h5>
-                               <p>
-                                       According to the Federal Data Protection Act, you have a right to free-of-charge
-                                       information about your stored data, and possibly entitlement to correction, blocking
-                                       or deletion of such data.
-                                       Inquiries can be directed to <a class="has-text-primary" href="mailto:legal@ipfire.org">legal@ipfire.org</a>.
-                               </p>
-               </div>
-       </section>
+                       <div class="block">
+                               <h5 class="title is-5">Disclosure</h5>
+                                       <p>
+                                               According to the Federal Data Protection Act, you have a right to free-of-charge
+                                               information about your stored data, and possibly entitlement to correction, blocking
+                                               or deletion of such data.
+                                               Inquiries can be directed to <a class="has-text-primary" href="mailto:legal@ipfire.org">legal@ipfire.org</a>.
+                                       </p>
+                       </div>
+               </section>
+       </div>
 {% end block %}
\ No newline at end of file