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

Fix dataset pg layout bug related to guestbook popup. [ref #4838] #4975

Merged
merged 2 commits into from
Aug 21, 2018
Merged

Fix dataset pg layout bug related to guestbook popup. [ref #4838] #4975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf6cb32
Moved button render logic to ui:fragment to fix dataset pg layout bug…
mheppler Aug 17, 2018
965d180
Moved render logic on submit for review button to ui:fragment to fix …
mheppler Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/main/webapp/dataset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,16 @@
<!-- END: Return to Author Button -->

<!-- Submit for Review Button -->
<button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" onclick="PF('inreview').show()"
jsf:rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
and !DatasetPage.datasetLockedInWorkflow
and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
and DatasetPage.canUpdateDataset()
and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
<span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
</button>
<ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
and !DatasetPage.datasetLockedInWorkflow
and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
and DatasetPage.canUpdateDataset()
and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
<button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" onclick="PF('inreview').show()">
<span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
</button>
</ui:fragment>

<!-- End: Submit for Review Button -->
</ui:fragment>
<!-- END: Publish/Submit for Review/Return to Author Button Group -->
Expand Down
16 changes: 10 additions & 6 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,16 @@
<!--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))}">
<button jsf:rendered="#{exploreTools.size()==1}" type="button" class="btn btn-default" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
<span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
</button>
<button jsf:rendered="#{exploreTools.size()>1}" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"/>
</button>
<ui:fragment rendered="#{exploreTools.size()==1}">
<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}">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"/>
</button>
</ui:fragment>
<ul class="dropdown-menu multi-level pull-right text-left" role="menu">
<!--external tools-->
<ui:repeat var="tool" value="#{exploreTools}">
Expand Down