kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update install wizard to Bootstrap 5

Browse Source
This commit is contained in:
Shaun Walker 2021-07-19 16:49:31 -04:00
parent 0e6baae366
commit 1cc16a7ed4
10 changed files with 255 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Oqtane.Client/Installer/Controls/LocalDBConfig.razor
View File

@ -1,41 +1,30 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer
@{ <div class="row mb-1 align-items-center">
foreach (var field in _connectionStringFields) <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
{ <div class="col-sm-9">
var fieldId = field.Name.ToLowerInvariant(); <input id="server" type="text" class="form-control" @bind="@_server" />
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); </div>
</div>
<tr> <div class="row mb-1 align-items-center">
<td> <Label Class="col-sm-3" For="database" HelpText="Enter the name of the database" ResourceKey="Database">Database:</Label>
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <div class="col-sm-9">
</td> <input id="database" type="text" class="form-control" @bind="@_database" />
<td> </div>
<input id="@fieldId" type="text" class="form-control" @bind="@field.Value" /> </div>
</td>
</tr>
}
}
@code { @code {
private readonly List<ConnectionStringField> _connectionStringFields = new() private string _server = "(LocalDb)\\MSSQLLocalDB";
{ private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
new() {Name = "Server", FriendlyName = "Server", Value = "(LocalDb)\\MSSQLLocalDB", HelpText="Enter the database server"},
new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"}
};
public string GetConnectionString() public string GetConnectionString()
{ {
var connectionString = String.Empty; var connectionString = String.Empty;
var server = _connectionStringFields[0].Value; if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database))
var database = _connectionStringFields[1].Value;
if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database))
{ {
connectionString = $"Data Source={server};AttachDbFilename=|DataDirectory|\\{database}.mdf;Initial Catalog={database};Integrated Security=SSPI;"; connectionString = $"Data Source={_server};AttachDbFilename=|DataDirectory|\\{_database}.mdf;Initial Catalog={_database};Integrated Security=SSPI;";
} }
return connectionString; return connectionString;

76
Oqtane.Client/Installer/Controls/MySQLConfig.razor
View File

@ -1,54 +1,58 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer
@{ <div class="row mb-1 align-items-center">
foreach (var field in _connectionStringFields) <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
{ <div class="col-sm-9">
var fieldId = field.Name.ToLowerInvariant(); <input id="server" type="text" class="form-control" @bind="@_server" />
var fieldType = (field.Name == "Pwd") ? "password" : "text"; </div>
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); </div>
<div class="row mb-1 align-items-center">
<tr> <Label Class="col-sm-3" For="port" HelpText="Enter the port used to connect to the server" ResourceKey="Port">Port:</Label>
<td> <div class="col-sm-9">
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <input id="port" type="text" class="form-control" @bind="@_port" />
</td> </div>
<td> </div>
<input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" /> <div class="row mb-1 align-items-center">
</td> <Label Class="col-sm-3" For="database" HelpText="Enter the name of the database" ResourceKey="Database">Database:</Label>
</tr> <div class="col-sm-9">
} <input id="database" type="text" class="form-control" @bind="@_database" />
} </div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="uid" HelpText="Enter the username to use for the database" ResourceKey="Uid">User Id:</Label>
<div class="col-sm-9">
<input id="uid" type="text" class="form-control" @bind="@_uid" />
</div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
<div class="col-sm-9">
<input id="pwd" type="password" class="form-control" @bind="@_pwd" />
</div>
</div>
@code { @code {
private readonly List<ConnectionStringField> _connectionStringFields = new() private string _server = "127.0.0.1";
{ private string _port = "3306";
new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"}, private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
new() {Name = "Port", FriendlyName = "Port", Value = "3306", HelpText="Enter the port used to connect to the server"}, private string _uid = String.Empty;
new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"}, private string _pwd = String.Empty;
new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"},
new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"}
};
public string GetConnectionString() public string GetConnectionString()
{ {
var connectionString = String.Empty; var connectionString = String.Empty;
var server = _connectionStringFields[0].Value; if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database) && !String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
var port = _connectionStringFields[1].Value;
var database = _connectionStringFields[2].Value;
var userId = _connectionStringFields[3].Value;
var password = _connectionStringFields[4].Value;
if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password))
{ {
connectionString = $"Server={server};Database={database};Uid={userId};Pwd={password};"; connectionString = $"Server={_server};Database={_database};Uid={_uid};Pwd={_pwd};";
} }
if (!String.IsNullOrEmpty(port)) if (!String.IsNullOrEmpty(_port))
{ {
connectionString += $"Port={port};"; connectionString += $"Port={_port};";
} }
return connectionString; return connectionString;
} }
} }

119
Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor
View File

@ -1,89 +1,76 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer @inject IStringLocalizer<PostgreSQLConfig> Localizer
@inject IStringLocalizer<SharedResources> SharedLocalizer
@{ <div class="row mb-1 align-items-center">
foreach (var field in _connectionStringFields) <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
{ <div class="col-sm-9">
var fieldId = field.Name.ToLowerInvariant(); <input id="server" type="text" class="form-control" @bind="@_server" />
if (field.Name != "IntegratedSecurity") </div>
{ </div>
var isVisible = ""; <div class="row mb-1 align-items-center">
var fieldType = (field.Name == "Pwd") ? "password" : "text"; <Label Class="col-sm-3" For="port" HelpText="Enter the port used to connect to the server" ResourceKey="Port">Port:</Label>
if ((field.Name == "Uid" || field.Name == "Pwd")) <div class="col-sm-9">
{ <input id="port" type="text" class="form-control" @bind="@_port" />
var intSecurityField = _connectionStringFields.Single(f => f.Name == "IntegratedSecurity"); </div>
if (intSecurityField != null) </div>
{ <div class="row mb-1 align-items-center">
isVisible = (Convert.ToBoolean(intSecurityField.Value)) ? "display: none;" : ""; <Label Class="col-sm-3" For="database" HelpText="Enter the name of the database" ResourceKey="Database">Database:</Label>
} <div class="col-sm-9">
} <input id="database" type="text" class="form-control" @bind="@_database" />
</div>
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); </div>
<div class="row mb-1 align-items-center">
<tr style="@isVisible"> <Label Class="col-sm-3" For="security" HelpText="Select your security method" ResourceKey="Security">Security:</Label>
<td> <div class="col-sm-9">
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <select id="security" class="form-select custom-select" @bind="@_security">
</td> <option value="integrated" selected>@Localizer["Integrated"]</option>
<td> <option value="custom">@Localizer["Custom"]</option>
<input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" /> </select>
</td> </div>
</tr> </div>
} @if (_security == "custom")
else {
{ <div class="row mb-1 align-items-center">
<tr> <Label Class="col-sm-3" For="uid" HelpText="Enter the username to use for the database" ResourceKey="Uid">User Id:</Label>
<td> <div class="col-sm-9">
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <input id="uid" type="text" class="form-control" @bind="@_uid" />
</td> </div>
<td> </div>
<select id="@fieldId" class="custom-select" @bind="@field.Value"> <div class="row mb-1 align-items-center">
<option value="true" selected>@SharedLocalizer["True"]</option> <Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
<option value="false">@SharedLocalizer["False"]</option> <div class="col-sm-9">
</select> <input id="pwd" type="password" class="form-control" @bind="@_pwd" />
</td> </div>
</tr> </div>
}
}
} }
@code { @code {
private readonly List<ConnectionStringField> _connectionStringFields = new() private string _server = "127.0.0.1";
{ private string _port = "5432";
new() { Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText = "Enter the database server" }, private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
new() { Name = "Port", FriendlyName = "Port", Value = "5432", HelpText = "Enter the port used to connect to the server" }, private string _security = "integrated";
new() { Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText = "Enter the name of the database" }, private string _uid = String.Empty;
new() { Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText = "Select if you want integrated security or not" }, private string _pwd = String.Empty;
new() { Name = "Uid", FriendlyName = "User Id", Value = "", HelpText = "Enter the username to use for the database" },
new() { Name = "Pwd", FriendlyName = "Password", Value = "", HelpText = "Enter the password to use for the database" }
};
public string GetConnectionString() public string GetConnectionString()
{ {
var connectionString = String.Empty; var connectionString = String.Empty;
var server = _connectionStringFields[0].Value; if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database) && !String.IsNullOrEmpty(_port))
var port = _connectionStringFields[1].Value;
var database = _connectionStringFields[2].Value;
var integratedSecurity = Boolean.Parse(_connectionStringFields[3].Value);
var userId = _connectionStringFields[4].Value;
var password = _connectionStringFields[5].Value;
if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(port))
{ {
connectionString = $"Server={server};Port={port};Database={database};"; connectionString = $"Server={_server};Port={_port};Database={_database};";
} }
if (integratedSecurity) if (_security == "integrated")
{ {
connectionString += "Integrated Security=true;"; connectionString += "Integrated Security=true;";
} }
else else
{ {
if (!String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password)) if (!String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
{ {
connectionString += $"User ID={userId};Password={password};"; connectionString += $"User ID={_uid};Password={_pwd};";
} }
else else
{ {

111
Oqtane.Client/Installer/Controls/SqlServerConfig.razor
View File

@ -1,87 +1,69 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer @inject IStringLocalizer<SqlServerConfig> Localizer
@inject IStringLocalizer<SharedResources> SharedLocalizer
@{ <div class="row mb-1 align-items-center">
foreach (var field in _connectionStringFields) <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
{ <div class="col-sm-9">
var fieldId = field.Name.ToLowerInvariant(); <input id="server" type="text" class="form-control" @bind="@_server" />
if (field.Name != "IntegratedSecurity") </div>
{ </div>
var isVisible = ""; <div class="row mb-1 align-items-center">
var fieldType = (field.Name == "Pwd") ? "password" : "text"; <Label Class="col-sm-3" For="database" HelpText="Enter the name of the database" ResourceKey="Database">Database:</Label>
if ((field.Name == "Uid" || field.Name == "Pwd")) <div class="col-sm-9">
{ <input id="database" type="text" class="form-control" @bind="@_database" />
var intSecurityField = _connectionStringFields.Single(f => f.Name == "IntegratedSecurity"); </div>
if (intSecurityField != null) </div>
{ <div class="row mb-1 align-items-center">
isVisible = (Convert.ToBoolean(intSecurityField.Value)) ? "display: none;" : ""; <Label Class="col-sm-3" For="security" HelpText="Select your security method" ResourceKey="Security">Security:</Label>
} <div class="col-sm-9">
} <select id="security" class="form-select custom-select" @bind="@_security">
<option value="integrated" selected>@Localizer["Integrated"]</option>
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); <option value="custom">@Localizer["Custom"]</option>
</select>
<tr style="@isVisible"> </div>
<td> </div>
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> @if (_security == "custom")
</td> {
<td> <div class="row mb-1 align-items-center">
<input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" /> <Label Class="col-sm-3" For="uid" HelpText="Enter the username to use for the database" ResourceKey="Uid">User Id:</Label>
</td> <div class="col-sm-9">
</tr> <input id="uid" type="text" class="form-control" @bind="@_uid" />
} </div>
else </div>
{ <div class="row mb-1 align-items-center">
<tr> <Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
<td> <div class="col-sm-9">
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <input id="pwd" type="password" class="form-control" @bind="@_pwd" />
</td> </div>
<td> </div>
<select id="@fieldId" class="custom-select" @bind="@field.Value">
<option value="true" selected>@SharedLocalizer["True"]</option>
<option value="false">@SharedLocalizer["False"]</option>
</select>
</td>
</tr>
}
}
} }
@code { @code {
private readonly List<ConnectionStringField> _connectionStringFields = new() private string _server = String.Empty;
{ private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
new() { Name = "Server", FriendlyName = "Server", Value = ".", HelpText = "Enter the database server" }, private string _security = "integrated";
new() { Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText = "Enter the name of the database" }, private string _uid = String.Empty;
new() { Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText = "Select if you want integrated security or not" }, private string _pwd = String.Empty;
new() { Name = "Uid", FriendlyName = "User Id", Value = "", HelpText = "Enter the username to use for the database" },
new() { Name = "Pwd", FriendlyName = "Password", Value = "", HelpText = "Enter the password to use for the database" }
};
public string GetConnectionString() public string GetConnectionString()
{ {
var connectionString = String.Empty; var connectionString = String.Empty;
var server = _connectionStringFields[0].Value; if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database))
var database = _connectionStringFields[1].Value;
var integratedSecurity = Boolean.Parse(_connectionStringFields[2].Value);
var userId = _connectionStringFields[3].Value;
var password = _connectionStringFields[4].Value;
if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database))
{ {
connectionString = $"Data Source={server};Initial Catalog={database};"; connectionString = $"Data Source={_server};Initial Catalog={_database};";
} }
if (integratedSecurity) if (_security == "integrated")
{ {
connectionString += "Integrated Security=SSPI;"; connectionString += "Integrated Security=SSPI;";
} }
else else
{ {
if (!String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password)) if (!String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
{ {
connectionString += $"User ID={userId};Password={password};"; connectionString += $"User ID={_uid};Password={_pwd};";
} }
else else
{ {
@ -91,5 +73,4 @@
return connectionString; return connectionString;
} }
} }

34
Oqtane.Client/Installer/Controls/SqliteConfig.razor
View File

@ -1,39 +1,23 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer
@{ <div class="row mb-1 align-items-center">
foreach (var field in _connectionStringFields) <Label Class="col-sm-3" For="server" HelpText="Enter the file name to use for the database" ResourceKey="Server">File Name:</Label>
{ <div class="col-sm-9">
var fieldId = field.Name.ToLowerInvariant(); <input id="server" type="text" class="form-control" @bind="@_server" />
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); </div>
</div>
<tr>
<td>
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
</td>
<td>
<input id="@fieldId" type="text" class="form-control" @bind="@field.Value" />
</td>
</tr>
}
}
@code { @code {
private readonly List<ConnectionStringField> _connectionStringFields = new() private string _server = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm") + ".db";
{
new() {Name = "Server", FriendlyName = "File Name", Value = "Oqtane-{{Date}}.db", HelpText="Enter the file name to use for the database"}
};
public string GetConnectionString() public string GetConnectionString()
{ {
var connectionstring = String.Empty; var connectionstring = String.Empty;
var server = _connectionStringFields[0].Value; if (!String.IsNullOrEmpty(_server))
if (!String.IsNullOrEmpty(server))
{ {
connectionstring = $"Data Source={server};"; connectionstring = $"Data Source={_server};";
} }
return connectionstring; return connectionstring;

115
Oqtane.Client/Installer/Installer.razor
View File

@ -20,78 +20,64 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col text-center"> <div class="col text-center">
<h2>@Localizer["DatabaseConfig"]</h2><br /> <h2>@Localizer["DatabaseConfig"]</h2><br />
<table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;"> <div class="container">
<tbody> <div class="row mb-1 align-items-center">
<tr> <Label Class="col-sm-3" For="databasetype" HelpText="Select the type of database you wish to use" ResourceKey="DatabaseType">Database:</Label>
<td> <div class="col-sm-9">
<Label For="databasetype" HelpText="Select the type of database you wish to create" ResourceKey="DatabaseType">Database Type:</Label> <select id="databasetype" class="form-select custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
</td> @if (_databases != null)
<td> {
<select id="databasetype" class="custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))"> foreach (var database in _databases)
@if (_databases != null)
{ {
foreach (var database in _databases) if (database.IsDefault)
{ {
if (database.IsDefault) <option value="@database.Name" selected>@Localizer[@database.Name]</option>
{ }
<option value="@database.Name" selected>@Localizer[@database.Name]</option> else
} {
else <option value="@database.Name">@Localizer[@database.Name]</option>
{
<option value="@database.Name">@Localizer[@database.Name]</option>
}
} }
} }
</select> }
</td> </select>
</tr> </div>
@{ </div>
if (_databaseConfigType != null) @{
{ if (_databaseConfigType != null)
@DatabaseConfigComponent; {
} @DatabaseConfigComponent;
} }
</tbody> }
</table> </div>
</div> </div>
<div class="col text-center"> <div class="col text-center">
<h2>@Localizer["ApplicationAdmin"]</h2><br /> <h2>@Localizer["ApplicationAdmin"]</h2><br />
<table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;"> <div class="container">
<tbody> <div class="row mb-1 align-items-center">
<tr> <Label Class="col-sm-3" For="username" HelpText="The username of the host user account (this is not customizable)" ResourceKey="Username">Username:</Label>
<td> <div class="col-sm-9">
<Label For="username" HelpText="The username of the host user account ( this is not customizable )" ResourceKey="Username">Username:</Label> <input id="username" type="text" class="form-control" @bind="@_hostUsername" readonly />
</td> </div>
<td> </div>
<input id="username" type="text" class="form-control" @bind="@_hostUsername" readonly /> <div class="row mb-1 align-items-center">
</td> <Label Class="col-sm-3" For="password" HelpText="Provide the password for the host user account" ResourceKey="Password">Password:</Label>
</tr> <div class="col-sm-9">
<tr> <input id="password" type="password" class="form-control" @bind="@_hostPassword" />
<td> </div>
<Label For="password" HelpText="Provide the password for the host user account" ResourceKey="Password">Password:</Label> </div>
</td> <div class="row mb-1 align-items-center">
<td> <Label Class="col-sm-3" For="confirm" HelpText="Please confirm the password entered above by entering it again" ResourceKey="Confirm">Confirm:</Label>
<input id="password" type="password" class="form-control" @bind="@_hostPassword" /> <div class="col-sm-9">
</td> <input id="confirm" type="password" class="form-control" @bind="@_confirmPassword" />
</tr> </div>
<tr> </div>
<td> <div class="row mb-1 align-items-center">
<Label For="confirm" HelpText="Please confirm the password entered above by entering it again" ResourceKey="Confirm">Confirm:</Label> <Label Class="col-sm-3" For="email" HelpText="Provide the email address for the host user account" ResourceKey="Email">Email:</Label>
</td> <div class="col-sm-9">
<td> <input type="text" class="form-control" @bind="@_hostEmail" />
<input id="confirm" type="password" class="form-control" @bind="@_confirmPassword" /> </div>
</td> </div>
</tr> </div>
<tr>
<td>
<Label For="email" HelpText="Provide the email address for the host user account" ResourceKey="Email">Email:</Label>
</td>
<td>
<input type="text" class="form-control" @bind="@_hostEmail" />
</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
<hr class="app-rule" /> <hr class="app-rule" />
@ -215,5 +201,4 @@
_message = Localizer["Message.Require.DbInfo"]; _message = Localizer["Message.Require.DbInfo"];
} }
} }
} }

6
Oqtane.Client/Resources/Installer/Controls/PostgreSQLConfig.resx
View File

@ -153,4 +153,10 @@
<data name="Pwd.HelpText" xml:space="preserve"> <data name="Pwd.HelpText" xml:space="preserve">
<value>Enter the password to use for the database</value> <value>Enter the password to use for the database</value>
</data> </data>
<data name="Custom" xml:space="preserve">
<value>Custom</value>
</data>
<data name="Integrated" xml:space="preserve">
<value>Integrated</value>
</data>
</root> </root>

6
Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx
View File

@ -147,4 +147,10 @@
<data name="Pwd.HelpText" xml:space="preserve"> <data name="Pwd.HelpText" xml:space="preserve">
<value>Enter the password to use for the database</value> <value>Enter the password to use for the database</value>
</data> </data>
<data name="Custom" xml:space="preserve">
<value>Custom</value>
</data>
<data name="Integrated" xml:space="preserve">
<value>Integrated</value>
</data>
</root> </root>

31
Oqtane.Client/Resources/Installer/Installer.resx
View File

@ -120,8 +120,8 @@
<data name="DatabaseConfig" xml:space="preserve"> <data name="DatabaseConfig" xml:space="preserve">
<value>Database Configuration</value> <value>Database Configuration</value>
</data> </data>
<data name="DatabaseType" xml:space="preserve"> <data name="DatabaseType.Text" xml:space="preserve">
<value>Database Type:</value> <value>Database:</value>
</data> </data>
<data name="ApplicationAdmin" xml:space="preserve"> <data name="ApplicationAdmin" xml:space="preserve">
<value>Application Administrator</value> <value>Application Administrator</value>
@ -138,4 +138,31 @@
<data name="Register" xml:space="preserve"> <data name="Register" xml:space="preserve">
<value>Please Register Me For Major Product Updates And Security Bulletins</value> <value>Please Register Me For Major Product Updates And Security Bulletins</value>
</data> </data>
<data name="Confirm.HelpText" xml:space="preserve">
<value>Please confirm the password entered above by entering it again</value>
</data>
<data name="Confirm.Text" xml:space="preserve">
<value>Confirm:</value>
</data>
<data name="DatabaseType.HelpText" xml:space="preserve">
<value>Select the type of database you wish to use</value>
</data>
<data name="Email.HelpText" xml:space="preserve">
<value>Provide the email address for the host user account</value>
</data>
<data name="Email.Text" xml:space="preserve">
<value>Email:</value>
</data>
<data name="Password.HelpText" xml:space="preserve">
<value>Provide the password for the host user account</value>
</data>
<data name="Password.Text" xml:space="preserve">
<value>Password:</value>
</data>
<data name="Username.HelpText" xml:space="preserve">
<value>The username of the host user account (this is not customizable)</value>
</data>
<data name="Username.Text" xml:space="preserve">
<value>Username:</value>
</data>
</root> </root>

28
Oqtane.Shared/Models/ConnectionStringField.cs
View File

@ -1,28 +0,0 @@
namespace Oqtane.Models
{
/// <summary>
/// Helper class for input fields in the setup of the SQL connection
/// </summary>
public class ConnectionStringField
{
/// <summary>
/// Simple to understand field name / label
/// </summary>
public string FriendlyName { get; set; }
/// <summary>
/// Instructions / help for the user
/// </summary>
public string HelpText { get; set; }
/// <summary>
/// Property / Setting name which will be filled in by the user. Typically something like `Server`, `Port` etc.
/// </summary>
public string Name { get; set; }
/// <summary>
/// Initial value used in the UI and probably later also the user input that was given.
/// </summary>
public string Value { get; set; }
}
}