From a4d3da6625ce88bb33f950cf6ec168b15139de0f Mon Sep 17 00:00:00 2001
From: Rene Krenn <rkrenn@phoenixctms.org>
Date: Tue, 27 Feb 2024 19:22:24 +0100
Subject: [PATCH 1/3] postgres jdbc CVE-2024-1597

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6f826f80c5a6..d9a03112d6e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,7 +334,7 @@
 			<dependency>
 				<groupId>org.postgresql</groupId>
 				<artifactId>postgresql</artifactId>
-				<version>42.3.7</version>
+				<version>42.3.9</version>
 			</dependency>
 
 			<dependency>

From 54bc6868678678222e3bf6d8d2c367b07708a432 Mon Sep 17 00:00:00 2001
From: Rene Krenn <rkrenn@phoenixctms.org>
Date: Tue, 27 Feb 2024 19:26:33 +0100
Subject: [PATCH 2/3] switch to left-oriented tabviews when there are more than
 5 tabs

---
 web/src/main/webapp/course/course.xhtml         | 1 +
 web/src/main/webapp/inputfield/inputField.xhtml | 1 +
 web/src/main/webapp/inventory/inventory.xhtml   | 1 +
 web/src/main/webapp/massmail/massMail.xhtml     | 1 +
 web/src/main/webapp/proband/proband.xhtml       | 1 +
 web/src/main/webapp/staff/staff.xhtml           | 1 +
 web/src/main/webapp/trial/trial.xhtml           | 1 +
 web/src/main/webapp/user/user.xhtml             | 1 +
 8 files changed, 8 insertions(+)

diff --git a/web/src/main/webapp/course/course.xhtml b/web/src/main/webapp/course/course.xhtml
index 37508965cd2e..ded5698f1577 100644
--- a/web/src/main/webapp/course/course.xhtml
+++ b/web/src/main/webapp/course/course.xhtml
@@ -30,6 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="courseTabView"
 					onTabShow="handleCourseTabChange(transposeTabIndex(index.index()))"
+					orientation="#{sessionScopeBean.courseVisibleTabSet.size() > 5 ? 'left' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab
 						id="coursemain"
diff --git a/web/src/main/webapp/inputfield/inputField.xhtml b/web/src/main/webapp/inputfield/inputField.xhtml
index 3b8d495f1815..c3b5b33ea958 100644
--- a/web/src/main/webapp/inputfield/inputField.xhtml
+++ b/web/src/main/webapp/inputfield/inputField.xhtml
@@ -30,6 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="inputFieldTabView"
 					onTabShow="handleInputFieldTabChange(transposeTabIndex(index.index()))"
+					orientation="#{sessionScopeBean.inputFieldVisibleTabSet.size() > 5 ? 'left' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab
 						id="inputfieldmain"
diff --git a/web/src/main/webapp/inventory/inventory.xhtml b/web/src/main/webapp/inventory/inventory.xhtml
index eb57fa314af1..40c41d22a29b 100644
--- a/web/src/main/webapp/inventory/inventory.xhtml
+++ b/web/src/main/webapp/inventory/inventory.xhtml
@@ -30,6 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="inventoryTabView"
 					onTabShow="handleInventoryTabChange(transposeTabIndex(index.index()))"
+					orientation="#{sessionScopeBean.inventoryVisibleTabSet.size() > 5 ? 'left' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab
 						id="inventorymain"
diff --git a/web/src/main/webapp/massmail/massMail.xhtml b/web/src/main/webapp/massmail/massMail.xhtml
index 1bf844ac6f19..da689197d85b 100644
--- a/web/src/main/webapp/massmail/massMail.xhtml
+++ b/web/src/main/webapp/massmail/massMail.xhtml
@@ -30,6 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="massMailTabView"
 					onTabShow="handleMassMailTabChange(transposeTabIndex(index.index()))"
+					orientation="#{sessionScopeBean.massMailVisibleTabSet.size() > 5 ? 'left' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab
 						id="massMailmain"
diff --git a/web/src/main/webapp/proband/proband.xhtml b/web/src/main/webapp/proband/proband.xhtml
index d1a8e1835e47..a821fd84c709 100644
--- a/web/src/main/webapp/proband/proband.xhtml
+++ b/web/src/main/webapp/proband/proband.xhtml
@@ -30,6 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="probandTabView"
 					onTabShow="handleProbandTabChange(transposeTabIndex(index.index()))"
+					orientation="#{sessionScopeBean.probandVisibleTabSet.size() > 5 ? 'left' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab
 						id="probandmain"
diff --git a/web/src/main/webapp/staff/staff.xhtml b/web/src/main/webapp/staff/staff.xhtml
index 4110e18a0799..90732a02579e 100644
--- a/web/src/main/webapp/staff/staff.xhtml
+++ b/web/src/main/webapp/staff/staff.xhtml
@@ -30,6 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="staffTabView"
 					onTabShow="handleStaffTabChange(transposeTabIndex(index.index()))"
+					orientation="#{sessionScopeBean.staffVisibleTabSet.size() > 5 ? 'left' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab
 						id="staffmain"
diff --git a/web/src/main/webapp/trial/trial.xhtml b/web/src/main/webapp/trial/trial.xhtml
index 81c8852ce6b2..61fe8f34325a 100644
--- a/web/src/main/webapp/trial/trial.xhtml
+++ b/web/src/main/webapp/trial/trial.xhtml
@@ -22,6 +22,7 @@
 				<p:tabView id="tabView" dynamic="true" cache="false"
 					widgetVar="trialTabView"
 					onTabShow="handleTrialTabChange(transposeTabIndex(index.index()))"
+					orientation="#{sessionScopeBean.trialVisibleTabSet.size() > 5 ? 'left' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab id="trialmain" disabled="false"
 						titleStyleClass="#{!trialBean.created ? 'ctsms-tabtitle-emphasized' : 'ctsms-tabtitle'}"
diff --git a/web/src/main/webapp/user/user.xhtml b/web/src/main/webapp/user/user.xhtml
index febebe14a8be..7a5f8ec29d97 100644
--- a/web/src/main/webapp/user/user.xhtml
+++ b/web/src/main/webapp/user/user.xhtml
@@ -30,6 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="userTabView"
 					onTabShow="handleUserTabChange(transposeTabIndex(index.index()))"
+					orientation="#{sessionScopeBean.userVisibleTabSet.size() > 5 ? 'left' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab
 						id="usermain"

From 0e5b35c4a61c9c1a0279dc18e6332d641d1a6907 Mon Sep 17 00:00:00 2001
From: Rene Krenn <rkrenn@phoenixctms.org>
Date: Tue, 27 Feb 2024 19:26:54 +0100
Subject: [PATCH 3/3] css fixes for left-oriented tabviews

---
 web/src/main/webapp/resources/css/default.css | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/web/src/main/webapp/resources/css/default.css b/web/src/main/webapp/resources/css/default.css
index f5bbbb923fbf..05f663226764 100644
--- a/web/src/main/webapp/resources/css/default.css
+++ b/web/src/main/webapp/resources/css/default.css
@@ -108,6 +108,24 @@ td .ui-selectonemenu {
 	border-radius: 0px !important;
 }
 
+.ui-tabs-left > .ui-tabs-nav {
+    width: 200px;
+    padding: 2px 0px;
+    height: 100%;
+} 
+
+.ui-tabs-left > .ui-tabs-panels {
+    width: calc(100% - 200px);
+}
+
+.ui-tabs .ui-tabs-panel {
+    padding: 0px 2px;
+}
+
+.ui-tabs.ui-tabs-left > .ui-tabs-nav li {
+    border-right: 1px solid #aaa;
+}
+
 .ui-tabs .ui-tabs-nav li a {
 	font-size: inherit;
 }