From 8ab91e444fe724e442c0776e2f0e07b779923874 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Fri, 23 Aug 2019 00:34:12 +0200
Subject: [PATCH] Redesign footer. Advances #43.
---
biscuit/core/templates/core/base.html | 24 +++++----------
biscuit/core/templates/footer-menu.html | 39 +++++++++++++------------
2 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/biscuit/core/templates/core/base.html b/biscuit/core/templates/core/base.html
index 9a419938d..753cee252 100644
--- a/biscuit/core/templates/core/base.html
+++ b/biscuit/core/templates/core/base.html
@@ -1,6 +1,6 @@
{# -*- engine:django -*- #}
{% extends "bootstrap4/bootstrap4.html" %}
-{% load bootstrap4 menu_generator staticfiles font_awesome any_js sass_tags %}
+{% load bootstrap4 i18n menu_generator staticfiles font_awesome any_js sass_tags %}
{% block bootstrap4_extra_head %}
@@ -43,24 +43,16 @@
{% block content %}{% endblock %}
</main>
-
<footer class="footer text-dark bg-light">
<div class="container-fluid">
+ <div class="row text-center text-xs-center text-sm-left text-md-left text-dark">
+ {% with menu=FOOTER_MENU_CORE %}{% include "footer-menu.html" %}{% endwith %}
+ </div>
<div class="row">
- <div class="col-sm-4 col-sm-offset-1 col-xs-10 col-xs-offset-1 text-center text-md-left">
- <span class="text-muted text-left">
- <a href="https://biscuit.edugit.org/">
- BiscuIT - The Free School Information System
- </a>
- ·
- © The BiscuIT Team @
- <a href="https://www.teckids.org/">
- Teckids e.V.
- </a>
- </span>
- </div>
- <div class="col-sm-5 col-sm-offset-1 col-xs-10 col-xs-offset-1 text-center text-md-right">
- {% with menu=FOOTER_MENU_CORE %}{% include "footer-menu.html" %}{% endwith %}
+ <div class="col-xs-12 col-sm-12 col-md-12 mt-2 mt-sm-2 text-center text-dark">
+ <p>
+ <a href="https://biscuit.edugit.org/">BiscuIT - The Free School Information System</a> © The BiscuIT Team @ <a href="https://www.teckids.org">Teckids e.V.</a>
+ </p>
</div>
</div>
</div>
diff --git a/biscuit/core/templates/footer-menu.html b/biscuit/core/templates/footer-menu.html
index 2b93a17aa..d8269c36b 100644
--- a/biscuit/core/templates/footer-menu.html
+++ b/biscuit/core/templates/footer-menu.html
@@ -1,24 +1,25 @@
{# -*- engine:django -*- #}
{% load menu_generator %}
{% get_menu "FOOTER_MENU_CORE" as footer_menu %}
- {% for item in footer_menu %}
- <ul class="footer-link-list">
- {% if not item.submenu %}
- <a href="{{ item.url }}"> <i class="{{ item.icon_class }}"></i> {{ item.name }}</a>
- {% endif %}
- </ul>
- {% if item.submenu %}
- <div class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" id="footerDropdown" aria-expanded="false" role="button" aria-haspopup="true" href="#">
- {{ item.name }}
- </a>
- <div class="dropdown-menu dropdown-menu-right" aria-labelledby="footerDropdown">
+ {% for item in footer_menu %}
+ {% if item.submenu %}
+ <div class="col-xs-12 col-sm-4 ">
+ <h5>{{ item.name }}</h5>
+ <ul class="list-unstyled quick-links">
{% for menu in item.submenu %}
- <a class="dropdown-item" href="{{ menu.url }}">
- {{ menu.name }}
- </a>
+ <li><a href="{{ menu.url }}"><i class="fa fa-angle-double-right"></i>{{ menu.name }}</a></li>
{% endfor %}
- </div>
- </li>
- {% endif %}
- {% endfor %}
+ </ul>
+ </div>
+ {% endif %}
+ {% endfor %}
+ <div class="col-xs-12 col-sm-4 ">
+ <h5>Assorted</h5>
+ <ul class="list-unstyled quick-links">
+ {% for item in footer_menu %}
+ {% if not item.submenu %}
+ <li><a href="{{ item.url }}"><i class="fa fa-angle-double-right"></i>{{ item.name }}</a></li>
+ {% endif %}
+ {% endfor %}
+ </ul>
+ </div>
--
GitLab