Simple navbar finished

3 years ago · b63cb3c493
parent 629bf4230e
commit b63cb3c493
5 changed files with 194 additions and 199 deletions
--- a/konova/static/css/konova.css
+++ b/konova/static/css/konova.css
@ -7,15 +7,30 @@ Declare some basic colours
    --rlp-grey-light: #c6c6c6;
 }

+body{
+    font-family: Arial;
+    letter-spacing: 0.2px;
+}
+

 .nav{
    background-color: var(--rlp-red);
-    height: 50px;
+}
+.nav-icon{
+    color: white;
+    font-weight: bold;
+    font-size: 1.5rem;
+    letter-spacing: -3px;
 }

 .menu-elem{
    border-left: 1px solid white;
    border-right: 1px solid white;
+    display: inline-block;
+}
+
+.menu-elem:hover{
+    background-color: var(--rlp-grey-light);
 }

 .nav-btn{
--- a/konova/sub_settings/context_settings.py
+++ b/konova/sub_settings/context_settings.py
@ -6,6 +6,6 @@ Created on: 16.11.20

 """

-BASE_TITLE = "konova"
+BASE_TITLE = "KSP"
 BASE_FRONTEND_TITLE = "Kompensationsverzeichnis Service Portal"
 WIKI_URL = "https://dienste.naturschutz.rlp.de/doku/doku.php?id=ksp:start"
--- a/locale/de/LC_MESSAGES/django.mo
+++ b/locale/de/LC_MESSAGES/django.mo
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-02 09:22+0200\n"
+"POT-Creation-Date: 2021-07-02 12:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -43,8 +43,7 @@ msgstr "Aktionen"
 msgid "Compensations"
 msgstr "Kompensationen"

-#: compensation/tables.py:48 compensation/tables.py:98
-#: templates/authenticated-user-navbar.html:45
+#: compensation/tables.py:48 compensation/tables.py:98 templates/navbar.html:22
 msgid "Compensation"
 msgstr "Kompensation"

@ -103,8 +102,7 @@ msgstr "Datenbereitsteller"
 msgid "Who provides the data for the intervention"
 msgstr "Wer stellt die Daten für den Eingriff zur Verfügung"

-#: intervention/forms.py:63 templates/authenticated-user-navbar.html:90
-#: templates/authenticated-user-navbar.html:93
+#: intervention/forms.py:63
 msgid "Organization"
 msgstr "Organisation"

@ -128,11 +126,11 @@ msgstr "Wo findet der Eingriff statt"
 msgid "Files"
 msgstr "Dateien"

-#: intervention/forms.py:102 templates/authenticated-user-navbar.html:40
+#: intervention/forms.py:102
 msgid "New intervention"
 msgstr "Neuer Eingriff"

-#: intervention/forms.py:145 konova/settings.py:56
+#: intervention/forms.py:145
 msgid "Edit intervention"
 msgstr "Eingriff bearbeiten"

@ -141,8 +139,7 @@ msgid "Interventions"
 msgstr "Eingriffe"

 #: intervention/tables.py:57 intervention/tables.py:68
-#: intervention/templates/intervention/open.html:8
-#: templates/authenticated-user-navbar.html:31
+#: intervention/templates/intervention/open.html:8 templates/navbar.html:16
 msgid "Intervention"
 msgstr "Eingriff"

@ -186,214 +183,81 @@ msgstr "Entferne"
 msgid "You are about to remove {} {}"
 msgstr "Sie sind dabei {} {} zu löschen"

-#: konova/management/commands/setup_data.py:32
+#: konova/settings.py:54
 msgid "Default"
 msgstr ""

-#: konova/management/commands/setup_data.py:47
+#: konova/settings.py:55
 msgid "Registration office"
 msgstr "Zulassungsbehörde"

-#: konova/management/commands/setup_data.py:53
+#: konova/settings.py:56
 msgid "Conservation office"
 msgstr "Naturschutzbehörde"

-#: konova/settings.py:55
-msgid "Add new intervention"
-msgstr "Neuen Eingriff hinzufügen"
-
-#: konova/settings.py:57
-msgid "Delete intervention"
-msgstr "Eingriff löschen"
-
-#: konova/settings.py:58
-msgid "Add new compensation"
-msgstr "Neue Kompensation hinzufügen"
-
-#: konova/settings.py:59
-msgid "Edit compensation"
-msgstr "Kompensation bearbeiten"
-
-#: konova/settings.py:60
-msgid "Delete compensation"
-msgstr "Kompensation löschen"
-
-#: konova/settings.py:61
-msgid "Add new eco account"
-msgstr "Neues Ökokonto hinzufügen"
-
-#: konova/settings.py:62
-msgid "Edit eco account"
-msgstr "Ökokonto bearbeiten"
-
-#: konova/settings.py:63
-msgid "Delete eco account"
-msgstr "Ökokonto löschen"
-
-#: konova/settings.py:64
-msgid "Create share link"
-msgstr "Freigabelink erstellen"
-
-#: konova/settings.py:67
-msgid "Confirm check on data"
-msgstr "Datenprüfung bestätigen"
-
-#: konova/settings.py:70
-msgid "Record data"
-msgstr "Daten verzeichnen"
-
-#: konova/settings.py:71
-msgid "Add new EMA"
-msgstr "Neue EMA hinzufügen"
-
-#: konova/settings.py:72
-msgid "Edit EMA"
-msgstr "Bearbeite EMA"
-
-#: konova/settings.py:73
-msgid "Delete EMA"
-msgstr "Lösche EMA"
-
-#: konova/templates/kspneo/home.html:11
+#: konova/templates/konova/home.html:11
 msgid "Proceed with login"
 msgstr "Mit Login fortfahren"

-#: konova/templates/kspneo/home.html:16
+#: konova/templates/konova/home.html:16
 msgid "Logged in as"
 msgstr "Eingeloggt als"

-#: konova/templates/kspneo/home.html:18
+#: konova/templates/konova/home.html:18
 msgid "Last login on"
 msgstr "Zuletzt eingeloggt am"

-#: templates/anonymous-user-navbar.html:7
-#: templates/authenticated-user-navbar.html:8
-msgid "Menu"
-msgstr "Menü"
-
-#: templates/anonymous-user-navbar.html:14
-#: templates/anonymous-user-navbar.html:15
-#: templates/authenticated-user-navbar.html:14 templates/base.html:25
-#: templates/base.html:26
-msgid "Home"
-msgstr "Home"
-
-#: templates/authenticated-user-navbar.html:17
-msgid "Process"
-msgstr "Vorgang"
-
-#: templates/authenticated-user-navbar.html:20
-msgid "Process management"
-msgstr "Vorgangsverwaltung"
-
-#: templates/authenticated-user-navbar.html:23
-msgid "Show process"
-msgstr "Zeige Vorgänge"
-
-#: templates/authenticated-user-navbar.html:26
-msgid "New process"
-msgstr "Neuer Vorgang"
+#: templates/generic_table_form.html:37
+msgid "Fields with * are required."
+msgstr "* sind Pflichtfelder."

-#: templates/authenticated-user-navbar.html:34
-msgid "Intervention management"
-msgstr "Eingriffsverwaltung"
+#: templates/generic_table_form.html:41
+msgid "Cancel"
+msgstr "Abbrechen"

-#: templates/authenticated-user-navbar.html:37
-msgid "Show intervention"
-msgstr "Zeige Eingriffe"
+#: templates/generic_table_form.html:45
+msgid "Save"
+msgstr "Speichern"

-#: templates/authenticated-user-navbar.html:48
-msgid "Compensation management"
-msgstr "Kompensationsverwaltung"
+#: templates/navbar.html:3
+msgid "Kompensationsverzeichnis Service Portal"
+msgstr ""

-#: templates/authenticated-user-navbar.html:51
-msgid "Show compensation"
-msgstr "Zeige Kompensationen"
+#: templates/navbar.html:4
+msgid "KSP"
+msgstr ""

-#: templates/authenticated-user-navbar.html:54
-msgid "New compensation"
-msgstr "Neue Kompensation"
+#: templates/navbar.html:10
+msgid "Home"
+msgstr "Home"

-#: templates/authenticated-user-navbar.html:59
+#: templates/navbar.html:28
 msgid "Eco-account"
 msgstr "Ökokonto"

-#: templates/authenticated-user-navbar.html:62
-msgid "Eco-account management"
-msgstr "Ökokontoverwaltung"
-
-#: templates/authenticated-user-navbar.html:65
-msgid "Show eco-accounts"
-msgstr "Zeige Ökokonten"
-
-#: templates/authenticated-user-navbar.html:68
-msgid "New eco-account"
-msgstr "Neues Ökokonto"
+#: templates/navbar.html:34
+msgid "More"
+msgstr "Mehr"

-#: templates/authenticated-user-navbar.html:71
-msgid "Withdraw from eco-account"
-msgstr "Von Konto abbuchen"
-
-#: templates/authenticated-user-navbar.html:82
-msgid "Show actions"
-msgstr "Zeige Maßnahmen"
-
-#: templates/authenticated-user-navbar.html:85
-msgid "New action"
-msgstr "Neue Maßnahme"
-
-#: templates/authenticated-user-navbar.html:96
-msgid "Import / Export"
+#: templates/navbar.html:37
+msgid "EMA"
 msgstr ""

-#: templates/authenticated-user-navbar.html:99
-msgid "Annual report"
-msgstr "Jahresbericht"
-
-#: templates/authenticated-user-navbar.html:102
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: templates/authenticated-user-navbar.html:105
-msgid "Help"
-msgstr "Hilfe"
-
-#: templates/authenticated-user-navbar.html:110
-#: templates/authenticated-user-navbar.html:113
-msgid "User"
-msgstr "Nutzer"
-
-#: templates/authenticated-user-navbar.html:116
-msgid "Logout"
-msgstr "Abmelden"
-
-#: templates/authenticated-user-navbar.html:125
-msgid "You are currently working as "
-msgstr "Sie arbeiten gerade als "
-
-#: templates/authenticated-user-navbar.html:127
-msgid "Change..."
-msgstr "Ändern..."
-
-#: templates/base.html:84
-msgid "About this site"
+#: templates/navbar.html:38
+msgid "Import..."
 msgstr ""

-#: templates/base.html:87
-msgid "Privacy policy"
+#: templates/navbar.html:39
+msgid "Export..."
 msgstr ""

-#: templates/generic_table_form.html:37
-msgid "Fields with * are required."
-msgstr "* sind Pflichtfelder."
-
-#: templates/generic_table_form.html:41
-msgid "Cancel"
-msgstr "Abbrechen"
+#: templates/navbar.html:40
+msgid "Reports"
+msgstr "Berichte"

-#: templates/generic_table_form.html:45
-msgid "Save"
-msgstr "Speichern"
+#: templates/navbar.html:51
+msgid "Logout"
+msgstr "Abmelden"

 #: templates/table.html:14
 msgid "New entry"
@ -1602,6 +1466,114 @@ msgstr ""
 msgid "A fontawesome icon field"
 msgstr ""

+#~ msgid "Add new intervention"
+#~ msgstr "Neuen Eingriff hinzufügen"
+
+#~ msgid "Delete intervention"
+#~ msgstr "Eingriff löschen"
+
+#~ msgid "Add new compensation"
+#~ msgstr "Neue Kompensation hinzufügen"
+
+#~ msgid "Edit compensation"
+#~ msgstr "Kompensation bearbeiten"
+
+#~ msgid "Delete compensation"
+#~ msgstr "Kompensation löschen"
+
+#~ msgid "Add new eco account"
+#~ msgstr "Neues Ökokonto hinzufügen"
+
+#~ msgid "Edit eco account"
+#~ msgstr "Ökokonto bearbeiten"
+
+#~ msgid "Delete eco account"
+#~ msgstr "Ökokonto löschen"
+
+#~ msgid "Create share link"
+#~ msgstr "Freigabelink erstellen"
+
+#~ msgid "Confirm check on data"
+#~ msgstr "Datenprüfung bestätigen"
+
+#~ msgid "Record data"
+#~ msgstr "Daten verzeichnen"
+
+#~ msgid "Add new EMA"
+#~ msgstr "Neue EMA hinzufügen"
+
+#~ msgid "Edit EMA"
+#~ msgstr "Bearbeite EMA"
+
+#~ msgid "Delete EMA"
+#~ msgstr "Lösche EMA"
+
+#~ msgid "Menu"
+#~ msgstr "Menü"
+
+#~ msgid "Process"
+#~ msgstr "Vorgang"
+
+#~ msgid "Process management"
+#~ msgstr "Vorgangsverwaltung"
+
+#~ msgid "Show process"
+#~ msgstr "Zeige Vorgänge"
+
+#~ msgid "New process"
+#~ msgstr "Neuer Vorgang"
+
+#~ msgid "Intervention management"
+#~ msgstr "Eingriffsverwaltung"
+
+#~ msgid "Show intervention"
+#~ msgstr "Zeige Eingriffe"
+
+#~ msgid "Compensation management"
+#~ msgstr "Kompensationsverwaltung"
+
+#~ msgid "Show compensation"
+#~ msgstr "Zeige Kompensationen"
+
+#~ msgid "New compensation"
+#~ msgstr "Neue Kompensation"
+
+#~ msgid "Eco-account management"
+#~ msgstr "Ökokontoverwaltung"
+
+#~ msgid "Show eco-accounts"
+#~ msgstr "Zeige Ökokonten"
+
+#~ msgid "New eco-account"
+#~ msgstr "Neues Ökokonto"
+
+#~ msgid "Withdraw from eco-account"
+#~ msgstr "Von Konto abbuchen"
+
+#~ msgid "Show actions"
+#~ msgstr "Zeige Maßnahmen"
+
+#~ msgid "New action"
+#~ msgstr "Neue Maßnahme"
+
+#~ msgid "Annual report"
+#~ msgstr "Jahresbericht"
+
+#~ msgid "Settings"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Help"
+#~ msgstr "Hilfe"
+
+#~ msgid "User"
+#~ msgstr "Nutzer"
+
+#~ msgid "You are currently working as "
+#~ msgstr "Sie arbeiten gerade als "
+
+#~ msgid "Change..."
+#~ msgstr "Ändern..."
+
 #~ msgid ""
 #~ "Interventions must be part of a process. Please fill in the missing data "
 #~ "for the process"
--- a/templates/navbar.html
+++ b/templates/navbar.html
@ -1,11 +1,13 @@
 {% load i18n fontawesome_5 %}
-
-<nav class="nav">
-    <a class="nav-item" href="{% url 'home' %}">
+<nav class="nav justify-content-between">
+    <div class="d-flex align-items-center nav-icon ml-2" title="{% trans 'Kompensationsverzeichnis Service Portal' %}">
+        <strong class="">{% trans 'KSP' %}</strong>
+    </div>
+    <div class="justify-content-center">
+    <a class="nav-item menu-elem" href="{% url 'home' %}">
        <div class="btn nav-btn">
-            <h5>
-                {% trans 'KSP' %}
-            </h5>
+            {% fa5_icon 'home' %}
+            {% trans 'Home' %}
        </div>
    </a>
    <a class="nav-item menu-elem" href="{% url 'home' %}">
@ -26,22 +28,28 @@
            {% trans 'Eco-account' %}
        </div>
    </a>
-    <a class="nav-item menu-elem dropdown" href="{% url 'home' %}">
+    <div class="nav-item menu-elem dropdown">
        <div class="btn nav-btn" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
            {% fa5_icon 'ellipsis-v' %}
            {% trans 'More' %}
        </div>
        <div class="dropdown-menu">
-            <div class="dropdown-item">{% fa5_icon 'euro-sign' %}  {% trans 'EMA' %}</div>
-            <div class="dropdown-item">{% fa5_icon 'file-import' %}  {% trans 'Import...' %}</div>
-            <div class="dropdown-item">{% fa5_icon 'file-export' %}  {% trans 'Export...' %}</div>
-            <div class="dropdown-item">{% fa5_icon 'file-alt' %}  {% trans 'Reports' %}</div>
+            <a class="dropdown-item" href="{% url 'home' %}">{% fa5_icon 'euro-sign' %}  {% trans 'EMA' %}</a>
+            <a class="dropdown-item" href="{% url 'home' %}">{% fa5_icon 'file-import' %}  {% trans 'Import...' %}</a>
+            <a class="dropdown-item" href="{% url 'home' %}">{% fa5_icon 'file-export' %}  {% trans 'Export...' %}</a>
+            <a class="dropdown-item" href="{% url 'home' %}">{% fa5_icon 'file-alt' %}  {% trans 'Reports' %}</a>
        </div>
-    </a>
-    <a class="nav-item " href="{% url 'home' %}">
-        <div class="btn nav-btn">
+    </div>
+
+    </div>
+    <div class="nav-item ">
+        <div class="btn nav-btn" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
            {% fa5_icon 'user-circle' %}
            {{ user.username }}
        </div>
-    </a>
+        <div class="dropdown-menu">
+            <a class="dropdown-item" href="{% url 'logout' %}">{% fa5_icon 'cogs' %}  {% trans 'Settings' %}</a>
+            <a class="dropdown-item" href="{% url 'logout' %}">{% fa5_icon 'sign-out-alt' %}  {% trans 'Logout' %}</a>
+        </div>
+    </div>
 </nav>