OHIFVIEWER18- Thumbnails panel is on top of images when it is not pinned

This commit is contained in:
Evren Ozkan 2015-12-10 11:34:39 -05:00
parent 906c3e3f55
commit 25fc95e963
3 changed files with 33 additions and 21 deletions

View File

@ -8,7 +8,7 @@
#viewportAndLesionTable #viewportAndLesionTable
height: 100% height: 100%
width: 99% width: 99%
float: left float: right
-o-transition: all 0.3s ease-out; -o-transition: all 0.3s ease-out;
-ms-transition: all 0.3s ease-out; -ms-transition: all 0.3s ease-out;
-moz-transition: all 0.3s ease-out; -moz-transition: all 0.3s ease-out;

View File

@ -12,17 +12,10 @@ Template.hidingPanel.events({
template.hidingPanelOpen.set(true); template.hidingPanelOpen.set(true);
// Rotate Arrow Icon // Rotate Arrow Icon
$('.arrowIcon').css( {'transform': 'rotate(180deg)'}); $('.arrowIcon').toggleClass("arrowIconRotate");
// Set panel content opacity // Set panel content opacity
$(".hidingPanelContent").css("opacity", "1"); $(".hidingPanelContent").toggleClass("hidingPanelContentOpaque");
// Calculate newWidth of viewportAndLesionTable
var viewerWidth = $("#viewer").width();
var newPercentageOfviewportAndLesionTable = 100 - 120 / viewerWidth *100;
$("#viewportAndLesionTable").css("width", newPercentageOfviewportAndLesionTable+"%");
resizeViewportElements();
} }
}, },
@ -38,15 +31,11 @@ Template.hidingPanel.events({
template.hidingPanelOpen.set(false); template.hidingPanelOpen.set(false);
// Rotate Arrow Icon // Rotate Arrow Icon
$('.arrowIcon').css( {'transform': 'rotate(0deg)'}); $('.arrowIcon').toggleClass("arrowIconRotate");
// Set panel content opacity // Set panel content opacity
$(".hidingPanelContent").css("opacity", "0"); $(".hidingPanelContent").toggleClass("hidingPanelContentOpaque");
// Calculate newWidth of viewportAndLesionTable
$("#viewportAndLesionTable").css("width", "99%");
resizeViewportElements();
} }
}, },
@ -54,6 +43,20 @@ Template.hidingPanel.events({
var panelPinned = template.panelPinned.get(); var panelPinned = template.panelPinned.get();
panelPinned = !panelPinned; panelPinned = !panelPinned;
template.panelPinned.set(panelPinned); template.panelPinned.set(panelPinned);
if(panelPinned) {
// Calculate newWidth of viewportAndLesionTable
var viewerWidth = $("#viewer").width();
var newPercentageOfviewportAndLesionTable = 100 - 120 / viewerWidth *100;
$("#viewportAndLesionTable").css("width", newPercentageOfviewportAndLesionTable+"%");
resizeViewportElements();
}else{
// Calculate newWidth of viewportAndLesionTable
$("#viewportAndLesionTable").css("width", "99%");
resizeViewportElements();
}
} }
}); });

View File

@ -1,5 +1,5 @@
.hidingPanel,.studyBrowserContainer, .arrowIcon .hidingPanel, .hidingPanelContent, .studyBrowserContainer, .arrowIcon, .arrowIconRotate, .hidingPanelContentOpaque
-o-transition: all 0.3s ease-out -o-transition: all 0.3s ease-out
-ms-transition: all 0.3s ease-out -ms-transition: all 0.3s ease-out
@ -11,8 +11,12 @@
.hidingPanel .hidingPanel
width: 1% width: 1%
height: 100% height: 100%
position: relative position: absolute
float: left left: 0px
top: 70px
bottom: 0px
z-index: 10
background-color: black
.arrowIcon .arrowIcon
color: white color: white
@ -21,6 +25,11 @@
margin-left: 2px; margin-left: 2px;
line-height: 12px line-height: 12px
.arrowIconRotate
-ms-transform: rotate(180deg)
-webkit-transform: rotate(180deg)
transform: rotate(180deg)
.hidingPanelContent .hidingPanelContent
width: 100% width: 100%
height: 100% height: 100%
@ -70,5 +79,5 @@
.pinInactive .pinInactive
color: #424242 color: #424242
.hidingPanelContentOpaque
opacity: 1;