Fixes to Add Person, work on Org Settings

This commit is contained in:
Rick Falkvinge
2016-12-30 01:29:14 +01:00
parent aa4e3c283b
commit 92e2f87d01
5 changed files with 39 additions and 22 deletions
+6 -6
View File
@@ -45,16 +45,16 @@
} else {
alertify.error(SwarmopsJS.unescape('<%= this.Localized_AjaxGeneralErrorSettingValue %>'));
}
$(this).css('background-color', '#FFA0A0');
//$(this).css('background-color', '#FFA0A0');
} else {
if (msg.DisplayMessage != null) {
alertify.log(msg.DisplayMessage);
}
$(this).css('background-color', '#E0FFE0');
//$(this).css('background-color', '#E0FFE0');
_initVal_<%=this.SliderCheckbox.ClientID%> = msg.NewValue;
}
$(this).val(msg.NewValue);
$(this).animate({ backgroundColor: "#FFFFFF" }, 250);
//$(this).animate({ backgroundColor: "#FFFFFF" }, 250);
<%
if (!string.IsNullOrEmpty(this.OnChange))
@@ -74,8 +74,8 @@
$.proxy(function(msg) {
alertify.error(SwarmopsJS.unescape('<%= this.Localized_AjaxCallException %>'));
$(this).val(_initVal_<%=this.SliderCheckbox.ClientID%>);
$(this).css('background-color', '#FFA0A0');
$(this).animate({ backgroundColor: "#FFFFFF" }, 250);
//$(this).css('background-color', '#FFA0A0');
//$(this).animate({ backgroundColor: "#FFFFFF" }, 250);
}, this)
);
} else {
@@ -113,5 +113,5 @@
</script>
<div class="stacked-input-control"><asp:Label runat="server" ID="ToggleSliderLabel"></asp:Label>
<div class="stacked-input-control"><asp:Label runat="server" ID="ToggleSliderLabel" CssClass="toggleLabel"></asp:Label>
<div class="toggle-iphone toggle-padding" id="<%=this.ClientID %>_sliderContainer"><asp:Checkbox ID="SliderCheckbox" runat="server"/></div></div>
+7 -3
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" Inherits="Swarmops.Frontend.Pages.Admin.OrgSettings" Codebehind="OrgSettings.aspx.cs" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" Inherits="Swarmops.Frontend.Pages.Admin.OrgSettings" CodeFile="OrgSettings.aspx.cs" %>
<%@ Import Namespace="Swarmops.Frontend" %>
<%@ Register tagPrefix="Swarmops5" tagName="FileUpload" src="~/Controls/v5/Base/FileUpload.ascx" %>
<%@ Register tagPrefix="Swarmops5" tagName="DropDown" src="~/Controls/v5/Base/DropDown.ascx" %>
@@ -89,6 +89,7 @@
function initializeSettings(orgSettings) {
console.log(orgSettings);
<%=this.ToggleBitcoinCold.ClientID%>_initialize(orgSettings.AccountBitcoinCold);
suppressSwitchResponse = true;
$("#CheckEnableBitcoinCold").prop("checked", orgSettings.AccountBitcoinCold).change();
$("#CheckEnableBitcoinHot").prop("checked", orgSettings.AccountBitcoinHot).change();
@@ -142,9 +143,12 @@
<div title="<img src='/Images/Icons/iconshock-switch-red-64px.png' />">
<h2>Accounting Features</h2>
<div class="entryFields">
<Swarmops5:AjaxToggleSlider ID="ToggleBitcoinCold" Cookie="BitcoinCold" Label="Bitcoin Cold" runat="server" AjaxCallbackUrl="/Pages/v5/Admin/OrgSettings.aspx/SwitchToggled"/>
<Swarmops5:AjaxToggleSlider ID="ToggleBitcoinHot" Cookie="BitcoinHot" Label="Bitcoin Hot" runat="server" AjaxCallbackUrl="/Pages/v5/Admin/OrgSettings.aspx/SwitchToggled"/>
<Swarmops5:AjaxTextBox ID="TextDaysCashReserves" runat="server" CssClass="bitcoinHotField alignRight" ReadOnly="true" Placeholder="60-90" AjaxCallbackUrl="/Pages/v5/Admin/OrgSettings.aspx/StoreCallback" Cookie="BitcoinReserves" />
<label for="CheckEnableBitcoinCold"><asp:Literal ID="LiteralLabelBitcoinColdShort" runat="server" Text="Bitcoin Cold"/></label><div class="CheckboxContainer"><input type="checkbox" rel="BitcoinCold" class="EditCheck" id="CheckEnableBitcoinCold"/></div><br/>
<label for="CheckEnableBitcoinHot"><asp:Literal ID="LiteralLabelBitcoinHotShort" runat="server" Text="Bitcoin Hot"/></label><div class="CheckboxContainer"><input type="checkbox" rel="BitcoinHot" class="EditCheck" id="CheckEnableBitcoinHot"/></div><br/>
<Swarmops5:AjaxTextBox ID="TextDaysCashReserves" runat="server" CssClass="bitcoinHotField alignRight" ReadOnly="true" Placeholder="60-90" AjaxCallbackUrl="/Pages/v5/Admin/OrgSettings.aspx/StoreCallback" Cookie="BitcoinReserves" />
<Swarmops5:AjaxTextBox ID="AjaxTextBox1" runat="server" CssClass="bitcoinHotField alignRight" ReadOnly="true" Placeholder="60-90" AjaxCallbackUrl="/Pages/v5/Admin/OrgSettings.aspx/StoreCallback" Cookie="BitcoinReserves" />
<label for="CheckEnablePaypal"><asp:Literal ID="Literal1" runat="server" Text="Paypal"/></label><div class="CheckboxContainer"><input type="checkbox" rel="Paypal" class="EditCheck" id="CheckEnablePaypal"/></div><br/>
<Swarmops5:AjaxTextBox ID="TextPaypalAccountAddress" runat="server" Placeholder="paypal@example.org" CssClass="paypalAccountField" AjaxCallbackUrl="/Pages/v5/Admin/OrgSettings.aspx/StoreCallback" Cookie="PaypalAccountAddress" />
<label for="CheckEnableForex"><asp:Literal ID="Literal2" runat="server" Text="Forex Profit/Loss"/></label><div class="CheckboxContainer"><input type="checkbox" rel="Forex" class="EditCheck" id="CheckEnableForex"/></div><br/>
@@ -162,7 +166,7 @@
Enable Participant Financials?<br/>
</div>
<div id="divUseAccountPlan" style="display: none; width: 100%; text-align: center; margin-top: 20px; margin-bottom: 20px; border-top: 1px solid <%= CommonV5.GetColor (ColorType.Base, ColorVariant.Light) %>; border-bottom: 1px solid <%= CommonV5.GetColor (ColorType.Base, ColorVariant.Light) %>; background-color: <%= CommonV5.GetColor (ColorType.Base, ColorVariant.XLight) %>">
Use the <a href="/Pages/v5/Ledgers/AccountPlan.aspx">Account Plan</a> page to set detailed parameters for these accounts, once enabled.
Use the <a href="/Ledgers/AccountPlan">Account Plan</a> page to set detailed parameters for these accounts, once enabled.
</div>
</div>
<div title="<img src='/Images/Icons/iconshock-contacts-64px.png' />">
+9
View File
@@ -12,6 +12,15 @@ namespace Swarmops.Frontend.Pages.Admin {
public partial class OrgSettings {
/// <summary>
/// ToggleBitcoinCold control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Swarmops.Frontend.Controls.Base.AjaxToggleSlider ToggleBitcoinCold;
/// <summary>
/// LiteralLabelBitcoinColdShort control.
/// </summary>
+13 -13
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" Inherits="Swarmops.Frontend.Pages.v5.Swarm.AddPerson" Codebehind="AddPerson.aspx.cs" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" Inherits="Swarmops.Frontend.Pages.v5.Swarm.AddPerson" CodeFile="AddPerson.aspx.cs" %>
<%@ Register TagPrefix="Swarmops5" TagName="DropDown" Src="~/Controls/v5/Base/DropDown.ascx" %>
<asp:Content ID="Content1" ContentPlaceHolderID="PlaceHolderHead" Runat="Server">
@@ -194,18 +194,18 @@
<asp:Content ID="Content2" ContentPlaceHolderID="PlaceHolderMain" Runat="Server">
<h2><asp:Label runat="server" ID="BoxTitle" /></h2>
<div class="entryFields">
<asp:TextBox runat="server" ID="TextName" />&#8203;<br/>
<Swarmops5:DropDown runat="server" OnClientChange=" UpdatePostalPrefix " ID="DropCountries"/>&#8203;<br/>
<asp:TextBox runat="server" ID="TextMail" />&#8203;<br/>
<asp:TextBox runat="server" ID="TextPhone" />&#8203;<br/>
&nbsp;<br/>
<asp:TextBox runat="server" ID="TextStreet1" />&#8203;<br/>
<asp:TextBox runat="server" ID="TextStreet2" />&#8203;<br/>
<div style="float: right; margin-right: 5px"><asp:TextBox runat="server" ID="TextPostal" />&nbsp;<asp:TextBox runat="server" ID="TextCity" /></div><div style="width: 40px; overflow: hidden"><span id="spanCountryPrefix">XX</span>&ndash;</div>
<span id="spanDetectedGeo">...</span>&nbsp;<br/>
&nbsp;<br/>
<asp:TextBox runat="server" ID="TextDateOfBirth" />&#8203;<br/>
<Swarmops5:DropDown runat="server" ID="DropGenders" />&#8203;<br/>
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextName" /></div>
<Swarmops5:DropDown runat="server" OnClientChange=" UpdatePostalPrefix " ID="DropCountries"/>
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextMail" /></div>
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextPhone" /></div>
<div class="stacked-input-control"></div>
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextStreet1" /></div>
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextStreet2" /></div>
<div style="float: right; margin-right: 5px"><asp:TextBox runat="server" ID="TextPostal" />&nbsp;<asp:TextBox runat="server" ID="TextCity" /></div><div class="stacked-input-control" style="width: 40px; overflow: hidden"><span id="spanCountryPrefix">XX</span>&ndash;</div>
<div class="stacked-input-control"><span id="spanDetectedGeo">...</span></div>
<div class="stacked-input-control"></div>
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextDateOfBirth" /></div>
<Swarmops5:DropDown runat="server" ID="DropGenders" />
<asp:Button ID="ButtonSubmit" runat="server" CssClass="buttonAccentColor NoInputFocus" OnClientClick=" return ValidateFields(); " OnClick="ButtonSubmit_Click" Text="Register"/>
</div>
<div class="entryLabels">
+4
View File
@@ -691,6 +691,10 @@ body.rtl div.modal .entryFields {
width: 324px;
}
.entryFields span.toggleLabel {
position: relative;
top: -3px;
}
.entryLabels
{