From 5604210521d38d73f6918e6299c8f6ff1d7b0e5c Mon Sep 17 00:00:00 2001 From: Juraj Roka <95219754+jr-rk@users.noreply.github.com> Date: Thu, 10 Apr 2025 14:01:39 +0200 Subject: [PATCH 1/9] Menu options links edit --- src/app/header/header.component.ts | 6 +++--- .../dspace/app/header/header.component.html | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 0a847d1b289..b05f9c14110 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -65,9 +65,9 @@ export class HeaderComponent implements OnInit { } const translations = { - 'partners': 'partneri', - 'integration': 'integrace', - 'partnership': 'partnerstvi', + 'partners': 'cs/partneri', + 'integration': 'cs/integrace', + 'partnership': 'cs/partnerstvi', 'services': 'sluzby' }; diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html index 58b9baf7516..8d08a9352d6 100644 --- a/src/themes/dspace/app/header/header.component.html +++ b/src/themes/dspace/app/header/header.component.html @@ -17,34 +17,34 @@
From 09d6d9264e337cbb7aab6f7bc3033a3abe71a441 Mon Sep 17 00:00:00 2001 From: Juraj Roka <95219754+jr-rk@users.noreply.github.com> Date: Fri, 11 Apr 2025 10:37:01 +0200 Subject: [PATCH 2/9] Revert "Menu options links edit" This reverts commit 5604210521d38d73f6918e6299c8f6ff1d7b0e5c. --- src/app/header/header.component.ts | 6 +++--- .../dspace/app/header/header.component.html | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index b05f9c14110..0a847d1b289 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -65,9 +65,9 @@ export class HeaderComponent implements OnInit { } const translations = { - 'partners': 'cs/partneri', - 'integration': 'cs/integrace', - 'partnership': 'cs/partnerstvi', + 'partners': 'partneri', + 'integration': 'integrace', + 'partnership': 'partnerstvi', 'services': 'sluzby' }; diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html index 8d08a9352d6..58b9baf7516 100644 --- a/src/themes/dspace/app/header/header.component.html +++ b/src/themes/dspace/app/header/header.component.html @@ -17,34 +17,34 @@
From df6528046e7e5d3ce0afba9fc9cfa13f798b9f24 Mon Sep 17 00:00:00 2001 From: Juraj Roka <95219754+jr-rk@users.noreply.github.com> Date: Fri, 11 Apr 2025 12:03:35 +0200 Subject: [PATCH 3/9] trying to change single link --- src/themes/dspace/app/header/header.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html index 58b9baf7516..8a46f440294 100644 --- a/src/themes/dspace/app/header/header.component.html +++ b/src/themes/dspace/app/header/header.component.html @@ -17,7 +17,7 @@
From 9e664828e8aa9d544aed10f3205ba5fedb1472d6 Mon Sep 17 00:00:00 2001 From: Juraj Roka <95219754+jr-rk@users.noreply.github.com> Date: Fri, 11 Apr 2025 13:50:05 +0200 Subject: [PATCH 6/9] trying to change slug-functions --- src/app/header/header.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 0a847d1b289..77639e8f2ed 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -50,7 +50,7 @@ export class HeaderComponent implements OnInit { * @returns {string} The language code if Czech, empty string otherwise */ getLangCodeIfCzech(): string { - return this.localeService.getCurrentLanguageCode() === 'cs' ? this.localeService.getCurrentLanguageCode() : ''; + return this.localeService.getCurrentLanguageCode() === 'cs' ? 'cs' : ''; } /** @@ -71,6 +71,6 @@ export class HeaderComponent implements OnInit { 'services': 'sluzby' }; - return translations[slug] || ''; + return this.getLangCodeIfCzech + '/' + translations[slug] || ''; } } From b8eb14c5d7b8a15d78ca7405a806463f80d196db Mon Sep 17 00:00:00 2001 From: Juraj Roka <95219754+jr-rk@users.noreply.github.com> Date: Fri, 11 Apr 2025 14:58:17 +0200 Subject: [PATCH 7/9] additional fixes to slug-functions --- angular.json | 2 +- config/config.yml | 6 ++++++ src/app/header/header.component.ts | 8 ++++---- src/themes/dspace/app/header/header.component.html | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/angular.json b/angular.json index bf3dd88c524..d7a46ac7dff 100644 --- a/angular.json +++ b/angular.json @@ -68,7 +68,7 @@ "src/license-selector-creation.js", "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" ], - "baseHref": "/" + "baseHref": "/repository/" }, "configurations": { "development": { diff --git a/config/config.yml b/config/config.yml index 6016a55b498..4c33ebf736b 100644 --- a/config/config.yml +++ b/config/config.yml @@ -6,6 +6,12 @@ rest: port: 8080 nameSpace: /server +ui: + ssl: false + host: localhost + port: 4000 + nameSpace: /repository + # Caching settings cache: # NOTE: how long should objects be cached for by default diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 77639e8f2ed..5c3d5ed6c17 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -65,12 +65,12 @@ export class HeaderComponent implements OnInit { } const translations = { - 'partners': 'partneri', - 'integration': 'integrace', - 'partnership': 'partnerstvi', + 'partners': this.getLangCodeIfCzech() + '/' + 'partneri', + 'integration': this.getLangCodeIfCzech() + '/' + 'integrace', + 'partnership': this.getLangCodeIfCzech() + '/' + 'partnerstvi', 'services': 'sluzby' }; - return this.getLangCodeIfCzech + '/' + translations[slug] || ''; + return translations[slug] || ''; } } diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html index 9d638fd76ea..ac7d8326859 100644 --- a/src/themes/dspace/app/header/header.component.html +++ b/src/themes/dspace/app/header/header.component.html @@ -35,7 +35,7 @@ {{'navbar.services' | translate}}
  • - {{'navbar.about' | translate}}
    From 5197387aa9d18c7d5bf59fb35f3cf1403d9ce4e8 Mon Sep 17 00:00:00 2001 From: Juraj Roka <95219754+jr-rk@users.noreply.github.com> Date: Fri, 11 Apr 2025 15:18:57 +0200 Subject: [PATCH 8/9] config.yml fix - removed the ui namespace testing part --- config/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/config.yml b/config/config.yml index 4c33ebf736b..6016a55b498 100644 --- a/config/config.yml +++ b/config/config.yml @@ -6,12 +6,6 @@ rest: port: 8080 nameSpace: /server -ui: - ssl: false - host: localhost - port: 4000 - nameSpace: /repository - # Caching settings cache: # NOTE: how long should objects be cached for by default From 6762b2c75a70788436f4a8c09fe230e171e952ea Mon Sep 17 00:00:00 2001 From: Juraj Roka <95219754+jr-rk@users.noreply.github.com> Date: Fri, 11 Apr 2025 15:21:59 +0200 Subject: [PATCH 9/9] angular.json fix - removed repository slug --- angular.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular.json b/angular.json index d7a46ac7dff..bf3dd88c524 100644 --- a/angular.json +++ b/angular.json @@ -68,7 +68,7 @@ "src/license-selector-creation.js", "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" ], - "baseHref": "/repository/" + "baseHref": "/" }, "configurations": { "development": {