diff --git a/src/endpoints/user/post_toggle.rs b/src/endpoints/user/post_toggle.rs index df554f22..214ca85a 100644 --- a/src/endpoints/user/post_toggle.rs +++ b/src/endpoints/user/post_toggle.rs @@ -49,37 +49,29 @@ pub async fn post( if !user.locked { return HttpResponse::Ok().body(format!( - r##" - + r##" - - + Entsperren
ja
"##, id = user.id)); } else { return HttpResponse::Ok().body(format!( - r##" - + r##" - Sperren
nein
"##, id = user.id)); diff --git a/static/style.scss b/static/style.scss index 60a7a1e7..b9d75b03 100644 --- a/static/style.scss +++ b/static/style.scss @@ -1,5 +1,5 @@ // Set your brand colors -$crimson: #00d1b2;//#B80F0A; +$crimson: #00d1b2; //#B80F0A; // Override global Sass variables from the /utilities folder @use "bulma/sass/utilities" with ($family-primary: '"Nunito", sans-serif', @@ -43,25 +43,14 @@ $crimson: #00d1b2;//#B80F0A; // TODO: bulma theme for sweetalert looks and feels outdated @use "sweetalert2/src/sweetalert2.scss" with ($swal2-confirm-button-background-color: $crimson); -.feather { - width: 24px; - height: 24px; +[class*=" icon"], +[class^=icon] { stroke: currentColor; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; fill: none; -} - -[class*=" icon"], -[class^=icon] { display: inline-block; - width: 1em; - height: 1em; - stroke-width: 0; - stroke: currentColor; - fill: currentColor; - line-height: 1; position: relative; top: -.05em; vertical-align: middle; diff --git a/templates/area/new_or_edit.html b/templates/area/new_or_edit.html index 930f4f40..562c9101 100644 --- a/templates/area/new_or_edit.html +++ b/templates/area/new_or_edit.html @@ -31,11 +31,9 @@
- - + - Zurück
diff --git a/templates/index.html b/templates/index.html index 3cef9daa..603a315b 100644 --- a/templates/index.html +++ b/templates/index.html @@ -8,11 +8,9 @@
- - - - - + + +
@@ -39,11 +37,9 @@
- - - - - + + +
@@ -64,11 +60,9 @@ selected_area.unwrap() == user.area_id) %}
- - - - - + + + Neues Event für diesen Tag
@@ -116,11 +110,9 @@ {% if selected_area.is_none() || selected_area.unwrap() == user.area_id %}
- - - - - + + + Neue Verfügbarkeit für diesen Tag
diff --git a/templates/location/new.html b/templates/location/new.html index dc57cb5f..e7e8c13b 100644 --- a/templates/location/new.html +++ b/templates/location/new.html @@ -46,21 +46,17 @@
- - + - Zurück
diff --git a/templates/location/overview.html b/templates/location/overview.html index aac1af0d..0c42e59f 100644 --- a/templates/location/overview.html +++ b/templates/location/overview.html @@ -12,20 +12,16 @@
{% if user.role == Role::Admin %} - - - - - + + + Neuen Bereich anlegen {% endif %} - - - - - + + + Neuen Ort anlegen
@@ -38,7 +34,27 @@ {% else %} {% for gl in grouped_locations %}
-
Bereich {{ gl.0.name }}
+
+
+
+
Bereich {{ gl.0.name }}
+
+ +
+ + + + + + + + + + +
+
+
+ {% for l in gl.1 %}
@@ -46,19 +62,15 @@
- - - - - + + + Bearbeiten - - - - - + + + Löschen
diff --git a/templates/nav.html b/templates/nav.html index d585714a..c8e49cd6 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -68,11 +68,9 @@ angemeldet als {{ user.name }}
- - - - - + + + Profil diff --git a/templates/user/login.html b/templates/user/login.html index 76fd5388..5b698dda 100644 --- a/templates/user/login.html +++ b/templates/user/login.html @@ -24,11 +24,9 @@
Passwort vergessen diff --git a/templates/user/new_or_edit.html b/templates/user/new_or_edit.html index 34da3611..b24b6a89 100644 --- a/templates/user/new_or_edit.html +++ b/templates/user/new_or_edit.html @@ -106,11 +106,9 @@
- - - - - + + + Zurück
diff --git a/templates/user/overview.html b/templates/user/overview.html index 8ad0e070..a7df461b 100644 --- a/templates/user/overview.html +++ b/templates/user/overview.html @@ -11,11 +11,9 @@
- - - - - + + + Neuen Nutzer anlegen
@@ -92,28 +90,22 @@ {% if user.id != u.id %}
- - - - - + + + Bearbeiten
diff --git a/templates/user/profile.html b/templates/user/profile.html index 71d340fa..cd86118c 100644 --- a/templates/user/profile.html +++ b/templates/user/profile.html @@ -100,11 +100,9 @@ checked="{{ user.receive_notifications }}"> Ich möchte E-Mail Benachrichtigungen zu neuen Brasiwa-Einteilungen erhalten. - - - - - + + + gespeichert