From cf9202214fe4c039e29c460298be14aa39a0ef9b Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 27 Jan 2017 14:14:41 -0500
Subject: [PATCH] #2290 remove extra line; fix spacing

---
 src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java | 1 -
 src/main/webapp/file.xhtml                                    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
index 600e4679538..ebb0dddd524 100644
--- a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
@@ -1781,7 +1781,6 @@ public void handleFileUpload(FileUploadEvent event) throws IOException {
                     RequestContext context = RequestContext.getCurrentInstance();
                     RequestContext.getCurrentInstance().update("datasetForm:fileTypeDifferentPopup");
                     context.execute("PF('fileTypeDifferentPopup').show();");
-                    context.execute("PF('fileTypeDifferentPopup').show();");
             }
             return;
                
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index d724947ee64..a462b10e843 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -275,7 +275,7 @@
                                                      and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
                                             <span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
                                     </h:outputLink>
-                                <div class="btn-group pull-right" jsf:rendered="#{dataverseSession.user.authenticated
+                                <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
                                                          and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset) 
                                                          and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile)) }">
                                     <p:commandLink styleClass="btn btn-default" onclick="PF('fileAlreadyReplacedPrevious').show()">