From c422901e6720be4b555081c82c3e2091dd8d95cc Mon Sep 17 00:00:00 2001 From: mipel Date: Fri, 2 Jul 2021 13:12:38 +0200 Subject: [PATCH] Simple navbar finished --- konova/static/css/konova.css | 17 +- konova/sub_settings/context_settings.py | 2 +- locale/de/LC_MESSAGES/django.mo | Bin 5318 -> 3396 bytes locale/de/LC_MESSAGES/django.po | 348 +++++++++++------------- templates/navbar.html | 38 ++- 5 files changed, 200 insertions(+), 205 deletions(-) diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css index 794ff849..0c87f870 100644 --- 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{ diff --git a/konova/sub_settings/context_settings.py b/konova/sub_settings/context_settings.py index cb25b58a..7bf9f916 100644 --- 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" diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index d7ae08ecdbdf1535621a012d0e9f5c38a15a3b1e..4ed51b012db15f0c02dfacea54e67700f54a0238 100644 GIT binary patch delta 1600 zcmXxkZEO@p9LMn~R(lVv*WO)esX&hc)j~NDq}FJ#9N~p&S_2YHR1%Ntw0BtU%I;oG zHFDtv@gXLr4w^t>f{+j%OniaS=v#!CCWHi|Cccn2N~ke0BpP1g_qW|ncJ{L~-I@8% z{P%i&;D?^Z@9E}G4dq$tYU&?N#=L}IKE#c3x7nB$T*Nfq!$+|BVPje`iEY@8daoZd zn8ySbqQ8$}C+*iTjz^L44f75UNjly~<~Ap>15cqQyo`_G734BExux)D9Kb(O<5EPW z1+%EYdNGTGsD*c-0(~XYhBl1xdC+E$qXwQpF7rv$e+px?KSwQeKI*@W+R0bgj^Cli zFQ5YdHEQ2Ro!sB3lX-w#Cc{fDtZ#aF&;)&`1-7GhIvllkVn6NO*o%j84StB5@Iuu7 z37@8Y4+pWIs1@MLSRkzjQ5!i!=PJC24ZU!cn}fvEikYW$n1`5UNIe1ybk&L+sea(Ri4C-HmK3H%kk@DFO?`>0$hs&42+ zEtE$EG>n>f6m@b%)JCRI<7cD(26CAb+_cVolJi&YKchn*$7$5S3#gQQi(2SM)DCW; z0=bP^_+QilE&NfoqdwkMsBxQ70qsDo^Bn3|_5y02*Bd-2mq&32evCQ1hEL!fRPIwm zrvQhzk;-uK?Wm#&wHUF4MY+{!C`CEyN~-2iQIH&FShjK3_ZLQ@4@UuXQI(Pbs)~+V zWj$57RGRWs?P@JmWpIh`u3avdAs+gu+Mvq1CCoF(zEm3F7rb$)VK$?VZIJga<^Po@Sy(>D*7j;wCSYufvIez>Lm5c3CpfhP^ndYQz-g&!sTNt-FU3q z9gDTOFJfJ8A-2_x#Mi8tsJOH7IhRZ9bhC-Qn|!}GWqmVN^Q;-SZ>i>NHSp%br%E-j z-YjhtC%;7k$58o${Bb oGkdDRr1h%S6l^%mHD%Vu3DQn0NOv;xp37&~x%q6TdpG;y|I?4h6aWAK literal 5318 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 diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 8fe31e91..9a1f6521 100644 --- 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 \n" "Language-Team: LANGUAGE \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,203 +183,30 @@ 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/authenticated-user-navbar.html:34 -msgid "Intervention management" -msgstr "Eingriffsverwaltung" - -#: templates/authenticated-user-navbar.html:37 -msgid "Show intervention" -msgstr "Zeige Eingriffe" - -#: templates/authenticated-user-navbar.html:48 -msgid "Compensation management" -msgstr "Kompensationsverwaltung" - -#: templates/authenticated-user-navbar.html:51 -msgid "Show compensation" -msgstr "Zeige Kompensationen" - -#: templates/authenticated-user-navbar.html:54 -msgid "New compensation" -msgstr "Neue Kompensation" - -#: templates/authenticated-user-navbar.html:59 -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/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" -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" -msgstr "" - -#: templates/base.html:87 -msgid "Privacy policy" -msgstr "" - #: templates/generic_table_form.html:37 msgid "Fields with * are required." msgstr "* sind Pflichtfelder." @@ -395,6 +219,46 @@ msgstr "Abbrechen" msgid "Save" msgstr "Speichern" +#: templates/navbar.html:3 +msgid "Kompensationsverzeichnis Service Portal" +msgstr "" + +#: templates/navbar.html:4 +msgid "KSP" +msgstr "" + +#: templates/navbar.html:10 +msgid "Home" +msgstr "Home" + +#: templates/navbar.html:28 +msgid "Eco-account" +msgstr "Ökokonto" + +#: templates/navbar.html:34 +msgid "More" +msgstr "Mehr" + +#: templates/navbar.html:37 +msgid "EMA" +msgstr "" + +#: templates/navbar.html:38 +msgid "Import..." +msgstr "" + +#: templates/navbar.html:39 +msgid "Export..." +msgstr "" + +#: templates/navbar.html:40 +msgid "Reports" +msgstr "Berichte" + +#: templates/navbar.html:51 +msgid "Logout" +msgstr "Abmelden" + #: templates/table.html:14 msgid "New entry" msgstr "Neuer Eintrag" @@ -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" diff --git a/templates/navbar.html b/templates/navbar.html index 4bce064f..5a7ee56f 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -1,11 +1,13 @@ {% load i18n fontawesome_5 %} - -