diff --git a/Site5/App_GlobalResources/Pages_Admin.resx b/Site5/App_GlobalResources/Pages_Admin.resx
index d35a7fce..35a66938 100644
--- a/Site5/App_GlobalResources/Pages_Admin.resx
+++ b/Site5/App_GlobalResources/Pages_Admin.resx
@@ -147,7 +147,7 @@
This can be "members", etc.
- The new organization has been created. You have been given an initial two-year {0} in the organization, so you can work with it and set it up properly. To switch to working with your new organization, use the control panel top right.
+ The new organization has been created. You have been given an initial two-year {0} in the organization, so you can work with it and set it up properly. You have also been <strong>logged in</strong> to your new organization instead of the one you were logged in to before.<br/><br/>This is the Edit Organization panel, where you can set more parameters for your new organization.
The {0} is membership, employment, citizenship, residence, etc.
diff --git a/Site5/Controls/v5/UI/ExternalScripts.ascx.cs b/Site5/Controls/v5/UI/ExternalScripts.ascx.cs
index a662b02f..30fb554a 100644
--- a/Site5/Controls/v5/UI/ExternalScripts.ascx.cs
+++ b/Site5/Controls/v5/UI/ExternalScripts.ascx.cs
@@ -42,6 +42,6 @@ namespace Swarmops.Frontend.Controls.v5.UI
}
public string Package { get; set; }
- public string Controls { get; set; }
+ public new string Controls { get; set; }
}
}
\ No newline at end of file
diff --git a/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs b/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs
index 641168c4..35e42bf5 100644
--- a/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs
+++ b/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Globalization;
using System.Web;
using System.Web.UI.WebControls;
using Swarmops.Logic.Financial;
@@ -130,13 +131,11 @@ namespace Swarmops.Frontend.Pages.v5.Admin
string successMessage = String.Format(Resources.Pages_Admin.CreateOrganization_Success, Resources.Global.ResourceManager.GetString("Title_" + peopleLabel + "_Ship"));
- // Create org here
-
Response.AppendCookie(new HttpCookie("DashboardMessage", HttpUtility.UrlEncode(successMessage)));
- // Redirect to dashboard
+ // Log in to new organization, then redirect to Edit
- Response.Redirect("/", true);
+ Response.Redirect("/Pages/v5/Security/SetCurrentOrganization.aspx?OrganizationId=" + newOrganization.Identity.ToString(CultureInfo.InvariantCulture) + "&ReturnUrl=/Pages/v5/Admin/EditOrganization.aspx", true);
}
}
diff --git a/Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs b/Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs
index 43847774..60887bf5 100644
--- a/Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs
+++ b/Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs
@@ -19,6 +19,7 @@ namespace Swarmops.Frontend.Pages.v5.Security
throw new UnauthorizedAccessException("No"); // may cause problems on login screen?
}
+ string returnUrlString = Request.QueryString["ReturnUrl"];
string organizationIdString = Request.QueryString["OrganizationId"];
int organizationId = Int32.Parse(organizationIdString);
Organization suggestedOrganization = null;
@@ -47,10 +48,19 @@ namespace Swarmops.Frontend.Pages.v5.Security
logonFlags = currentIdentityParts[3];
}
- FormsAuthentication.RedirectFromLoginPage(
- CurrentUser.Identity.ToString(CultureInfo.InvariantCulture) + "," +
- suggestedOrganization.Identity.ToString(CultureInfo.InvariantCulture) + ",," +
- logonFlags, true);
+ string userIdentityString = CurrentUser.Identity.ToString(CultureInfo.InvariantCulture) + "," +
+ suggestedOrganization.Identity.ToString(CultureInfo.InvariantCulture) + ",," +
+ logonFlags;
+
+ if (!string.IsNullOrEmpty(returnUrlString))
+ {
+ FormsAuthentication.SetAuthCookie(userIdentityString, true);
+ Response.Redirect(returnUrlString);
+ }
+ else
+ {
+ FormsAuthentication.RedirectFromLoginPage(userIdentityString, true);
+ }
}
}
diff --git a/Site5/Style/style-v5.css b/Site5/Style/style-v5.css
index 2337531b..1d73ad7c 100644
--- a/Site5/Style/style-v5.css
+++ b/Site5/Style/style-v5.css
@@ -1031,6 +1031,14 @@ input.ButtonSwarmopsUpload:active {
}
+/* JQUERY PLUGIN OVERRIDES */
+
+
+nav.alertify-buttons {
+ margin-top: 20px;
+}
+
+
/* COLOR SCHEME
#A2BEFF #476EC7 #1C397E #C8D9FF #E4ECFF -- blue (hue 222)