AWV-3: Merging changes from upstream

2016-09-03 14:47:39 -03:00
commit 176b503c5a
@@ -13,3 +13,4 @@ notices-for-facebook-graph-api-2
 1.3.0-split-minifiers-package
 1.3.5-remove-old-dev-bundle-link
 1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
@@ -5,20 +5,20 @@
 # but you can also edit it by hand.

 twbs:bootstrap
-http@1.2.8
+http@1.2.9
 arsnebula:reactive-promise
-promise@0.8.3
-stylus@2.513.4
+promise@0.8.4
+stylus@2.513.5
 fortawesome:fontawesome
 mrt:moment
 meteor-base@1.0.4
 mobile-experience@1.0.4
-mongo@1.1.10
+mongo@1.1.12
 blaze-html-templates@1.0.4
 session@1.1.6
 jquery@1.11.9
 tracker@1.1.0
-logging@1.1.14
+logging@1.1.15
 reload@1.1.10
 random@1.0.10
 ejson@1.0.12
@@ -26,9 +26,10 @@ spacebars@1.0.12
 check@1.2.3
 cornerstone
 dicomweb
+aldeed:simple-schema          # Third party package to deal with schemas
 design
 ohif:core
-ecmascript@0.5.7
+ecmascript@0.5.8
 viewerbase
 worklist
 reactive-var@1.0.10
@@ -37,7 +38,10 @@ hangingprotocols
 reactive-dict@1.1.8
 clinical:router
 fastclick@1.0.12
-standard-minifier-css@1.1.8
-standard-minifier-js@1.1.8
-aldeed:simple-schema
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
 johdirr:meteor-git-rev
+wadoproxy
+aldeed:template-extension
+peppelg:bootstrap-3-modal
+shell-server
@@ -1 +1 @@
-METEOR@1.4.0.1
+METEOR@1.4.1.1
@@ -1,16 +1,17 @@
 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.11
-babel-compiler@6.9.0
-babel-runtime@0.1.10
+babel-compiler@6.9.1
+babel-runtime@0.1.11
 base64@1.0.9
 binary-heap@1.0.9
 blaze@2.1.8
 blaze-html-templates@1.0.4
 blaze-tools@1.0.9
 boilerplate-generator@1.0.9
-caching-compiler@1.1.6
+caching-compiler@1.1.7
 caching-html-compiler@1.0.6
 callback-hook@1.0.9
 check@1.2.3
@@ -18,19 +19,19 @@ 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.2.3
+coffeescript@1.2.4_1
 cornerstone@0.0.1
 ddp@1.2.5
-ddp-client@1.3.0
+ddp-client@1.3.1
 ddp-common@1.2.6
-ddp-server@1.3.9
+ddp-server@1.3.10
 deps@1.0.12
 design@0.0.1
 dicomweb@0.0.1
 diff-sequence@1.0.6
 dimseservice@0.0.1
-ecmascript@0.5.7
-ecmascript-runtime@0.3.12
+ecmascript@0.5.8
+ecmascript-runtime@0.3.14
 ejson@1.0.12
 fastclick@1.0.12
 fortawesome:fontawesome@4.5.0
@@ -40,7 +41,7 @@ hangingprotocols@0.0.1
 hot-code-push@1.0.4
 html-tools@1.0.10
 htmljs@1.0.10
-http@1.2.8
+http@1.2.9
 id-map@1.0.8
 iron:controller@1.0.12
 iron:core@1.0.11
@@ -50,31 +51,32 @@ johdirr:meteor-git-rev@0.0.4
 jquery@1.11.9
 launch-screen@1.0.12
 livedata@1.0.18
-logging@1.1.14
-mdg:validation-error@0.2.0
-meteor@1.2.16
+logging@1.1.15
+mdg:validation-error@0.5.1
+meteor@1.2.17
 meteor-base@1.0.4
 meteor-platform@1.2.6
-minifier-css@1.2.13
-minifier-js@1.2.13
+minifier-css@1.2.14
+minifier-js@1.2.14
 minimongo@1.0.17
 mobile-experience@1.0.4
 mobile-status-bar@1.0.12
-modules@0.7.5
-modules-runtime@0.7.5
+modules@0.7.6
+modules-runtime@0.7.6
 momentjs:moment@2.14.4
-mongo@1.1.10
+mongo@1.1.12
 mongo-id@1.0.5
 mrt:moment@2.8.1
-natestrauser:select2@4.0.2
-npm-mongo@1.5.45
+natestrauser:select2@4.0.3
+npm-mongo@1.5.49
 observe-sequence@1.0.12
 ohif:core@0.0.1
 ordered-dict@1.0.8
 orthanc-remote@0.0.1
+peppelg:bootstrap-3-modal@1.0.4
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:loglevel@1.2.0_2
-promise@0.8.3
+promise@0.8.4
 random@1.0.10
 reactive-dict@1.1.8
 reactive-var@1.0.10
@@ -83,14 +85,15 @@ retry@1.0.8
 routepolicy@1.0.11
 rwatts:uuid@0.1.0
 session@1.1.6
+shell-server@0.2.1
 silentcicero:jszip@0.0.4
 spacebars@1.0.12
 spacebars-compiler@1.0.12
 standard-app-packages@1.0.9
-standard-minifier-css@1.1.8
-standard-minifier-js@1.1.8
-stylus@2.513.4
-templating@1.2.13
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
+stylus@2.513.5
+templating@1.2.14
 templating-tools@1.0.4
 tracker@1.1.0
 twbs:bootstrap@3.3.6
@@ -99,6 +102,7 @@ underscore@1.0.9
 url@1.0.10
 validatejs@0.0.1
 viewerbase@0.0.1
-webapp@1.3.10
+wadoproxy@0.0.1
+webapp@1.3.11
 webapp-hashing@1.0.9
 worklist@0.0.1
@@ -27,11 +27,11 @@ $lesionsSidebarMenuWidth = 450px
        transform(translateX(0%))

  .sidebar-left
-    max-width: $studiesSidebarMenuWidth
-    order: 1
+    theme('border-right', '%s solid $uiBorderColor' % $uiBorderThickness)
    flex: 1
    margin-left: - $studiesSidebarMenuWidth
-    border-right: $uiBorderThickness $uiBorderColor solid
+    max-width: $studiesSidebarMenuWidth
+    order: 1

    &.sidebar-open
      margin-left: 0
@@ -62,7 +62,7 @@ $lesionsSidebarMenuWidth = 450px
      max-width: $lesionsSidebarMenuWidth + 270px

    &:before
-      background-color: $uiBorderColor
+      theme('background-color', '$uiBorderColor')
      content: ''
      display: block
      height: 100%
@@ -75,6 +75,6 @@ $lesionsSidebarMenuWidth = 450px
      margin-right: 0

  .studiesListedChanger
+    theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)
    padding: 20px 10px
    text-align: center
-    border-bottom: $uiBorderThickness $uiBorderColor solid
@@ -25,4 +25,5 @@
    </div>
    {{> worklist }}
    {{> aboutModal }}
+    {{> viewSeriesDetailsModal }}
 </template>
@@ -9,8 +9,8 @@ $expandedHeight = 160px

 .topBar
  height: $topBarHeight
-  color: $textPrimaryColor
-  background-color: $primaryBackgroundColor
+  theme('color', '$textPrimaryColor')
+  theme('background-color', '$primaryBackgroundColor')
  transition(all 0.5s ease)

  .brandSection
@@ -26,14 +26,14 @@ $expandedHeight = 160px
      display: inline-block
      font-family: $logoFontFamily
      font-weight: $logoFontWeight
-      color: $textPrimaryColor
+      theme('color', '$textPrimaryColor')
      line-height: 30px

  .studyListLinkSection
-    border-left: $uiBorderThickness solid $uiBorderColor;
-    
+    theme('border-left', '%s solid $uiBorderColor' % $uiBorderThickness)
+
  .btn
-    color: $textSecondaryColor
+    theme('color', '$textSecondaryColor')
    cursor: pointer
    font-size: 13px
    font-weight: 500
@@ -41,10 +41,10 @@ $expandedHeight = 160px
    margin-top: 3px

    &:hover
-      color: $hoverColor
+      theme('color', '$hoverColor')

    &:active
-      color: $activeColor
+      theme('color', '$activeColor')

  &.studyList
    background-color: rgba(21, 25, 30, 0.7)
@@ -75,5 +75,5 @@ $expandedHeight = 160px
  .tab-pane
    .viewerContainer
      .loadingTextDiv
-        color: $textSecondaryColor
-        font-size: 30px
+        theme('color', '$textSecondaryColor')
+        font-size: 30px
@@ -1,7 +1,7 @@
@import "{design}/app"

 .toolbarSection
-  border-bottom: $uiBorderColor $uiBorderThickness solid
+  theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)
  flex: 0 0 auto
  height: $toolbarHeight
  overflow: hidden
@@ -11,4 +11,4 @@
  width: 100%

  &.expanded
-    height: $toolbarHeight + $toolbarDrawerHeight
+    height: $toolbarHeight + $toolbarDrawerHeight
@@ -6,5 +6,5 @@
  width: 100%

 .loadingTextDiv
-  color: $textSecondaryColor
+  theme('color', '$textSecondaryColor')
  font-size: 30px