Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

left-oriented tabviews #283

Merged
merged 3 commits into from
Feb 27, 2024
Merged

left-oriented tabviews #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4d3da6
postgres jdbc CVE-2024-1597
rkrenn Feb 27, 2024
54bc686
switch to left-oriented tabviews when there are more than 5 tabs
rkrenn Feb 27, 2024
0e5b35c
css fixes for left-oriented tabviews
rkrenn Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.3.7</version>
<version>42.3.9</version>
</dependency>

<dependency>
Expand Down
1 change: 1 addition & 0 deletions web/src/main/webapp/course/course.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions web/src/main/webapp/inputfield/inputField.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions web/src/main/webapp/inventory/inventory.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions web/src/main/webapp/massmail/massMail.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions web/src/main/webapp/proband/proband.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 18 additions & 0 deletions web/src/main/webapp/resources/css/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions web/src/main/webapp/staff/staff.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions web/src/main/webapp/trial/trial.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}"
Expand Down
1 change: 1 addition & 0 deletions web/src/main/webapp/user/user.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading