Layout revisions related to Compute button, Cloud Storage Access labe…

…l, and other related action buttons on the file, dataset and dataverse pgs. [ref #3747]
IQSS · Apr 26, 2017 · ec49142 · ec49142
1 parent 113976e
commit ec49142
Show file tree

Hide file tree

Showing 7 changed files with 277 additions and 265 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -42,6 +42,7 @@ curator=Curator
 explore=Explore
 download=Download
 deaccession=Deaccession
+link=Link
 linked=Linked
 harvested=Harvested
 apply=Apply
@@ -1252,6 +1253,7 @@ file.selectedThumbnail=Thumbnail
 file.selectedThumbnail.tip=The thumbnail for this file is used as the default thumbnail for the dataset. Click 'Advanced Options' button of another file to select that file.
 file.cloudStorageAccess=Cloud Storage Access
 file.cloudStorageAccess.tip=The container name for this dataset needed to access files in cloud storage.
+file.copy=Copy
 file.compute=Compute
 
 file.metaData.dataFile.dataTab.variables=Variables
@@ -1291,6 +1293,7 @@ file.spss-porExtraLabels.title=Upload an additional text file with extra variabl
 file.spss-porExtraLabels.selectToAddBtn=Select File to Add
 file.ingestFailed=Tabular Data Ingest Failed
 file.explore.twoRavens=TwoRavens
+file.map=Map
 file.mapData=Map Data
 file.mapData.worldMap=WorldMap
 file.mapData.unpublished.header=Data Not Published

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
@@ -349,11 +349,46 @@
                     <ui:fragment rendered="#{empty DataversePage.editMode}">
                         <div id="actionButtonBlock" class="button-block clearfix" jsf:rendered="#{!widgetWrapper.widgetView}">
                             <!-- Edit/Publish Button Group -->
-                            <ui:fragment rendered="#{dataverseSession.user.authenticated and 
+                            <div class="btn-group pull-right" jsf:rendered="#{dataverseSession.user.authenticated and 
                                                      (permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)
                                                      or permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse))}">
+                                    <!-- Publish Button -->
+                                    <ui:fragment rendered="#{permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse)}">
+                                        <button type="button" class="btn btn-default btn-access" onclick="PF('confirmation').show()"
+                                                jsf:rendered="#{!DataversePage.dataverse.released and (empty DataversePage.dataverse.owner or DataversePage.dataverse.owner.released)}">
+                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
+                                        </button>
+                                        <button type="button" class="btn btn-default btn-access" onclick="PF('mayNotRelease').show()"
+                                                jsf:rendered="#{!DataversePage.dataverse.released and (!empty DataversePage.dataverse.owner and !DataversePage.dataverse.owner.released)}">
+                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
+                                        </button>
+                                    </ui:fragment>
+                                    <!-- END: Publish Button -->
+                                    <div class="btn-group" jsf:rendered="#{dataverseSession.user.superuser and (SearchIncludeFragment.mode == 'search' or DataversePage.dataverse.owner != null)}">
+                                        <a href="#" type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                                            <span class="glyphicon glyphicon-link"/> #{bundle['link']} <span class="caret"></span>
+                                        </a>
+                                        <ul class="dropdown-menu pull-right text-left" role="menu">
+                                            <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
+                                                <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"                                                          
+                                                               oncomplete="PF('linkDataverseForm').show()"
+                                                               update=":linkDataverseForm"
+                                                               disabled="#{DataversePage.dataverse.owner == null}">
+                                                    #{bundle['dataverse.link']}
+                                                </p:commandLink>
+                                            </li>
+                                            <li class="#{SearchIncludeFragment.mode == 'search' ? '' : 'disabled'}">
+                                                <p:commandLink action="#{DataversePage.setupLinkingPopup('savedSearch')}"
+                                                               oncomplete="PF('linkDataverseForm').show()"
+                                                               update=":linkDataverseForm"
+                                                               disabled="#{SearchIncludeFragment.mode != 'search'}">
+                                                    #{bundle['dataverse.savedsearch.link']}
+                                                </p:commandLink>
+                                            </li>
+                                        </ul>
+                                    </div>
                                     <!-- Edit Button -->
-                                    <div class="btn-group pull-right" jsf:rendered="#{permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)}">
+                                    <div class="btn-group" jsf:rendered="#{permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)}">
                                         <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-pencil"/> #{bundle['dataverse.edit']} <span class="caret"></span>
                                         </button>
@@ -427,19 +462,7 @@
                                         </ul>
                                     </div>
                                     <!-- END: Edit Button -->
-                                    <!-- Publish Button -->
-                                    <ui:fragment rendered="#{permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse)}">
-                                        <button type="button" class="btn btn-default btn-access pull-right" onclick="PF('confirmation').show()"
-                                                jsf:rendered="#{!DataversePage.dataverse.released and (empty DataversePage.dataverse.owner or DataversePage.dataverse.owner.released)}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
-                                        </button>
-                                        <button type="button" class="btn btn-default btn-access pull-right" onclick="PF('mayNotRelease').show()"
-                                                jsf:rendered="#{!DataversePage.dataverse.released and (!empty DataversePage.dataverse.owner and !DataversePage.dataverse.owner.released)}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
-                                        </button>
-                                    </ui:fragment>
-                                    <!-- END: Publish Button -->
-                            </ui:fragment>
+                            </div>
 
                             <!-- END: Edit/Publish Button Group -->
                             <!-- Email/Link/Share Button Group -->
@@ -453,30 +476,6 @@
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DataversePage.dataverse}"/>
                                         <span class="glyphicon glyphicon-envelope"/> Contact
                                 </p:commandLink>
-                                <div class="btn-group" jsf:rendered="#{dataverseSession.user.superuser and (SearchIncludeFragment.mode == 'search' or DataversePage.dataverse.owner != null)}">
-                                    <a href="#" class="text-button dropdown-toggle bootstrap-button-tooltip" data-toggle="dropdown" aria-expanded="false"
-                                            title="#{bundle['dataverse.link.btn.tip']}">
-                                        <span class="glyphicon glyphicon-link"/> Link <span class="caret"></span>
-                                    </a>
-                                    <ul class="dropdown-menu pull-right text-left" role="menu">
-                                        <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
-                                            <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"                                                          
-                                                           oncomplete="PF('linkDataverseForm').show()"
-                                                           update=":linkDataverseForm"
-                                                           disabled="#{DataversePage.dataverse.owner == null}">
-                                                #{bundle['dataverse.link']}
-                                            </p:commandLink>
-                                        </li>
-                                        <li class="#{SearchIncludeFragment.mode == 'search' ? '' : 'disabled'}">
-                                            <p:commandLink action="#{DataversePage.setupLinkingPopup('savedSearch')}"
-                                                           oncomplete="PF('linkDataverseForm').show()"
-                                                           update=":linkDataverseForm"
-                                                           disabled="#{SearchIncludeFragment.mode != 'search'}">
-                                                #{bundle['dataverse.savedsearch.link']}
-                                            </p:commandLink>
-                                        </li>
-                                    </ul>
-                                </div>
                                 <p:commandLink type="button" styleClass="text-button bootstrap-button-tooltip"
                                    title="#{bundle['dataverse.share.dataverseShare']}"
                                    oncomplete="PF('shareDialog').show();sharrre();">

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
@@ -18,28 +18,30 @@
         </span>
     </ui:fragment>
 
-    <!-- WorldMap Preview -->
-    <div class="modal fade" id="map-modal-#{fileMetadata.id}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header text-left">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="#{bundle['close']}"><span aria-hidden="true">&#215;</span></button>
-                    <h4 class="modal-title" id="myModalLabel"><span style="color:#c75b1d;">#{bundle['file.previewMap']}</span> #{fileMetadata.label}</h4>
-                </div>
-                <div class="modal-body">
-                    <iframe id="id_iframe_map" height="300" width="100%" src="#{ worldMapPermissionHelper.getMapLayerMetadata(fileMetadata.dataFile).getEmbedMapLink() }"></iframe>
-                </div>
-                <div class="modal-footer clearfix">
-                    <a href="#{ worldMapPermissionHelper.getMapLayerMetadata(fileMetadata.dataFile).getLayerLink() }" target="_blank"><img src="https://worldmap.harvard.edu/static/theme/img/WorldMap-Logo_26px.png" alt="#{bundle['file.mapData.worldMap']}" class="pull-left" style="margin-top:5px;" /></a>
-                    <a href="#{ worldMapPermissionHelper.getMapLayerMetadata(fileMetadata.dataFile).getLayerLink() }" class="btn btn-default" target="_blank"><span class="glyphicon glyphicon-equalizer"/> #{bundle['file.metaData.viewOnWorldMap']}</a>
-                    <button type="button" class="btn btn-default" data-dismiss="modal">#{bundle['close']}</button>
+    <ui:fragment rendered="#{worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata)}">
+        <button type="button" style="border-right:0;" class="btn btn-default" data-target="#map-modal-#{fileMetadata.id}" data-toggle="modal">
+            <span class="glyphicon glyphicon-map-marker"/> #{bundle['preview']}
+        </button>
+        <div class="modal fade" id="map-modal-#{fileMetadata.id}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+            <!-- WorldMap Preview -->
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header text-left">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="#{bundle['close']}"><span aria-hidden="true">&#215;</span></button>
+                        <h4 class="modal-title" id="myModalLabel"><span style="color:#c75b1d;">#{bundle['file.previewMap']}</span> #{fileMetadata.label}</h4>
+                    </div>
+                    <div class="modal-body">
+                        <iframe id="id_iframe_map" height="300" width="100%" src="#{ worldMapPermissionHelper.getMapLayerMetadata(fileMetadata.dataFile).getEmbedMapLink() }"></iframe>
+                    </div>
+                    <div class="modal-footer clearfix">
+                        <a href="#{ worldMapPermissionHelper.getMapLayerMetadata(fileMetadata.dataFile).getLayerLink() }" target="_blank"><img src="https://worldmap.harvard.edu/static/theme/img/WorldMap-Logo_26px.png" alt="#{bundle['file.mapData.worldMap']}" class="pull-left" style="margin-top:5px;" /></a>
+                        <a href="#{ worldMapPermissionHelper.getMapLayerMetadata(fileMetadata.dataFile).getLayerLink() }" class="btn btn-default" target="_blank"><span class="glyphicon glyphicon-equalizer"/> #{bundle['file.metaData.viewOnWorldMap']}</a>
+                        <button type="button" class="btn btn-default" data-dismiss="modal">#{bundle['close']}</button>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-    <button type="button" jsf:rendered="#{worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata)}" class="btn btn-default" data-target="#map-modal-#{fileMetadata.id}" data-toggle="modal">
-        <span class="glyphicon glyphicon-map-marker"/> #{bundle['preview']}
-    </button>
+    </ui:fragment>
 
     <div class="btn-group" jsf:rendered="#{twoRavensHelper.canSeeTwoRavensExploreButtonFromPage(fileMetadata) and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata)}">           
         <!-- Explore Dropdown: When TwoRavens **AND** WorldMap Explore options are available -->
@@ -112,22 +114,24 @@
         </p:commandLink>
     </ui:fragment>
 
-    <div class="btn-group" role="group" jsf:rendered="#{worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}">
+    <ui:fragment rendered="#{worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}">
         <!-- WorldMap Map Data button group -->
         <!-- 4.2.1: VERIFIED: none of these checks add any queries, if there are no map layers. -->
         <!-- WorldMap Map Data -->
         <h:outputLink pt:role="button" rendered="#{worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata)}"
                       type="button" styleClass="btn btn-default" value="#{fileMetadata.dataFile.getMapItURL(dataverseSession.user.id)}" role="button">
-            <span class="glyphicon glyphicon-map-marker"/> #{bundle['file.mapData']}
+            <span class="glyphicon glyphicon-map-marker"/> #{bundle['file.map']}
         </h:outputLink>
         <!-- Unpublished Map Data -->
-        <ui:fragment rendered="#{worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}">
-            <button type="button" class="btn btn-default" onclick="PF('mapData_popup').show()">
-                <span class="glyphicon glyphicon-map-marker"/> #{bundle['file.mapData']}
-            </button>
-        </ui:fragment>
-    </div>
+        <button type="button" jsf:rendered="#{worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}" class="btn btn-default" onclick="PF('mapData_popup').show()">
+            <span class="glyphicon glyphicon-map-marker"/> #{bundle['file.map']}
+        </button>
+    </ui:fragment>
 
+    <button type="button" jsf:rendered="#{isFilePg}" class="btn btn-default">
+        <span class="glyphicon glyphicon-flash"/> #{bundle['file.compute']}
+    </button>
+
     <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) }"
                    type="button" styleClass="btn btn-default"
                    actionListener="#{fileDownloadService.startFileDownload(guestbookResponse, fileMetadata, 'Download')}">

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -43,7 +43,7 @@
 
                             <div class="button-block pull-right">
                                 <!-- Explore/Map Data/Download/Request Button Block -->
-                                <div class="button-container pull-right" jsf:rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
+                                <div class="button-container btn-group pull-right" jsf:rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
                                                               (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset()))}">
                                     <ui:include src="file-download-button-fragment.xhtml">
                                         <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
@@ -52,6 +52,7 @@
                                         <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
                                         <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
                                         <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
+                                        <ui:param name="isFilePg" value="true"/>
                                     </ui:include>
                                 </div>
                                 <!-- END: Explore/Map Data/Download/Request Button Block -->