diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs index 30e6d25c..dbc41ff2 100644 --- a/Logic/Structure/Organization.cs +++ b/Logic/Structure/Organization.cs @@ -283,20 +283,20 @@ namespace Swarmops.Logic.Structure set { OptionalData[ObjectOptionalDataType.OrgRegularLabel] = value.ToString(); } } - public string ActivistLabel + public ParticipantTitle ActivistLabel { get { string optionalData = OptionalData[ObjectOptionalDataType.OrgActivistLabel]; if (string.IsNullOrEmpty (optionalData)) { - ActivistLabel = "Activist"; - return "Activist"; + ActivistLabel = ParticipantTitle.Activist; + return ParticipantTitle.Activist; // Legacy } - return optionalData; + return (ParticipantTitle)(Enum.Parse(typeof(ParticipantTitle), optionalData)); } - set { OptionalData[ObjectOptionalDataType.OrgActivistLabel] = value; } + set { OptionalData[ObjectOptionalDataType.OrgActivistLabel] = value.ToString(); } } #region Public methods diff --git a/Site5/App_GlobalResources/Pages.Public.resx b/Site5/App_GlobalResources/Pages.Public.resx index 152c8964..fbaccfd8 100644 --- a/Site5/App_GlobalResources/Pages.Public.resx +++ b/Site5/App_GlobalResources/Pages.Public.resx @@ -120,6 +120,10 @@ If you wish to engage further, you can make yourself available for calls-to-action, at no obligation whatsoever to show up, attend, or take part in any particular one of them. + + {0} At Opportunity + {0} is the Activist label for the org. + How much do you wish to engage? @@ -131,8 +135,12 @@ This is the default level, and means you'll take normal part in the organization as a grassroots {0}. {0} is the Participantship name (membership, ambassadorship etc). + + Regular {0} + {0} is the Regular Participant label for the org. + - If you wish to volunteer to take formal responsibility for some part of the organization, helping out where it's needed most, it's obviously most welcome. (You'll get a selection of positions to volunteer for on the next page.) + If you wish to volunteer for taking formal responsibility for some part of the organization, helping out where it's needed most, it's obviously most welcome. (You'll get a selection of positions to volunteer for on the next page.) Officer Volunteer @@ -143,6 +151,9 @@ The two password copies do not match. + + Please select your desired activity level. + Fees and Costs @@ -158,8 +169,8 @@ Your logon (your mail) - There is no cost whatsoever in signing up for a {0}, nor any cost to renew when it expires on {1}. In addition, you may terminate your {0} at any time. - {0} is the Participantship title. {1} is the expiry date. + There is no cost whatsoever in signing up for a {0} with {2}, nor any cost to renew when it expires on {1}. In addition, you may terminate your {0} at any time. + {0} is the Participantship title. {1} is the expiry date. {2} is the organization name. Choose a password @@ -168,7 +179,7 @@ Repeat that password - Signing up for <bdo>{0}</bdo> + Signing up for {0} The {0} is the organization name diff --git a/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs b/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs index e4a5ecfd..9c5a6343 100644 --- a/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs +++ b/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs @@ -100,7 +100,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin protected void ButtonCreate_Click (object sender, EventArgs e) { - string activistLabel = this.DropActivistLabel.SelectedValue; + ParticipantTitle activistLabel = (ParticipantTitle) (Enum.Parse(typeof(ParticipantTitle), this.DropActivistLabel.SelectedValue)); ParticipantTitle peopleLabel = (ParticipantTitle) (Enum.Parse (typeof (ParticipantTitle), this.DropPersonLabel.SelectedValue)); string asRoot = this.DropCreateChild.SelectedValue; @@ -112,7 +112,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin throw new ArgumentException ("Organization name can't be empty"); } - if (activistLabel == "0" || peopleLabel == ParticipantTitle.Unknown || asRoot == "0" || currencyCode == "0") + if (activistLabel == ParticipantTitle.Unknown || peopleLabel == ParticipantTitle.Unknown || asRoot == "0" || currencyCode == "0") { throw new ArgumentException ("Necessary argument was not supplied (did client-side validation run?)"); } diff --git a/Site5/Pages/v5/Public/Signup.aspx b/Site5/Pages/v5/Public/Signup.aspx index c0763e75..7a798d04 100644 --- a/Site5/Pages/v5/Public/Signup.aspx +++ b/Site5/Pages/v5/Public/Signup.aspx @@ -10,7 +10,7 @@ - + @@ -63,11 +63,32 @@ overflow: initial !important; } - input, select { + input:not([type="radio"]), select { width: 200px; font-size: 16px; } + input[type="radio"] { + margin-right: 5px; /* complements margin-left 5px in stylesheet */ + margin-bottom: 5px; + margin-top: 10px; + } + + input[type="radio"]+label { + font-size: 16px; + position:relative; /* ugly ugly way to circumvent a nonfunctional margin-bottom */ + top: -4px; + } + + input[type="radio"]+label+p { + padding-left: 24px; + } + + body.rtl input[type="radio"]+label+p { + padding-right: 24px; + padding-left: inherit; + } + .entryFieldsAdmin, .entryLabelsAdmin { font-size: 16px; @@ -336,7 +357,27 @@ } else if (stepNumber == 4) { isValid = true; // assume true, make false as we go - } else if (stepNumber == 5) { + if (suppressChecks) { + return true; + } + + var selectedOption = $('input:radio[name="ActivationLevel"]:checked').val(); + if (selectedOption === undefined) { + isValid = false; + alertify.error(""); + } + + if (selectedOption != "RadioActivationVolunteer" && isValid) { + suppressChecks = true; // prevents foreverlooping into this check + $('#wizard').smartWizard('goToStep', 6); + setTimeout(function() { + $('a[rel="5"]').addClass("done").removeClass("selected"); + $('a.buttonNext').addClass("buttonDisabled"); // hacks because SmartWizard doesn't handle skipping steps + }, 250); + suppressChecks = false; + } + + } else if (stepNumber == 5) { isValid = true; // assume true, make false as we go } else if (stepNumber == 6) { @@ -375,6 +416,8 @@ document.location = document.location + "&Culture=" + cultureCode; } + var suppressChecks = false; + @@ -480,9 +523,18 @@
-

Creating the first user

+

+

+ +

+ +

+ +

- diff --git a/Site5/Pages/v5/Public/Signup.aspx.cs b/Site5/Pages/v5/Public/Signup.aspx.cs index 2565f7e4..77c03394 100644 --- a/Site5/Pages/v5/Public/Signup.aspx.cs +++ b/Site5/Pages/v5/Public/Signup.aspx.cs @@ -104,6 +104,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.LabelWelcomeHeader.Text = String.Format (Resources.Pages.Public.Signup_Welcome, Organization.Name); this.LabelHeader.Text = String.Format(Resources.Pages.Public.Signup_SigningUp, Organization.Name).ToUpperInvariant(); @@ -146,6 +147,15 @@ namespace Swarmops.Frontend.Pages.Public this.TextStreet1.Attributes["placeholder"] = "78 West Avenue"; this.TextPostal.Attributes["placeholder"] = "12345"; + this.LabelActivationLevelHeader.Text = Resources.Pages.Public.Signup_ActivationLevel; + this.LabelActivationLevelIntro.Text = String.Format(Resources.Pages.Public.Signup_ActivationLevelText, this.Organization.Name); + this.RadioActivationPassive.Text = String.Format(Resources.Pages.Public.Signup_ActivationPassiveHeader, Participant.Localized (this.Organization.RegularLabel)); + this.LabelActivationPassiveText.Text = String.Format(Resources.Pages.Public.Signup_ActivationPassive, this.Organization.Name); + this.RadioActivationActive.Text = String.Format(Resources.Pages.Public.Signup_ActivationActiveHeader, Participant.Localized (this.Organization.ActivistLabel)); + this.LabelActivationActiveText.Text = Resources.Pages.Public.Signup_ActivationActive; + this.RadioActivationVolunteer.Text = Resources.Pages.Public.Signup_ActivationVolunteerHeader; + this.LabelActivationVolunteerText.Text = Resources.Pages.Public.Signup_ActivationVolunteer; + // Enable support for RTL languages if (Thread.CurrentThread.CurrentCulture.TextInfo.IsRightToLeft) @@ -159,7 +169,7 @@ namespace Swarmops.Frontend.Pages.Public this.LabelSidebarActionsHeader.Text = Resources.Pages.Public.Signup_FeeHeader; // if (this.Organization.MembershipFee == 0 && this.Organization.MembershipRenewalFee == 0) this.LabelSidebarActionsContent.Text = String.Format (Resources.Pages.Public.Signup_NoFeeText, - Participant.Localized (this.Organization.RegularLabel, TitleVariant.Ship), DateTime.Today.AddYears (1).ToShortDateString()); + Participant.Localized (this.Organization.RegularLabel, TitleVariant.Ship), DateTime.Today.AddYears (1).ToShortDateString(), this.Organization.Name); this.LabelSidebarInfoHeader.Text = Resources.Global.Sidebar_Information; this.LabelSidebarTodoHeader.Text = Resources.Global.Sidebar_Todo;