Skip to content

Commit

Permalink
Merge branch 'develop' into 3747-swift-and-compute-button #3747
Browse files Browse the repository at this point in the history
  • Loading branch information
pdurbin committed Apr 24, 2017
2 parents 282822f + 64090b7 commit da24842
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/main/webapp/file-download-button-fragment.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -275,4 +275,14 @@
<!-- 4.2.1 - TODO: retest this on a dataset with fileRequest enabled and with some files restricted to the user -->
<span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
</p:commandLink>
<p:dialog header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapData_popup" modal="true">
<p class="help-block">
<span class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
</p>
<div class="button-block">
<button type="button" class="btn btn-default" onclick="PF('mapData_popup').hide();PF('blockDatasetForm').hide();">
#{bundle.close}
</button>
</div>
</p:dialog>
</ui:composition>

0 comments on commit da24842

Please sign in to comment.