othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging from downstream (Ascend)

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-09-09 15:40:23 -03:00
parent e088eca37a
commit 574a6d02b0
4 changed files with 39 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Packages/lesiontracker/client/components/lesionTrackerWorklistContextMenu/lesionTrackerWorklistContextMenu.html
View File

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

1
Packages/viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.styl
View File

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

2
config/orthancDICOMWeb.json
View File

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

20
etc/AscendAWS_CORSProxy.js
View File

@ -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);
});