-
- {{#if panelPinned}}
-
- {{else}}
-
- {{/if}}
-
-
{{#if studyDateIsShown}}
{{> studyDateList}}
{{/if}}
-
{{> studyBrowser}}
diff --git a/Packages/viewerbase/client/components/basic/hidingPanel/hidingPanel.js b/Packages/viewerbase/client/components/basic/hidingPanel/hidingPanel.js
index 25ae65d0d..b97541b02 100644
--- a/Packages/viewerbase/client/components/basic/hidingPanel/hidingPanel.js
+++ b/Packages/viewerbase/client/components/basic/hidingPanel/hidingPanel.js
@@ -1,78 +1,82 @@
Template.hidingPanel.events({
'mouseover div.hidingPanel': function(e, template) {
-
- if (!template.panelPinned.get()) {
-
- var hidingPanel = $(e.currentTarget);
- hidingPanel.css({
- width: "122px"
- });
-
- // Set panel as open
- template.hidingPanelOpen.set(true);
-
- // Rotate Arrow Icon
- $('.arrowIcon').css( {'transform': 'rotate(180deg)'});
-
- // Set panel content opacity
- $(".hidingPanelContent").css("opacity", "1");
+ var isPinned = template.isPinned.get();
+ if (isPinned) {
+ return;
}
+
+ var hidingPanel = $(e.currentTarget);
+ hidingPanel.css({
+ width: '122px'
+ });
+
+ // Set panel as open
+ template.panelOpen.set(true);
+
+ // Rotate Arrow Icon
+ $('.arrowIcon').addClass('fa-flip-horizontal');
+
+ // Set panel content opacity
+ //hidingPanel.find('.hidingPanelContent').css('opacity', '1');
+ hidingPanel.find('.hidingPanelContent').css({
+ transform: 'translate(130px)'
+ });
},
'mouseout div.hidingPanel': function(e, template) {
-
- if (!template.panelPinned.get()) {
- var hidingPanel = $(e.currentTarget);
- hidingPanel.css({
- width: "1%"
- });
-
- // Set panel as closed
- template.hidingPanelOpen.set(false);
-
- // Rotate Arrow Icon
- $('.arrowIcon').css( {'transform': 'rotate(0deg)'});
-
- // Set panel content opacity
- $(".hidingPanelContent").css("opacity", "0");
-
+ var isPinned = template.isPinned.get();
+ if (isPinned) {
+ return;
}
+
+ var hidingPanel = $(e.currentTarget);
+ hidingPanel.css({
+ width: '1%'
+ });
+
+ // Set panel as closed
+ template.panelOpen.set(false);
+
+ // Rotate Arrow Icon
+ $('.arrowIcon').removeClass('fa-flip-horizontal');
+
+ // Set panel content opacity
+ //hidingPanel.find('.hidingPanelContent').css('opacity', '0');
+ hidingPanel.find('.hidingPanelContent').css({
+ transform: 'translate(-130px)'
+ });
},
-
'click button.btnPin': function(e, template) {
- var panelPinned = template.panelPinned.get();
- panelPinned = !panelPinned;
- template.panelPinned.set(panelPinned);
- if(panelPinned) {
+ var isPinned = template.isPinned.get();
+ isPinned = !isPinned;
+
+ template.isPinned.set(isPinned);
+
+ var mainElements = $('#viewportAndLesionTable');
+ if (isPinned) {
// Calculate newWidth of viewportAndLesionTable
- var viewerWidth = $("#viewer").width();
- var newPercentageOfviewportAndLesionTable = 100 - 122 / viewerWidth *100;
- $("#viewportAndLesionTable").css("width", newPercentageOfviewportAndLesionTable+"%");
-
- resizeViewportElements();
- }else{
-
+ var viewerWidth = $('#viewer').width();
+ var newWidth = 100 - 122 / viewerWidth * 100;
+ mainElements.css('width', newWidth + '%');
+ } else {
// Calculate newWidth of viewportAndLesionTable
- $("#viewportAndLesionTable").css("width", "99%");
-
- resizeViewportElements();
+ mainElements.css('width', '99%');
}
+
+ resizeViewportElements();
}
});
Template.hidingPanel.helpers({
- 'studyDateIsShown': function() {
+ studyDateIsShown: function() {
return true;
},
- 'panelPinned': function() {
- return Template.instance().panelPinned.get();
- },
- 'hidingPanelOpen': function() {
- return Template.instance().hidingPanelOpen.get();
+ isPinned: function() {
+ return Template.instance().isPinned.get();
}
});
Template.hidingPanel.onCreated(function() {
- this.hidingPanelOpen = new ReactiveVar(false);
- this.panelPinned = new ReactiveVar(false);
-});
\ No newline at end of file
+ this.panelOpen = new ReactiveVar(false);
+ this.isPinned = new ReactiveVar(false);
+});
diff --git a/Packages/viewerbase/client/components/basic/hidingPanel/hidingPanel.styl b/Packages/viewerbase/client/components/basic/hidingPanel/hidingPanel.styl
index dec78f998..26271cf99 100644
--- a/Packages/viewerbase/client/components/basic/hidingPanel/hidingPanel.styl
+++ b/Packages/viewerbase/client/components/basic/hidingPanel/hidingPanel.styl
@@ -1,81 +1,46 @@
-
-.hidingPanel, .hidingPanelContent, .studyBrowserContainer, .arrowIcon, .arrowIconRotate
-
- -o-transition: all 0.3s ease-out
- -ms-transition: all 0.3s ease-out
- -moz-transition: all 0.3s ease-out
- -webkit-transition: all 0.3s ease-out
- transition: all 0.3s ease-out
-
-
.hidingPanel
width: 1%
height: 100%
position: absolute
- left: 0px
+ left: 0
top: 70px
- bottom: 0px
+ bottom: 0
z-index: 10
background-color: black
+ border: 1px solid #666
- .arrowIcon
- color: white
- float: left
- margin-top: 8px
- margin-left: 2px;
- line-height: 12px
+ &.pinned
+ border: 1px solid transparent
- .arrowIconRotate
- -ms-transform: rotate(180deg)
- -webkit-transform: rotate(180deg)
- transform: rotate(180deg)
+ .iconContainer
+ width: 100%
+ height: 35px
+ overflow: hidden
+
+ .arrowIcon
+ color: white
+ margin: 0px 3px
+ font-size: 15pt
+ line-height: 35px
+
+ .btnPin
+ float: right
+ margin: 3px
+ outline: none
.hidingPanelContent
+ position: absolute
+ left: -130px
width: 100%
height: 100%
margin: 1px auto
- float: none
- opacity: 0
- border: 1px solid #666
- text-align: center
.studyBrowserContainer
- position: absolute
- display: block
- width: 120px
- left: 0
- right: 0
- top: 100px
height: calc(100% - 150px)
- .panelPinContainer
- width: 100%
- height: auto
- text-align: right
- vertical-align: center
- padding: 0
- margin: 0
- border-bottom: 1px solid #666
-
- .btnPin
- margin: 1px
- color: #424242
- outline: none
- background-color: #202020
- border: solid 1px #424242
- border-radius: 3px
-
- .btnPinActive
- border-color: white
-
- .btnPinInactive
- border: solid 1px #424242
-
- .btnPin:hover
- border: solid 1px lightgray
-
- .pinActive
- color: #FFFFFF
-
- .pinInactive
- color: #424242
\ No newline at end of file
+.hidingPanel, .arrowIcon
+ -o-transition: all 0.3s ease-out
+ -ms-transition: all 0.3s ease-out
+ -moz-transition: all 0.3s ease-out
+ -webkit-transition: all 0.3s ease-out
+ transition: all 0.3s ease-out
\ No newline at end of file
diff --git a/Packages/viewerbase/client/components/studyBrowser/studyBrowser/studyBrowser.styl b/Packages/viewerbase/client/components/studyBrowser/studyBrowser/studyBrowser.styl
index aec804342..5e1e315b8 100644
--- a/Packages/viewerbase/client/components/studyBrowser/studyBrowser/studyBrowser.styl
+++ b/Packages/viewerbase/client/components/studyBrowser/studyBrowser/studyBrowser.styl
@@ -2,7 +2,7 @@
float: left
height: 100%
width: 100%
- min-width: 120px
+ //min-width: 120px
overflow-y: auto
overflow-x: hidden
background-color: black