Skip to content

Commit df3b264

Browse files
bcivelbcivel
committed
remove sidebar on testcasescript page
1 parent 886bfb3 commit df3b264

File tree

3 files changed

+24
-18
lines changed

3 files changed

+24
-18
lines changed

‎source/src/main/webapp/TestCaseScript.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</head>
4646
<body x-data x-cloak class="crb_body">
4747
<jsp:include page="include/global/header2.html"/>
48-
<main class="crb_main" :class="$store.sidebar.expanded ? 'crb_main_sidebar-expanded' : 'crb_main_sidebar-collapsed'">
48+
<main class="crb_main" x-init="$store.sidebar.hidden = true">
4949
<%@ include file="include/global/messagesArea.html"%>
5050
<%@ include file="include/transversalobject/TestCase.html"%>
5151
<%@ include file="include/utils/modal-confirmation.html"%>

‎source/src/main/webapp/include/global/header2.html‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<aside class="crb_sidebar"
33
:class="$store.sidebar.expanded ? 'w-72' : 'w-20'"
44
@mouseenter="$store.sidebar.handleEnter()"
5-
@mouseleave="$store.sidebar.handleLeave()">
5+
@mouseleave="$store.sidebar.handleLeave()"
6+
x-show="!$store.sidebar.hidden">
67

78
<!-- Logo & Header -->
89
<div class="flex items-center justify-between p-6 border-b border-slate-700/50">
@@ -257,7 +258,7 @@
257258
<div x-cloak x-transition.opacity.duration.300ms
258259
x-show="!$store.sidebar.expanded && $store.sidebar.showSubMenu.maintain"
259260
:style="$store.sidebar.showSubMenu.maintain ? 'position: fixed; top:' + $store.sidebar.hoverPos.top + 'px; left:5rem;' : 'display:none'"
260-
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem]"
261+
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem] border border-slate-600"
261262
@mouseenter="$store.sidebar.enterSubMenu('maintain')"
262263
@mouseleave="$store.sidebar.leaveSubMenu('maintain')"
263264
x-ref="maintainMenuTeleport"
@@ -341,7 +342,7 @@
341342
<div x-cloak x-transition.opacity.duration.300ms
342343
x-show="!$store.sidebar.expanded && $store.sidebar.showSubMenu.execute"
343344
:style="$store.sidebar.showSubMenu.execute ? 'position: fixed; top:' + $store.sidebar.hoverPos.top + 'px; left:5rem;' : 'display:none'"
344-
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem]"
345+
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem] border border-slate-600"
345346
@mouseenter="$store.sidebar.enterSubMenu('execute')"
346347
@mouseleave="$store.sidebar.leaveSubMenu('execute')"
347348
x-ref="executeMenuTeleport"
@@ -413,7 +414,7 @@
413414
<div x-cloak x-transition.opacity.duration.300ms
414415
x-show="!$store.sidebar.expanded && $store.sidebar.showSubMenu.monitor"
415416
:style="$store.sidebar.showSubMenu.monitor ? 'position: fixed; top:' + $store.sidebar.hoverPos.top + 'px; left:5rem;' : 'display:none'"
416-
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem]"
417+
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem] border border-slate-600"
417418
@mouseenter="$store.sidebar.enterSubMenu('monitor')"
418419
@mouseleave="$store.sidebar.leaveSubMenu('monitor')"
419420
x-ref="monitorMenuTeleport"
@@ -491,7 +492,7 @@
491492
<div x-cloak x-transition.opacity.duration.300ms
492493
x-show="!$store.sidebar.expanded && $store.sidebar.showSubMenu.insights"
493494
:style="$store.sidebar.showSubMenu.insights ? 'position: fixed; top:' + $store.sidebar.hoverPos.top + 'px; left:5rem;' : 'display:none'"
494-
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem]"
495+
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem] border border-slate-600"
495496
@mouseenter="$store.sidebar.enterSubMenu('insights')"
496497
@mouseleave="$store.sidebar.leaveSubMenu('insights')"
497498
x-ref="insightsMenuTeleport"
@@ -586,7 +587,7 @@
586587
<div x-cloak x-transition.opacity.duration.300ms
587588
x-show="!$store.sidebar.expanded && $store.sidebar.showSubMenu.settings"
588589
:style="$store.sidebar.showSubMenu.settings ? 'position: fixed; top:' + $store.sidebar.hoverPos.top + 'px; left:5rem;' : 'display:none'"
589-
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem]"
590+
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem] border border-slate-600"
590591
@mouseenter="$store.sidebar.enterSubMenu('settings')"
591592
@mouseleave="$store.sidebar.leaveSubMenu('settings')"
592593
x-ref="settingsMenuTeleport"
@@ -644,7 +645,7 @@
644645
<div x-cloak x-transition.opacity.duration.300ms
645646
x-show="!$store.sidebar.expanded && $store.sidebar.showSubMenu.admin"
646647
:style="$store.sidebar.showSubMenu.admin ? 'position: fixed; top:' + $store.sidebar.hoverPos.top + 'px; left:5rem;' : 'display:none'"
647-
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem]"
648+
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem] border border-slate-600"
648649
@mouseenter="$store.sidebar.enterSubMenu('admin')"
649650
@mouseleave="$store.sidebar.leaveSubMenu('admin')"
650651
x-ref="adminMenuTeleport"
@@ -718,7 +719,7 @@
718719
<div x-cloak x-transition.opacity.duration.300ms
719720
x-show="!$store.sidebar.expanded && $store.sidebar.showSubMenu.developer"
720721
:style="$store.sidebar.showSubMenu.developer ? 'position: fixed; top:' + $store.sidebar.hoverPos.top + 'px; left:5rem;' : 'display:none'"
721-
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem]"
722+
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem] border border-slate-600"
722723
@mouseenter="$store.sidebar.enterSubMenu('developer')"
723724
@mouseleave="$store.sidebar.leaveSubMenu('developer')"
724725
x-ref="devMenuTeleport"
@@ -771,7 +772,7 @@
771772
<div x-cloak x-transition.opacity.duration.300ms
772773
x-show="!$store.sidebar.expanded && $store.sidebar.showSubMenu.help"
773774
:style="$store.sidebar.showSubMenu.help ? 'position: fixed; top:' + $store.sidebar.hoverPos.top + 'px; left:5rem;' : 'display:none'"
774-
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem]"
775+
class="crb_submenu bg-slate-800 rounded-lg shadow-lg p-2 space-y-1 min-w-[12rem] border border-slate-600"
775776
@mouseenter="$store.sidebar.enterSubMenu('help')"
776777
@mouseleave="$store.sidebar.leaveSubMenu('help')"
777778
x-ref="helpMenuTeleport"

‎source/src/main/webapp/js/global/initAlpineStore.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ document.addEventListener('alpine:init', () => {
3030
hoverSubMenu: {automate:false, maintain:false, execute:false, monitor:false, insights:false, settings: false, admin: false, developer: false, help: false},
3131
showSubMenu: {automate:false, maintain:false, execute:false, monitor:false, insights:false, settings: false, admin: false, developer: false, help: false},
3232
hoverPos: null,
33+
hidden: false,
3334

3435
toggleSidebar() {
3536
this.expanded = !this.expanded;
@@ -81,18 +82,22 @@ document.addEventListener('alpine:init', () => {
8182

8283

8384
handleEnter() {
84-
this.hover = true
85-
if (!this.expanded) {
86-
this.hoverTimeout = setTimeout(() => {
87-
if (this.hover) this.showLogo = false
88-
}, 1000) // délai 1s
85+
if (!this.hidden) {
86+
this.hover = true
87+
if (!this.expanded) {
88+
this.hoverTimeout = setTimeout(() => {
89+
if (this.hover) this.showLogo = false
90+
}, 1000) // délai 1s
91+
}
8992
}
9093
},
9194

9295
handleLeave() {
93-
this.hover = false
94-
this.showLogo = true
95-
if (this.hoverTimeout) clearTimeout(this.hoverTimeout)
96+
if (!this.hidden) {
97+
this.hover = false
98+
this.showLogo = true
99+
if (this.hoverTimeout) clearTimeout(this.hoverTimeout)
100+
}
96101
}
97102
});
98103

0 commit comments

Comments
 (0)