PWV-1: Fixing merging issues

LesionTracker/activeEntry.js

@@ -6,10 +6,10 @@ if (Meteor.isClient){
         },
         signIn: {
             displayFullName: true,
-            destination: '/worklist'
+            destination: '/studylist'
         },
         signUp: {
-            destination: '/worklist'
+            destination: '/studylist'
         },
         themeColors: {
             primary: ""

LesionTracker/client/components/app/app.html

@@ -1,6 +1,6 @@
 <template name="app">
     <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">

LesionTracker/client/components/app/app.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

OHIFViewer/.meteor/versions

@@ -1,117 +0,0 @@
-accounts-base@1.2.14
-aldeed:collection2@2.10.0
-aldeed:collection2-core@1.2.0
-aldeed:schema-deny@1.1.0
-aldeed:schema-index@1.1.1
-aldeed:simple-schema@1.5.3
-aldeed:template-extension@4.0.0
-allow-deny@1.0.5
-arsnebula:reactive-promise@0.9.1
-autoupdate@1.3.12
-babel-compiler@6.13.0
-babel-runtime@0.1.13
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.2.0
-blaze-html-templates@1.0.5
-blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-caching-compiler@1.1.8
-caching-html-compiler@1.0.7
-callback-hook@1.0.10
-check@1.2.4
-clinical:router@2.0.19
-clinical:router-location@2.1.0
-clinical:router-middleware-stack@2.1.2
-clinical:router-url@2.1.0
-coffeescript@1.11.1_2
-ddp@1.2.5
-ddp-client@1.3.2
-ddp-common@1.2.7
-ddp-rate-limiter@1.0.6
-ddp-server@1.3.11
-deps@1.0.12
-design@0.0.1
-diff-sequence@1.0.7
-ecmascript@0.5.9
-ecmascript-runtime@0.3.15
-ejson@1.0.13
-fastclick@1.0.13
-fortawesome:fontawesome@4.6.3
-geojson-utils@1.0.10
-gilbertwat:bootstrap3-daterangepicker@1.3.21_1
-hot-code-push@1.0.4
-html-tools@1.0.11
-htmljs@1.0.11
-http@1.2.10
-id-map@1.0.9
-iron:controller@1.0.12
-iron:core@1.0.11
-iron:dynamic-template@1.0.12
-iron:layout@1.0.12
-johdirr:meteor-git-rev@0.0.4
-jquery@1.11.10
-launch-screen@1.1.0
-livedata@1.0.18
-localstorage@1.0.12
-logging@1.1.16
-mdg:validation-error@0.5.1
-meteor@1.6.0
-meteor-base@1.0.4
-meteor-platform@1.2.6
-minifier-css@1.2.15
-minifier-js@1.2.15
-minimongo@1.0.18
-mobile-experience@1.0.4
-mobile-status-bar@1.0.13
-modules@0.7.7
-modules-runtime@0.7.7
-momentjs:moment@2.15.2
-mongo@1.1.14
-mongo-id@1.0.6
-mrt:moment@2.8.1
-natestrauser:select2@4.0.3
-npm-mongo@2.2.11_2
-observe-sequence@1.0.14
-ohif:core@0.0.1
-ohif:cornerstone@0.0.1
-ohif:dicom-services@0.0.1
-ohif:hanging-protocols@0.0.1
-ohif:study-list@0.0.1
-ohif:viewerbase@0.0.1
-ohif:wadoproxy@0.0.1
-ordered-dict@1.0.9
-peppelg:bootstrap-3-modal@1.0.4
-practicalmeteor:chai@2.1.0_1
-practicalmeteor:loglevel@1.2.0_2
-promise@0.8.8
-raix:eventemitter@0.1.3
-random@1.0.10
-rate-limit@1.0.6
-reactive-dict@1.1.8
-reactive-var@1.0.11
-reload@1.1.11
-retry@1.0.9
-routepolicy@1.0.12
-service-configuration@1.0.11
-session@1.1.7
-shell-server@0.2.1
-silentcicero:jszip@0.0.4
-spacebars@1.0.13
-spacebars-compiler@1.0.13
-standard-app-packages@1.0.9
-standard-minifier-css@1.3.2
-standard-minifier-js@1.2.1
-stylus@2.513.6
-templating@1.2.15
-templating-compiler@1.2.15
-templating-runtime@1.2.15
-templating-tools@1.0.5
-tracker@1.1.1
-twbs:bootstrap@3.3.6
-ui@1.0.12
-underscore@1.0.10
-url@1.0.11
-validatejs@0.0.1
-webapp@1.3.12
-webapp-hashing@1.0.9

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) {
+        if (contentId !== studylistContentId) {
-            switchToTab(worklistContentId);
+            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({

PETSUVMeasurements/activeEntry.js

@@ -6,10 +6,10 @@ if (Meteor.isClient){
         },
         signIn: {
             displayFullName: true,
-            destination: '/worklist'
+            destination: '/studylist'
         },
         signUp: {
-            destination: '/worklist'
+            destination: '/studylist'
         },
         themeColors: {
             primary: ""

PETSUVMeasurements/client/components/app/app.html

@@ -1,6 +1,6 @@
 <template name="app">
     <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">

PETSUVMeasurements/client/components/app/app.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

Packages/ohif-core/client/ui/bounded/bounded.js

@@ -79,7 +79,7 @@ class Bounded {
         const result = {};
 
         // Check if the element is the window
-        if (element === window) {
+        if (!element || element === window) {
             const $window = $(window);
             const width = $window.outerWidth();
             const height = $window.outerHeight();

Packages/ohif-design/styles/imports/theme-tide.styl

@@ -8,7 +8,7 @@ $themes['tide'] = {
   $uiStateErrorBorder: #993333
   $uiStateErrorText: #661111
 
-  $uiLightGray: #516873
+  $uiGrayLight: #516873
   $uiGray: #263340
   $uiGrayDark: #16202B
   $uiGrayDarker: #151A1F

Packages/ohif-design/styles/imports/theme-tigerlilly.styl

@@ -8,7 +8,7 @@ $themes['tigerlilly'] = {
   $uiStateErrorBorder: #CC6666
   $uiStateErrorText: #661111
 
-  $uiLightGray: #516873
+  $uiGrayLight: #516873
   $uiGray: #263340
   $uiGrayDark: #16202B
   $uiGrayDarker: #151A1F

Packages/ohif-design/styles/imports/variables.styl

@@ -6,6 +6,8 @@ $toolbarHeight = 78px
 $toolbarDrawerHeight = 62px
 $studiesSidebarMenuWidth = 307px
 $lesionsSidebarMenuWidth = 323px
+$studyListPadding = 8%
+$studyListPaddingMediumScreen = 10px
 
 // Fonts
 $logoFontFamily = "Sanchez"

Packages/ohif-study-list/client/components/studylist/studylist.styl

@@ -12,9 +12,8 @@ body
 
 .studylistContainer
   theme('background-color', '$primaryBackgroundColor')
-  margin: 0 auto
+  margin: 2px auto 0
   color: white
-  float: left;
   width: 100%;
 
 .tab-content

Packages/ohif-study-list/client/components/studylist/studylistPagination/studylistPagination.styl

@@ -4,9 +4,6 @@
     font-size: 13px
     font-weight: normal !important
 
-  .rows-per-page
-    padding-top: 20px
-
     label
       font-weight: normal
 
@@ -15,18 +12,23 @@
       color: white
 
   .page-number
+    margin: 0
     text-align: right
 
     label
       font-weight: normal
 
       ul#pagination
+        margin: 0
 
         li
           a
             padding: 4px 8px
             theme('background-color', '$primaryBackgroundColor')
+            theme('border-color', '$uiGray')
+            theme('background-color', '$uiGrayDarkest')
             color: white
+            padding: 4px 8px
 
             &:hover
               theme('color', '$activeColor')
@@ -41,3 +43,13 @@
           a:hover
             color: inherit
 
+          &:not(.disabled):hover a
+            theme('background-color', '$uiGrayDark')
+            theme('color', '$activeColor')
+
+          &.active a
+            theme('background-color', '$uiGrayDark')
+            theme('color', '$activeColor')
+
+          &.disabled a
+            theme('color', '$uiGrayLight')

Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.html

@@ -1,6 +1,6 @@
 <template name="studylistResult">
-    <div class="studyListToolbar">
+    <div class="studyListToolbar clearfix">
-        <div class="header">
+        <div class="header pull-left">
             Study list
         </div>
         <div class="studyCount pull-right">

Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl

@@ -8,23 +8,21 @@ $inputBackgroundColor = #2c363f
 $inputPlaceholderColor = lightgray
 
 $studyListToolbarHeight = 75px
-$tablePadding = 8%
 $bodyCellHeight = 40px
 
 .studyListToolbar
   theme('background', '$uiGrayDarker')
   height: $studyListToolbarHeight
-  border-bottom: 2px solid black
+  margin-bottom: 2px
-  padding: 0 30px
+  padding: 0 $studyListPadding
 
-  div
+  &>div
     display: inline-block
 
   .header
     font-size: 22px
     font-weight: 300
     color: $tableTextSecondaryColor
-    padding: 0 10px
     line-height: $studyListToolbarHeight
 
   .studylistToolbar
@@ -35,20 +33,35 @@ $bodyCellHeight = 40px
     theme('color', '$uiSkyBlue')
     font-size: 40px
     font-weight: 100
-    padding: 0 10px
     line-height: $studyListToolbarHeight
 
 .theadBackground
-  theme('background-color', '$uiGrayDarker')
+  height: 121px
-  width: 100%
-  height: 122px
   position: absolute
-  z-index: 1
+  width: 100%
+
+  &:before, &:after
+    content: ''
+    display: block
+    left: 0
+    position: absolute
+    width: 100%
+
+  &:before
+    theme('background-color', '$uiGrayDarker')
+    height: 100%
+    top: 0
+    z-index: 1
+
+  &:after
+    theme('background-color', '$uiSkyBlue')
+    bottom: -1px
+    height: 1px
+    z-index: 3
 
 #studyListContainer
-  background: black
   width: 100%
-  padding: 0 $tablePadding
+  padding: 0 $studyListPadding
   position: absolute
   z-index: 2
 
@@ -64,7 +77,6 @@ $bodyCellHeight = 40px
 
   table#tblStudyList
     thead
-      theme('background-color', '$uiGrayDarker')
       white-space: nowrap
 
       tr
@@ -144,15 +156,10 @@ $bodyCellHeight = 40px
           color: $tableTextPrimaryColor
           font-weight: 300
           border-top: 1px solid #436270
+          border-bottom: 1px solid #436270
           white-space: nowrap
           transition(all 0.1s ease)
 
-          &:first-child
-            padding-left: $tablePadding
-
-          &:last-child
-            padding-right: $tablePadding
-
         &:hover, &:active, &.active
           background-color: $tableHoverColor
           color: white
@@ -163,7 +170,6 @@ $bodyCellHeight = 40px
             border-bottom: 1px solid #436270
             background-color: $tableHoverColor
 
-
 @media only screen and (max-width: 1362px)
   $tablePadding = 5%
   

Packages/ohif-study-list/client/lib/studylist.js

@@ -19,7 +19,7 @@ const currentServerChangeHandler = () => {
         return;
     }
 
-    switchToTab('worklistTab');
+    switchToTab('studylistTab');
 };
 
 CurrentServer.find().observe({

Packages/ohif-study-list/server/index.js

@@ -1,4 +1,5 @@
 import './publications.js';
+import './servers.js';
 import './validateServerConfiguration.js';
 
 import './lib';

Packages/ohif-study-list/server/servers.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { _ } from 'meteor/underscore';
 
 Meteor.startup(function() {
     console.log('Adding Servers from JSON Configuration');
@@ -72,7 +73,7 @@ class ServersControl {
     }
 
     static remove(serverId) {
-        var query = {
+        const query = {
             _id: serverId
         };
 

Packages/ohif-user-management/client/components/userAccountMenu/userAccountMenu.styl

@@ -24,7 +24,7 @@
         line-height: 18px
 
       .caret-down
-        theme('color', '$uiLightGray')
+        theme('color', '$uiGrayLight')
         margin: 0 4px 4px 2px
 
   ul.dropdown-menu

Packages/ohif-viewerbase/client/components/basic/loadingText/loadingText.styl

@@ -1,4 +1,4 @@
 .loadingTextDiv
-  margin: 30px
-  text-align: center
   font-weight: 300
+  padding: 30px
+  text-align: center

Packages/ohif-viewerbase/client/components/studyBrowser/thumbnailEntry/thumbnailEntry.js

@@ -205,10 +205,6 @@ Template.thumbnailEntry.onCreated(() => {
     instance.isDragAndDrop = _.isUndefined(instance.data.viewportIndex);
 });
 
-Template.thumbnailEntry.onRendered(() => {
-    console.warn('thumbnailEntry onRendered');
-});
-
 Template.thumbnailEntry.events({
     // Event handlers for drag and drop
     'touchstart .thumbnailEntry, mousedown .thumbnailEntry'(event, instance) {

StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.html

@@ -1,11 +1,11 @@
 <template name="standaloneViewer">
     <div class="topBar noselect">
-        <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

StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.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
@@ -50,17 +52,16 @@ $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
 
-#worklistTabs
+#studylistTabs
   height: "calc(100% - %s)" % $topBarHeight
 
   .tab-pane