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

Merge pull request #2947 from sbwalker/dev

Browse Source 
improve helptext for Aliases
This commit is contained in:
Shaun Walker 2023-06-28 12:44:16 -04:00 committed by GitHub
commit 60be0c92da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Oqtane.Client/Modules/Admin/Site/Index.razor
View File

@ -234,53 +234,53 @@
{ {
<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases"> <Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
<div class="container"> <div class="container">
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="aliases" HelpText="The list of aliases for this site" ResourceKey="Aliases">Aliases: </Label> <Label Class="col-sm-3" For="aliases" HelpText="The urls for the site. This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder)." ResourceKey="Aliases">Aliases: </Label>
<div class="col-sm-9"> <div class="col-sm-9">
<button type="button" class="btn btn-primary" @onclick="AddAlias">@SharedLocalizer["Add"]</button> <button type="button" class="btn btn-primary" @onclick="AddAlias">@SharedLocalizer["Add"]</button>
<Pager Items="@_aliases"> <Pager Items="@_aliases">
<Header> <Header>
<th style="width: 1px;">&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th style="width: 1px;">&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>@Localizer["AliasName"]</th> <th>@Localizer["AliasName"]</th>
<th>@Localizer["AliasDefault"]</th> <th>@Localizer["AliasDefault"]</th>
</Header> </Header>
<Row> <Row>
@if (context.AliasId != _aliasid) @if (context.AliasId != _aliasid)
{ {
<td> <td>
@if (_aliasid == -1) @if (_aliasid == -1)
{ {
<button type="button" class="btn btn-primary" @onclick="@(() => EditAlias(context))">@SharedLocalizer["Edit"]</button> <button type="button" class="btn btn-primary" @onclick="@(() => EditAlias(context))">@SharedLocalizer["Edit"]</button>
} }
</td> </td>
<td> <td>
@if (_aliasid == -1) @if (_aliasid == -1)
{ {
<ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteModule" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" /> <ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteModule" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
} }
</td> </td>
<td>@context.Name</td> <td>@context.Name</td>
<td>@context.IsDefault</td> <td>@context.IsDefault</td>
} }
else else
{ {
<td><button type="button" class="btn btn-success" @onclick="@(async () => await SaveAlias())">@SharedLocalizer["Save"]</button></td> <td><button type="button" class="btn btn-success" @onclick="@(async () => await SaveAlias())">@SharedLocalizer["Save"]</button></td>
<td><button type="button" class="btn btn-secondary" @onclick="@(async () => await CancelAlias())">@SharedLocalizer["Cancel"]</button></td> <td><button type="button" class="btn btn-secondary" @onclick="@(async () => await CancelAlias())">@SharedLocalizer["Cancel"]</button></td>
<td> <td>
<input id="aliasname" class="form-control" @bind="@_aliasname" /> <input id="aliasname" class="form-control" @bind="@_aliasname" />
</td> </td>
<td> <td>
<select id="defaultaias" class="form-select" @bind="@_defaultalias" required> <select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
<option value="True">@SharedLocalizer["Yes"]</option> <option value="True">@SharedLocalizer["Yes"]</option>
<option value="False">@SharedLocalizer["No"]</option> <option value="False">@SharedLocalizer["No"]</option>
</select> </select>
</td> </td>
} }
</Row> </Row>
</Pager> </Pager>
</div>
</div> </div>
</div>
</div> </div>
</Section> </Section>
<Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting"> <Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting">

2
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -29,7 +29,7 @@ else
</div> </div>
</div> </div>
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="alias" HelpText="Enter the aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder)." ResourceKey="Aliases">Aliases: </Label> <Label Class="col-sm-3" For="alias" HelpText="The urls for the site (comman delimited). This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder)." ResourceKey="Aliases">Urls: </Label>
<div class="col-sm-9"> <div class="col-sm-9">
<textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea> <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
</div> </div>

2
Oqtane.Client/Modules/Admin/Sites/Index.razor
View File

@ -18,7 +18,7 @@ else
<Header> <Header>
<th style="width: 1px;">&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th style="width: 1px;">&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>@SharedLocalizer["Name"]</th> <th>@Localizer["AliasName"]</th>
</Header> </Header>
<Row> <Row>
<td><button type="button" class="btn btn-primary" @onclick="@(async () => Edit(context.Name))">@SharedLocalizer["Edit"]</button></td> <td><button type="button" class="btn btn-primary" @onclick="@(async () => Edit(context.Name))">@SharedLocalizer["Edit"]</button></td>

8
Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
View File

@ -166,7 +166,7 @@
<value>The name of the database used for the site</value> <value>The name of the database used for the site</value>
</data> </data>
<data name="Aliases.HelpText" xml:space="preserve"> <data name="Aliases.HelpText" xml:space="preserve">
<value>The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder).</value> <value>The urls for the site. This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder).</value>
</data> </data>
<data name="IsDeleted.HelpText" xml:space="preserve"> <data name="IsDeleted.HelpText" xml:space="preserve">
<value>Is this site deleted?</value> <value>Is this site deleted?</value>
@ -217,7 +217,7 @@
<value>Database: </value> <value>Database: </value>
</data> </data>
<data name="Aliases.Text" xml:space="preserve"> <data name="Aliases.Text" xml:space="preserve">
<value>Aliases: </value> <value>Urls:</value>
</data> </data>
<data name="IsDeleted.Text" xml:space="preserve"> <data name="IsDeleted.Text" xml:space="preserve">
<value>Deleted? </value> <value>Deleted? </value>
@ -322,10 +322,10 @@
<value>Default Alias: </value> <value>Default Alias: </value>
</data> </data>
<data name="Aliases.Heading" xml:space="preserve"> <data name="Aliases.Heading" xml:space="preserve">
<value>Aliases</value> <value>Urls</value>
</data> </data>
<data name="AliasName" xml:space="preserve"> <data name="AliasName" xml:space="preserve">
<value>Name</value> <value>Url</value>
</data> </data>
<data name="AliasDefault" xml:space="preserve"> <data name="AliasDefault" xml:space="preserve">
<value>Default?</value> <value>Default?</value>

4
Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
View File

@ -136,7 +136,7 @@
<value>Default Admin Container</value> <value>Default Admin Container</value>
</data> </data>
<data name="Aliases.HelpText" xml:space="preserve"> <data name="Aliases.HelpText" xml:space="preserve">
<value>Enter the alias for the server</value> <value>The urls for the site (comman delimited). This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or a virtual folder (ie. domain.com/folder).</value>
</data> </data>
<data name="DefaultContainer.HelpText" xml:space="preserve"> <data name="DefaultContainer.HelpText" xml:space="preserve">
<value>Select the default container for the site</value> <value>Select the default container for the site</value>
@ -145,7 +145,7 @@
<value>Database: </value> <value>Database: </value>
</data> </data>
<data name="Aliases.Text" xml:space="preserve"> <data name="Aliases.Text" xml:space="preserve">
<value>Aliases: </value> <value>Urls: </value>
</data> </data>
<data name="DefaultTheme.Text" xml:space="preserve"> <data name="DefaultTheme.Text" xml:space="preserve">
<value>Default Theme: </value> <value>Default Theme: </value>

3
Oqtane.Client/Resources/Modules/Admin/Sites/Index.resx
View File

@ -135,4 +135,7 @@
<data name="Browse" xml:space="preserve"> <data name="Browse" xml:space="preserve">
<value>Browse</value> <value>Browse</value>
</data> </data>
<data name="AliasName" xml:space="preserve">
<value>Url</value>
</data>
</root> </root>