PWV-1: Fixing merging issues

OHIFViewer/client/components/ohifViewer/ohifViewer.html

@@ -1,11 +1,11 @@
 <template name="ohifViewer">
     <div class="topBar noselect {{#if onStudyList}}studyList{{/if}}">
-        <div class="clearfix p-x-1 p-t-1">
+        <div class="clearfix">
             <a target='_blank'
                class="brandSection pull-left"
                href="http://ohif.org">
                 <svg class="logoImage">
-                    <use xlink:href="/packages/viewerbase/assets/icons.svg#icon-ohif-logo"></use>
+                    <use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"></use>
                 </svg>
                 <div class="logoText">
                     Open Health Imaging Foundation

OHIFViewer/client/components/ohifViewer/ohifViewer.js

@@ -1,7 +1,7 @@
 import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
 
-const worklistContentId = 'worklistTab';
+const studylistContentId = 'studylistTab';
 let lastContentId;
 
 // Define the ViewerData global object
@@ -15,8 +15,8 @@ Template.ohifViewer.events({
     'click .js-toggle-studyList'() {
         const contentId = Session.get('activeContentId');
 
-        if (contentId !== worklistContentId) {
-            switchToTab(worklistContentId);
+        if (contentId !== studylistContentId) {
+            switchToTab(studylistContentId);
         } else {
             switchToTab(lastContentId);
         }
@@ -35,7 +35,7 @@ Template.ohifViewer.helpers({
             return;
         }
 
-        if (contentId === worklistContentId) {
+        if (contentId === studylistContentId) {
             return 'Back to viewer';
         } else {
             lastContentId = contentId;
@@ -44,6 +44,6 @@ Template.ohifViewer.helpers({
     },
 
     onStudyList() {
-        return (Session.get('activeContentId') === 'worklistTab');
+        return (Session.get('activeContentId') === 'studylistTab');
     }
 });

OHIFViewer/client/components/ohifViewer/ohifViewer.styl

@@ -9,6 +9,8 @@ $expandedHeight = 160px
 
 .topBar
   height: $topBarHeight
+  overflow: hidden
+  padding: 1rem $studyListPadding 0
   theme('color', '$textPrimaryColor')
   theme('background-color', '$primaryBackgroundColor')
   transition(all 0.5s ease)
@@ -19,7 +21,7 @@ $expandedHeight = 160px
     text-decoration: none
 
     .logoImage
-      margin: 0 8px
+      margin: 0 8px 0 0
       width: 30px
 
     .logoText
@@ -53,12 +55,11 @@ $expandedHeight = 160px
     .brandSection
       height: 100%
       width: 80%
-      padding-left: 50px
       line-height: $expandedHeight
 
       .logoImage
         width: 50px
-        margin: 0 20px
+        margin: 0 20px 0 0
 
       .logoText
         font-size: 30px
@@ -69,7 +70,7 @@ $expandedHeight = 160px
       top: 5px
       left: 5px
 
-#worklistTabs
+#studylistTabs
   height: "calc(100% - %s)" % $topBarHeight
 
   .tab-pane

OHIFViewer/client/components/toolbarSection/toolbarSection.js

@@ -19,7 +19,7 @@ Template.toolbarSection.helpers({
             value: instance.data.state,
             options: [{
                 value: 'studies',
-                svgLink: '/packages/viewerbase/assets/icons.svg#icon-studies',
+                svgLink: '/packages/ohif_viewerbase/assets/icons.svg#icon-studies',
                 svgWidth: 15,
                 svgHeight: 13,
                 bottomLabel: 'Series'
@@ -47,35 +47,35 @@ Template.toolbarSection.helpers({
             id: 'zoom',
             title: 'Zoom',
             classes: 'imageViewerTool',
-            svgLink: '/packages/viewerbase/assets/icons.svg#icon-tools-zoom'
+            svgLink: '/packages/ohif_viewerbase/assets/icons.svg#icon-tools-zoom'
         });
 
         buttonData.push({
             id: 'wwwc',
             title: 'Levels',
             classes: 'imageViewerTool',
-            svgLink: '/packages/viewerbase/assets/icons.svg#icon-tools-levels'
+            svgLink: '/packages/ohif_viewerbase/assets/icons.svg#icon-tools-levels'
         });
 
         buttonData.push({
             id: 'pan',
             title: 'Pan',
             classes: 'imageViewerTool',
-            svgLink: '/packages/viewerbase/assets/icons.svg#icon-tools-pan'
+            svgLink: '/packages/ohif_viewerbase/assets/icons.svg#icon-tools-pan'
         });
 
         buttonData.push({
             id: 'length',
             title: 'Length',
             classes: 'imageViewerTool toolbarSectionButton',
-            svgLink: '/packages/viewerbase/assets/icons.svg#icon-tools-measure-temp'
+            svgLink: '/packages/ohif_viewerbase/assets/icons.svg#icon-tools-measure-temp'
         });
 
         buttonData.push({
             id: 'annotate',
             title: 'Annotate',
             classes: 'imageViewerTool',
-            svgLink: '/packages/viewerbase/assets/icons.svg#icon-tools-measure-non-target'
+            svgLink: '/packages/ohif_viewerbase/assets/icons.svg#icon-tools-measure-non-target'
         });
 
         buttonData.push({