From 99c377a719d0342fc8d50ddfc0618be1d59a9e2e Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 19 May 2015 02:47:31 +0200 Subject: [PATCH] Checkpoint commit; only the actual storing of the new user on Signup remains --- Site5/App_GlobalResources/Pages.Public.resx | 6 ++++ Site5/Pages/v5/Public/Signup.aspx | 38 ++++++++++++++------- Site5/Pages/v5/Public/Signup.aspx.cs | 3 ++ 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/Site5/App_GlobalResources/Pages.Public.resx b/Site5/App_GlobalResources/Pages.Public.resx index e5c8c87b..b1fbf89d 100644 --- a/Site5/App_GlobalResources/Pages.Public.resx +++ b/Site5/App_GlobalResources/Pages.Public.resx @@ -154,6 +154,9 @@ Please select your desired activity level. + + Please select at least one position. + Fees and Costs @@ -165,6 +168,9 @@ The {0} fee is {1} {2:N2} for {3}. You will get an invoice at the end of this process. (You can terminate your {0} at any time.) {0} is the Participantship title. {1} and {2} are the currency and amount. {3} is the duration, like "one year" or "two years" (set in Organization Settings). + + Finalize Signup + Your logon (your mail) diff --git a/Site5/Pages/v5/Public/Signup.aspx b/Site5/Pages/v5/Public/Signup.aspx index 17692693..93d3dd8f 100644 --- a/Site5/Pages/v5/Public/Signup.aspx +++ b/Site5/Pages/v5/Public/Signup.aspx @@ -73,7 +73,7 @@ overflow: initial !important; } - input:not([type="radio"]), select { + input:not([type="radio"]):not([type="checkbox"]), select { width: 200px; font-size: 16px; } @@ -156,8 +156,6 @@ $('#<%= TextCity.ClientID %>').on('input', function () { CheckPostalCity(); }); - - $('#tableVolunteerPositions').datagrid(); }); function CheckPostalCity() { @@ -330,6 +328,8 @@ $(document).ready(function () { + $('#tableVolunteerPositions').datagrid({ url:'/Pages/v5/Public/Json-SignupVolunteerPositions.aspx?OrganizationId=<%=Organization.Identity%>&GeographyId=0'}); + // Doc.Ready instance 2. Smart Wizard initialization. // This is a separate Doc.Ready as I hope to break out the // above code some day to a common file between this file @@ -355,8 +355,9 @@ } function onFinishCallback(obj) { - // $('#LOGINBUTTONID').click(); - } + alert("On Finish Callback"); + // $('#LOGINBUTTONID').click(); + } function validateStep(stepNumber) { var isValid = true; // assume true and set false underway @@ -419,17 +420,24 @@ $('a[rel="5"]').removeClass("crossout"); // if user navigating back and forth, need to remove the crossout here - $('#tableVolunteerPositions').datagrid('reload', '/Pages/v5/Public/Json-SignupVolunteerPositions.aspx?OrganizationId=<%=Organization.Identity%>&GeographyId=' + currentGeographyId); + setTimeout(function() { + $('#tableVolunteerPositions').datagrid({ url: '/Pages/v5/Public/Json-SignupVolunteerPositions.aspx?OrganizationId=<%=Organization.Identity%>&GeographyId=' + currentGeographyId }); + //$('#tableVolunteerPositions').datagrid('reload'); + }, 250); } } else if (stepNumber == 5) { isValid = true; // assume true, make false as we go - } else if (stepNumber == 6) { - // If we get here, we're always good + selectedPositions = $('#tableVolunteerPositions').datagrid('getChecked'); + if (selectedPositions.length == 0) { + isValid = false; + alertify.error(""); + } - isValid = true; - } + } else if (stepNumber == 6) { + // This will never trigger in the stock signup - Finish doesn't trigger Validate + } return isValid; } @@ -462,6 +470,7 @@ } var suppressChecks = false; + var selectedPositions = {}; @@ -581,11 +590,11 @@

- + @@ -594,6 +603,11 @@

+
+

+

This is the organization-specific text shown for Signup Finalization. It is set in Admin / Org Settings. When the new person presses Finish, they will be entered into the organization, logged on, and sent to the Dashboard as a Beginner user.

+
+
diff --git a/Site5/Pages/v5/Public/Signup.aspx.cs b/Site5/Pages/v5/Public/Signup.aspx.cs index 014517c9..b69ced13 100644 --- a/Site5/Pages/v5/Public/Signup.aspx.cs +++ b/Site5/Pages/v5/Public/Signup.aspx.cs @@ -105,6 +105,7 @@ namespace Swarmops.Frontend.Pages.Public this.LiteralErrorNeedPassword.Text = Resources.Pages.Public.Signup_Error_NeedPassword; this.LiteralErrorPasswordMismatch.Text = Resources.Pages.Public.Signup_Error_PasswordMismatch; this.LiteralErrorSelectActivationLevel.Text = Resources.Pages.Public.Signup_Error_SelectActivationLevel; + this.LiteralErrorSelectVolunteerPosition.Text = Resources.Pages.Public.Signup_Error_SelectPosition; this.LabelWelcomeHeader.Text = String.Format (Resources.Pages.Public.Signup_Welcome, Organization.Name); this.LabelHeader.Text = String.Format(Resources.Pages.Public.Signup_SigningUp, Organization.Name).ToUpperInvariant(); @@ -161,6 +162,8 @@ namespace Swarmops.Frontend.Pages.Public this.LabelVolunteerPositionHeader.Text = Resources.Pages.Public.Signup_VolunteerHeader; this.LabelVolunteerPositionText.Text = Resources.Pages.Public.Signup_VolunteerText; + this.LabelFinalizeSignupHeader.Text = Resources.Pages.Public.Signup_FinalizeSignup; + // Enable support for RTL languages if (Thread.CurrentThread.CurrentCulture.TextInfo.IsRightToLeft)