diff --git a/frontend/index.html b/frontend/index.html index bc51d63..785ad40 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -2,9 +2,9 @@ - + - Vite + Svelte + Umbrella diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico new file mode 100644 index 0000000..01e17d4 Binary files /dev/null and b/frontend/public/favicon.ico differ diff --git a/frontend/public/umbrella100px.png b/frontend/public/umbrella100px.png new file mode 100644 index 0000000..7e33646 Binary files /dev/null and b/frontend/public/umbrella100px.png differ diff --git a/frontend/src/routes/bookmark/Index.svelte b/frontend/src/routes/bookmark/Index.svelte index de575c0..385f787 100644 --- a/frontend/src/routes/bookmark/Index.svelte +++ b/frontend/src/routes/bookmark/Index.svelte @@ -95,6 +95,10 @@ onMount(loadBookmarks); + + Umbrella – {t('bookmarks')} + +
{t('Bookmarks')} diff --git a/frontend/src/routes/company/Editor.svelte b/frontend/src/routes/company/Editor.svelte index 1446282..7ef9f63 100644 --- a/frontend/src/routes/company/Editor.svelte +++ b/frontend/src/routes/company/Editor.svelte @@ -58,9 +58,12 @@ if (success) caption = t('saved'); btnEnabled = true; } - + + Umbrella – {t('company')}: {company?.name} + +
{#if company} {t('edit_object',{object:company.name})} diff --git a/frontend/src/routes/company/Index.svelte b/frontend/src/routes/company/Index.svelte index 6c7acda..2630fdb 100644 --- a/frontend/src/routes/company/Index.svelte +++ b/frontend/src/routes/company/Index.svelte @@ -63,6 +63,10 @@ onMount(loadCompanies) + + Umbrella – {t('companies')} + +
{t('companies')} diff --git a/frontend/src/routes/document/List.svelte b/frontend/src/routes/document/List.svelte index ed34ce1..93777f8 100644 --- a/frontend/src/routes/document/List.svelte +++ b/frontend/src/routes/document/List.svelte @@ -76,6 +76,10 @@ onMount(loadCompanies); + + Umbrella – {t('documents')} + +
{selected_company ? t( 'docs_of_company',{company:selected_company.name}) : t('document_list')} {#if error} diff --git a/frontend/src/routes/document/View.svelte b/frontend/src/routes/document/View.svelte index 378e776..68672a4 100644 --- a/frontend/src/routes/document/View.svelte +++ b/frontend/src/routes/document/View.svelte @@ -129,6 +129,10 @@ onMount(loadDoc); + + Umbrella – {t('document')} {doc?.number} + + {#if error} {error} {/if} diff --git a/frontend/src/routes/notes/Index.svelte b/frontend/src/routes/notes/Index.svelte index 60ccfc0..bb16c59 100644 --- a/frontend/src/routes/notes/Index.svelte +++ b/frontend/src/routes/notes/Index.svelte @@ -76,6 +76,10 @@ loadNotes(loadNotes) + + Umbrella – {t('notes')} + + {#if error} {error} diff --git a/frontend/src/routes/project/Kanban.svelte b/frontend/src/routes/project/Kanban.svelte index 2d28cd2..0d473ae 100644 --- a/frontend/src/routes/project/Kanban.svelte +++ b/frontend/src/routes/project/Kanban.svelte @@ -194,6 +194,10 @@ onMount(load); + + Umbrella – {project?.name} + + {#if project}

router.navigate(`/project/${project.id}/view`)}>{project.name}

{/if} diff --git a/frontend/src/routes/project/List.svelte b/frontend/src/routes/project/List.svelte index cfdc338..f79540e 100644 --- a/frontend/src/routes/project/List.svelte +++ b/frontend/src/routes/project/List.svelte @@ -62,6 +62,10 @@ onMount(loadProjects); + + Umbrella – {t('Projects')} + + {#if error} {error} {/if} diff --git a/frontend/src/routes/project/View.svelte b/frontend/src/routes/project/View.svelte index bfb6f27..66b2e1c 100644 --- a/frontend/src/routes/project/View.svelte +++ b/frontend/src/routes/project/View.svelte @@ -142,6 +142,10 @@ onMount(loadProject); + + Umbrella – {project?.name} + + {#if error} {error} {/if} diff --git a/frontend/src/routes/search/Search.svelte b/frontend/src/routes/search/Search.svelte index a5f3d31..791b94f 100644 --- a/frontend/src/routes/search/Search.svelte +++ b/frontend/src/routes/search/Search.svelte @@ -76,9 +76,12 @@ } $effect(() => doSearch(key)) - + + Umbrella – {t('search')}: {key} + +
{t('search')} {#if error} diff --git a/frontend/src/routes/task/Add.svelte b/frontend/src/routes/task/Add.svelte index dd912a3..9012428 100644 --- a/frontend/src/routes/task/Add.svelte +++ b/frontend/src/routes/task/Add.svelte @@ -122,6 +122,9 @@ onMount(load); + + Umbrella – {t('add_object',{object:t('task')})} +
{t('add_object',{object:t('task')})} diff --git a/frontend/src/routes/task/Index.svelte b/frontend/src/routes/task/Index.svelte index 1188b08..13d002a 100644 --- a/frontend/src/routes/task/Index.svelte +++ b/frontend/src/routes/task/Index.svelte @@ -96,6 +96,10 @@ onMount(load); + + Umbrella – {t('tasks')} + +
{loading ? t('loading_object',{object:t('task_list')}) : t('task_list')} {#if error} diff --git a/frontend/src/routes/task/View.svelte b/frontend/src/routes/task/View.svelte index 52ccfde..efaab84 100644 --- a/frontend/src/routes/task/View.svelte +++ b/frontend/src/routes/task/View.svelte @@ -170,6 +170,10 @@ } + + Umbrella – {t('task')}: {task?.name} + + {#if error} {error} {/if} diff --git a/frontend/src/routes/time/Index.svelte b/frontend/src/routes/time/Index.svelte index a3c7e75..da5af63 100644 --- a/frontend/src/routes/time/Index.svelte +++ b/frontend/src/routes/time/Index.svelte @@ -142,6 +142,10 @@ onMount(loadTimes); + + Umbrella – {t('timetracking')} + +

{t('timetracking')}

{#if error} {error} diff --git a/frontend/src/routes/user/User.svelte b/frontend/src/routes/user/User.svelte index 25ae66a..b513477 100644 --- a/frontend/src/routes/user/User.svelte +++ b/frontend/src/routes/user/User.svelte @@ -12,6 +12,10 @@ if (redirect && user.name) location.href = redirect; + + Umbrella – {t('user')}: {user?.name} + +

{t('user_module')}

diff --git a/web/src/main/resources/web/css/basic.css b/web/src/main/resources/web/css/basic.css index c7380b7..e1fef13 100644 --- a/web/src/main/resources/web/css/basic.css +++ b/web/src/main/resources/web/css/basic.css @@ -11,6 +11,11 @@ body{ margin-top: 25px; font-family: sans-serif; position: relative; + background-color: #0f3a09; + background-image: url('/umbrella100px.png'); + background-repeat: no-repeat; + background-position: right top; + } code{ display: inline-block; @@ -535,10 +540,6 @@ table #preview-source{ } } - -body{ - background: #0f3a09; -} a{ color: #0c0061; } diff --git a/web/src/main/resources/web/css/bloodshed.css b/web/src/main/resources/web/css/bloodshed.css index bcef502..d300b17 100644 --- a/web/src/main/resources/web/css/bloodshed.css +++ b/web/src/main/resources/web/css/bloodshed.css @@ -9,9 +9,12 @@ a { } body { font-family: sans; - background: black; color: red; margin: 0 0 40px 0; + background-color: black; + background-image: url('/umbrella100px.png'); + background-repeat: no-repeat; + background-position: 98% 70px; } fieldset { diff --git a/web/src/main/resources/web/css/default.css b/web/src/main/resources/web/css/default.css index f05ebae..351b311 100644 --- a/web/src/main/resources/web/css/default.css +++ b/web/src/main/resources/web/css/default.css @@ -10,9 +10,12 @@ a { body { font-family: sans; - background: black; color: orange; margin: 0 0 40px 0; + background-color: black; + background-image: url('/umbrella100px.png'); + background-repeat: no-repeat; + background-position: 98% 70px; } fieldset { diff --git a/web/src/main/resources/web/css/winter.css b/web/src/main/resources/web/css/winter.css index b9ec4e8..b06a834 100644 --- a/web/src/main/resources/web/css/winter.css +++ b/web/src/main/resources/web/css/winter.css @@ -10,9 +10,12 @@ a { body { font-family: sans; - background: white; color: navy; margin: 0 0 40px 0; + background-color: white; + background-image: url('/umbrella100px.png'); + background-repeat: no-repeat; + background-position: 98% 70px; } fieldset {