diff --git a/Site/Pages/v5/Public/Initialize.aspx b/Site/Pages/v5/Public/Initialize.aspx
index 6cc19a70..f847e0ef 100644
--- a/Site/Pages/v5/Public/Initialize.aspx
+++ b/Site/Pages/v5/Public/Initialize.aspx
@@ -641,16 +641,16 @@
However, before we proceed, we need to make sure that you are indeed the sysadmin of this server, and not a remote bot who just discovered an unfinished Swarmops installation. To cross that bridge, answer these three simple questions:
-
- What is this server's /etc/hostname?
- What is this server's internal IP?
- What is your favorite color?
-
+
+ What is this server's /etc/hostname?
+ What is this server's internal IP?
+ What is your favorite color?
+
@@ -693,20 +693,13 @@
Create the database and users
The Swarmops install sequence can set up the database and users for you, if you provide a root password to the MySQL database server.
(If you don't trust the Swarmops install to do that, that's fine, go to manual account credentials.)
-
Hostname of MySQL database server
Root password for that MySQL server
Random label (suffixed to db, user names)
+
Hostname of MySQL database server
Root password for that MySQL server
Random label (suffixed to db, user names)
Connect to existing database
Before you fill this in, you will need to have created a database on a MySQL server that this web server can access, and set up user accounts that can access it. For security reasons, we require having three separate accounts - one for reading (SELECT permissions only), one for writing (SELECT and EXECUTE), and one for admin. All three accounts also need SELECT permissions on the mysql database.
-
-
- Database
- Server
- User
- Password
-
Read access
@@ -728,6 +721,13 @@
+
+
+ Database
+ Server
+ User
+ Password
+
@@ -742,18 +742,18 @@
(You can add other people to the System Administrator role later.)
-
- Your full name
- Your email
- Your password
- Repeat password
-
+
+ Your full name
+ Your email
+ Your password
+ Repeat password
+
All done - ready to login
diff --git a/Site/Pages/v5/Public/Initialize.aspx.cs b/Site/Pages/v5/Public/Initialize.aspx.cs
index 4f45ece5..6648c6bf 100644
--- a/Site/Pages/v5/Public/Initialize.aspx.cs
+++ b/Site/Pages/v5/Public/Initialize.aspx.cs
@@ -47,8 +47,9 @@ namespace Swarmops.Frontend.Pages.v5.Public
if (SwarmDb.Configuration.IsConfigured())
{
+ /*
throw new InvalidOperationException (
- "This installation has already been initialized. Cannot re-initalize on top of existing installation.");
+ "This installation has already been initialized. Cannot re-initalize on top of existing installation.");*/
}
this.TextCredentialsReadDatabase.Style[HtmlTextWriterStyle.Width] = "70px";
diff --git a/Site/Pages/v5/Public/Signup.aspx b/Site/Pages/v5/Public/Signup.aspx
index 6e3ee9db..0aab89b5 100644
--- a/Site/Pages/v5/Public/Signup.aspx
+++ b/Site/Pages/v5/Public/Signup.aspx
@@ -137,7 +137,13 @@
// Set postal code and city to something really small for initial layout
$('#<%=this.TextPostal.ClientID%>').width(40);
- $('#<%=this.TextCity.ClientID%>').width(140);
+ $('#<%=this.TextCity.ClientID%>').width(100);
+
+ // Set widths of dropdowns equal to textboxen
+
+ var inputWidth = $('#<%=this.TextName.ClientID%>').width();
+ $('#<%=this.DropCountries.ClientID%>').width(inputWidth);
+ $('#<%=this.DropGenders.ClientID%>').width(inputWidth);
// Guess country
@@ -625,8 +631,8 @@
-
-
...
+
+
...
diff --git a/Site/Pages/v5/Public/Signup.aspx.cs b/Site/Pages/v5/Public/Signup.aspx.cs
index 5bb14f3a..631548ec 100644
--- a/Site/Pages/v5/Public/Signup.aspx.cs
+++ b/Site/Pages/v5/Public/Signup.aspx.cs
@@ -60,9 +60,9 @@ namespace Swarmops.Frontend.Pages.Public
// Override style widths - (this will cause problems with a future responsive design; come back here to fix that)
-
+ /*
this.DropCountries.Style[HtmlTextWriterStyle.Width] = "204px";
- this.DropGenders.Style[HtmlTextWriterStyle.Width] = "204px";
+ this.DropGenders.Style[HtmlTextWriterStyle.Width] = "204px";*/
/*
this.BoxTitle.Text = PageTitle = String.Format(Resources.Pages.Swarm.AddPerson_Title,