diff --git a/frontend/src/routes/time/Index.svelte b/frontend/src/routes/time/Index.svelte
index 89040c1..33653f1 100644
--- a/frontend/src/routes/time/Index.svelte
+++ b/frontend/src/routes/time/Index.svelte
@@ -244,7 +244,7 @@
{time.duration.toFixed(3)} h
{/if}
-
+ | {detail = time.id}}>
{users[time.user_id].name}
|
{detail = time.id}}>
diff --git a/translations/src/main/resources/de.json b/translations/src/main/resources/de.json
index 67b2f07..47c94b6 100644
--- a/translations/src/main/resources/de.json
+++ b/translations/src/main/resources/de.json
@@ -18,6 +18,7 @@
"cancel": "abbrechen",
"choose_type": "Typ wählen",
+ "click_to_edit": "Anklicken zum Bearbeiten",
"client_id": "Client-ID",
"client_secret": "Client-Geheimnis",
"close_settings": "Einstellungen schließen",
@@ -137,15 +138,16 @@
"login_services": "Login-Services",
"logout": "Abmelden",
"logout_user": "{user} abmelden",
- "long_click_to_edit": "lang klicken zum Bearbeiten",
"markdown_code": "Markdown-Code",
+ "markdown_supported": "Markdown & Plantuml nutzbar!",
"MANAGE_LOGIN_SERVICES": "Login-Services verwalten",
"member": "Mitarbeiter",
"members": "Mitarbeiter",
"message": "Nachricht",
"messages": "Benachrichtigungen",
"miscellaneous_settings": "sonstige Einstellungen",
+ "mismatch": "ungleich",
"model": "Modell",
"models": "Modelle",
"module": {
@@ -166,7 +168,6 @@
"user": "Benutzer",
"wiki": "Wiki"
},
- "mismatch": "ungleich",
"month": "Monat",
"must_not_be_empty": "darf nicht leer sein",
@@ -215,6 +216,7 @@
"region": "Bundesland",
"repeat_new_password": "Wiederholung",
"results": "Ergebnisse",
+ "right_click_to_edit": "Rechts-Klick zum Bearbeiten",
"save": "speichern",
"saved": "gespeichert",
diff --git a/translations/src/main/resources/en.json b/translations/src/main/resources/en.json
index abcda28..de3b4ba 100644
--- a/translations/src/main/resources/en.json
+++ b/translations/src/main/resources/en.json
@@ -18,6 +18,7 @@
"cancel": "cancel",
"choose_type": "choose type",
+ "click_to_edit": "click to edit",
"client_id": "client ID",
"client_secret": "client secret",
"close_settings": "close settings",
@@ -38,7 +39,7 @@
"contained_tax": "contained tax",
"content": "content",
"context": "context",
- "count_of_occurrences": "{count} occurences",
+ "count_of_occurrences": "{count} occurrences",
"country": "country",
"COURT": "local court",
"CUSTOMER-NUMBER": "customer number",
@@ -137,15 +138,16 @@
"login_services": "login service",
"logout": "logout",
"logout_user": "logout {user}",
- "long_click_to_edit": "click long to edit",
"markdown_code": "Markdown-Code",
+ "markdown_supported": "Markdown & Plantuml supported!",
"MANAGE_LOGIN_SERVICES": "manage login services",
"member": "member",
"members": "members",
"message": "message",
"messages": "messages",
"miscellaneous_settings": "miscellaneous settings",
+ "mismatch": "mismatch",
"model": "model",
"models": "models",
"module": {
@@ -166,7 +168,6 @@
"user": "Users",
"wiki": "wiki"
},
- "mismatch": "mismatch",
"month": "month",
"must_not_be_empty": "must not be empty",
@@ -215,6 +216,7 @@
"region": "region",
"repeat_new_password": "repeat new password",
"results": "results",
+ "right_click_to_edit": "right click to edit",
"save": "save",
"saved": "saved",
diff --git a/web/src/main/resources/web/css/default-color.css b/web/src/main/resources/web/css/default-color.css
index 205b0ee..1360748 100644
--- a/web/src/main/resources/web/css/default-color.css
+++ b/web/src/main/resources/web/css/default-color.css
@@ -87,7 +87,7 @@ textarea{
.kanban .state_10 .box,
.kanban .state_100 .box{
- background: linear-gradient(rgba(0,0,0,0.8));
+ background: linear-gradient(rgba(0,0,0,0.6));
}
.kanban .state_10 .box,
diff --git a/web/src/main/resources/web/css/default.css b/web/src/main/resources/web/css/default.css
index 0585de2..24d7053 100644
--- a/web/src/main/resources/web/css/default.css
+++ b/web/src/main/resources/web/css/default.css
@@ -290,6 +290,19 @@ span.timetracking {
display: inline-block;
}
+.markdown.editing{
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ column-gap: 10px;
+}
+.markdown .buttons,
+.markdown .hint{
+ grid-column-end: span 2;
+}
+
+.editable:hover{
+ border: 1px dotted;
+}
.timetracks .year, .timetracks .month{
border: 1px solid;
@@ -307,23 +320,6 @@ span.timetracking {
float: right;
}
-.markdown.editing{
- position: relative;
-}
-
-.markdown.editing > *{
- width: 49%;
-}
-
-.markdown.editing > *:nth-child(2){
- position: absolute;
- right: 0;
- top: 0;
-}
-
-.markdown img{
- max-width: 75%;
-}
table{
min-width: 30vw;
@@ -370,6 +366,7 @@ a.wikilink{
.grid2{
display: grid;
grid-template-columns: 230px auto;
+ margin: 0 5px;
}
.grid2 > :nth-child(2n-1){
@@ -399,6 +396,17 @@ a.wikilink{
text-align: initial;
padding-top: 8px;
}
+
+ .markdown.editing{
+ display: block;
+ grid-template-columns: 1fr 1fr;
+ column-gap: 10px;
+ }
+
+ .markdown textarea{
+ width: calc(100% - 10px);
+ min-height: 50px;
+ }
}
fieldset.vcard{
|