From 5853d2d3c8261f30590ee1b0406d9a2422ede00b Mon Sep 17 00:00:00 2001
From: Alex Rudyy <orudyy@apache.org>
Date: Tue, 27 Jan 2015 16:04:58 +0000
Subject: QPID-6337: Fix renediring of dialog action bar

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1655071 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/resources/addAccessControlProvider.html         | 2 +-
 .../src/main/java/resources/addAuthenticationProvider.html        | 2 +-
 .../management-http/src/main/java/resources/addBinding.html       | 2 +-
 .../management-http/src/main/java/resources/addExchange.html      | 2 +-
 .../management-http/src/main/java/resources/addPort.html          | 2 +-
 .../src/main/java/resources/addPreferencesProvider.html           | 2 +-
 .../management-http/src/main/java/resources/addQueue.html         | 2 +-
 .../management-http/src/main/java/resources/addStore.html         | 2 +-
 .../src/main/java/resources/addVirtualHostNodeAndVirtualHost.html | 2 +-
 .../management-http/src/main/java/resources/css/common.css        | 8 ++++++++
 .../management-http/src/main/java/resources/editBroker.html       | 2 +-
 .../management-http/src/main/java/resources/editQueue.html        | 2 +-
 .../management-http/src/main/java/resources/editVirtualHost.html  | 2 +-
 .../src/main/java/resources/editVirtualHostNode.html              | 2 +-
 .../src/main/java/resources/grid/showColumnDefDialog.html         | 2 +-
 .../src/main/java/resources/grid/showRowNumberLimitDialog.html    | 2 +-
 .../management-http/src/main/java/resources/index.html            | 2 +-
 .../management-http/src/main/java/resources/login.html            | 2 +-
 .../src/main/java/resources/logs/showLogFileDownloadDialog.html   | 2 +-
 .../management-http/src/main/java/resources/showPreferences.html  | 4 ++--
 20 files changed, 28 insertions(+), 20 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addAccessControlProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAccessControlProvider.html
index 07a0c4cf83..64f8078314 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addAccessControlProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAccessControlProvider.html
@@ -58,7 +58,7 @@
             </div>
         </div>
 
-        <div class="dijitDialogPaneActionBar">
+        <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
             <button data-dojo-type="dijit/form/Button" id="addAccessControlProvider.addButton" data-dojo-props="label: 'Save'" type="submit"></button>
             <button data-dojo-type="dijit/form/Button" id="addAccessControlProvider.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
         </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
index cf38cd425c..5a565e72e3 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
@@ -56,7 +56,7 @@
 
             <div id="addPreferencesProvider.form"></div>
         </div>
-        <div class="dijitDialogPaneActionBar">
+        <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
             <button data-dojo-type="dijit/form/Button" id="addAuthenticationProvider.addButton" data-dojo-props="label: 'Save'" type="submit"></button>
             <button data-dojo-type="dijit/form/Button" id="addAuthenticationProvider.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
         </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html
index 1b30c6ddcc..d4ac5877cb 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html
@@ -56,7 +56,7 @@
                 </fieldset>
             </div>
 
-            <div class="dijitDialogPaneActionBar">
+            <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
                 <input type="submit" value="Create Binding" label="Create Binding"  data-dojo-type="dijit/form/Button" />
             </div>
         </form>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
index 77d5ed0bc1..25e9752392 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
@@ -66,7 +66,7 @@
 
             <div class="clear"></div>
 
-            <div class="dijitDialogPaneActionBar">
+            <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
                 <input type="submit" value="Create Exchange" label="Create Exchange" dojoType="dijit.form.Button" />
             </div>
         </form>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
index c76a230382..b787e701ec 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
@@ -234,7 +234,7 @@
 
             <input type="hidden" id="formAddPort.id" name="id"/>
             <div class="clear"></div>
-            <div class="dijitDialogPaneActionBar">
+            <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
                 <!-- submit buttons -->
                 <input type="submit" value="Save Port" label="Save Port" dojoType="dijit.form.Button" />
             </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html
index e850f5ac7f..e3984e1ae2 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html
@@ -19,7 +19,7 @@
 
         <div id="addPreferencesProvider.preferencesProvider" data-dojo-type="qpid/management/preferencesprovider/PreferencesProviderForm"></div>
 
-        <div class="dijitDialogPaneActionBar">
+        <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
             <!-- submit buttons -->
             <input type="button" value="Save" data-dojo-props="label: 'Save'" data-dojo-type="dijit/form/Button" id="addPreferencesProvider.saveButton"/>
             <input type="button" value="Cancel" data-dojo-props="label: 'Cancel'" data-dojo-type="dijit/form/Button" id="addPreferencesProvider.cancelButton"/>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
index 042d6d7ad7..61f0de22d8 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
@@ -334,7 +334,7 @@
               <div id="formAddQueue.context" ></div>
           </div>
 
-          <div class="dijitDialogPaneActionBar">
+          <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
             <!-- submit buttons -->
             <input type="submit" value="Create Queue" label="Create Queue" dojoType="dijit.form.Button" />
           </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addStore.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addStore.html
index dd6e7a3d38..a1903d456e 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addStore.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addStore.html
@@ -58,7 +58,7 @@
             </div>
         </div>
 
-        <div class="dijitDialogPaneActionBar">
+        <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
             <button data-dojo-type="dijit/form/Button" id="addStore.addButton" data-dojo-props="label: 'Save'" type="submit"></button>
             <button data-dojo-type="dijit/form/Button" id="addStore.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
         </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
index 383c782d60..a2ee2c1b4b 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
@@ -128,7 +128,7 @@
             </div>
         </form>
       </div>
-      <div class="dijitDialogPaneActionBar">
+      <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
             <button data-dojo-type="dijit/form/Button" id="addVirtualHostNodeAndVirtualHost.addButton" data-dojo-props="label: 'Add'" type="submit"></button>
             <button data-dojo-type="dijit/form/Button" id="addVirtualHostNodeAndVirtualHost.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
       </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css b/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
index a18562fa1a..ec31709987 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
@@ -329,3 +329,11 @@ div .messages {
     max-height: 140px;
     overflow: auto;
 }
+
+.qpidDialogPaneActionBar
+{
+    margin-left:-10px;
+    margin-right:-10px;
+    margin-bottom:-10px;
+    margin-top:5px;
+}
\ No newline at end of file
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/editBroker.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/editBroker.html
index 85ca617c10..993a2c7505 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/editBroker.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/editBroker.html
@@ -109,7 +109,7 @@
 
               <div class="clear"></div>
             </div>
-            <div class="dijitDialogPaneActionBar">
+            <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
                   <button data-dojo-type="dijit/form/Button" id="editBroker.saveButton" data-dojo-props="label: 'Save'">Save</button>
                   <button data-dojo-type="dijit/form/Button" id="editBroker.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
             </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/editQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/editQueue.html
index aff2b5dfa5..e7b33ed6f9 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/editQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/editQueue.html
@@ -289,7 +289,7 @@
                     <div id="formEditQueue.context" ></div>
                 </div>
             </div>
-            <div class="dijitDialogPaneActionBar">
+            <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
                 <button data-dojo-type="dijit/form/Button" id="formEditQueue.saveButton" data-dojo-props="label: 'Save'">Save</button>
                 <button data-dojo-type="dijit/form/Button" id="formEditQueue.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
             </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
index f4826016ec..8e03dfdd17 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
@@ -127,7 +127,7 @@
                     <div id="editVirtualHost.context" ></div>
               </div>
             </div>
-            <div class="dijitDialogPaneActionBar">
+            <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
                   <button data-dojo-type="dijit/form/Button" id="editVirtualHost.saveButton" data-dojo-props="label: 'Save'">Save</button>
                   <button data-dojo-type="dijit/form/Button" id="editVirtualHost.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
             </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
index 46e76c31f0..cee18f7185 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
@@ -44,7 +44,7 @@
                   <div id="editVirtualHostNode.context" ></div>
           </div>
         </div>
-        <div class="dijitDialogPaneActionBar">
+        <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
               <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.saveButton" data-dojo-props="label: 'Save'">Save</button>
               <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
         </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showColumnDefDialog.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showColumnDefDialog.html
index 5b6b8ad774..535b9a1fe5 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showColumnDefDialog.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showColumnDefDialog.html
@@ -23,7 +23,7 @@
         <div>Select columns to display:</div>
         <div class="columnList"></div>
     </div>
-    <div class="dijitDialogPaneActionBar">
+    <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
         <button value="Display" data-dojo-type="dijit.form.Button"
             class="displayButton" data-dojo-props="label: 'Display' "></button>
         <button value="Cancel" data-dojo-type="dijit.form.Button" data-dojo-props="label: 'Cancel'"
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showRowNumberLimitDialog.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showRowNumberLimitDialog.html
index 087d54c0f9..cacdf49e66 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showRowNumberLimitDialog.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/grid/showRowNumberLimitDialog.html
@@ -24,7 +24,7 @@
         <input class="rowNumberLimit" data-dojo-type="dijit.form.NumberSpinner"
         data-dojo-props="invalidMessage: 'Invalid value', required: true, smallDelta: 1,mconstraints: {min:1,max:65535,places:0, pattern: '#####'}, label: 'Maximum number of rows:', name: 'rowNumberLimit'"></input>
     </div>
-    <div class="dijitDialogPaneActionBar">
+    <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
         <button value="Submit" data-dojo-type="dijit.form.Button"
             class="submitButton" data-dojo-props="label: 'Submit' "></button>
         <button value="Cancel" data-dojo-type="dijit.form.Button" data-dojo-props="label: 'Cancel'"
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
index 379a25bbcd..896640fd67 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
@@ -125,7 +125,7 @@
                     </div>
                 </div>
             </div>
-            <div class="dijitDialogPaneActionBar">
+            <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
                 <input type="button" id="errorDialog.button.cancel" value="Cancel" label="Cancel" dojoType="dijit.form.Button" onClick="dijit.byId('errorDialog').hide();"/>
                 <input type="button" id="errorDialog.button.relogin"  value="Login" label="Login" dojoType="dijit.form.Button" onClick="dijit.byId('errorDialog').hide(); window.location='logout';"/>
             </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/login.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/login.html
index aaa2855bd2..6e7f05e41b 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/login.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/login.html
@@ -104,7 +104,7 @@
                             <div data-dojo-type="dijit.form.ValidationTextBox" type="password" id="password" name="password" data-dojo-props="label:'Password:',required:true, intermediateChanges:true"></div>
                         </div>
                     </div>
-                    <div class="dijitDialogPaneActionBar">
+                    <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
                          <button data-dojo-type="dijit.form.Button" type="submit" id="loginButton">Login</button>
                     </div>
                 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/logs/showLogFileDownloadDialog.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/logs/showLogFileDownloadDialog.html
index bc633d059a..d48682a566 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/logs/showLogFileDownloadDialog.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/logs/showLogFileDownloadDialog.html
@@ -23,7 +23,7 @@
      <div><b>Select log files to download</b></div>
      <div class="logFilesGrid" style='height:300px;width: 580px'></div>
   </div>
-  <div class="dijitDialogPaneActionBar">
+  <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
      <button value="Download" data-dojo-type="dijit.form.Button"
        class="downloadLogsButton"
        data-dojo-props="iconClass: 'downloadLogsIcon', label: 'Download' "></button>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferences.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferences.html
index 2695d8f099..8dff5132bd 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferences.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferences.html
@@ -40,7 +40,7 @@
             </tr>
         </table>
         </div>
-        <div class="dijitDialogPaneActionBar">
+        <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
           <button data-dojo-type="dijit/form/Button" data-dojo-props="label: 'Set'" id="preferences.setButton">Set</button>
           <button data-dojo-type="dijit/form/Button" data-dojo-props="label: 'Set and Close'" id="preferences.setAndCloseButton">Set and Close</button>
         </div>
@@ -70,7 +70,7 @@
           </tr>
         </thead>
       </table>
-      <div class="dijitDialogPaneActionBar">
+      <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
         <button id="preferences.deleteButton" data-dojo-type="dijit/form/Button" data-dojo-props="label:'Delete', title:'Delete preferences for selected users'">Delete</button>
         <button id="preferences.deleteAndCloseButton" data-dojo-type="dijit/form/Button" data-dojo-props="label: 'Delete and Close', title:'Delete preferences for selected users and close the dialog'">Delete and Close</button>
       </div>
-- 
cgit v1.2.1