From 92e2f87d012f22c09b7cce1a6f799b331bec4066 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Fri, 30 Dec 2016 01:29:14 +0100 Subject: [PATCH] Fixes to Add Person, work on Org Settings --- Site/Controls/v5/Base/AjaxToggleSlider.ascx | 12 ++++----- Site/Pages/v5/Admin/OrgSettings.aspx | 10 ++++--- .../v5/Admin/OrgSettings.aspx.designer.cs | 9 +++++++ Site/Pages/v5/Swarm/AddPerson.aspx | 26 +++++++++---------- Site/Style/style-v5.css | 4 +++ 5 files changed, 39 insertions(+), 22 deletions(-) diff --git a/Site/Controls/v5/Base/AjaxToggleSlider.ascx b/Site/Controls/v5/Base/AjaxToggleSlider.ascx index ede12f9c..9b0f9b83 100644 --- a/Site/Controls/v5/Base/AjaxToggleSlider.ascx +++ b/Site/Controls/v5/Base/AjaxToggleSlider.ascx @@ -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 @@ -
+
diff --git a/Site/Pages/v5/Admin/OrgSettings.aspx b/Site/Pages/v5/Admin/OrgSettings.aspx index 8ab6161d..8f692393 100644 --- a/Site/Pages/v5/Admin/OrgSettings.aspx +++ b/Site/Pages/v5/Admin/OrgSettings.aspx @@ -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 @@

Accounting Features

+ + +


- +


@@ -162,7 +166,7 @@ Enable Participant Financials?
diff --git a/Site/Pages/v5/Admin/OrgSettings.aspx.designer.cs b/Site/Pages/v5/Admin/OrgSettings.aspx.designer.cs index 731e2f74..ea8c2292 100644 --- a/Site/Pages/v5/Admin/OrgSettings.aspx.designer.cs +++ b/Site/Pages/v5/Admin/OrgSettings.aspx.designer.cs @@ -12,6 +12,15 @@ namespace Swarmops.Frontend.Pages.Admin { public partial class OrgSettings { + /// + /// ToggleBitcoinCold control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Frontend.Controls.Base.AjaxToggleSlider ToggleBitcoinCold; + /// /// LiteralLabelBitcoinColdShort control. /// diff --git a/Site/Pages/v5/Swarm/AddPerson.aspx b/Site/Pages/v5/Swarm/AddPerson.aspx index b6ea7f6f..c7256e68 100644 --- a/Site/Pages/v5/Swarm/AddPerson.aspx +++ b/Site/Pages/v5/Swarm/AddPerson.aspx @@ -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" %> @@ -194,18 +194,18 @@

- ​
- ​
- ​
- ​
-  
- ​
- ​
-
 
XX–
- ... 
-  
- ​
- ​
+
+ +
+
+
+
+
+
 
XX–
+
...
+
+
+