Fixed jumping issue with Copy button, and spacing and grammar issues …

…with help text in Cloud Storage Access block. [ref #3747]
IQSS · May 5, 2017 · b010eca · b010eca
1 parent 4218ecc
commit b010eca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -1254,7 +1254,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.cloudStorageAccess.help=To directly access this data in the {2} cloud environment, use the container name in the Cloud Storage Access box below. To learn more about Cloud Storage Access, visit the <a href="{0}/{1}/user/dataset-management.html#cloud-storage" title="Cloud Storage Access - Dataverse User Guide" target="_blank">Cloud Storage Access</a> section of the User Guide.
+file.cloudStorageAccess.help=To directly access this data in the {2} cloud environment, use the container name in the Cloud Storage Access box below. To learn more about the cloud environment, visit the <a href="{0}/{1}/user/dataset-management.html#cloud-storage" title="Cloud Storage Access - Dataverse User Guide" target="_blank">Cloud Storage Access</a> section of the User Guide.
 file.copy=Copy
 file.compute=Compute
 

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -27,7 +27,7 @@
                 <div class="form-group col-xs-12 text-left">
                     <div class="col-xs-12">
                         <p class="help-block text-muted"><span class="glyphicon glyphicon-info-sign"/> 
-                            <h:outputFormat value="#{bundle['file.cloudStorageAccess.help']}" escape="false">
+                            <h:outputFormat value=" #{bundle['file.cloudStorageAccess.help']}" escape="false">
                                 <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                 <f:param value="#{systemConfig.guidesVersion}"/>
                                 <f:param value="#{DatasetPage.cloudEnvironmentName}"/>
@@ -42,14 +42,14 @@
                     <div class="col-md-4 col-sm-5 col-xs-6 input-group">
                         <div id="copy-input" class="form-control">#{DatasetPage.swiftContainerName}</div>
                         <span class="input-group-btn">
-                            <a href="#" class="btn btn-default btn-copy" data-clipboard-action="copy" data-clipboard-target="#copy-input">
-                                <span class="glyphicon glyphicon-copy"></span> #{bundle['file.copy']}
-                            </a>
+                            <button class="btn btn-default btn-copy" type="button" id="copy-button" data-clipboard-action="copy" data-clipboard-target="#copy-input">
+                              <span class="glyphicon glyphicon-copy"></span> #{bundle['file.copy']}
+                            </button>
                         </span>
                         <script>
                             $(document).ready(function () {
                                 // clipboard.js > cloud storage copy btn
-                                var clipboard = new Clipboard('a.btn-copy');
+                                var clipboard = new Clipboard('button.btn-copy');
 
                                 clipboard.on('success', function(e) {
                                     console.log(e);