Merging from downstream (Ascend)

Packages/lesiontracker/client/components/lesionTrackerWorklistContextMenu/lesionTrackerWorklistContextMenu.html

@@ -1,43 +1,42 @@
 <template name="lesionTrackerWorklistContextMenu">
     {{#if uiSettings.studyListFunctionsEnabled}}
-    <div id="studyContextMenu" class="studyContextMenu noselect"
-         oncontextmenu='return false;'
-         unselectable='on'
-         onselectstart='return false;'>
-        <ul>
-            <li>
-                <a id="viewStudies" type="button"
-                   title="View Studies">
-                    View
-                </a>
-                <hr/>
-                <a id="launchStudyAssociation" type="button"
-                   data-toggle="modal"
-                   data-target="#associationModal"
-                   title="Launch Study Association">
-                    Associate
-                </a>
-                <a id="launchRemoveAssociation" type="button"
-                   data-toggle="modal"
-                   data-target="#confirmRemoveTimepointAssociation"
-                    title="Remove Timepoint Association">
-                    Remove Association
-                </a>
-                <hr/>
-                <a id="viewSeriesDetails" type="button"
-                   title="View Series Details">
-                    View Series Details
-                </a>
-                <a class="disabled">Anonymize</a>
-                <a class="disabled">Send</a>
-                <hr/>
-                <a id="exportSelectedStudies"
-                   title="Export Selected Studies">
-                    Export
-                </a>
-                <a class="disabled">Delete</a>
-            </li>
-        </ul>
-    </div>
+        <div id="studyContextMenu" class="studyContextMenu noselect"
+            oncontextmenu='return false;'
+            unselectable='on'
+            onselectstart='return false;'
+        >
+            <ul>
+                <li>
+                    <a id="viewStudies" type="button"
+                       title="View Studies"
+                    >View</a>
+                    <hr/>
+
+                    <a id="launchStudyAssociation" type="button"
+                       data-toggle="modal"
+                       data-target="#associationModal"
+                       title="Launch Study Association"
+                    >Associate</a>
+                    <a id="launchRemoveAssociation" type="button"
+                       data-toggle="modal"
+                       data-target="#confirmRemoveTimepointAssociation"
+                       title="Remove Timepoint Association"
+                    >Remove Association</a>
+                    <hr/>
+
+                    <a id="viewSeriesDetails" type="button"
+                        title="View Series Details"
+                    >View Series Details</a>
+                    <a class="disabled">Anonymize</a>
+                    <a class="disabled">Send</a>
+                    <hr/>
+
+                    <a id="exportSelectedStudies"
+                        title="Export Selected Studies"
+                    >Export</a>
+                    <a class="disabled">Delete</a>
+                </li>
+            </ul>
+        </div>
     {{/if}}
 </template>

Packages/viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.styl

@@ -16,7 +16,6 @@
   position: relative
   transition($sidebarTransition)
   width: 217px
-
   -moz-background-clip: padding
   -webkit-background-clip: padding
   background-clip: padding-box

config/orthancDICOMWeb.json

@@ -23,7 +23,7 @@
     "verifyEmail": false,
     "ui": {
         "studyListFunctionsEnabled": true,
-        "leftSidebarOpen": true,
+        "leftSidebarOpen": false,
         "displaySetNavigationLoopOverSeries": false,
         "displaySetNavigationMultipleViewports": true
     }

etc/AscendAWS_CORSProxy.js

@@ -1,20 +0,0 @@
-// This sets up a proxy to work around CORS.
-// See http://chafey.blogspot.be/2014/09/working-around-cors.html
-// For more information
-var http = require('http'),
-    httpProxy = require('http-proxy');
-
-var proxy =  httpProxy.createProxyServer({
-    target: 'http://172.31.7.135:8042',
-    auth: 'orthanc:orthanc'
-}).listen(8043);
-
-proxy.on('proxyRes', function(proxyReq, req, res, options) {
-  // add the CORS header to the response
-  res.setHeader('Access-Control-Allow-Origin', '*');
-});
-
-proxy.on('error', function(e) {
-  // suppress errors
-  console.log(e);
-});