s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1850 from ostephens/fix-transformall-label

Browse Source 
Fix on screen text in Transform All columns dialog
This commit is contained in:
Antonin Delpeuch 2018-11-22 17:41:35 +00:00 committed by GitHub
commit 1189cdb4f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
main/webapp/modules/core/scripts/dialogs/expression-column-dialog.html
View File

@ -2,14 +2,10 @@
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">
<div id="custom-column-selecter-tabs" class="refine-tabs"> <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> <div id="custom-column-selecter-tabs-content">
<tr> <div class="grid-layout grid-layout-for-ui layout-normal layout-full">
<td bind="or_dialog_selAndOrd"></td> <table>
</tr>
<tr> <tr>
<td width="100%"><div bind="columnList" class="custom-tabular-exporter-columns"></div></td> <td width="100%"><div bind="columnList" class="custom-tabular-exporter-columns"></div></td>
</tr> </tr>
@ -19,11 +15,20 @@
<button class="button" bind="deselectAllButton"></button> <button class="button" bind="deselectAllButton"></button>
</td> </td>
</tr> </tr>
</table></div></div> </table>
</div>
</div>
</div>
</div>
<div class="dialog-footer" bind="dialogFooter"><div class="grid-layout layout-tightest layout-full"><table><tr> <div class="dialog-footer" bind="dialogFooter">
<table>
<tr>
<td><button class="button" bind="okButton"></button></td> <td><button class="button" bind="okButton"></button></td>
<td><button class="button" bind="cancelButton"></button></td> <td><button class="button" bind="cancelButton"></button></td>
</tr></table></div></div> </tr>
</table>
</div>
</div> </div>

2
main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js
View File

@ -32,8 +32,6 @@ ExpressionColumnDialog.prototype._createDialog = function() {
this._elmts.dialogHeader.html($.i18n('core-dialogs/select-columns-dialog')); 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.selectAllButton.html($.i18n('core-buttons/select-all'));
this._elmts.deselectAllButton.html($.i18n('core-buttons/deselect-all')); this._elmts.deselectAllButton.html($.i18n('core-buttons/deselect-all'));
this._elmts.okButton.html($.i18n('core-buttons/ok')); this._elmts.okButton.html($.i18n('core-buttons/ok'));