Merge pull request #13213 from SORMAS-Foundation/change-13126-update-…

…default-logo-to-only-sf-logo Change 13126 update default logo to only sf logo
SORMAS-Foundation · Dec 14, 2024 · 2a94140 · 2a94140
2 parents 7602439 + 8439dd1
commit 2a94140
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -3127,8 +3127,8 @@ public interface Captions {
 	String versionIsMissing = "versionIsMissing";
 	String view = "view";
 	String View_actions = "View.actions";
-	String View_adverseeventinvestigations = "View.adverseeventinvestigations";
 	String View_adverseevents = "View.adverseevents";
+	String View_adverseevents_investigations = "View.adverseevents.investigations";
 	String View_aggregatereports = "View.aggregatereports";
 	String View_aggregatereports_aggregatereporting = "View.aggregatereports.aggregatereporting";
 	String View_aggregatereports_reportdata = "View.aggregatereports.reportdata";

diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -3122,7 +3122,7 @@ View.samples.sub=
 View.travelEntries=Travel Entries Directory
 View.immunizations=Immunization Directory
 View.adverseevents=Adverse Events Directory
-View.adverseeventinvestigations=AEFI Investigations Directory
+View.adverseevents.investigations=AEFI Investigations Directory
 View.statistics=Statistics
 View.statistics.database-export=Database export
 View.tasks=Task Management

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/login/LoginScreen.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/login/LoginScreen.java
@@ -315,12 +315,6 @@ private Layout buildLoginSidebarLayout() {
 		imgSormasFoundation.setWidth(isCustomBranding ? CUSTOM_BRANDING_LOGO_WIDTH : LOGO_WIDTH, Unit.PIXELS);
 		poweredByLayout.addComponent(imgSormasFoundation);
 
-		if (!isCustomBranding) {
-			Image imgGiz = new Image(null, new ThemeResource("img/giz-logo.png"));
-			imgGiz.setWidth(isCustomBranding ? CUSTOM_BRANDING_LOGO_WIDTH : LOGO_WIDTH, Unit.PIXELS);
-			poweredByLayout.addComponent(imgGiz);
-		}
-
 		loginSidebarLayout.addComponent(poweredByLayout);
 
 		Label customSidebarLabel = new Label();