Merge branch 'feature/notifications' into dev

frontend/src/routes/message/Settings.svelte

@@ -1,9 +1,11 @@
 <script>
 	import { onMount } from 'svelte';
+	import { useTinyRouter } from 'svelte-tiny-router';
 	import { t } from '../../translations.svelte';
 	import { api, get, patch } from '../../urls.svelte';
 	import { error, warn, yikes } from '../../warn.svelte';
 
+	const router = useTinyRouter();
 	let instant = false;
 	let silent = false;
 	let at8 = false;
@@ -103,11 +105,15 @@
 		saveTimes();
 	}
 
+	function user_profile(ev){
+		router.navigate('/user');
+	}
+
 	onMount(loadSettings)
 </script>
 
 <fieldset class="message settings">
-	<legend>{t('notification settings')}</legend>
+	<legend>{t('notification settings')} <button onclick={user_profile}>{t('user profile')}</button></legend>
 	<p>{t('When shall messages be delivered?')}</p>
 	<table>
 		<tbody>

translations/src/main/resources/de.json

@@ -398,6 +398,7 @@
   "user ({id})": "Benutzer ({id})",
   "user_list": "Benutzer-Liste",
   "user_module" : "Umbrella User-Verwaltung",
+  "user profile": "Benutzer-Profil",
   "users": "Benutzer",
   "user_created_entity": "{user} hat \"{entity}\" angelegt",
   "user_deleted_entity": "{user} hat \"{entity}\" gelöscht",

translations/src/main/resources/en.json

@@ -398,6 +398,7 @@
   "user ({id})": "user ({id})",
   "user_list": "user list",
   "user_module" : "Umbrella user management",
+  "user profile": "User profile",
   "users": "users",
   "user_created_entity": "{user} created \"{entity}\"",
   "user_deleted_entity": "{user} deleted \"{entity}\"",

web/src/main/resources/web/css/bloodshed.css

@@ -232,6 +232,14 @@ textarea{
     max-height: unset;
 }
 
+.message.settings label{
+	display: block;
+}
+
+.message.settings td{
+	vertical-align: middle;
+}
+
 .project th,
 .task th{
     text-align: right;

web/src/main/resources/web/css/default-color.css

@@ -134,11 +134,6 @@ tr:hover .taglist .tag button {
     backdrop-filter: blur(3px);
 }
 
-.settings{
-    background-color: black;
-    border-color: orange;
-}
-
 .start_end button.join{
     background-color: none;
     color: orange;
@@ -295,6 +290,7 @@ tr:hover .taglist .tag button {
 	border-color: orange;
 	color: orange;
 }
+
 .easylist fieldset {
 	border-color: #ff7726;
 	color: #ff7726;

web/src/main/resources/web/css/default.css

@@ -327,6 +327,7 @@ textarea{
 .message.settings label{
 	display: block;
 }
+
 .message.settings td{
 	vertical-align: middle;
 }

web/src/main/resources/web/css/winter-color.css

@@ -119,11 +119,6 @@ tr:hover .taglist .tag button {
     backdrop-filter: blur(3px);
 }
 
-.settings {
-  background-color: black;
-  border-color: blue;
-}
-
 .states .active{
     background: #dfe4ff;
 }
@@ -165,7 +160,6 @@ tr:hover .taglist .tag button {
   background: white;
 }
 
-
 .version a.selected{
      border-color: orange;
 }
@@ -279,6 +273,7 @@ tr:hover .taglist .tag button {
 	color: blue;
 	background: #dfe4ff;
 }
+
 .easylist fieldset {
 	border-color: blue;
 	color: blue;

web/src/main/resources/web/css/winter.css

@@ -232,6 +232,13 @@ textarea{
     max-height: unset;
 }
 
+.message.settings label{
+	display: block;
+}
+.message.settings td{
+	vertical-align: middle;
+}
+
 .project th,
 .task th{
     text-align: right;