Merge branch 'master' into maintenace_mode

BiscuIT-App-Chronos @ 25d63449

-Subproject commit 379b37bee6f6124a5e82355f081721273bc59499
+Subproject commit 25d6344980e25ea18fcd293b89a26933c6e9785b

biscuit/core/menus.py

@@ -3,24 +3,43 @@ from django.utils.translation import ugettext_lazy as _
 MENUS = {
     'NAV_MENU_CORE': [
         {
-            'name': _('Login'),
-            'url': 'login',
-            'validators': ['menu_generator.validators.is_anonymous']
-        },
-        {
-            'name': _('Logout'),
-            'url': 'logout',
-            'validators': ['menu_generator.validators.is_authenticated']
-        },
-        {
-            'name': _('Persons'),
-            'url': 'persons',
-            'validators': ['menu_generator.validators.is_authenticated', 'menu_generator.validators.is_superuser']
+            'name': _('Account'),
+            'url': '#',
+            'root': True,
+            'submenu': [
+                {
+                    'name': _('Login'),
+                    'url': 'login',
+                    'validators': ['menu_generator.validators.is_anonymous']
+                },
+                {
+                    'name': _('Logout'),
+                    'url': 'logout',
+                    'validators': ['menu_generator.validators.is_authenticated']
+                }
+            ]
         },
         {
-            'name': _('Groups'),
-            'url': 'groups',
-            'validators': ['menu_generator.validators.is_authenticated', 'menu_generator.validators.is_superuser']
+            'name': _('People'),
+            'url': '#',
+            'root': True,
+            'submenu': [
+                {
+                    'name': _('Persons'),
+                    'url': 'persons',
+                    'validators': ['menu_generator.validators.is_authenticated', 'menu_generator.validators.is_superuser']
+                },
+                {
+                    'name': _('Groups'),
+                    'url': 'groups',
+                    'validators': ['menu_generator.validators.is_authenticated', 'menu_generator.validators.is_superuser']
+                },
+                {
+                    'name': _('Persons and accounts'),
+                    'url': 'persons_accounts',
+                    'validators': ['menu_generator.validators.is_authenticated', 'menu_generator.validators.is_superuser']
+                }
+            ]
         }
     ],
     'FOOTER_MENU_CORE': [
@@ -36,7 +55,7 @@ MENUS = {
                     'name': 'Teckids e.V.',
                     'url': 'https://www.teckids.org/'
                 }
-            ],
-        },
+            ]
+        }
     ]
 }

biscuit/core/static/css/style.css

 html {
-  position: relative;
-  min-height: 100%;
+  height: 100%;
 }
 
-.footer {
-  width: 100%;
+body {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  padding-top: 70px;
 }
 
-body > .container {
-  padding: 60px 15px 0;
+main {
+  margin-bottom: 2em;
 }
 
-.footer > .container {
-  padding-right: 15px;
-  padding-left: 15px;
+footer {
+  width: 100%;
+  margin-top: auto;
+  padding: 2em 0;
 }
 
 img.person-img {

biscuit/core/templates/core/base.html

@@ -25,7 +25,7 @@
      {% fa 'fa-align-justify' %}
     </button>
     <a class="navbar-brand" href="{% url "index" %}">
-     {% fa 'fa-briefcase' %} BiscuIT School Information System
+     {% fa 'fa-briefcase' %} BiscuIT SIS
     </a>
 
    <div class="collapse navbar-collapse" id="navbar-main">
@@ -43,7 +43,7 @@
 
   {% block content %}{% endblock %}
  </main>
- <footer class="footer text-dark bg-light">
+ <footer class="footer text-dark bg-light mt-auto">
   <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 %}

biscuit/core/templates/core/language_form.html

+{% load i18n %}
+
+<form action="{% url 'set_language' %}" method="post">
+  {% csrf_token %}
+  <input name="next" type="hidden" value="{{ request.get_full_path }}">
+  <select name="language" onchange="this.form.submit()" class="form-control bg-light text-dark border-2 border-dark">
+    {% get_current_language as LANGUAGE_CODE %}
+    {% get_available_languages as LANGUAGES %}
+    {% get_language_info_list for LANGUAGES as languages %}
+    {% for language in languages %}
+      <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected{% endif %}>
+        {{ language.name_local }} ({{ language.code }})
+      </option>
+    {% endfor %}
+  </select>
+  <noscript>
+    <input type="submit" value="&gt;">
+  </noscript>
+</form>

biscuit/core/templates/footer-menu.html

@@ -7,7 +7,7 @@
 {% for menu in footer_menus %}
  {% if not menu.grouper %}
   {% for item in menu.list %}
-   <div class="col-xs-12 col-sm-4 ">
+   <div class="col">
     <h5>{{ item.name }}</h5>
     <ul class="list-unstyled quick-links">
      {% for menu in item.submenu %}
@@ -21,7 +21,7 @@
 
 {% for menu in footer_menus %}
  {% if menu.grouper %}
-  <div class="col-xs-12 col-sm-4 ">
+  <div class="col">
    <h5>{% blocktrans %}Assorted{% endblocktrans %}</h5>
    <ul class="list-unstyled quick-links">
     {% for item in menu.list %}
@@ -31,3 +31,8 @@
   </div>
  {% endif %}
 {% endfor %}
+
+<div class="col">
+  <h5>{% blocktrans %}Language{% endblocktrans %}</h5>
+  {% include 'core/language_form.html' %}
+</div>

biscuit/core/urls.py

@@ -24,6 +24,7 @@ urlpatterns = [
          {'template': 'full'}, name='group_by_id'),
     path('', views.index, name='index'),
     path('maintenance-mode/', include('maintenance_mode.urls')),
+    path('__i18n__/', include('django.conf.urls.i18n'))
 ]
 
 # Custom error pages