align UI tabviews to the right

phoenixctms · Feb 29, 2024 · ae63421 · ae63421
1 parent ac0a3ed
commit ae63421
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 14 deletions.
diff --git a/web/src/main/webapp/course/course.xhtml b/web/src/main/webapp/course/course.xhtml
@@ -30,7 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="courseTabView"
 					onTabShow="handleCourseTabChange(transposeTabIndex(index.index()))"
-					orientation="#{sessionScopeBean.courseVisibleTabSet.size() > 5 ? 'left' : 'top'}"
+					orientation="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
@@ -30,7 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="inputFieldTabView"
 					onTabShow="handleInputFieldTabChange(transposeTabIndex(index.index()))"
-					orientation="#{sessionScopeBean.inputFieldVisibleTabSet.size() > 5 ? 'left' : 'top'}"
+					orientation="#{sessionScopeBean.inputFieldVisibleTabSet.size() >= 5 ? 'right' : '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
@@ -30,7 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="inventoryTabView"
 					onTabShow="handleInventoryTabChange(transposeTabIndex(index.index()))"
-					orientation="#{sessionScopeBean.inventoryVisibleTabSet.size() > 5 ? 'left' : 'top'}"
+					orientation="#{sessionScopeBean.inventoryVisibleTabSet.size() >= 5 ? 'right' : '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
@@ -30,7 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="massMailTabView"
 					onTabShow="handleMassMailTabChange(transposeTabIndex(index.index()))"
-					orientation="#{sessionScopeBean.massMailVisibleTabSet.size() > 5 ? 'left' : 'top'}"
+					orientation="#{sessionScopeBean.massMailVisibleTabSet.size() >= 5 ? 'right' : '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
@@ -30,7 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="probandTabView"
 					onTabShow="handleProbandTabChange(transposeTabIndex(index.index()))"
-					orientation="#{sessionScopeBean.probandVisibleTabSet.size() > 5 ? 'left' : 'top'}"
+					orientation="#{sessionScopeBean.probandVisibleTabSet.size() >= 5 ? 'right' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab
 						id="probandmain"

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

diff --git a/web/src/main/webapp/staff/staff.xhtml b/web/src/main/webapp/staff/staff.xhtml
@@ -30,7 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="staffTabView"
 					onTabShow="handleStaffTabChange(transposeTabIndex(index.index()))"
-					orientation="#{sessionScopeBean.staffVisibleTabSet.size() > 5 ? 'left' : 'top'}"
+					orientation="#{sessionScopeBean.staffVisibleTabSet.size() >= 5 ? 'right' : '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
@@ -22,7 +22,7 @@
 				<p:tabView id="tabView" dynamic="true" cache="false"
 					widgetVar="trialTabView"
 					onTabShow="handleTrialTabChange(transposeTabIndex(index.index()))"
-					orientation="#{sessionScopeBean.trialVisibleTabSet.size() > 5 ? 'left' : 'top'}"
+					orientation="#{sessionScopeBean.trialVisibleTabSet.size() >= 5 ? 'right' : '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
@@ -30,7 +30,7 @@
 					dynamic="true" cache="false"
 					widgetVar="userTabView"
 					onTabShow="handleUserTabChange(transposeTabIndex(index.index()))"
-					orientation="#{sessionScopeBean.userVisibleTabSet.size() > 5 ? 'left' : 'top'}"
+					orientation="#{sessionScopeBean.userVisibleTabSet.size() >= 5 ? 'right' : 'top'}"
 					styleClass="ctsms-tabview">
 					<p:tab
 						id="usermain"