From ee5b647eb14cb1875288ee1253d5e9d0cb30d8e5 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 8 Feb 2016 23:20:52 -0500
Subject: [PATCH] Cleaned up the layout of the access action popups on the File
 Permissions pg. [ref #2716]

---
 .../webapp/permissions-manage-files.xhtml     | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml
index cbaeac07aef..676efb25e31 100644
--- a/src/main/webapp/permissions-manage-files.xhtml
+++ b/src/main/webapp/permissions-manage-files.xhtml
@@ -187,7 +187,7 @@
                         </div>
                     </div>
                     <!-- View / Remove Users/Groups Popup -->
-                    <p:dialog id="viewRemoveDialog" styleClass="largePopUp" header="#{bundle['dataverse.permissionsFiles.viewRemoveDialog.header']}" widgetVar="viewRemoveWidget" modal="true">
+                    <p:dialog id="viewRemoveDialog" width="65%" header="#{bundle['dataverse.permissionsFiles.viewRemoveDialog.header']}" widgetVar="viewRemoveWidget" modal="true">
                         <div>
                             <p:outputPanel id="selectionRemoveCounter">
                                 <p>
@@ -228,7 +228,7 @@
                         </div>
                     </p:dialog>
                     <!-- Assign Users/Groups Popup -->
-                    <p:dialog id="assignDialog" header="#{bundle['dataverse.permissionsFiles.assignDialog.header']}" widgetVar="assignWidget" modal="true">
+                    <p:dialog id="assignDialog" width="65%" header="#{bundle['dataverse.permissionsFiles.assignDialog.header']}" widgetVar="assignWidget" modal="true">
                         <p:fragment id="assignMessages">
                             <div class="messagePanel">
                                 <iqbs:messages collapsible="true" />
@@ -243,7 +243,7 @@
                                             #{bundle['dataverse.permissionsFiles.assignDialog.userOrGroup']}
                                         </span>
                                     </label>
-                                    <div class="col-sm-9">
+                                    <div class="col-sm-5">
                                         <p:autoComplete id="userGroupNameAssign" placeholder="#{bundle['dataverse.permissionsFiles.assignDialog.userOrGroup.enterName']}"
                                                         multiple="true" scrollHeight="180" forceSelection="true" emptyMessage="#{bundle['dataverse.permissionsFiles.assignDialog.userOrGroup.invalidMsg']}"
                                                         value="#{manageFilePermissionsPage.selectedRoleAssignees}"  completeMethod="#{manageFilePermissionsPage.completeRoleAssignee}"
@@ -262,41 +262,41 @@
                                         <p:message for="userGroupNameAssign" display="text"/>
                                     </div>
                                 </div>
-                                <div>
-                                    <p:outputPanel id="selectionCounter">
-                                        <p>
-                                            <span class="highlightBold">Selecting #{manageFilePermissionsPage.selectedFiles.size()} of 
-                                                
-                                                #{!empty manageFilePermissionsPage.fileRequester ? 
-                                                            manageFilePermissionsPage.fileAccessRequestMap.get(manageFilePermissionsPage.fileRequester).size()
-                                                            :
-                                                            manageFilePermissionsPage.fileMap.size()}
-                                                
-                                                #{!empty manageFilePermissionsPage.fileRequester ? 
-                                                            'Requested Files'
-                                                            :
-                                                            'Restricted Files'}
-                                            </span>
-                                        </p>
-                                    </p:outputPanel>
-                                    
-                                    <o:importFunctions type="java.util.Arrays" />
-                                    <p:dataTable id="restrictedFilesForAccess" styleClass="col-sm-12" var="file"
-                                                 value="#{empty manageFilePermissionsPage.fileRequester ? Arrays:asList(manageFilePermissionsPage.fileMap.keySet().toArray()) :
-                                                          manageFilePermissionsPage.fileAccessRequestMap.get(manageFilePermissionsPage.fileRequester)}"
-                                                 selection="#{manageFilePermissionsPage.selectedFiles}" rowKey="#{file.id}" sortBy="#{file.displayName}"
-                                                 scrollable="true" scrollHeight="300">
-                                        
-                                        <p:ajax event="rowSelectCheckbox" listener="#{manageFilePermissionsPage.rowSelected}" update=":rolesPermissionsForm:selectionCounter" />
-                                        <p:ajax event="rowUnselectCheckbox" listener="#{manageFilePermissionsPage.rowSelected}" update=":rolesPermissionsForm:selectionCounter" />
-                                        <p:ajax event="toggleSelect" listener="#{manageFilePermissionsPage.rowSelected}" update=":rolesPermissionsForm:selectionCounter" />
-                                        
-                                        <p:column selectionMode="multiple" style="width:2%;text-align:center"/>
-                                        <p:column headerText="#{bundle['dataverse.permissionsFiles.assignDialog.fileName']}">
-                                            <h:outputText value="#{file.displayName}"/>
-                                        </p:column>
-                                    </p:dataTable>
-                                </div>
+                            </div>
+                            <div>
+                                <p:outputPanel id="selectionCounter">
+                                    <p>
+                                        <span class="highlightBold">Selecting #{manageFilePermissionsPage.selectedFiles.size()} of 
+
+                                            #{!empty manageFilePermissionsPage.fileRequester ? 
+                                                        manageFilePermissionsPage.fileAccessRequestMap.get(manageFilePermissionsPage.fileRequester).size()
+                                                        :
+                                                        manageFilePermissionsPage.fileMap.size()}
+
+                                            #{!empty manageFilePermissionsPage.fileRequester ? 
+                                                        'Requested Files'
+                                                        :
+                                                        'Restricted Files'}
+                                        </span>
+                                    </p>
+                                </p:outputPanel>
+
+                                <o:importFunctions type="java.util.Arrays" />
+                                <p:dataTable id="restrictedFilesForAccess" var="file"
+                                             value="#{empty manageFilePermissionsPage.fileRequester ? Arrays:asList(manageFilePermissionsPage.fileMap.keySet().toArray()) :
+                                                      manageFilePermissionsPage.fileAccessRequestMap.get(manageFilePermissionsPage.fileRequester)}"
+                                             selection="#{manageFilePermissionsPage.selectedFiles}" rowKey="#{file.id}" sortBy="#{file.displayName}"
+                                             scrollable="true" scrollHeight="300">
+
+                                    <p:ajax event="rowSelectCheckbox" listener="#{manageFilePermissionsPage.rowSelected}" update=":rolesPermissionsForm:selectionCounter" />
+                                    <p:ajax event="rowUnselectCheckbox" listener="#{manageFilePermissionsPage.rowSelected}" update=":rolesPermissionsForm:selectionCounter" />
+                                    <p:ajax event="toggleSelect" listener="#{manageFilePermissionsPage.rowSelected}" update=":rolesPermissionsForm:selectionCounter" />
+
+                                    <p:column selectionMode="multiple" style="width:2%;text-align:center"/>
+                                    <p:column headerText="#{bundle['dataverse.permissionsFiles.assignDialog.fileName']}">
+                                        <h:outputText value="#{file.displayName}"/>
+                                    </p:column>
+                                </p:dataTable>
                             </div>
                             <div class="button-block">
                                 <p:commandLink type="button" styleClass="btn btn-default" rendered="#{empty manageFilePermissionsPage.fileRequester}"