From 3052155c0abe0acd15094e6cbb629c1308eb5c45 Mon Sep 17 00:00:00 2001
From: Owen Stephens <owen@ostephens.com>
Date: Thu, 22 Nov 2018 11:39:29 +0000
Subject: [PATCH] Fix on screen text in Transform All columns dialog

---
 .../dialogs/expression-column-dialog.html     | 47 ++++++++++---------
 .../dialogs/expression-column-dialog.js       |  2 -
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.html b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.html
index 568145c2a..74b1bf002 100644
--- a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.html
+++ b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.html
@@ -2,28 +2,33 @@
   <div class="dialog-header" bind="dialogHeader"></div>
   <div class="dialog-body" bind="dialogBody">
     <div id="custom-column-selecter-tabs" class="refine-tabs">
-      <ul>
-        <li><a href="#custom-column-selecter-tabs-content" bind="or_dialog_content"></a></li>
-      </ul>
       
-      <div id="custom-column-selecter-tabs-content"><div class="grid-layout grid-layout-for-ui layout-normal layout-full"><table>
-        <tr>
-          <td bind="or_dialog_selAndOrd"></td>
-        </tr>
-        <tr>
-          <td width="100%"><div bind="columnList" class="custom-tabular-exporter-columns"></div></td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <button class="button" bind="selectAllButton"></button>
-            <button class="button" bind="deselectAllButton"></button>
-          </td>
-        </tr>
-      </table></div></div>
+      <div id="custom-column-selecter-tabs-content">
+        <div class="grid-layout grid-layout-for-ui layout-normal layout-full">
+          <table>
+            <tr>
+              <td width="100%"><div bind="columnList" class="custom-tabular-exporter-columns"></div></td>
+            </tr>
+            <tr>
+              <td colspan="2">
+                <button class="button" bind="selectAllButton"></button>
+                <button class="button" bind="deselectAllButton"></button>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
       
+    </div>
+  </div>
+      
+  <div class="dialog-footer" bind="dialogFooter">
+    <table>
+      <tr>
+        <td><button class="button" bind="okButton"></button></td>
+        <td><button class="button" bind="cancelButton"></button></td>
+      </tr>
+    </table>
+  </div>
       
-  <div class="dialog-footer" bind="dialogFooter"><div class="grid-layout layout-tightest layout-full"><table><tr>
-    <td><button class="button" bind="okButton"></button></td>
-    <td><button class="button" bind="cancelButton"></button></td>
-  </tr></table></div></div>
 </div>
\ No newline at end of file
diff --git a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js
index 91ff46577..53ef3ea0b 100644
--- a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js
+++ b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js
@@ -32,8 +32,6 @@ ExpressionColumnDialog.prototype._createDialog = function() {
   
   
   this._elmts.dialogHeader.html($.i18n('core-dialogs/select-columns-dialog'));
-  this._elmts.or_dialog_content.html($.i18n('core-dialogs/content'));
-  this._elmts.or_dialog_selAndOrd.html($.i18n('core-dialogs/sel-and-ord'));
   this._elmts.selectAllButton.html($.i18n('core-buttons/select-all'));
   this._elmts.deselectAllButton.html($.i18n('core-buttons/deselect-all'));
   this._elmts.okButton.html($.i18n('core-buttons/ok'));