footer: Refactor - once again

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/sass/main.sass b/src/sass/main.sass
index 80e43ac2be60ec3b666098ea8f2b5851b3c86984..b1292f76f88b5429f451acc1fd181833e0535499 100644 (file)
--- a/src/sass/main.sass
+++ b/src/sass/main.sass
@@ -58,6 +58,9 @@ $breadcrumb-item-active-color:  $primary
 $section-padding:               3rem 1.5rem
 $section-padding-desktop:       3rem 0.5rem
 
+// Footer
+$footer-padding:                               3rem 1.5rem 3rem
+
 // Import Bulma
 @import "../third-party/bulma/sass/utilities/_all.sass"
 @import "../third-party/bulma/sass/base/_all.sass"

diff --git a/src/templates/base.html b/src/templates/base.html
index f5af1fad2158c1f031a44e1d244d16f80a768450..34d189bf346bab0ba5de0d37401f33f41d2ebee3 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -129,6 +129,23 @@
                                                                                {{ _("Donate") }}
                                                                        </a>
                                                                </div>
+
+                                                               {% if current_user %}
+                                                                       <div class="navbar-item has-dropdown is-hoverable">
+                                                                               <a class="navbar-link is-arrowless" href="/users/{{ current_user.uid }}">
+                                                                                       <figure class="image">
+                                                                                               <img class="is-rounded" style="width: auto" src="{{ current_user.avatar_url(128) }}">
+                                                                                       </figure>
+                                                                               </a>
+
+                                                                               <div class="navbar-dropdown">
+                                                                                       <a class="navbar-item" href="/logout">
+                                                                                               {{ _("Logout")}}
+                                                                                       </a>
+                                                                               </div>
+
+                                                                       </div>
+                                                               {% end %}
                                                        </div>
                                                {% elif hostname.startswith("fireinfo.") %}
                                                        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
@@ -183,136 +200,66 @@
                {% block footer %}
                        <footer class="footer is-flex-shrink-0">
                                <div class="container">
-                                       <div class="columns">
-                                               <div class="column is-two-fifths">
-                                                       {# Show some profile information for users who are logged in #}
-                                                       {% if current_user %}
-                                                               <h4 class="title is-4 mb-0">{{ _("Hello, %s!") % current_user }}</h4>
-
-                                                               <div class="level is-mobile">
-                                                                       <div class="level-left">
-                                                                               <a class="level-item" href="/users/{{ current_user.uid }}">
-                                                                                       {{ _("My Profile") }}
-                                                                               </a>
+                                       {# Encourage people to join #}
+                                       {% if not current_user %}
+                                               <div class="columns">
+                                                       <div class="column is-one-fifth">
+                                                               <a class="button is-primary is-medium is-fullwidth" href="/register">
+                                                                       {{ _("Join Now") }}
+                                                               </a>
+                                                       </div>
 
-                                                                               <a class="level-item" href="/logout">
-                                                                                       {{ _("Logout") }}
-                                                                               </a>
-                                                                       </div>
+                                                       <div class="column is-one-quarter">
+                                                               <div class="block">
+                                                                       <p class="title is-5">
+                                                                               {{ _("Join our community and sign up to our newsletter") }}
+                                                                       </p>
                                                                </div>
-
-                                                       {# Otherwise encourage people to join #}
-                                                       {% else %}
-                                                               <p class="is-size-4">
-                                                                       <span class="has-text-weight-bold">IPFire</span><span class="has-text-primary has-text-weight-bold">_</span>People
-                                                               </p>
-
-                                                               <p>
-                                                                       Join the community and sign up for our newsletter
-                                                               </p>
-
-                                                               <a class="button is-primary is-outlined is-medium
-                                                                               has-text-black has-text-weight-bold" href="/register">
-                                                                       JOIN NOW
-                                                               </a>
-                                                               <a class="button is-primary is-outlined  is-medium
-                                                                               has-text-black has-text-weight-bold" href="/login">
-                                                                       LOG IN
-                                                               </a>
-                                                       {% end %}
+                                                       </div>
                                                </div>
 
-                                               <div class="column">
-                                                       <ul>
-                                                               <li>
-                                                                       <a href="/about">
-                                                                               {{ _("About") }}
-                                                                       </a>
-                                                               </li>
-                                                               <li>
-                                                                       <a href="/docs">
-                                                                               {{ _("Documentation") }}
-                                                                       </a>
-                                                               </li>
-                                                               <li>
-                                                                       <a href="/help">
-                                                                               {{ _("Help") }}
-                                                                       </a>
-                                                               </li>
-                                                               <li>
-                                                                       <a href="/docs/devel">
-                                                                               {{ _("Development") }}
-                                                                       </a>
-                                                               </li>
-                                                       </ul>
+                                               <div class="columns">
+                                                       <div class="column is-one-fifth">
+                                                               <a class="button is-primary is-medium is-outlined is-fullwidth" href="/login">
+                                                                       {{ _("Log In") }}
+                                                               </a>
+                                                       </div>
                                                </div>
+                                       {% end %}
 
-                                               <div class="column">
-                                                       <ul>
-                                                               <li>
-                                                                       <a href="/download">
-                                                                               {{ _("Download") }}
-                                                                       </a>
-                                                               </li>
-                                                               <li>
-                                                                       <a href="https://community.ipfire.org/">
-                                                                               {{ _("Community") }}
-                                                                       </a>
-                                                               </li>
-                                                               <li>
-                                                                       <a href="/sitemap">
-                                                                               {{ _("Sitemap") }}
-                                                                       </a>
-                                                               </li>
-                                                               <li>
-                                                                       <a href="/legal">
-                                                                               {{ _("Legal") }}
-                                                                       </a>
-                                                               </li>
-                                                       </ul>
-                                               </div>
+                                               <div class="level">
+                                                       <div class="level-left">
+                                                               <div class="level-item">
+                                                                       {{ year }} &copy; IPFire.org
+                                                               </div>
 
-                                               {% if current_user and current_user.is_staff() %}
-                                                       <div class="column">
-                                                               <ul>
-                                                                       <li>
-                                                                               <a href="/voip">
-                                                                                       {{ _("VoIP") }}
-                                                                               </a>
-                                                                       </li>
-                                                               </ul>
-                                                       </div>
-                                               {% end %}
+                                                               <div class="level-item">
+                                                                       <a href="/legal">{{ _("Legal") }}</a>
+                                                               </div>
 
-                                               <div class="column is-one-fifth">
-                                                       <div class="block">
-                                                               <a class="button is-primary is-fullwidth is-medium has-text-weight-bold is-uppercase"
-                                                                               href="https://www.ipfire.org/donate">
-                                                                       {{ _("Donate") }}
-                                                               </a>
+                                                               <div class="level-item">
+                                                                       <a href="/sitemap">{{ _("Sitemap") }}</a>
+                                                               </div>
                                                        </div>
 
-                                                       <div class="block">
-                                                               <div class="level is-mobile">
-                                                                       <div class="level-item">
-                                                                               <a href="https://social.ipfire.org/@news" title="{{ _("Mastodon") }}">
-                                                                                       <i class="fa-brands fa-mastodon"></i>
-                                                                               </a>
-                                                                       </div>
-                                                                       <div class="level-item">
-                                                                               <a href="https://twitter.com/ipfire" title="{{ _("Twitter") }}">
-                                                                                       <i class="fa-brands fa-twitter"></i>
-                                                                               </a>
-                                                                       </div>
-                                                                       <div class="level-item">
-                                                                               <a href="https://linkedin.com/company/ipfire" title="{{ _("LinkedIn") }}">
-                                                                                       <i class="fa-brands fa-linkedin-in"></i>
-                                                                               </a>
-                                                                       </div>
+                                                       <div class="level-right">
+                                                               <div class="level-item">
+                                                                       <a href="https://social.ipfire.org/@news" title="{{ _("Mastodon") }}">
+                                                                               <i class="fa-brands fa-mastodon px-2"></i>
+                                                                       </a>
+                                                               </div>
+                                                               <div class="level-item">
+                                                                       <a href="https://twitter.com/ipfire" title="{{ _("Twitter") }}">
+                                                                               <i class="fa-brands fa-twitter px-2"></i>
+                                                                       </a>
+                                                               </div>
+                                                               <div class="level-item">
+                                                                       <a href="https://linkedin.com/company/ipfire" title="{{ _("LinkedIn") }}">
+                                                                               <i class="fa-brands fa-linkedin-in px-2"></i>
+                                                                       </a>
                                                                </div>
                                                        </div>
                                                </div>
-                                       </div>
                                </div>
                        </footer>
                {% end block %}

diff --git a/src/templates/static/sitemap.html b/src/templates/static/sitemap.html
index 053513c2b4b9787b7ce920f2d60d4c2b5148ddbd..04653ce5a73c4d3a21ce50cc82e5bbca3dc8b31a 100644 (file)
--- a/src/templates/static/sitemap.html
+++ b/src/templates/static/sitemap.html
@@ -204,6 +204,19 @@
                                                </p>
                                        </div>
                                </div>
+
+                               {% if current_user and current_user.is_staff() %}
+                                       <div class="column is-one-third has-text-centered">
+                                               <div>
+                                                       <p class="heading">Telephony</p>
+                                                       <p class="title">
+                                                               <a href="/voip">
+                                                                       {{ _("VoIP") }}
+                                                               </a>
+                                                       </p>
+                                               </div>
+                                       </div>
+                               {% end %}
                        </div>
                </div>
        </section>