Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#5052 Fix Display of Explore Button #5077

Merged
merged 3 commits into from
Sep 27, 2018
Merged

#5052 Fix Display of Explore Button #5077

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9399b78
#5052 Fix Display of Explore Button
sekmiller Sep 21, 2018
1ff3a25
#5052 - fix doubling of explore button
sekmiller Sep 27, 2018
423e372
Merge branch 'develop' into 5052-fix-explore-button-render
sekmiller Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/webapp/file-download-button-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
<!--exploreTools is set as a ui:param by the file and dataset pages-->
<!--Note that "WorldMap Explore" is not an explore tool (external tool)-->
<div class="btn-group" jsf:rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools or (worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
<ui:fragment rendered="#{exploreTools.size()==1}">
<ui:fragment rendered="#{exploreTools.size()==1 or (exploreTools.size()==0 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
<button type="button" class="btn btn-default" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
<span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
</button>
</ui:fragment>
<ui:fragment rendered="#{exploreTools.size()>1}">
<ui:fragment rendered="#{exploreTools.size()>1 or (exploreTools.size()>=1 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"/>
</button>
Expand Down