]> git.ipfire.org Git - ipfire.org.git/blobdiff - templates/base.html
add spacing and menu on mobile
[ipfire.org.git] / templates / base.html
index 8cb9e9061edfe6b97a3f61a2ccdc0d98a71516fd..c420810852d2bd3ecc778e9cc98e439727d85b41 100644 (file)
                <meta name="description" content="{{ _("IPFire is a free firewall distribution based on Linux.") }}" />
 
                <!-- styling stuff -->
-               <link rel="stylesheet" type="text/css" href="{{ static_url("css/bootstrap.min.css") }}" />
-               <link rel="stylesheet" type="text/css" href="{{ static_url("css/font-awesome.min.css") }}" />
                <link rel="stylesheet" type="text/css" href="{{ static_url("css/style.css") }}" />
-               <link href="//fonts.googleapis.com/css?family=Ubuntu:400,700" rel="stylesheet" type="text/css">
+
                <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
                {% if rss_url %}
        </head>
 
        <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
-               <div class="navbar navbar-custom navbar-fixed-top" role="navigation">
-                       <div class="container">
-                               <div class="navbar-header page-scroll">
-                                       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
-                                               <span class="fa fa-bars"></span>
+               
+               <div class="fixed-top">
+                       <div class="container d-flex justify-content-between">
+                               <nav class="navbar navbar-toggleable-md align-items-md-start">
+                                       <button class="navbar-toggler navbar-toggler-left pt-4" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+                                               <svg width="18" height="12" viewBox="0 0 18 12" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M-3-6h24v24H-3z"/><path d="M0 12h18v-2H0v2zm0-5h18V5H0v2zm0-7v2h18V0H0z" fill="#000"/></g></svg>
+                                               <div class="visible-md-up menu-text">Menu</div>
                                        </button>
-                                       <span class="navbar-brand">
-                                               <img class="navbar-brand-logo" src="{{ static_url("images/tux/ipfire_tux_32x32.png") }}" alt="IPFire Logo">
-                                               <a href="/">
-                                                       {% if hostname in ("www.ipfire.org", "dev.ipfire.org") %}
-                                                               {{ _("IPFire") }}
-                                                       {% elif hostname in ("planet.ipfire.org", "planet.dev.ipfire.org") %}
-                                                               {{ _("IPFire Planet") }} &nbsp;
-                                                               <span class="text-muted">{{ _("The Blog of the IPFire Team") }}</span>
-                                                       {% elif hostname in ("wishlist.ipfire.org", "wishlist.dev.ipfire.org") %}
-                                                               {{ _("IPFire Wishlist") }} &nbsp;
-                                                               <span class="text-muted">{{ _("The IPFire Crowd-Funding Platform") }}</span>
-                                                       {% else %}
-                                                               {{ hostname }}
-                                                       {% end %}
-                                               </a>
-                                       </span>
-                               </div>                                  
-                               <div class="collapse navbar-collapse navbar-right navbar-main-collapse" id="navbar">
-                                       {% block menu %}
-                                               {% module Menu() %}
-                                       {% end block %}
+                                       
+                                       <a class="navbar-brand align-self-center" href="/">
+                                               <img src="http://static.ipfire:8891/img/ipfire-tux.png" alt="IPFire Tux" height="40px" />
+                                               {% if hostname in ("www.ipfire.org", "dev.ipfire.org") %}
+                                                       {{ _("IPFire") }}
+                                               {% elif hostname in ("planet.ipfire.org", "planet.dev.ipfire.org") %}
+                                                       {{ _("IPFire Planet") }} &nbsp;
+                                                       <span class="text-muted">{{ _("The Blog of the IPFire Team") }}</span>
+                                               {% elif hostname in ("wishlist.ipfire.org", "wishlist.dev.ipfire.org") %}
+                                                       {{ _("IPFire Wishlist") }} &nbsp;
+                                                       <span class="text-muted">{{ _("The IPFire Crowd-Funding Platform") }}</span>
+                                               {% else %}
+                                                       {{ hostname }}
+                                               {% end %}
+                                       </a>
+                                       
+                                       <div id="navbarSupportedContent" class="navbar-collapse collapse d-lg-flex justify-content-lg-end pt-lg-2">
+                                               {% block menu %}
+                                                       {% module Menu() %}
+                                               {% end block %}
+                                       </div>
+                               </nav>
+                               <div class="align-self-start hidden-md-down">
+                                       <a class="btn btn-red900 btn-sm mt-5" href="/donate"><svg width="20" height="19" viewBox="0 0 20 19" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M-2-3h24v24H-2z"/><path d="M10 18.35l-1.45-1.32C3.4 12.36 0 9.28 0 5.5 0 2.42 2.42 0 5.5 0 7.24 0 8.91.81 10 2.09 11.09.81 12.76 0 14.5 0 17.58 0 20 2.42 20 5.5c0 3.78-3.4 6.86-8.55 11.54L10 18.35z" fill="#fff"/></g></svg><small>{{ _("Donate") }}</small></a>
                                </div>
                        </div>
                </div>
 
                {% block footer %}
                        <footer class="footer">
-                               <div class="container">
-                                       <div class="row">
-                                               <div class="col-md-2 links">
-                                                       <h5>{{ _("About") }}</h5>
+                               <div class="container pb-3">
+                                       <div class="row mb-6">
+                                               <div class="col-6 col-md-3 col-lg-2 mb-5">
+                                                       <h4>{{ _("About") }}</h4>
 
                                                        <ul class="list-unstyled">
                                                                <li>
@@ -84,8 +87,8 @@
                                                        </ul>
                                                </div>
 
-                                               <div class="col-md-2 links">
-                                                       <h5>{{ _("Support") }}</h5>
+                                               <div class="col-6 col-md-3 col-lg-2 mb-5">
+                                                       <h4>{{ _("Support") }}</h4>
 
                                                        <ul class="list-unstyled">
                                                                <li>
                                                        </ul>
                                                </div>
 
-                                               <div class="col-md-2 links">
-                                                       <h5>{{ _("Join") }}</h5>
+                                               <div class="col-6 col-md-3 col-lg-2 mb-5">
+                                                       <h4>{{ _("Community") }}</h4>
 
                                                        <ul class="list-unstyled">
                                                                <li>
                                                        </ul>
                                                </div>
 
-                                               <div class="col-md-2 links">
-                                                       <h5>{{ _("Development") }}</h5>
+                                               <div class="col-6 col-md-3 col-lg-2 mb-6">
+                                                       <h4>{{ _("Development") }}</h4>
 
                                                        <ul class="list-unstyled">
                                                                <li>
                                                        </ul>
                                                </div>
 
-                                               <div class="col-md-4 text-center">
-                                                       <a class="btn btn-primary" href="//www.ipfire.org/donate">
-                                                               <span class="fa fa-heart"></span> {{ _("Donate") }}
+                                               <div class="col-md-12 col-lg-4 pt-md-6 pt-lg-1 text-center">
+                                                       <a class="btn btn-primary btn-lg" href="//www.ipfire.org/donate">
+                                                               <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20 19" style="enable-background:new 0 0 20 19;" xml:space="preserve">
+                                                                       <g>
+                                                                               <path style="fill:none;" d="M-2-3h24v24H-2V-3z"/>
+                                                                               <path style="fill:#FFFFFF;" d="M10,18.35l-1.45-1.32C3.4,12.36,0,9.28,0,5.5C0,2.42,2.42,0,5.5,0C7.24,0,8.91,0.81,10,2.09
+                                                                                       C11.09,0.81,12.76,0,14.5,0C17.58,0,20,2.42,20,5.5c0,3.78-3.4,6.86-8.55,11.54L10,18.35z"/>
+                                                                       </g>
+                                                               </svg>
+                                                               {{ _("Donate") }}
                                                        </a>
 
-                                                       <br><br>
-
-                                                       <div class="btn-toolbar links">
-                                                               <a class="btn btn-sm" href="http://www.ipfire.org/rss">
-                                                                       <span class="fa fa-2x fa-rss"></span>
+                                                       <div class="btn-toolbar justify-content-around col-md-6 offset-md-3">
+                                                               <a class="btn btn-sm" href="http://www.ipfire.org/news.rss">
+                                                                       <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M-4-4h24v24H-4z"/><path d="M2.18 11.2a2.18 2.18 0 0 1 2.18 2.18c0 1.18-.98 2.18-2.18 2.18-1.18 0-2.18-1-2.18-2.18a2.18 2.18 0 0 1 2.18-2.18zM0 0c8.594 0 15.56 6.966 15.56 15.56h-2.83C12.73 8.53 7.03 2.83 0 2.83V0zm0 5.66c5.468 0 9.9 4.432 9.9 9.9H7.07A7.07 7.07 0 0 0 0 8.49V5.66z" fill="#263238" fill-rule="nonzero"/></g></svg>
                                                                </a>
                                                                <a class="btn btn-sm" href="https://twitter.com/ipfire">
-                                                                       <span class="fa fa-2x fa-twitter"></span>
+                                                                       <svg width="19" height="16" viewBox="0 0 19 16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M-3-5h24v24H-3z"/><path d="M19 1.792c-.58.835-1.159 1.552-1.97 2.15v.476c0 1.194-.116 2.27-.464 3.344a8.244 8.244 0 0 1-1.39 3.104 11.87 11.87 0 0 1-2.2 2.627c-.812.716-1.854 1.313-3.128 1.79-1.16.479-2.55.717-3.94.717-2.085 0-4.17-.596-5.908-1.79h.927c1.737 0 3.36-.478 4.866-1.672-.927 0-1.622-.24-2.318-.836-.695-.478-1.158-1.194-1.39-1.91h.811c.348 0 .696 0 .927-.12-.811-.24-1.622-.716-2.201-1.433-.58-.716-.927-1.552-.927-2.507.58.238 1.159.478 1.854.478-.58-.359-1.043-.836-1.275-1.433a4.331 4.331 0 0 1-.463-2.03c0-.717.116-1.433.463-2.03 1.043 1.194 2.201 2.15 3.592 2.985 1.39.716 2.896 1.194 4.518 1.313-.116-.358-.116-.716-.116-1.074 0-1.075.348-2.03 1.159-2.866C11.122.359 12.049 0 13.09 0c1.159 0 2.085.359 2.896 1.194.927-.119 1.738-.477 2.433-.955-.231.955-.81 1.672-1.621 2.27A7.918 7.918 0 0 0 19 1.791" fill="#263238"/></g></svg>
                                                                </a>
                                                                <a class="btn btn-sm" href="https://www.facebook.com/IPFire.org">
-                                                                       <span class="fa fa-2x fa-facebook"></span>
+                                                                       <svg width="10" height="18" viewBox="0 0 10 18" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M-7-3h24v24H-7z"/><path d="M10 .207V3H8.223c-.667 0-1.112.103-1.334.414-.222.207-.333.62-.333 1.138v2.07h3.333l-.444 3.206h-2.89V18H3V9.828H0V6.62h3v-2.38c0-1.344.444-2.379 1.222-3.103C5 .414 6.112 0 7.444 0c1.112 0 2 .104 2.556.207" fill="#263238"/></g></svg>
                                                                </a>
-                                                               <a class="btn btn-sm" href="https://youtube.com/user/ipfireproject">
-                                                                       <span class="fa fa-2x fa-youtube"></span>
+                                                               <a class="btn btn-sm" href="https://google.com/+IpfireOrg4Ever">
+                                                                       <svg width="24" height="15" viewBox="0 0 24 15" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M0-4h24v24H0z"/><path d="M15 7.647c0 1.47-.3 2.745-.9 3.824-.7 1.078-1.5 1.96-2.6 2.647-1.1.588-2.4.882-3.9.882-1 0-2-.196-2.9-.588-1-.392-1.8-.882-2.5-1.569-.7-.686-1.2-1.47-1.6-2.451A6.91 6.91 0 0 1 0 7.549c0-1.078.2-1.96.6-2.941.4-.883.9-1.765 1.6-2.353C2.9 1.569 3.7.98 4.7.588 5.6.196 6.6 0 7.6 0c2 0 3.7.686 5.1 1.961l-2 1.96c-.8-.784-1.9-1.176-3.1-1.176-.8 0-1.6.294-2.4.686-.7.393-1.2.98-1.7 1.765-.4.686-.6 1.47-.6 2.353 0 .784.2 1.667.6 2.354.5.686 1 1.274 1.7 1.764.8.392 1.6.588 2.4.588.6 0 1.1-.098 1.6-.196.5-.196.9-.392 1.2-.588.3-.294.6-.588.8-.882.3-.294.4-.59.5-.785.1-.294.2-.588.3-.784H7.6V6.47h7.2c.1.393.2.785.2 1.177m9-1.176v2.157h-2.2v2.059h-2.2v-2.06h-2.2V6.472h2.2V4.314h2.2v2.157H24" fill="#263238"/></g></svg>
                                                                </a>
-                                                               <a class="btn btn-sm" href="https://plus.google.com/+ipfire">
-                                                                       <span class="fa fa-2x fa-google-plus"></span>
+                                                               <a class="btn btn-sm" href="https://youtube.com/user/ipfireproject">
+                                                                       <svg width="22" height="16" viewBox="0 0 22 16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M-1-4h24v24H-1z"/><path d="M15.412 8.716c.235-.238.353-.358.353-.716s-.118-.597-.353-.716L9.06 3.344c-.236-.12-.47-.24-.823 0-.236.12-.354.358-.354.716v7.88c0 .358.118.597.354.717.235.119.352.119.47.119.117 0 .235 0 .353-.12l6.353-3.94zM22 6.09v3.82c0 .358 0 .955-.118 1.672 0 .716-.118 1.313-.235 1.79-.118.597-.47 1.075-.824 1.553-.47.358-.94.597-1.53.716-1.881.24-4.587.359-8.234.359-3.647 0-6.47-.12-8.235-.359-.588-.119-1.059-.358-1.53-.716-.47-.358-.705-.956-.823-1.552a23.942 23.942 0 0 1-.353-1.791c0-.717 0-1.314-.118-1.672V6.09c.118-.358.118-.955.118-1.672.117-.716.235-1.314.353-1.79.118-.597.353-1.195.823-1.553.471-.478.942-.716 1.53-.716C4.588.12 7.412 0 11.06 0c3.647 0 6.353.12 8.235.359.588 0 1.059.238 1.529.716.353.358.706.956.824 1.552a7.38 7.38 0 0 1 .235 1.791C22 5.135 22 5.732 22 6.09z" fill="#263238"/></g></svg>
                                                                </a>
                                                        </div>
                                                </div>
                                        </div>
-
-                                       {% if ssl_protocol %}
-                                               <p class="pull-right">
-                                                       <span class="fa fa-lock"></span> {{ ssl_protocol }}
-                                                       {% if ssl_cipher %}({{ ssl_cipher }}){% end %}
-                                               </p>
-                                       {% end %}
-
-                                       {% if hostname == "wishlist.ipfire.org" %}
-                                               <p class="pull-right">
-                                                       <a href="/terms">{{ _("Terms & Conditions") }}</a>
-                                               </p>
-                                       {% end %}
-
-                                       <p>
-                                               &copy; {{ year }} -
-                                               {{ _("IPFire is free software written by the IPFire Project") }}
-                                       </p>
+                               </div>
+                               
+                               <div id="copyright">
+                                       <div class="container">
+                                               {% if ssl_protocol %}
+                                                       <p class="pull-right">
+                                                               <span class="fa fa-lock"></span> {{ ssl_protocol }}
+                                                               {% if ssl_cipher %}({{ ssl_cipher }}){% end %}
+                                                       </p>
+                                               {% end %}
+       
+                                               {% if hostname == "wishlist.ipfire.org" %}
+                                                       <p class="pull-right">
+                                                               <a href="/terms">{{ _("Terms & Conditions") }}</a>
+                                                       </p>
+                                               {% end %}
+       
+                                               <p><small>&copy; {{ year }} - {{ _("IPFire is free software written by the IPFire Project") }}</small></p>
+                                       </div>
                                </div>
                        </footer>
                {% end block %}
 
                <script src="{{ static_url("js/jquery.js") }}"></script>
                <script src="{{ static_url("js/jquery.easing.js") }}"></script>
-               <script src="{{ static_url("js/bootstrap.min.js") }}"></script>
+               <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
+               <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
                <script src="{{ static_url("js/site.js") }}"></script>
        </body>
 </html>