Merge branch 'main' into dev
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
href = '#',
|
href = '#',
|
||||||
onclick = evt => { evt.preventDefault(); startEdit(); return false },
|
onclick = evt => { evt.preventDefault(); startEdit(); return false },
|
||||||
onSet = newVal => {return true;},
|
onSet = newVal => {return true;},
|
||||||
title = t('long_click_to_edit'),
|
title = t('click_to_edit'),
|
||||||
type = 'div',
|
type = 'div',
|
||||||
value = $bindable(null)
|
value = $bindable(null)
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|||||||
@@ -124,9 +124,10 @@
|
|||||||
<textarea bind:value={editValue.source} onkeyup={typed} autofocus={!simple}></textarea>
|
<textarea bind:value={editValue.source} onkeyup={typed} autofocus={!simple}></textarea>
|
||||||
<span class="buttons">
|
<span class="buttons">
|
||||||
<button class="cancel" onclick={e => editing = false}>{t('cancel')}</button>
|
<button class="cancel" onclick={e => editing = false}>{t('cancel')}</button>
|
||||||
|
<span>{t('markdown_supported')}</span>
|
||||||
<button class="save" onclick={doSave}>{t('save')}</button>
|
<button class="save" onclick={doSave}>{t('save')}</button>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
<svelte:element this={type} {onclick} {oncontextmenu} class={{editable}} title={t('long_click_to_edit')} >{@html target(editValue.rendered)}</svelte:element>
|
<svelte:element this={type} {onclick} {oncontextmenu} class={{editable}} title={t('right_click_to_edit')} >{@html target(editValue.rendered)}</svelte:element>
|
||||||
</div>
|
</div>
|
||||||
@@ -85,7 +85,7 @@
|
|||||||
<textarea bind:value={editValue} onkeyup={typed} autofocus></textarea>
|
<textarea bind:value={editValue} onkeyup={typed} autofocus></textarea>
|
||||||
{:else}
|
{:else}
|
||||||
{#if value}
|
{#if value}
|
||||||
<svelte:element this={type} {onmousedown} {onmouseup} {ontouchstart} {ontouchend} class={{editable}} title={t('long_click_to_edit')} >
|
<svelte:element this={type} {onmousedown} {onmouseup} {ontouchstart} {ontouchend} class={{editable}} title={t('right_click_to_edit')} >
|
||||||
{#each value.split("\n") as line}
|
{#each value.split("\n") as line}
|
||||||
{line}<br/>
|
{line}<br/>
|
||||||
{/each}
|
{/each}
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
{#if field}
|
{#if field}
|
||||||
<div class={field.name}>
|
<div class={field.name}>
|
||||||
{#if field.value.includes('\\n')}
|
{#if field.value.includes('\\n')}
|
||||||
<MultiLineEditor type="div" editable={true} value={field.value.replaceAll('\\n','\n')} {onSet} title={t(field.name)+' – '+t('long_click_to_edit')} />
|
<MultiLineEditor type="div" editable={true} value={field.value.replaceAll('\\n','\n')} {onSet} title={t(field.name)+' – '+t('right_click_to_edit')} />
|
||||||
{:else}
|
{:else}
|
||||||
<LineEditor type="div" editable={true} value={field.value} {onSet} title={t(field.name)+' – '+t('long_click_to_edit')} />
|
<LineEditor type="div" editable={true} value={field.value} {onSet} title={t(field.name)+' – '+t('click_to_edit')} />
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
@@ -23,7 +23,6 @@
|
|||||||
let tasks = $state({});
|
let tasks = $state({});
|
||||||
let users = {};
|
let users = {};
|
||||||
let columns = $derived(project.allowed_states?Object.keys(project.allowed_states).length+1:1);
|
let columns = $derived(project.allowed_states?Object.keys(project.allowed_states).length+1:1);
|
||||||
const controller = new AbortController();
|
|
||||||
|
|
||||||
$effect(() => updateUrl(filter_input));
|
$effect(() => updateUrl(filter_input));
|
||||||
|
|
||||||
@@ -175,8 +174,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function openTask(task_id){
|
function openTask(task_id){
|
||||||
controller.abort();
|
window.open(`/task/${task_id}/view`, '_blank').focus();
|
||||||
router.navigate(`/task/${task_id}/view`)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function save_bookmark(){
|
async function save_bookmark(){
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
"cancel": "abbrechen",
|
"cancel": "abbrechen",
|
||||||
"choose_type": "Typ wählen",
|
"choose_type": "Typ wählen",
|
||||||
|
"click_to_edit": "Anklicken zum Bearbeiten",
|
||||||
"client_id": "Client-ID",
|
"client_id": "Client-ID",
|
||||||
"client_secret": "Client-Geheimnis",
|
"client_secret": "Client-Geheimnis",
|
||||||
"close_settings": "Einstellungen schließen",
|
"close_settings": "Einstellungen schließen",
|
||||||
@@ -137,15 +138,16 @@
|
|||||||
"login_services": "Login-Services",
|
"login_services": "Login-Services",
|
||||||
"logout": "Abmelden",
|
"logout": "Abmelden",
|
||||||
"logout_user": "{user} abmelden",
|
"logout_user": "{user} abmelden",
|
||||||
"long_click_to_edit": "lang klicken zum Bearbeiten",
|
|
||||||
|
|
||||||
"markdown_code": "Markdown-Code",
|
"markdown_code": "Markdown-Code",
|
||||||
|
"markdown_supported": "Markdown & Plantuml nutzbar!",
|
||||||
"MANAGE_LOGIN_SERVICES": "Login-Services verwalten",
|
"MANAGE_LOGIN_SERVICES": "Login-Services verwalten",
|
||||||
"member": "Mitarbeiter",
|
"member": "Mitarbeiter",
|
||||||
"members": "Mitarbeiter",
|
"members": "Mitarbeiter",
|
||||||
"message": "Nachricht",
|
"message": "Nachricht",
|
||||||
"messages": "Benachrichtigungen",
|
"messages": "Benachrichtigungen",
|
||||||
"miscellaneous_settings": "sonstige Einstellungen",
|
"miscellaneous_settings": "sonstige Einstellungen",
|
||||||
|
"mismatch": "ungleich",
|
||||||
"model": "Modell",
|
"model": "Modell",
|
||||||
"models": "Modelle",
|
"models": "Modelle",
|
||||||
"module": {
|
"module": {
|
||||||
@@ -166,7 +168,6 @@
|
|||||||
"user": "Benutzer",
|
"user": "Benutzer",
|
||||||
"wiki": "Wiki"
|
"wiki": "Wiki"
|
||||||
},
|
},
|
||||||
"mismatch": "ungleich",
|
|
||||||
"month": "Monat",
|
"month": "Monat",
|
||||||
"must_not_be_empty": "darf nicht leer sein",
|
"must_not_be_empty": "darf nicht leer sein",
|
||||||
|
|
||||||
@@ -215,6 +216,7 @@
|
|||||||
"region": "Bundesland",
|
"region": "Bundesland",
|
||||||
"repeat_new_password": "Wiederholung",
|
"repeat_new_password": "Wiederholung",
|
||||||
"results": "Ergebnisse",
|
"results": "Ergebnisse",
|
||||||
|
"right_click_to_edit": "Rechts-Klick zum Bearbeiten",
|
||||||
|
|
||||||
"save": "speichern",
|
"save": "speichern",
|
||||||
"saved": "gespeichert",
|
"saved": "gespeichert",
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
"cancel": "cancel",
|
"cancel": "cancel",
|
||||||
"choose_type": "choose type",
|
"choose_type": "choose type",
|
||||||
|
"click_to_edit": "click to edit",
|
||||||
"client_id": "client ID",
|
"client_id": "client ID",
|
||||||
"client_secret": "client secret",
|
"client_secret": "client secret",
|
||||||
"close_settings": "close settings",
|
"close_settings": "close settings",
|
||||||
@@ -38,7 +39,7 @@
|
|||||||
"contained_tax": "contained tax",
|
"contained_tax": "contained tax",
|
||||||
"content": "content",
|
"content": "content",
|
||||||
"context": "context",
|
"context": "context",
|
||||||
"count_of_occurrences": "{count} occurences",
|
"count_of_occurrences": "{count} occurrences",
|
||||||
"country": "country",
|
"country": "country",
|
||||||
"COURT": "local court",
|
"COURT": "local court",
|
||||||
"CUSTOMER-NUMBER": "customer number",
|
"CUSTOMER-NUMBER": "customer number",
|
||||||
@@ -118,7 +119,6 @@
|
|||||||
"IMPERSONATE": "impersonate",
|
"IMPERSONATE": "impersonate",
|
||||||
"index_page": "task overview",
|
"index_page": "task overview",
|
||||||
"invoice": "invoice",
|
"invoice": "invoice",
|
||||||
"item": "item",
|
|
||||||
"items": "items",
|
"items": "items",
|
||||||
|
|
||||||
"join_objects" : "join {objects}",
|
"join_objects" : "join {objects}",
|
||||||
@@ -137,15 +137,16 @@
|
|||||||
"login_services": "login service",
|
"login_services": "login service",
|
||||||
"logout": "logout",
|
"logout": "logout",
|
||||||
"logout_user": "logout {user}",
|
"logout_user": "logout {user}",
|
||||||
"long_click_to_edit": "click long to edit",
|
|
||||||
|
|
||||||
"markdown_code": "Markdown-Code",
|
"markdown_code": "Markdown-Code",
|
||||||
|
"markdown_supported": "Markdown & Plantuml supported!",
|
||||||
"MANAGE_LOGIN_SERVICES": "manage login services",
|
"MANAGE_LOGIN_SERVICES": "manage login services",
|
||||||
"member": "member",
|
"member": "member",
|
||||||
"members": "members",
|
"members": "members",
|
||||||
"message": "message",
|
"message": "message",
|
||||||
"messages": "messages",
|
"messages": "messages",
|
||||||
"miscellaneous_settings": "miscellaneous settings",
|
"miscellaneous_settings": "miscellaneous settings",
|
||||||
|
"mismatch": "mismatch",
|
||||||
"model": "model",
|
"model": "model",
|
||||||
"models": "models",
|
"models": "models",
|
||||||
"module": {
|
"module": {
|
||||||
@@ -166,7 +167,6 @@
|
|||||||
"user": "Users",
|
"user": "Users",
|
||||||
"wiki": "wiki"
|
"wiki": "wiki"
|
||||||
},
|
},
|
||||||
"mismatch": "mismatch",
|
|
||||||
"month": "month",
|
"month": "month",
|
||||||
"must_not_be_empty": "must not be empty",
|
"must_not_be_empty": "must not be empty",
|
||||||
|
|
||||||
@@ -215,6 +215,7 @@
|
|||||||
"region": "region",
|
"region": "region",
|
||||||
"repeat_new_password": "repeat new password",
|
"repeat_new_password": "repeat new password",
|
||||||
"results": "results",
|
"results": "results",
|
||||||
|
"right_click_to_edit": "right click to edit",
|
||||||
|
|
||||||
"save": "save",
|
"save": "save",
|
||||||
"saved": "saved",
|
"saved": "saved",
|
||||||
|
|||||||
Reference in New Issue
Block a user