Die Kosmetik

This commit is contained in:
Rick Falkvinge
2017-01-01 17:57:05 +01:00
parent 0278c79e11
commit e1bfd86366
4 changed files with 32 additions and 25 deletions
+19 -19
View File
@@ -641,16 +641,16 @@
<p>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:</p> <asp:Label runat="server" ID="Label1" />
<div class="entryLabelsAdmin" style="width:250px">
What is this server's /etc/hostname?<br />
What is this server's internal IP?<br />
What is your favorite color?
</div>
<div class="entryFieldsAdmin">
<asp:TextBox CssClass="textinput" ID="TextServerName" runat="server" />&nbsp;<br />
<asp:TextBox CssClass="textinput" ID="TextServerAddress" runat="server" />&nbsp;<br />
<asp:DropDownList ID="DropFavoriteColor" runat="server" />&nbsp;<br />
</div>
<div class="entryLabelsAdmin" style="width:250px">
What is this server's /etc/hostname?<br />
What is this server's internal IP?<br />
What is your favorite color?
</div>
</div>
</div>
<div id="step-2">
@@ -693,20 +693,13 @@
<h2>Create the database and users</h2>
<p>The Swarmops install sequence can set up the database and users for you, if you provide a root password to the MySQL database server.</p>
<p>(If you don't trust the Swarmops install to do that, that's fine, go to <a href="javascript:goManualCredentials();">manual account credentials</a>.)</p>
<div class="entryLabelsAdmin" style="width:250px">Hostname of MySQL database server<br/>Root password for that MySQL server<br/>Random label (suffixed to db, user names)<br/>&nbsp;</div>
<div class="entryFieldsAdmin"><input type="text" id="TextMysqlServerHost" value="localhost"/>&nbsp;<br/><input type="password" id="TextMysqlRootPassword"/>&nbsp;<br/><asp:TextBox runat="server" MaxLength="5" ID="TextRandomDbLabel" />&nbsp;</div>
<div class="entryLabelsAdmin" style="width:250px">Hostname of MySQL database server<br/>Root password for that MySQL server<br/>Random label (suffixed to db, user names)<br/>&nbsp;</div>
</div>
<div id="DivDatabaseManualConfig" style="display:none">
<h2>Connect to existing database</h2>
<p>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 <strong>require</strong> 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.</p>
<div class="entryLabelsAdmin" style="width:120px">
&nbsp;<br/>
Database<br />
Server<br />
User<br/>
Password
</div>
<div class="entryFieldsAdmin" style="width:80px">
<strong>Read access</strong><br/>
<asp:TextBox CssClass="textinput" ID="TextCredentialsReadDatabase" runat="server" />&nbsp;<br />
@@ -728,6 +721,13 @@
<asp:TextBox CssClass="textinput" ID="TextCredentialsAdminUser" runat="server" />&nbsp;<br />
<asp:TextBox CssClass="textinput" ID="TextCredentialsAdminPassword" TextMode="Password" runat="server" />&nbsp;<br />
</div>
<div class="entryLabelsAdmin" style="width:120px">
&nbsp;<br/>
Database<br />
Server<br />
User<br/>
Password
</div>
</div>
</div>
<div id="step-3">
@@ -742,18 +742,18 @@
<p>(You can add other people to the <em>System Administrator</em> role later.)</p>
<div class="entryLabelsAdmin" style="width:250px">
Your full name<br />
Your email<br />
Your password<br/>
Repeat password
</div>
<div class="entryFieldsAdmin">
<asp:TextBox CssClass="textinput" ID="TextFirstUserName" runat="server" />&nbsp;<br />
<asp:TextBox CssClass="textinput" ID="TextFirstUserMail" runat="server" />&nbsp;<br />
<asp:TextBox CssClass="textinput" ID="TextFirstUserPassword1" TextMode="Password" runat="server" />&nbsp;<br />
<asp:TextBox CssClass="textinput" ID="TextFirstUserPassword2" TextMode="Password" runat="server" />&nbsp;<br />
</div>
<div class="entryLabelsAdmin" style="width:250px">
Your full name<br />
Your email<br />
Your password<br/>
Repeat password
</div>
</div>
<div id="step-5" style="display:none">
<h2>All done - ready to login</h2>
+2 -1
View File
@@ -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";
+9 -3
View File
@@ -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 @@
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextPhone" /></div>
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextStreet1" /></div>
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextStreet2" /></div>
<div class="stacked-input-control"><div class="elementFloatFar"><asp:TextBox runat="server" ID="TextPostal" />&thinsp;<asp:TextBox runat="server" ID="TextCity" /></div><div class="stacked-text" style="width: 28px; overflow-x: hidden"><span id="spanCountryPrefix">XX</span>--</div></div>
<div class="stacked-input-control"><span id="spanDetectedGeo">...</span></div>
<div class="stacked-input-control"><div class="elementFloatFar"><asp:TextBox runat="server" ID="TextPostal" />&thinsp;<asp:TextBox runat="server" ID="TextCity" /></div><div class="stacked-text" style="width: 22px; overflow-x: hidden"><span id="spanCountryPrefix">XX</span>--</div></div>
<div class="stacked-input-control"><span class="stacked-text" id="spanDetectedGeo">...</span></div>
<div class="stacked-input-control"><asp:TextBox runat="server" ID="TextDateOfBirth" /></div>
<div class="stacked-input-control"><asp:DropDownList runat="server" ID="DropGenders" /></div>
</div>
+2 -2
View File
@@ -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,