From 1581963c05f56f73779ece9de7f39126e46f8e0a Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Sun, 30 Oct 2016 10:10:08 -0400
Subject: [PATCH] Cleaned up layout of Export Metadata button on file pg. [ref
 #2465]

---
 src/main/webapp/file.xhtml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 599c64c1f39..7f2da62eff2 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -269,15 +269,15 @@
                                                               (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset()))}">
                                 
                                 <!-- Add + Edit Metadata Button -->
-                                <div class="button-block tab-header margin-bottom text-right" jsf:rendered="#{dataverseSession.user.authenticated
+                                <div class="button-block tab-header margin-bottom text-right">
+                                    <h:outputLink class="btn btn-default" value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE"
+                                                  rendered="#{dataverseSession.user.authenticated
                                                      and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)}">
-                                    <h:outputLink class="btn btn-default" value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE">
                                             <span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
                                     </h:outputLink>
-                                </div>
-                                <!-- END: Add + Edit Metadata Button -->
-                                <!-- Download Button -->
-                                    <div class="btn-group" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released}" >
+
+                                    <!-- Export Button -->
+                                    <div class="btn-group" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released}">
                                         <button class="btn btn-default dropdown-toggle" type="button" styleClass="btn btn-default" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"/></button>
                                         <ul class="dropdown-menu" role="menu">
@@ -290,6 +290,7 @@
                                             </ui:repeat>
                                         </ul>
                                     </div>
+                                </div>
                                 <!-- END: Add + Edit Metadata Button -->
                                 
                                 <div class="panel panel-default">