diff --git a/Site5/Pages/v5/Public/Signup.aspx b/Site5/Pages/v5/Public/Signup.aspx index 7a798d04..624a9445 100644 --- a/Site5/Pages/v5/Public/Signup.aspx +++ b/Site5/Pages/v5/Public/Signup.aspx @@ -80,6 +80,10 @@ top: -4px; } + input[type="radio"]:checked+label { + font-weight: 500; /* increase font-weight for selected radio button labels to Medium */ + } + input[type="radio"]+label+p { padding-left: 24px; } @@ -130,8 +134,8 @@ function CheckPostalCity() { var currentCity = $('#<%= TextCity.ClientID %>').val().toLowerCase(); if (currentCity in cityNameLookup) { - var geoId = cityNameLookup[currentCity]; - $('#spanDetectedGeo').text(geographyIdLookup[geoId]); + currentGeographyId = cityNameLookup[currentCity]; + $('#spanDetectedGeo').text(geographyIdLookup[currentGeographyId]); } else { $('#spanDetectedGeo').text(''); } @@ -145,7 +149,8 @@ if (currentPostalCode in postalCodeLookup) { var cityId = postalCodeLookup[currentPostalCode]; $('#<%= TextCity.ClientID %>').attr("disabled", "disabled").val(cityIdLookup[cityId].Name); - $('#spanDetectedGeo').text(geographyIdLookup[cityIdLookup[cityId].GeoId]); + currentGeographyId = cityIdLookup[cityId].GeoId; + $('#spanDetectedGeo').text(geographyIdLookup[currentGeographyId]); postalCodeIdentified = true; return true; } else if (postalCodeIdentified) { @@ -291,6 +296,7 @@ var postalCodeIdentified = false; + var currentGeographyId = 0; $(document).ready(function () { @@ -371,7 +377,7 @@ suppressChecks = true; // prevents foreverlooping into this check $('#wizard').smartWizard('goToStep', 6); setTimeout(function() { - $('a[rel="5"]').addClass("done").removeClass("selected"); + $('a[rel="5"]').addClass("disabled").removeClass("selected"); $('a.buttonNext').addClass("buttonDisabled"); // hacks because SmartWizard doesn't handle skipping steps }, 250); suppressChecks = false; @@ -423,8 +429,8 @@
-
- +
+
diff --git a/Site5/Pages/v5/Public/Signup.aspx.cs b/Site5/Pages/v5/Public/Signup.aspx.cs index 77c03394..792e047a 100644 --- a/Site5/Pages/v5/Public/Signup.aspx.cs +++ b/Site5/Pages/v5/Public/Signup.aspx.cs @@ -150,7 +150,7 @@ namespace Swarmops.Frontend.Pages.Public 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.LabelActivationPassiveText.Text = String.Format(Resources.Pages.Public.Signup_ActivationPassive, Participant.Localized(this.Organization.RegularLabel)); 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;