Added dynamic compute to file pg (with ui:remove). Moved Contact/Shar…

…e button text to bundle. [ref #3747]
IQSS · Apr 28, 2017 · 1a08455 · 1a08455
1 parent 374abce
commit 1a08455
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 88 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
+share=Share
 link=Link
 linked=Linked
 harvested=Harvested

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -217,12 +217,12 @@
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
-                                    <span class="glyphicon glyphicon-envelope"/> Contact
+                                    <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
                                 </p:commandLink>
                                 <p:commandLink styleClass="text-button bootstrap-button-tooltip" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
                                                title="#{bundle['dataset.share.datasetShare']}"
                                                oncomplete="PF('shareDialog').show();sharrre();">
-                                    <span class="glyphicon glyphicon-share"/> Share
+                                    <span class="glyphicon glyphicon-share"/> #{bundle['share']}
                                 </p:commandLink>
                             </div>
                             <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true" rendered="#{!DatasetPage.workingVersion.deaccessioned}">

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
@@ -474,12 +474,12 @@
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
                                     <f:param name="DO_VALIDATION" value="false"/>   
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DataversePage.dataverse}"/>
-                                        <span class="glyphicon glyphicon-envelope"/> Contact
+                                        <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
                                 </p:commandLink>
                                 <p:commandLink type="button" styleClass="text-button bootstrap-button-tooltip"
                                    title="#{bundle['dataverse.share.dataverseShare']}"
                                    oncomplete="PF('shareDialog').show();sharrre();">
-                                    <span class="glyphicon glyphicon-share"/> Share
+                                    <span class="glyphicon glyphicon-share"/> #{bundle['share']}
                                 </p:commandLink>
                             </div>
                             <p:dialog id="shareDialog" header="#{bundle['dataverse.share.dataverseShare']}" widgetVar="shareDialog" modal="true">

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
@@ -114,9 +114,11 @@
         </p:commandLink>
     </ui:fragment>
 
-    <button type="button" jsf:rendered="#{isFilePg}" class="btn btn-default">
+    <ui:remove>
+    <h:outputLink value="#{DatasetPage.computeUrl}" type="button" class="btn btn-default" rendered="#{isFilePg and DatasetPage.isSwiftStorage()}">
         <span class="glyphicon glyphicon-flash"/> #{bundle['file.compute']}
-    </button>
+    </h:outputLink>
+    </ui:remove>
 
     <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) }"
                    type="button" styleClass="btn btn-default"