Added static Compute button and Cloud Storage Access label and input-…

…group to dataset pg. Moved dataset version number into label next to title on dataset and file pgs. [ref #3747]
IQSS · Apr 14, 2017 · bd73ce8 · bd73ce8
1 parent c0809e2
commit bd73ce8
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 99 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -1250,6 +1250,9 @@ file.originalChecksumType=Original File {0}
 file.checksum.exists.tip=A file with this checksum already exists in the dataset.
 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.compute=Compute
 
 file.metaData.dataFile.dataTab.variables=Variables
 file.metaData.dataFile.dataTab.observations=Observations
@@ -1453,7 +1456,7 @@ file.downloadDialog.header=Download File
 file.downloadDialog.tip=Please confirm and/or complete the information needed below in order to download files in this dataset.
 file.downloadDialog.termsTip=I accept these Terms of Use.
 
-file.search.placeholder=Search these data files...
+file.search.placeholder=Search this dataset...
 file.results.btn.sort=Sort
 file.results.btn.sort.option.nameAZ=Name (A-Z)
 file.results.btn.sort.option.nameZA=Name (Z-A)
@@ -1517,7 +1520,7 @@ file.general.metadata.label=General Metadata
 file.description.label=Description
 file.tags.label=Tags
 file.lastupdated.label=Last Updated
-file.DatasetVersion=Dataset Version
+file.DatasetVersion=Version
 
 file.metadataTab.fileMetadata.header=File Metadata
 file.metadataTab.fileMetadata.persistentid.label=Data File Persistent ID

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -277,6 +277,11 @@
                                     <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{DatasetPage.workingVersion.inReview}"/>
                                     <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!DatasetPage.dataset.released}"/>
                                     <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{DatasetPage.workingVersion.deaccessioned}"/>
+                                    <!-- DATASET VERSION NUMBER -->
+                                    <h:outputText styleClass="label label-default" rendered="#{DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview)}"
+                                                  value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionNumber}.#{DatasetPage.workingVersion.minorVersionNumber}" /> 
+                                    <h:outputText styleClass="label label-default" rendered="#{!DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview)}"
+                                                  value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionState}"/>
                                 </div>
                             </div>
                             <!-- CITATION BLOCK -->
@@ -409,13 +414,6 @@
                             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="#{DatasetPage.editMode == 'METADATA' ? 1 : DatasetPage.selectedTabIndex}"/>
                         </p:commandButton>
                     </div>
-
-                    <div id="versionNumber" class="col-xs-12">
-                                <h:outputText rendered="#{DatasetPage.workingVersion.released}" styleClass="highlightBold"
-                                              value="#{bundle['file.DatasetVersion']}: #{DatasetPage.workingVersion.versionNumber}.#{DatasetPage.workingVersion.minorVersionNumber}" /> 
-                                <h:outputText rendered="#{!DatasetPage.workingVersion.released}" styleClass="highlightBold"
-                                              value="#{bundle['file.DatasetVersion']}: #{DatasetPage.workingVersion.versionState}"/> 
-                    </div>
                     <!-- END Header / Button Panel -->
                     <!-- View/Tabs infoMode -->
                     <!-- Tabs -->

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -168,6 +168,11 @@
                                 <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
                                 <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>   
                                 <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
+                                <!-- DATASET VERSION NUMBER -->
+                                <h:outputText styleClass="label label-default" rendered="#{FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
+                                              value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}" /> 
+                                <h:outputText styleClass="label label-default" rendered="#{!FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
+                                              value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionState}"/>
                             </div>
                             <div id="citation-block" class="col-xs-12">
                                  <div class="col-xs-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
@@ -208,12 +213,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div id="versionNumber" class="col-xs-12">
-                                <h:outputText rendered="#{FilePage.fileMetadata.datasetVersion.released}" styleClass="highlightBold"
-                                              value="#{bundle['file.DatasetVersion']}: #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}" /> 
-                                <h:outputText rendered="#{!FilePage.fileMetadata.datasetVersion.released}" styleClass="highlightBold"
-                                              value="#{bundle['file.DatasetVersion']}: #{FilePage.fileMetadata.datasetVersion.versionState}"/> 
-                            </div>
 
                             <div id="deaccession-reason-block" class="col-xs-12" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                 <div class="col-xs-12 bg-danger">