diff --git a/Packages/ohif-studies/imports/client/components/browser/item.html b/Packages/ohif-studies/imports/client/components/browser/item.html index f6a4db584..03bb520c6 100644 --- a/Packages/ohif-studies/imports/client/components/browser/item.html +++ b/Packages/ohif-studies/imports/client/components/browser/item.html @@ -10,12 +10,8 @@
{{studyData.modalities}}
- {{#if isLoaded}} -
{{formatDA studyData.studyDate 'D-MMM-YYYY'}}
-
{{studyData.studyDescription}}
- {{else}} -
{{#if eq studyAvailable false}}N/A{{else}}Click to load{{/if}}
- {{/if}} +
{{formatDA studyData.studyDate 'D-MMM-YYYY'}}
+
{{studyData.studyDescription}}
{{/let}} diff --git a/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.js b/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.js index ad9a13040..994e65486 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.js +++ b/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.js @@ -114,9 +114,21 @@ Template.seriesQuickSwitch.events({ 'mouseenter .series-switch, rescale .series-switch'(event, instance) { // Control the width of the series browser const $switch = $(event.currentTarget); - const browserWidth = $switch.offset().left + $switch.outerWidth(); const $seriesBrowser = $switch.find('.series-browser'); - $seriesBrowser.width(browserWidth - (browserWidth % 237)); + const $seriesQuickSwitch = $switch.closest('.series-quick-switch'); + + const isRight = $seriesQuickSwitch.hasClass('right'); + const switchOffsetLeft = $switch.offset().left; + const switchOuterWidth = $switch.outerWidth(); + + let browserWidth; + if (isRight) { + browserWidth = $(window).width() - switchOffsetLeft; + } else { + browserWidth = switchOffsetLeft + switchOuterWidth; + } + + $seriesBrowser.width(browserWidth - (browserWidth % 240)); const $quickSwitch = instance.$('.series-quick-switch'); if ($quickSwitch.is(':hover')) { diff --git a/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.styl b/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.styl index 35d56ebcf..ad3c30719 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.styl +++ b/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.styl @@ -87,7 +87,7 @@ .series-browser max-height: 100vh - max-width: 711px + max-width: 720px right: 0 transform-origin(calc(100% - 1em) calc(1em + 15px))