diff --git a/Site5/Master-v5.master b/Site5/Master-v5.master index 32f218e7..757e7cd7 100644 --- a/Site5/Master-v5.master +++ b/Site5/Master-v5.master @@ -20,9 +20,6 @@ - - - @@ -46,6 +43,9 @@ + + + diff --git a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx index f03d0531..9f407e38 100644 --- a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx +++ b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx @@ -19,6 +19,13 @@ } }); + + $('input:radio[name="TxOptions"]').change(function() { + var pickedButtonName = $(this).val(); + alert(pickedButtonName); + $('div.radioOption').slideUp(); + $('div#radioOption' + pickedButtonName).slideDown(); + }); }); var transactionId = 0; @@ -26,6 +33,8 @@ function onFixTransaction(newTransactionId) { transactionId = newTransactionId; SwarmopsJS.formatInteger(transactionId, function(result) { $('span#spanModalTransactionId').text(result); }); + $('input:radio[name="TxOptions"]').prop('checked', false); + $('div.radioOption').hide(); <%= this.DialogTx.ClientID %>_open(); } @@ -34,6 +43,18 @@ .LocalIconFix { cursor: pointer; } + div.radioOption { + margin-top: -20px; + padding-bottom: 10px; + padding-left: 12px; + margin-right: 10px; + } + body.ltr div.radioOption { + padding-left: initial; + margin-right: initial; + padding-right: 12px; + margin-left: 10px; + } @@ -65,10 +86,29 @@

-

-

-

-

+

+
+
+ ​
+ +
+ +
+
+

+
+ Barfoo! +
+

+
+ Barfoot! +
+

+
+ Barerfeet! +
diff --git a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs index 1e49d526..f84dd299 100644 --- a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs +++ b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs @@ -16,6 +16,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers RegisterControl (EasyUIControl.DataGrid); Localize(); + } private void Localize() diff --git a/Site5/Style/style-v5.css b/Site5/Style/style-v5.css index 0dc80f70..982a3010 100644 --- a/Site5/Style/style-v5.css +++ b/Site5/Style/style-v5.css @@ -637,7 +637,7 @@ body.rtl .entryFields { } -.entryFields input, .entryFields textarea, .entryFields select +.entryFields input:not(.buttonAccentColor), .entryFields textarea, .entryFields select { /* "important" here overrides the easyUI native styling */