Merging from downstream (Ascend)

This commit is contained in:
Bruno Alves de Faria committed 2016-09-09 15:40:23 -03:00
1 parent e088eca37a
commit 574a6d02b0
4 files changed
+39 -61

No files matched your search

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