From d50fb1a1d6fb37a74603adf1185972e457639115 Mon Sep 17 00:00:00 2001 From: mipel Date: Wed, 7 Jul 2021 15:50:20 +0200 Subject: [PATCH] Dashboard * finishes work on dashboard --- konova/static/css/konova.css | 15 ++++++++ konova/templates/konova/home.html | 56 +++++++++++++++++++---------- locale/de/LC_MESSAGES/django.mo | Bin 3436 -> 3624 bytes locale/de/LC_MESSAGES/django.po | 57 ++++++++++++++++++++++-------- 4 files changed, 95 insertions(+), 33 deletions(-) diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css index 9f551ed0..4275cd0b 100644 --- a/konova/static/css/konova.css +++ b/konova/static/css/konova.css @@ -12,16 +12,31 @@ Declare some basic colours color:white; } +.rlp-gl-outline{ + border:1px solid var(--rlp-gray-light); + color:var(--rlp-gray-light); +} + .rlp-gd{ background-color: var(--rlp-gray-dark); color:white; } +.rlp-gd-outline{ + border:1px solid var(--rlp-gray-dark); + color:var(--rlp-gray-dark); +} + .rlp-r{ background-color: var(--rlp-red); color:white; } +.rlp-r-outline{ + border:1px solid var(--rlp-red); + color:var(--rlp-red); +} + html { position: relative; min-height: 100%; diff --git a/konova/templates/konova/home.html b/konova/templates/konova/home.html index ff8a5374..f4ca1b43 100644 --- a/konova/templates/konova/home.html +++ b/konova/templates/konova/home.html @@ -11,7 +11,7 @@ {% trans 'Intervention' %}
-
+
{% fa5_icon 'pencil-ruler' %}
@@ -19,11 +19,11 @@
{% trans 'Total' %}
-
{{total_intervention_count}}
+
{{total_intervention_count}}
{% trans 'Your own' %}
-
{{user_intervention_count}}
+
{{user_intervention_count}}
@@ -39,13 +39,15 @@
+
+

{% trans 'Compensation' %}

-
+
{% fa5_icon 'leaf' %}
@@ -53,11 +55,11 @@
{% trans 'Total' %}
-
{{total_compensation_count}}
+
{{total_compensation_count}}
{% trans 'Your own' %}
-
{{user_compensation_count}}
+
{{user_compensation_count}}
@@ -73,14 +75,16 @@
+
+

{% trans 'Eco-account' %}

-
+
{% fa5_icon 'tree' %}
@@ -88,26 +92,42 @@
{% trans 'Total' %}
-
{{total_eco_count}}
+
{{total_eco_count}}
{% trans 'Your own' %}
-
{{user_eco_count}}
+
{{user_eco_count}}
-
-
- - - +
+
+
+
+ + + +
+
+ + + +
+ +
+ +
+
+
+
+ + + +
-
- - -
+
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 847f6c43c080f54bef273736b5dc8241f2643b6f..dbf0f6bcdf1e1cc90926beeebcdf428ef29d08a8 100644 GIT binary patch delta 1567 zcmX}sOKeP09LMp0>0`9hQT1r`!Fbb_qQ$6p6OvkxXoaq7rmnV(nPfW6Bpw+}L?Xmy zf&~d-!GczFp|KD&ERk4vBnV-p8%bAfn)v?4(UbeXpL5T>=Y3{IEACgNzn11+HPTL^ zN-@o>UFLEloy#*Tz|HR`+1ScumC#8r46Rd2vKgz9)0)&2<1!FQ+u{K8`Tw~1_q z(a_6uUX&q4R_UG>qmSq1s1E8~c_T6d3tj| zaLfLRoHx^C)X|`G7F4W1&2Sm&3^d^eJdEn+ z3I_2yuEg{(86BSQs8jD_8e009NRd?_M<9D(U@8Tta%P)deg$fK7*lqZ8(q21j0U}! z(5kE@77%PfI(rcK&zVZ=$!SI!wf44#&>7I6bh_se+lbY~4q`i@f!7h*f;EIDr1P+f z_@8#VjQ&Hmxcn^r{*|<3ONeE}Rzj(X&=x3ZCH^NZn+{b2p(R$*(rVvBdLS+Rhb=;F z%O>}%v!k?*C?je!les5`!g&vJGUWx$C9U1@l(qFFqn@?Jli_Hlqu`qFP*1Y^Xd;}- zj1}|;+T(qRU_2GG&S<>X8%p|~%r^ w;giWs#DB@RD-!AJ?Dk@rQGX)1Tc3H>+SwiL@kVY@<@DKL#0w`P9#xa}7s!Q`6aWAK delta 1399 zcmXxkO-PhM9LMq5bah>Kw{$DbEVZnBD=RHE=~7u8B9o#+Q0OjCC9XmG2!+WL(jl@A z@$@FvAtDlr2(}ljTXjlr1zkeeLv-lHLwW1a_qR^NGxK?7_L*n?^YZLu`HwPhwmA2u zA+?js$$tXIbmB}71t}CXCLas17>h6ut1*K07{yl9b9*t42QiEZ`+GkwqdtrUcpd5Q znF($RX_&-Ze2zspg?iyMuEdYXW#%Xr<2=@4kZ9De(b|j}xD6HH9$boDr~po)0=|&d zGv*36n(Q6qGIwqL0fwkQLJjcDw!c8lU<#MuJJdj*Y+p0zd7DcU4DdsW0 zY2b#-G*ReM_)SRn|Jxp>9I; z??8>y>2ae7kD~%eqCUe@sF__t?d>>j!&g{|Kd}a5yhUfB1@*!c6l`ra2tBW){u-1R z%@(q@N~^A~%F_WVA+IAVDQZ?do9e6zL?IyXvd$lBY@WNn=$wVJH7 zaRIXd?cYkarB&a5mHkmv+WR(Sg4wj3vfAF)qn2?8c`bPpSxGCvS7w^X+BR+J|Fno3 zt*Dazb@<&1! z(~*Lgfl$Z5pzEYkuAd3V)0yy_K;&@p^ch+fdQC(Qsh5-TbE0GZ?daLq@JMCC=^02k Hw7TXWc)5FR diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 2ee96d0b..ea02b573 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-05 14:48+0200\n" +"POT-Creation-Date: 2021-07-07 15:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,7 +44,7 @@ msgid "Compensations" msgstr "Kompensationen" #: compensation/tables.py:48 compensation/tables.py:98 -#: konova/templates/konova/home.html:33 templates/navbar.html:26 +#: konova/templates/konova/home.html:47 templates/navbar.html:26 msgid "Compensation" msgstr "Kompensation" @@ -141,7 +141,7 @@ msgstr "Eingriffe" #: intervention/tables.py:57 intervention/tables.py:68 #: intervention/templates/intervention/open.html:8 -#: konova/templates/konova/home.html:32 templates/navbar.html:20 +#: konova/templates/konova/home.html:11 templates/navbar.html:20 msgid "Intervention" msgstr "Eingriff" @@ -197,25 +197,49 @@ msgstr "Zulassungsbehörde" msgid "Conservation office" msgstr "Naturschutzbehörde" -#: konova/templates/konova/home.html:6 -msgid "News" -msgstr "" +#: konova/templates/konova/home.html:21 konova/templates/konova/home.html:57 +#: konova/templates/konova/home.html:94 +msgid "Total" +msgstr "Insgesamt" -#: konova/templates/konova/home.html:12 +#: konova/templates/konova/home.html:25 konova/templates/konova/home.html:61 +#: konova/templates/konova/home.html:98 +msgid "Your own" +msgstr "Eigene" + +#: konova/templates/konova/home.html:33 konova/templates/konova/home.html:69 +#: konova/templates/konova/home.html:108 +msgid "Create" +msgstr "Neu" + +#: konova/templates/konova/home.html:38 konova/templates/konova/home.html:74 +#: konova/templates/konova/home.html:113 +msgid "Show" +msgstr "Anzeigen" + +#: konova/templates/konova/home.html:84 templates/navbar.html:32 +msgid "Eco-account" +msgstr "Ökokonto" + +#: konova/templates/konova/home.html:124 +msgid "Withdraw" +msgstr "Abbuchen" + +#: news/templates/news/dashboard-news.html:11 news/templates/news/index.html:19 msgid "Published on" msgstr "Veröffentlicht am" -#: konova/templates/konova/home.html:20 +#: news/templates/news/dashboard-news.html:19 msgid "Older ..." msgstr "Ältere ..." -#: konova/templates/konova/home.html:30 -msgid "Quickstart" -msgstr "Schnellstart" +#: news/templates/news/index.html:8 +msgid "All" +msgstr "" -#: konova/templates/konova/home.html:34 templates/navbar.html:32 -msgid "Eco-account" -msgstr "Ökokonto" +#: news/templates/news/index.html:9 +msgid "News" +msgstr "" #: templates/footer.html:6 msgid "Help" @@ -297,7 +321,7 @@ msgstr "Treffer pro Seite" #: venv/lib/python3.7/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3 #: venv/lib/python3.7/site-packages/bootstrap4/templates/bootstrap4/messages.html:4 msgid "close" -msgstr "" +msgstr "Schließen" #: venv/lib/python3.7/site-packages/django/contrib/messages/apps.py:7 msgid "Messages" @@ -1488,6 +1512,9 @@ msgstr "" msgid "A fontawesome icon field" msgstr "" +#~ msgid "Quickstart" +#~ msgstr "Schnellstart" + #~ msgid "Proceed with login" #~ msgstr "Mit Login fortfahren"