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

upgrade to Boostrap 5

Browse Source
This commit is contained in:
Shaun Walker 2021-07-02 20:03:51 -04:00
parent 525cbb87b0
commit cb7d9a0371
66 changed files with 551 additions and 11463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@
<Label For="folder" HelpText="Select the folder to save the file in" ResourceKey="Folder">Folder: </Label> <Label For="folder" HelpText="Select the folder to save the file in" ResourceKey="Folder">Folder: </Label>
</td> </td>
<td> <td>
<select id="folder" class="form-control" @bind="@_folderId"> <select id="folder" class="form-select" @bind="@_folderId">
<option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option> <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
@foreach (Folder folder in _folders) @foreach (Folder folder in _folders)
{ {

4
Oqtane.Client/Modules/Admin/Files/Details.razor
View File

@ -10,7 +10,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label for="name" HelpText="The name of the file" ResourceKey="Name">Name: </Label> <Label for="name" HelpText="The name of the file" ResourceKey="Name">Name: </Label>
</td> </td>
<td> <td>
@ -22,7 +22,7 @@
<Label For="parent" HelpText="The folder where the file is located" ResourceKey="Folder">Folder: </Label> <Label For="parent" HelpText="The folder where the file is located" ResourceKey="Folder">Folder: </Label>
</td> </td>
<td> <td>
<select id="parent" class="form-control" @bind="@_folderId"> <select id="parent" class="form-select" @bind="@_folderId">
@foreach (Folder folder in _folders) @foreach (Folder folder in _folders)
{ {
<option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option> <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>

6
Oqtane.Client/Modules/Admin/Files/Edit.razor
View File

@ -10,11 +10,11 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label> <Label For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
</td> </td>
<td> <td>
<select id="parent" class="form-control" @bind="@_parentId"> <select id="parent" class="form-select" @bind="@_parentId">
@if (PageState.QueryString.ContainsKey("id")) @if (PageState.QueryString.ContainsKey("id"))
{ {
<option value="-1">&lt;@Localizer["NoParent"]&gt;</option> <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
@ -45,7 +45,7 @@
} }
else else
{ {
<select id="type" class="form-control" @bind="@_type"> <select id="type" class="form-select" @bind="@_type">
<option value="@FolderTypes.Private">@Localizer[FolderTypes.Private]</option> <option value="@FolderTypes.Private">@Localizer[FolderTypes.Private]</option>
<option value="@FolderTypes.Public">@Localizer[FolderTypes.Public]</option> <option value="@FolderTypes.Public">@Localizer[FolderTypes.Public]</option>
</select> </select>

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

@ -14,7 +14,7 @@
<label class="control-label">@Localizer["Folder"] </label> <label class="control-label">@Localizer["Folder"] </label>
</td> </td>
<td> <td>
<select class="form-control" @onchange="(e => FolderChanged(e))"> <select class="form-select" @onchange="(e => FolderChanged(e))">
@foreach (Folder folder in _folders) @foreach (Folder folder in _folders)
{ {
<option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option> <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>

17
Oqtane.Client/Modules/Admin/Jobs/Edit.razor
View File

@ -7,7 +7,7 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="name" HelpText="Enter the job name" ResourceKey="Name">Name: </Label> <Label For="name" HelpText="Enter the job name" ResourceKey="Name">Name: </Label>
</td> </td>
<td> <td>
@ -27,7 +27,7 @@
<Label For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label> <Label For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label>
</td> </td>
<td> <td>
<select id="enabled" class="form-control" @bind="@_isEnabled"> <select id="enabled" class="form-select" @bind="@_isEnabled">
<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>
@ -39,7 +39,7 @@
</td> </td>
<td> <td>
<input id="runs-every" class="form-control" @bind="@_interval" /> <input id="runs-every" class="form-control" @bind="@_interval" />
<select id="runs-every" class="form-control" @bind="@_frequency"> <select id="runs-every" class="form-select" @bind="@_frequency">
<option value="m">@Localizer["Minute(s)"]</option> <option value="m">@Localizer["Minute(s)"]</option>
<option value="H">@Localizer["Hour(s)"]</option> <option value="H">@Localizer["Hour(s)"]</option>
<option value="d">@Localizer["Day(s)"]</option> <option value="d">@Localizer["Day(s)"]</option>
@ -82,6 +82,9 @@
</table> </table>
<button type="button" class="btn btn-success" @onclick="SaveJob">@SharedLocalizer["Save"]</button> <button type="button" class="btn btn-success" @onclick="SaveJob">@SharedLocalizer["Save"]</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
<br />
<br />
<AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
@code { @code {
private int _jobId; private int _jobId;
@ -94,6 +97,10 @@
private string _endDate = string.Empty; private string _endDate = string.Empty;
private string _retentionHistory = string.Empty; private string _retentionHistory = string.Empty;
private string _nextExecution = string.Empty; private string _nextExecution = string.Empty;
private string createdby;
private DateTime createdon;
private string modifiedby;
private DateTime modifiedon;
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
@ -114,6 +121,10 @@
_endDate = (job.EndDate != null) ? job.EndDate.ToString() : string.Empty; _endDate = (job.EndDate != null) ? job.EndDate.ToString() : string.Empty;
_retentionHistory = job.RetentionHistory.ToString(); _retentionHistory = job.RetentionHistory.ToString();
_nextExecution = job.NextExecution.ToString(); _nextExecution = job.NextExecution.ToString();
createdby = job.CreatedBy;
createdon = job.CreatedOn;
modifiedby = job.ModifiedBy;
modifiedon = job.ModifiedOn;
} }
} }
catch (Exception ex) catch (Exception ex)

6
Oqtane.Client/Modules/Admin/Languages/Add.razor
View File

@ -25,11 +25,11 @@ else
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="name" HelpText="Name Of The Language" ResourceKey="Name">Name:</Label> <Label For="name" HelpText="Name Of The Language" ResourceKey="Name">Name:</Label>
</td> </td>
<td> <td>
<select id="_code" class="form-control" @bind="@_code"> <select id="_code" class="form-select" @bind="@_code">
@foreach (var culture in _availableCultures) @foreach (var culture in _availableCultures)
{ {
<option value="@culture.Name">@culture.DisplayName</option> <option value="@culture.Name">@culture.DisplayName</option>
@ -42,7 +42,7 @@ else
<Label For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label> <Label For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label>
</td> </td>
<td> <td>
<select id="default" class="form-control" @bind="@_isDefault"> <select id="default" class="form-select" @bind="@_isDefault">
<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>

2
Oqtane.Client/Modules/Admin/Logs/Detail.razor
View File

@ -11,7 +11,7 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label> <Label For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
</td> </td>
<td> <td>

6
Oqtane.Client/Modules/Admin/Logs/Index.razor
View File

@ -14,7 +14,7 @@ else
<tr> <tr>
<td> <td>
<Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br /> <Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
<select id="level" class="form-control" @onchange="(e => LevelChanged(e))"> <select id="level" class="form-select" @onchange="(e => LevelChanged(e))">
<option value="-">&lt;@Localizer["AllLevels"]&gt;</option> <option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
<option value="Trace">@Localizer["Trace"]</option> <option value="Trace">@Localizer["Trace"]</option>
<option value="Debug">@Localizer["Debug"]</option> <option value="Debug">@Localizer["Debug"]</option>
@ -26,7 +26,7 @@ else
</td> </td>
<td> <td>
<Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br /> <Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
<select id="function" class="form-control" @onchange="(e => FunctionChanged(e))"> <select id="function" class="form-select" @onchange="(e => FunctionChanged(e))">
<option value="-">&lt;@Localizer["AllFunctions"]&gt;</option> <option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
<option value="Create">@Localizer["Create"]</option> <option value="Create">@Localizer["Create"]</option>
<option value="Read">@Localizer["Read"]</option> <option value="Read">@Localizer["Read"]</option>
@ -38,7 +38,7 @@ else
</td> </td>
<td> <td>
<Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br /> <Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
<select id="rows" class="form-control" @onchange="(e => RowsChanged(e))"> <select id="rows" class="form-select" @onchange="(e => RowsChanged(e))">
<option value="10">10</option> <option value="10">10</option>
<option value="50">50</option> <option value="50">50</option>
<option value="100">100</option> <option value="100">100</option>

6
Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
View File

@ -12,7 +12,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label> <Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
</td> </td>
<td> <td>
@ -40,7 +40,7 @@
<Label For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label> <Label For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
</td> </td>
<td> <td>
<select id="template" class="form-control" @onchange="(e => TemplateChanged(e))"> <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
<option value="-">&lt;@Localizer["Template.Select"]&gt;</option> <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
@foreach (Template template in _templates) @foreach (Template template in _templates)
{ {
@ -54,7 +54,7 @@
<Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label> <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
</td> </td>
<td> <td>
<select id="reference" class="form-control" @bind="@_reference"> <select id="reference" class="form-select" @bind="@_reference">
@foreach (string version in _versions) @foreach (string version in _versions)
{ {
if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0) if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)

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

@ -11,7 +11,7 @@
<TabPanel Name="Download" ResourceKey="Download"> <TabPanel Name="Download" ResourceKey="Download">
<ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage> <ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
<table class="table table-borderless" style=" margin: auto; width: 50% !important;"> <table class="table table-borderless" style="margin: auto; width: 50% !important;">
<tr> <tr>
<td> <td>
<input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" /> <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />

6
Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
View File

@ -12,7 +12,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label> <Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
</td> </td>
<td> <td>
@ -40,7 +40,7 @@
<Label For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label> <Label For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
</td> </td>
<td> <td>
<select id="template" class="form-control" @onchange="(e => TemplateChanged(e))"> <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
<option value="-">&lt;@Localizer["Template.Select"]&gt;</option> <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
@foreach (Template template in _templates) @foreach (Template template in _templates)
{ {
@ -54,7 +54,7 @@
<Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label> <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
</td> </td>
<td> <td>
<select id="reference" class="form-control" @bind="@_reference"> <select id="reference" class="form-select" @bind="@_reference">
@foreach (string version in _versions) @foreach (string version in _versions)
{ {
if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0) if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)

4
Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
View File

@ -9,7 +9,7 @@
<TabPanel Name="Definition" ResourceKey="Definition"> <TabPanel Name="Definition" ResourceKey="Definition">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label> <Label For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
</td> </td>
<td> <td>
@ -36,7 +36,7 @@
<Section Name="Information" ResourceKey="Information"> <Section Name="Information" ResourceKey="Information">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="moduledefinitionname" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label> <Label For="moduledefinitionname" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
</td> </td>
<td> <td>

2
Oqtane.Client/Modules/Admin/Modules/Export.razor
View File

@ -8,7 +8,7 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tbody> <tbody>
<tr> <tr>
<td> <td width="30%">
<Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label> <Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label>
</td> </td>
<td> <td>

2
Oqtane.Client/Modules/Admin/Modules/Import.razor
View File

@ -8,7 +8,7 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tbody> <tbody>
<tr> <tr>
<td> <td width="30%">
<Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label> <Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label>
</td> </td>
<td> <td>

19
Oqtane.Client/Modules/Admin/Modules/Settings.razor
View File

@ -14,7 +14,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="title" HelpText="Enter the title of the module" ResourceKey="Title">Title: </Label> <Label For="title" HelpText="Enter the title of the module" ResourceKey="Title">Title: </Label>
</td> </td>
<td> <td>
@ -26,7 +26,7 @@
<Label For="container" HelpText="Select the module's container" ResourceKey="Container">Container: </Label> <Label For="container" HelpText="Select the module's container" ResourceKey="Container">Container: </Label>
</td> </td>
<td> <td>
<select id="container" class="form-control" @bind="@_containerType"> <select id="container" class="form-select" @bind="@_containerType">
@foreach (var container in _containers) @foreach (var container in _containers)
{ {
<option value="@container.TypeName">@container.Name</option> <option value="@container.TypeName">@container.Name</option>
@ -39,7 +39,7 @@
<Label For="allpages" HelpText="Indicate if this module should be displayed on all pages" ResourceKey="DisplayOnAllPages">Display On All Pages? </Label> <Label For="allpages" HelpText="Indicate if this module should be displayed on all pages" ResourceKey="DisplayOnAllPages">Display On All Pages? </Label>
</td> </td>
<td> <td>
<select id="allpages" class="form-control" @bind="@_allPages"> <select id="allpages" class="form-select" @bind="@_allPages">
<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>
@ -50,7 +50,7 @@
<Label For="page" HelpText="The page that the module is located on" ResourceKey="Page">Page: </Label> <Label For="page" HelpText="The page that the module is located on" ResourceKey="Page">Page: </Label>
</td> </td>
<td> <td>
<select id="page" class="form-control" @bind="@_pageId"> <select id="page" class="form-select" @bind="@_pageId">
@foreach (Page p in PageState.Pages) @foreach (Page p in PageState.Pages)
{ {
if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions)) if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
@ -91,6 +91,9 @@
</TabStrip> </TabStrip>
<button type="button" class="btn btn-success" @onclick="SaveModule">@SharedLocalizer["Save"]</button> <button type="button" class="btn btn-success" @onclick="SaveModule">@SharedLocalizer["Save"]</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
<br />
<br />
<AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
@ -112,6 +115,10 @@
private Type _containerSettingsType; private Type _containerSettingsType;
private object _containerSettings; private object _containerSettings;
private RenderFragment ContainerSettingsComponent { get; set; } private RenderFragment ContainerSettingsComponent { get; set; }
private string createdby;
private DateTime createdon;
private string modifiedby;
private DateTime modifiedon;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
@ -123,6 +130,10 @@
_permissions = ModuleState.Permissions; _permissions = ModuleState.Permissions;
_permissionNames = ModuleState.ModuleDefinition.PermissionNames; _permissionNames = ModuleState.ModuleDefinition.PermissionNames;
_pageId = ModuleState.PageId.ToString(); _pageId = ModuleState.PageId.ToString();
createdby = ModuleState.CreatedBy;
createdon = ModuleState.CreatedOn;
modifiedby = ModuleState.ModifiedBy;
modifiedon = ModuleState.ModifiedOn;
if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType)) if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
{ {

24
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -12,7 +12,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="Name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label> <Label For="Name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
</td> </td>
<td> <td>
@ -24,7 +24,7 @@
<Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label> <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
</td> </td>
<td> <td>
<select id="Parent" class="form-control" @onchange="(e => ParentChanged(e))"> <select id="Parent" class="form-select" @onchange="(e => ParentChanged(e))">
<option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option> <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
@foreach (Page page in _pageList) @foreach (Page page in _pageList)
{ {
@ -38,7 +38,7 @@
<Label For="Insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages" ResourceKey="Insert">Insert: </Label> <Label For="Insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages" ResourceKey="Insert">Insert: </Label>
</td> </td>
<td> <td>
<select id="Insert" class="form-control" @bind="@_insert"> <select id="Insert" class="form-select" @bind="@_insert">
<option value="<<">@Localizer["AtBeginning"]</option> <option value="<<">@Localizer["AtBeginning"]</option>
@if (_children != null && _children.Count > 0) @if (_children != null && _children.Count > 0)
{ {
@ -49,7 +49,7 @@
</select> </select>
@if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">")) @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
{ {
<select class="form-control" @bind="@_childid"> <select class="form-select" @bind="@_childid">
<option value="-1">&lt;@Localizer["Page.Select"]&gt;</option> <option value="-1">&lt;@Localizer["Page.Select"]&gt;</option>
@foreach (Page page in _children) @foreach (Page page in _children)
{ {
@ -61,10 +61,10 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label> <Label For="navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
</td> </td>
<td> <td>
<select id="Navigation" class="form-control" @bind="@_isnavigation"> <select id="navigation" class="form-select" @bind="@_isnavigation">
<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>
@ -72,10 +72,10 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<Label For="Clickablen" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label> <Label For="clickable" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
</td> </td>
<td> <td>
<select id="Navigation" class="form-control" @bind="@_isclickable"> <select id="clickable" class="form-select" @bind="@_isclickable">
<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>
@ -101,7 +101,7 @@
<Section Name="Appearance" ResourceKey="Appearance"> <Section Name="Appearance" ResourceKey="Appearance">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label> <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
</td> </td>
<td> <td>
@ -113,7 +113,7 @@
<Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label> <Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
</td> </td>
<td> <td>
<select id="Theme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))"> <select id="Theme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))">
@foreach (var theme in _themes) @foreach (var theme in _themes)
{ {
<option value="@theme.TypeName">@theme.Name</option> <option value="@theme.TypeName">@theme.Name</option>
@ -126,7 +126,7 @@
<Label For="defaultContainer" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label> <Label For="defaultContainer" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label>
</td> </td>
<td> <td>
<select id="defaultContainer" class="form-control" @bind="@_containertype"> <select id="defaultContainer" class="form-select" @bind="@_containertype">
<option value="-">&lt;@Localizer["Container.Select"]&gt;</option> <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
@foreach (var container in _containers) @foreach (var container in _containers)
{ {
@ -148,7 +148,7 @@
<Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label> <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label>
</td> </td>
<td> <td>
<select id="Personalizable" class="form-control" @bind="@_ispersonalizable"> <select id="Personalizable" class="form-select" @bind="@_ispersonalizable">
<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>

20
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -13,7 +13,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="Name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label> <Label For="Name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
</td> </td>
<td> <td>
@ -25,7 +25,7 @@
<Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label> <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
</td> </td>
<td> <td>
<select id="Parent" class="form-control" value="@_parentid" @onchange="(e => ParentChanged(e))"> <select id="Parent" class="form-select" value="@_parentid" @onchange="(e => ParentChanged(e))">
<option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option> <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
@foreach (Page page in _pageList) @foreach (Page page in _pageList)
{ {
@ -42,7 +42,7 @@
<Label For="Move" HelpText="Select the location where you would like the page to be moved in relation to other pages" ResourceKey="Move">Move: </Label> <Label For="Move" HelpText="Select the location where you would like the page to be moved in relation to other pages" ResourceKey="Move">Move: </Label>
</td> </td>
<td> <td>
<select id="Move" class="form-control" @bind="@_insert"> <select id="Move" class="form-select" @bind="@_insert">
@if (_parentid == _currentparentid) @if (_parentid == _currentparentid)
{ {
<option value="=">&lt;@Localizer["ThisLocation.Keep"]&gt;</option> <option value="=">&lt;@Localizer["ThisLocation.Keep"]&gt;</option>
@ -57,7 +57,7 @@
</select> </select>
@if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">")) @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
{ {
<select class="form-control" @bind="@_childid"> <select class="form-select" @bind="@_childid">
<option value="-1">&lt;@Localizer["Page.Select"]&gt;</option> <option value="-1">&lt;@Localizer["Page.Select"]&gt;</option>
@foreach (Page page in _children) @foreach (Page page in _children)
{ {
@ -72,7 +72,7 @@
<Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label> <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
</td> </td>
<td> <td>
<select id="Navigation" class="form-control" @bind="@_isnavigation"> <select id="Navigation" class="form-select" @bind="@_isnavigation">
<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>
@ -83,7 +83,7 @@
<Label For="Clickablen" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label> <Label For="Clickablen" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
</td> </td>
<td> <td>
<select id="Navigation" class="form-control" @bind="@_isclickable"> <select id="Navigation" class="form-select" @bind="@_isclickable">
<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>
@ -109,7 +109,7 @@
<Section Name="Appearance" ResourceKey="Appearance"> <Section Name="Appearance" ResourceKey="Appearance">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label> <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
</td> </td>
<td> <td>
@ -121,7 +121,7 @@
<Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label> <Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
</td> </td>
<td> <td>
<select id="Theme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))"> <select id="Theme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))">
@foreach (var theme in _themes) @foreach (var theme in _themes)
{ {
<option value="@theme.TypeName">@theme.Name</option> <option value="@theme.TypeName">@theme.Name</option>
@ -134,7 +134,7 @@
<Label For="defaultContainer" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label> <Label For="defaultContainer" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label>
</td> </td>
<td> <td>
<select id="defaultContainer" class="form-control" @bind="@_containertype"> <select id="defaultContainer" class="form-select" @bind="@_containertype">
<option value="-">&lt;@Localizer["Container.Select"]&gt;</option> <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
@foreach (var container in _containers) @foreach (var container in _containers)
{ {
@ -156,7 +156,7 @@
<Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label> <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label>
</td> </td>
<td> <td>
<select id="Personalizable" class="form-control" @bind="@_ispersonalizable"> <select id="Personalizable" class="form-select" @bind="@_ispersonalizable">
<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>

20
Oqtane.Client/Modules/Admin/Profiles/Edit.razor
View File

@ -7,7 +7,7 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="name" HelpText="The name of this profile item" ResourceKey="Name">Name: </Label> <Label For="name" HelpText="The name of this profile item" ResourceKey="Name">Name: </Label>
</td> </td>
<td> <td>
@ -75,7 +75,7 @@
<Label For="required" HelpText="Should a user be required to provide a value for this profile item?" ResourceKey="Required">Required? </Label> <Label For="required" HelpText="Should a user be required to provide a value for this profile item?" ResourceKey="Required">Required? </Label>
</td> </td>
<td> <td>
<select id="required" class="form-control" @bind="@_isrequired"> <select id="required" class="form-select" @bind="@_isrequired">
<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>
@ -86,7 +86,7 @@
<Label For="private" HelpText="Should this profile item be visible to all users?" ResourceKey="Private">Private? </Label> <Label For="private" HelpText="Should this profile item be visible to all users?" ResourceKey="Private">Private? </Label>
</td> </td>
<td> <td>
<select id="private" class="form-control" @bind="@_isprivate"> <select id="private" class="form-select" @bind="@_isprivate">
<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>
@ -95,6 +95,12 @@
</table> </table>
<button type="button" class="btn btn-success" @onclick="SaveProfile">@SharedLocalizer["Save"]</button> <button type="button" class="btn btn-success" @onclick="SaveProfile">@SharedLocalizer["Save"]</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
@if (PageState.QueryString.ContainsKey("id"))
{
<br />
<br />
<AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
}
@code { @code {
private int _profileid = -1; private int _profileid = -1;
@ -108,6 +114,10 @@
private string _options = string.Empty; private string _options = string.Empty;
private string _isrequired = "False"; private string _isrequired = "False";
private string _isprivate = "False"; private string _isprivate = "False";
private string createdby;
private DateTime createdon;
private string modifiedby;
private DateTime modifiedon;
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
@ -133,6 +143,10 @@
_options = profile.Options; _options = profile.Options;
_isrequired = profile.IsRequired.ToString(); _isrequired = profile.IsRequired.ToString();
_isprivate = profile.IsPrivate.ToString(); _isprivate = profile.IsPrivate.ToString();
createdby = profile.CreatedBy;
createdon = profile.CreatedOn;
modifiedby = profile.ModifiedBy;
modifiedon = profile.ModifiedOn;
} }
} }
} }

73
Oqtane.Client/Modules/Admin/Register/Index.razor
View File

@ -17,30 +17,51 @@
<NotAuthorized> <NotAuthorized>
<ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" /> <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" />
<div class="container"> <table class="table table-borderless">
<div class="form-group"> <tr>
<label for="Username" class="control-label">@SharedLocalizer["Username"] </label> <td width="30%">
<input type="text" class="form-control" placeholder="Username" @bind="@_username" id="Username" /> <Label For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
</div> </td>
<div class="form-group"> <td>
<label for="Password" class="control-label">@SharedLocalizer["Password"] </label> <input id="username" class="form-control" @bind="@_username" readonly />
<input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" /> </td>
</div> </tr>
<div class="form-group"> <tr>
<label for="Confirm" class="control-label">@Localizer["Password.Confirm"] </label> <td>
<input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" /> <Label For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
</div> </td>
<div class="form-group"> <td>
<label for="Email" class="control-label">@SharedLocalizer["Email"] </label> <input id="password" type="password" class="form-control" @bind="@_password" autocomplete="new-password" />
<input type="text" class="form-control" placeholder="Email" @bind="@_email" id="Email" /> </td>
</div> </tr>
<div class="form-group"> <tr>
<label for="DisplayName" class="control-label">@SharedLocalizer["FullName"] </label> <td>
<input type="text" class="form-control" placeholder="Full Name" @bind="@_displayName" id="DisplayName" /> <Label For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
</div> </td>
<button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button> <td>
<button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button> <input id="confirm" type="password" class="form-control" @bind="@_confirm" autocomplete="new-password" />
</div> </td>
</tr>
<tr>
<td>
<Label For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
</td>
<td>
<input id="email" class="form-control" @bind="@_email" />
</td>
</tr>
<tr>
<td>
<Label For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
</td>
<td>
<input id="displayname" class="form-control" @bind="@_displayname" />
</td>
</tr>
</table>
<button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
<button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
</NotAuthorized> </NotAuthorized>
</AuthorizeView> </AuthorizeView>
} }
@ -54,7 +75,7 @@ else
private string _password = string.Empty; private string _password = string.Empty;
private string _confirm = string.Empty; private string _confirm = string.Empty;
private string _email = string.Empty; private string _email = string.Empty;
private string _displayName = string.Empty; private string _displayname = string.Empty;
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
@ -72,7 +93,7 @@ else
{ {
SiteId = PageState.Site.SiteId, SiteId = PageState.Site.SiteId,
Username = _username, Username = _username,
DisplayName = (_displayName == string.Empty ? _username : _displayName), DisplayName = (_displayname == string.Empty ? _username : _displayname),
Email = _email, Email = _email,
Password = _password Password = _password
}; };

4
Oqtane.Client/Modules/Admin/Roles/Add.razor
View File

@ -8,7 +8,7 @@
<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate> <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label> <Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
</td> </td>
<td> <td>
@ -28,7 +28,7 @@
<Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label> <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
</td> </td>
<td> <td>
<select id="isautoassigned" class="form-control" @bind="@_isautoassigned"> <select id="isautoassigned" class="form-select" @bind="@_isautoassigned">
<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>

4
Oqtane.Client/Modules/Admin/Roles/Edit.razor
View File

@ -8,7 +8,7 @@
<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate> <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label> <Label For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
</td> </td>
<td> <td>
@ -28,7 +28,7 @@
<Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label> <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
</td> </td>
<td> <td>
<select id="isautoassigned" class="form-control" @bind="@_isautoassigned"> <select id="isautoassigned" class="form-select" @bind="@_isautoassigned">
<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>

4
Oqtane.Client/Modules/Admin/Roles/Users.razor
View File

@ -13,7 +13,7 @@ else
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="role" HelpText="The role you are assigning users to" ResourceKey="Role">Role: </Label> <Label For="role" HelpText="The role you are assigning users to" ResourceKey="Role">Role: </Label>
</td> </td>
<td> <td>
@ -25,7 +25,7 @@ else
<Label For="user" HelpText="Select a user" ResourceKey="User">User: </Label> <Label For="user" HelpText="Select a user" ResourceKey="User">User: </Label>
</td> </td>
<td> <td>
<select id="user" class="form-control" @bind="@userid"> <select id="user" class="form-select" @bind="@userid">
<option value="-1">&lt;@Localizer["User.Select"]&gt;</option> <option value="-1">&lt;@Localizer["User.Select"]&gt;</option>
@foreach (UserRole userrole in users) @foreach (UserRole userrole in users)
{ {

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

@ -15,7 +15,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="name" HelpText="Enter the site name" ResourceKey="Name">Name: </Label> <Label For="name" HelpText="Enter the site name" ResourceKey="Name">Name: </Label>
</td> </td>
<td> <td>
@ -43,7 +43,7 @@
<Label For="allowRegister" HelpText="Do you want the users to be able to register for an account on the site" ResourceKey="AllowRegistration">Allow User Registration? </Label> <Label For="allowRegister" HelpText="Do you want the users to be able to register for an account on the site" ResourceKey="AllowRegistration">Allow User Registration? </Label>
</td> </td>
<td> <td>
<select id="allowRegister" class="form-control" @bind="@_allowregistration"> <select id="allowRegister" class="form-select" @bind="@_allowregistration">
<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>
@ -54,7 +54,7 @@
<Label For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Is Deleted? </Label> <Label For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Is Deleted? </Label>
</td> </td>
<td> <td>
<select id="isDeleted" class="form-control" @bind="@_isdeleted"> <select id="isDeleted" class="form-select" @bind="@_isdeleted">
<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>
@ -64,7 +64,7 @@
<Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance"> <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label> <Label For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
</td> </td>
<td> <td>
@ -84,7 +84,7 @@
<Label For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label> <Label For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label>
</td> </td>
<td> <td>
<select id="defaultTheme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))"> <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))">
<option value="-">&lt;@Localizer["Theme.Select"]&gt;</option> <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
@foreach (var theme in _themes) @foreach (var theme in _themes)
{ {
@ -98,7 +98,7 @@
<Label For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label> <Label For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
</td> </td>
<td> <td>
<select id="defaultContainer" class="form-control" @bind="@_containertype"> <select id="defaultContainer" class="form-select" @bind="@_containertype">
<option value="-">&lt;@Localizer["Container.Select"]&gt;</option> <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
@foreach (var container in _containers) @foreach (var container in _containers)
{ {
@ -112,7 +112,7 @@
<Label For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label> <Label For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
</td> </td>
<td> <td>
<select id="defaultAdminContainer" class="form-control" @bind="@_admincontainertype"> <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype">
<option value="-">&lt;@Localizer["Container.Select"]&gt;</option> <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
<option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option> <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
@foreach (var container in _containers) @foreach (var container in _containers)
@ -127,8 +127,9 @@
<Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings"> <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td colspan="2"> <td width="30%">&nbsp;</td>
<strong>@Localizer["Smtp.Required.EnableNotificationJob"]</strong> <td>
<strong>@Localizer["Smtp.Required.EnableNotificationJob"]</strong><br />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -152,7 +153,7 @@
<Label For="enabledSSl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="UseSsl">SSL Enabled: </Label> <Label For="enabledSSl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="UseSsl">SSL Enabled: </Label>
</td> </td>
<td> <td>
<select id="enabledSSl" class="form-control" @bind="@_smtpssl"> <select id="enabledSSl" class="form-select" @bind="@_smtpssl">
<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>
@ -189,11 +190,11 @@
<Section Name="PWA" Heading="Progressive Web Application Settings" ResourceKey="PWASettings"> <Section Name="PWA" Heading="Progressive Web Application Settings" ResourceKey="PWASettings">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="isEnabled" HelpText="Select whether you would like this site to be available as a Progressive Web Application (PWA)" ResourceKey="EnablePWA">Is Enabled? </Label> <Label For="isEnabled" HelpText="Select whether you would like this site to be available as a Progressive Web Application (PWA)" ResourceKey="EnablePWA">Is Enabled? </Label>
</td> </td>
<td> <td>
<select id="isEnabled" class="form-control" @bind="@_pwaisenabled"> <select id="isEnabled" class="form-select" @bind="@_pwaisenabled">
<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>
@ -222,7 +223,7 @@
<Section Name="TenantInformation" Heading="Tenant Information" ResourceKey="TenantInformation"> <Section Name="TenantInformation" Heading="Tenant Information" ResourceKey="TenantInformation">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="tenant" HelpText="The tenant for the site" ResourceKey="Tenant">Tenant: </Label> <Label For="tenant" HelpText="The tenant for the site" ResourceKey="Tenant">Tenant: </Label>
</td> </td>
<td> <td>

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

@ -21,7 +21,7 @@ else
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="name" HelpText="Enter the name of the site" ResourceKey="Name">Site Name: </Label> <Label For="name" HelpText="Enter the name of the site" ResourceKey="Name">Site Name: </Label>
</td> </td>
<td> <td>
@ -41,7 +41,7 @@ else
<Label For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label> <Label For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label>
</td> </td>
<td> <td>
<select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))"> <select id="defaultTheme" class="form-select" @onchange="(e => ThemeChanged(e))">
<option value="-">&lt;@Localizer["Theme.Select"]&gt;</option> <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
@foreach (var theme in _themes) @foreach (var theme in _themes)
{ {
@ -55,7 +55,7 @@ else
<Label For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label> <Label For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
</td> </td>
<td> <td>
<select id="defaultContainer" class="form-control" @bind="@_containertype"> <select id="defaultContainer" class="form-select" @bind="@_containertype">
<option value="-">&lt;@Localizer["Container.Select"]&gt;</option> <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
@foreach (var container in _containers) @foreach (var container in _containers)
{ {
@ -69,7 +69,7 @@ else
<Label For="adminContainer" HelpText="Select the admin container for the site" ResourceKey="AdminContainer">Admin Container: </Label> <Label For="adminContainer" HelpText="Select the admin container for the site" ResourceKey="AdminContainer">Admin Container: </Label>
</td> </td>
<td> <td>
<select id="adminContainer" class="form-control" @bind="@_admincontainertype"> <select id="adminContainer" class="form-select" @bind="@_admincontainertype">
<option value="-">&lt;@Localizer["Container.Select"]&gt;</option> <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
<option value="">&lt;@Localizer["DefaultContainer.Admin"]&gt;</option> <option value="">&lt;@Localizer["DefaultContainer.Admin"]&gt;</option>
@foreach (var container in _containers) @foreach (var container in _containers)
@ -84,7 +84,7 @@ else
<Label For="siteTemplate" HelpText="Select the site template" ResourceKey="SiteTemplate">Site Template: </Label> <Label For="siteTemplate" HelpText="Select the site template" ResourceKey="SiteTemplate">Site Template: </Label>
</td> </td>
<td> <td>
<select id="siteTemplate" class="form-control" @bind="@_sitetemplatetype"> <select id="siteTemplate" class="form-select" @bind="@_sitetemplatetype">
<option value="-">&lt;@Localizer["SiteTemplate.Select"]&gt;</option> <option value="-">&lt;@Localizer["SiteTemplate.Select"]&gt;</option>
@foreach (SiteTemplate siteTemplate in _siteTemplates) @foreach (SiteTemplate siteTemplate in _siteTemplates)
{ {
@ -98,7 +98,7 @@ else
<Label For="tenant" HelpText="Select the tenant for the site" ResourceKey="Tenant">Tenant: </Label> <Label For="tenant" HelpText="Select the tenant for the site" ResourceKey="Tenant">Tenant: </Label>
</td> </td>
<td> <td>
<select id="tenant" class="form-control" @onchange="(e => TenantChanged(e))"> <select id="tenant" class="form-select" @onchange="(e => TenantChanged(e))">
<option value="-">&lt;@Localizer["Tenant.Select"]&gt;</option> <option value="-">&lt;@Localizer["Tenant.Select"]&gt;</option>
<option value="+">&lt;@Localizer["Tenant.Add"]&gt;</option> <option value="+">&lt;@Localizer["Tenant.Add"]&gt;</option>
@foreach (Tenant tenant in _tenants) @foreach (Tenant tenant in _tenants)
@ -128,7 +128,7 @@ else
<Label For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label> <Label For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label>
</td> </td>
<td> <td>
<select id="databaseType" class="custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))"> <select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
@foreach (var database in _databases) @foreach (var database in _databases)
{ {
if (database.IsDefault) if (database.IsDefault)

4
Oqtane.Client/Modules/Admin/Sql/Index.razor
View File

@ -15,11 +15,11 @@ else
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="tenant" HelpText="Select the tenant for the SQL server" ResourceKey="Tenant">Tenant: </Label> <Label For="tenant" HelpText="Select the tenant for the SQL server" ResourceKey="Tenant">Tenant: </Label>
</td> </td>
<td> <td>
<select id="tenant" class="form-control" value="@_tenantid" @onchange="(e => TenantChanged(e))"> <select id="tenant" class="form-select" value="@_tenantid" @onchange="(e => TenantChanged(e))">
<option value="-1">&lt;@Localizer["Tenant.Select"]&gt;</option> <option value="-1">&lt;@Localizer["Tenant.Select"]&gt;</option>
@foreach (Tenant tenant in _tenants) @foreach (Tenant tenant in _tenants)
{ {

28
Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
View File

@ -9,7 +9,7 @@
<TabPanel Name="Info" Heading="Info" ResourceKey="Info"> <TabPanel Name="Info" Heading="Info" ResourceKey="Info">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label> <Label For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
</td> </td>
<td> <td>
@ -56,23 +56,24 @@
<input id="installationid" class="form-control" @bind="@_installationid" readonly /> <input id="installationid" class="form-control" @bind="@_installationid" readonly />
</td> </td>
</tr> </tr>
<tr>
<td>&nbsp;</td>
<td>
<br /><input type="checkbox" @onchange="(e => RegisterChecked(e))" /> @Localizer["Register"]
</td>
</tr>
</table> </table>
<div class="row">
<div class="mx-auto text-center">
<input type="checkbox" @onchange="(e => RegisterChecked(e))" /> @Localizer["Register"]
</div>
</div>
<br /><br /> <br /><br />
<ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" /> <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
</TabPanel> </TabPanel>
<TabPanel Name="Options" Heading="Options" ResourceKey="Options"> <TabPanel Name="Options" Heading="Options" ResourceKey="Options">
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label> <Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label>
</td> </td>
<td> <td>
<select id="runtime" class="form-control" @bind="@_runtime"> <select id="runtime" class="form-select" @bind="@_runtime">
<option value="Server">@Localizer["Server"]</option> <option value="Server">@Localizer["Server"]</option>
<option value="WebAssembly">@Localizer["WebAssembly"]</option> <option value="WebAssembly">@Localizer["WebAssembly"]</option>
</select> </select>
@ -83,7 +84,7 @@
<Label For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label> <Label For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label>
</td> </td>
<td> <td>
<select id="rendermode" class="form-control" @bind="@_rendermode"> <select id="rendermode" class="form-select" @bind="@_rendermode">
<option value="Server">@Localizer["Server"]</option> <option value="Server">@Localizer["Server"]</option>
<option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option> <option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option>
</select> </select>
@ -94,7 +95,7 @@
<Label For="detailederrors" HelpText="Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production." ResourceKey="DetailedErrors">Detailed Errors? </Label> <Label For="detailederrors" HelpText="Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production." ResourceKey="DetailedErrors">Detailed Errors? </Label>
</td> </td>
<td> <td>
<select id="detailederrors" class="form-control" @bind="@_detailederrors"> <select id="detailederrors" class="form-select" @bind="@_detailederrors">
<option value="true">@SharedLocalizer["True"]</option> <option value="true">@SharedLocalizer["True"]</option>
<option value="false">@SharedLocalizer["False"]</option> <option value="false">@SharedLocalizer["False"]</option>
</select> </select>
@ -105,7 +106,7 @@
<Label For="logginglevel" HelpText="The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log." ResourceKey="LoggingLevel">Logging Level: </Label> <Label For="logginglevel" HelpText="The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log." ResourceKey="LoggingLevel">Logging Level: </Label>
</td> </td>
<td> <td>
<select id="logginglevel" class="form-control" @bind="@_logginglevel"> <select id="logginglevel" class="form-select" @bind="@_logginglevel">
<option value="Trace">@Localizer["Trace"]</option> <option value="Trace">@Localizer["Trace"]</option>
<option value="Debug">@Localizer["Debug"]</option> <option value="Debug">@Localizer["Debug"]</option>
<option value="Information">@Localizer["Information"]</option> <option value="Information">@Localizer["Information"]</option>
@ -120,7 +121,7 @@
<Label For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label> <Label For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label>
</td> </td>
<td> <td>
<select id="swagger" class="form-control" @bind="@_swagger"> <select id="swagger" class="form-select" @bind="@_swagger">
<option value="true">@SharedLocalizer["True"]</option> <option value="true">@SharedLocalizer["True"]</option>
<option value="false">@SharedLocalizer["False"]</option> <option value="false">@SharedLocalizer["False"]</option>
</select> </select>
@ -131,13 +132,14 @@
<Label For="packageservice" HelpText="Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations" ResourceKey="PackageService">Enable Package Service? </Label> <Label For="packageservice" HelpText="Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations" ResourceKey="PackageService">Enable Package Service? </Label>
</td> </td>
<td> <td>
<select id="packageservice" class="form-control" @bind="@_packageservice"> <select id="packageservice" class="form-select" @bind="@_packageservice">
<option value="true">@SharedLocalizer["True"]</option> <option value="true">@SharedLocalizer["True"]</option>
<option value="false">@SharedLocalizer["False"]</option> <option value="false">@SharedLocalizer["False"]</option>
</select> </select>
</td> </td>
</tr> </tr>
</table> </table>
<br /><br />
<button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>&nbsp; <button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>&nbsp;
<a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>&nbsp; <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>&nbsp;
<ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" /> <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />

6
Oqtane.Client/Modules/Admin/Themes/Create.razor
View File

@ -13,7 +13,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="owner" HelpText="Enter the name of the organization who is developing this theme. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label> <Label For="owner" HelpText="Enter the name of the organization who is developing this theme. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
</td> </td>
<td> <td>
@ -33,7 +33,7 @@
<Label For="template" HelpText="Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server." ResourceKey="Template">Template: </Label> <Label For="template" HelpText="Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server." ResourceKey="Template">Template: </Label>
</td> </td>
<td> <td>
<select id="template" class="form-control" @onchange="(e => TemplateChanged(e))"> <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
<option value="-">&lt;@Localizer["Template.Select"]&gt;</option> <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
@foreach (Template template in _templates) @foreach (Template template in _templates)
{ {
@ -47,7 +47,7 @@
<Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label> <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
</td> </td>
<td> <td>
<select id="reference" class="form-control" @bind="@_reference"> <select id="reference" class="form-select" @bind="@_reference">
@foreach (string version in _versions) @foreach (string version in _versions)
{ {
if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0) if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)

2
Oqtane.Client/Modules/Admin/Themes/View.razor
View File

@ -8,7 +8,7 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="name" HelpText="The name of the theme" ResourceKey="Name">Name: </Label> <Label For="name" HelpText="The name of the theme" ResourceKey="Name">Name: </Label>
</td> </td>
<td> <td>

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

@ -10,7 +10,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="to" HelpText="Enter the username you wish to send a message to" ResourceKey="To">To: </Label> <Label For="to" HelpText="Enter the username you wish to send a message to" ResourceKey="To">To: </Label>
</td> </td>
<td> <td>

34
Oqtane.Client/Modules/Admin/UserProfile/Index.razor
View File

@ -23,55 +23,55 @@ else
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<label for="Name" class="control-label">@SharedLocalizer["Username"] </label> <Label For="username" HelpText="Your username. Note that this field can not be modified." ResourceKey="Username"></Label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@username" readonly /> <input id="username" class="form-control" @bind="@username" readonly />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="Name" class="control-label">@SharedLocalizer["Password"] </label> <Label For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@password" autocomplete="new-password" /> <input id ="password" type="password" class="form-control" @bind="@password" autocomplete="new-password" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="Name" class="control-label">@Localizer["Password.Confirm"] </label> <Label For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@confirm" autocomplete="new-password" /> <input id="confirm" type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="Name" class="control-label">@SharedLocalizer["Email"] </label> <Label For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@email" /> <input id="email" class="form-control" @bind="@email" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="Name" class="control-label">@SharedLocalizer["FullName"] </label> <Label For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@displayname" /> <input id="displayname" class="form-control" @bind="@displayname" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="Name" class="control-label">@Localizer["Photo"] </label> <Label For="@photofileid.ToString()" HelpText="A photo of yourself" ResourceKey="Photo"></Label>
</td> </td>
<td> <td>
<FileManager FileId="@photofileid" @ref="filemanager" /> <FileManager FileId="@photofileid" @ref="filemanager" />
</td> </td>
</tr> </tr>
</table> </table>
<button type="button" class="btn btn-primary" @onclick="Save">@SharedLocalizer["Save"]</button> <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
<button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button> <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
} }
</TabPanel> </TabPanel>
@ -94,13 +94,13 @@ else
category = p.Category; category = p.Category;
} }
<tr> <tr>
<td> <td width="30%">
<Label For="@p.Name" HelpText="@p.Description">@p.Title</Label> <Label For="@p.Name" HelpText="@p.Description">@p.Title</Label>
</td> </td>
<td> <td>
@if (!string.IsNullOrEmpty(p.Options)) @if (!string.IsNullOrEmpty(p.Options))
{ {
<select id="@p.Name" class="form-control" @onchange="@(e => ProfileChanged(e, p.Name))"> <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
@foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
{ {
@if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option)) @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
@ -130,7 +130,7 @@ else
} }
} }
</table> </table>
<button type="button" class="btn btn-primary" @onclick="Save">@SharedLocalizer["Save"]</button> <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
<button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button> <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
} }
</TabPanel> </TabPanel>
@ -206,7 +206,7 @@ else
</Pager> </Pager>
} }
<br /><hr /> <br /><hr />
<select class="form-control" @onchange="(e => FilterChanged(e))"> <select class="form-select" @onchange="(e => FilterChanged(e))">
<option value="to">@Localizer["Inbox"]</option> <option value="to">@Localizer["Inbox"]</option>
<option value="from">@Localizer["Items.Sent"]</option> <option value="from">@Localizer["Items.Sent"]</option>
</select> </select>

2
Oqtane.Client/Modules/Admin/UserProfile/View.razor
View File

@ -10,7 +10,7 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<label class="control-label">@Localizer["Title"] </label> <label class="control-label">@Localizer["Title"] </label>
</td> </td>
@if (title == "From") @if (title == "From")

26
Oqtane.Client/Modules/Admin/Users/Add.razor
View File

@ -13,43 +13,43 @@
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<label class="control-label">@SharedLocalizer["Username"] </label> <Label For="username" HelpText="A unique username for a user. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@username" /> <input id="username" class="form-control" @bind="@username" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@SharedLocalizer["Password"] </label> <Label For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@password" /> <input id="password" type="password" class="form-control" @bind="@password" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@Localizer["Password.Confirm"] </label> <Label For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@confirm" /> <input id="confirm" type="password" class="form-control" @bind="@confirm" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@SharedLocalizer["Email"] </label> <Label For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@email" /> <input id="email" class="form-control" @bind="@email" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@SharedLocalizer["FullName"] </label> <Label For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@displayname" /> <input id="displayname" class="form-control" @bind="@displayname" />
</td> </td>
</tr> </tr>
</table> </table>
@ -72,7 +72,7 @@
category = p.Category; category = p.Category;
} }
<tr> <tr>
<td> <td width="30%">
<Label For="@p.Name" HelpText="@p.Description">@p.Title</Label> <Label For="@p.Name" HelpText="@p.Description">@p.Title</Label>
</td> </td>
<td> <td>
@ -92,7 +92,7 @@
</TabPanel> </TabPanel>
</TabStrip> </TabStrip>
<button type="button" class="btn btn-primary" @onclick="SaveUser">@SharedLocalizer["Save"]</button> <button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
@code { @code {

32
Oqtane.Client/Modules/Admin/Users/Edit.razor
View File

@ -22,48 +22,48 @@ else
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<label class="control-label">@SharedLocalizer["Username"] </label> <Label For="username" HelpText="The unique username for a user. Note that this field can not be modified." ResourceKey="Username"></Label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@username" readonly /> <input id="username" class="form-control" @bind="@username" readonly />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@SharedLocalizer["Password"] </label> <Label For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@password" /> <input id="password" type="password" class="form-control" @bind="@password" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@Localizer["Password.Confirm"] </label> <Label For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@confirm" /> <input id="confirm" type="password" class="form-control" @bind="@confirm" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@SharedLocalizer["Email"] </label> <Label For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@email" /> <input id="email" class="form-control" @bind="@email" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@SharedLocalizer["FullName"] </label> <Label For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@displayname" /> <input id="displayname" class="form-control" @bind="@displayname" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@Localizer["Photo"] </label> <Label For="@photofileid.ToString()" HelpText="A photo of the user" ResourceKey="Photo"></Label>
</td> </td>
<td> <td>
<FileManager FileId="@photofileid" @ref="filemanager" /> <FileManager FileId="@photofileid" @ref="filemanager" />
@ -71,10 +71,10 @@ else
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label">@Localizer["Confirm.Delete"] </label> <Label For="isdeleted" HelpText="Indicate if the user is active" ResourceKey="IsDeleted"></Label>
</td> </td>
<td> <td>
<select class="form-control" @bind="@isdeleted"> <select id="isdeleted" class="form-select" @bind="@isdeleted">
<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>
@ -100,7 +100,7 @@ else
category = p.Category; category = p.Category;
} }
<tr> <tr>
<td> <td width="30%">
<Label For="@p.Name" HelpText="@p.Description">@p.Title</Label> <Label For="@p.Name" HelpText="@p.Description">@p.Title</Label>
</td> </td>
<td> <td>
@ -120,7 +120,7 @@ else
</TabPanel> </TabPanel>
</TabStrip> </TabStrip>
<button type="button" class="btn btn-primary" @onclick="SaveUser">@SharedLocalizer["Save"]</button> <button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
<br /> <br />
<br /> <br />

23
Oqtane.Client/Modules/Admin/Users/Index.razor
View File

@ -14,16 +14,19 @@
} }
else else
{ {
<div class="form-row"> <table class="table table-borderless">
<div class="col"> <tr>
<ActionLink Action="Add" Text="Add User" ResourceKey="AddUser" /> <td>
</div> <div><ActionLink Action="Add" Text="Add User" ResourceKey="AddUser" /></div>
<div class="col"> </td>
<div class="input-group flex-nowrap"> <td>
<input class="form-control" @bind="@_search" />&nbsp;<button class="btn btn-secondary" @onclick="OnSearch">@SharedLocalizer["Search"]</button> <input class="form-control" @bind="@_search" />
</div> </td>
</div> <td>
</div> <button class="btn btn-secondary" @onclick="OnSearch">@SharedLocalizer["Search"]</button>
</td>
</tr>
</table>
<Pager Items="@userroles"> <Pager Items="@userroles">
<Header> <Header>

4
Oqtane.Client/Modules/Admin/Users/Roles.razor
View File

@ -14,7 +14,7 @@ else
{ {
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="user" HelpText="The user you are assigning roles to" ResourceKey="User">User: </Label> <Label For="user" HelpText="The user you are assigning roles to" ResourceKey="User">User: </Label>
</td> </td>
<td> <td>
@ -26,7 +26,7 @@ else
<Label For="role" HelpText="Select a role" ResourceKey="Role">Role: </Label> <Label For="role" HelpText="Select a role" ResourceKey="Role">Role: </Label>
</td> </td>
<td> <td>
<select id="role" class="form-control" @bind="@roleid"> <select id="role" class="form-select" @bind="@roleid">
<option value="-1">&lt;@Localizer["Role.Select"]&gt;</option> <option value="-1">&lt;@Localizer["Role.Select"]&gt;</option>
@foreach (Role role in roles) @foreach (Role role in roles)
{ {

2
Oqtane.Client/Modules/Controls/ActionDialog.razor
View File

@ -9,7 +9,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">@Header</h5> <h5 class="modal-title">@Header</h5>
<button type="button" class="close" @onclick="DisplayModal" aria-label="Close">&times;</button> <button type="button" class="btn-close" aria-label="Close" @onclick="DisplayModal"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>@Message</p> <p>@Message</p>

6
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -13,7 +13,7 @@
@if (ShowFolders || FolderId <= 0) @if (ShowFolders || FolderId <= 0)
{ {
<div> <div>
<select class="form-control" value="@FolderId" @onchange="(e => FolderChanged(e))"> <select class="form-select" value="@FolderId" @onchange="(e => FolderChanged(e))">
@if (string.IsNullOrEmpty(Folder)) @if (string.IsNullOrEmpty(Folder))
{ {
<option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option> <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
@ -28,7 +28,7 @@
@if (ShowFiles) @if (ShowFiles)
{ {
<div> <div>
<select class="form-control" value="@FileId" @onchange="(e => FileChanged(e))"> <select class="form-select" value="@FileId" @onchange="(e => FileChanged(e))">
<option value="-1">&lt;@Localizer["File.Select"]&gt;</option> <option value="-1">&lt;@Localizer["File.Select"]&gt;</option>
@foreach (File file in _files) @foreach (File file in _files)
{ {
@ -49,7 +49,7 @@
<input type="file" id="@_fileinputid" name="file" accept="@_filter" /> <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
} }
<span id="@_progressinfoid"></span><progress id="@_progressbarid" style="width: 150px; visibility: hidden;"></progress> <span id="@_progressinfoid"></span><progress id="@_progressbarid" style="width: 150px; visibility: hidden;"></progress>
<span class="float-right"> <span class="float-end">
<button type="button" class="btn btn-success" @onclick="UploadFile">@SharedLocalizer["Upload"]</button> <button type="button" class="btn btn-success" @onclick="UploadFile">@SharedLocalizer["Upload"]</button>
@if (ShowFiles && GetFileId() != -1) @if (ShowFiles && GetFileId() != -1)
{ {

5
Oqtane.Client/Modules/Controls/Label.razor
View File

@ -30,6 +30,11 @@ else
{ {
base.OnParametersSet(); base.OnParametersSet();
if (string.IsNullOrEmpty(Class))
{
Class = "form-label";
}
_openLabel = "<label"; _openLabel = "<label";
if (!string.IsNullOrEmpty(For)) if (!string.IsNullOrEmpty(For))
{ {

10
Oqtane.Client/Modules/Controls/ModuleMessage.razor
View File

@ -10,9 +10,7 @@
{ {
@((MarkupString)"&nbsp;&nbsp;")<NavLink href="@NavigateUrl("admin/log")">View Details</NavLink> @((MarkupString)"&nbsp;&nbsp;")<NavLink href="@NavigateUrl("admin/log")">View Details</NavLink>
} }
<button type="button" class="close" data-dismiss="alert" aria-label="Close"> <button type="button" class="btn-close" aria-label="Close" @onclick="DismissModal"></button>
<span aria-hidden="true">&times;</span>
</button>
</div> </div>
<br /> <br />
} }
@ -57,4 +55,10 @@
return classname; return classname;
} }
private void DismissModal()
{
_message = "";
StateHasChanged();
}
} }

12
Oqtane.Client/Modules/Controls/Pager.razor
View File

@ -8,15 +8,15 @@
<div class="mx-auto text-center"> <div class="mx-auto text-center">
@if (_endPage > 1) @if (_endPage > 1)
{ {
<button class="btn btn-secondary mr-1" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></button> <button class="btn btn-secondary m-1" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></button>
} }
@if (_page > _maxPages) @if (_page > _maxPages)
{ {
<button class="btn btn-secondary mr-1" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></button> <button class="btn btn-secondary m-1" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></button>
} }
@if (_endPage > 1) @if (_endPage > 1)
{ {
<button class="btn btn-secondary mr-1" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></button> <button class="btn btn-secondary m-1" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></button>
@for (int i = _startPage; i <= _endPage; i++) @for (int i = _startPage; i <= _endPage; i++)
{ {
var pager = i; var pager = i;
@ -24,15 +24,15 @@
@pager @pager
</button> </button>
} }
<button class="btn btn-secondary mr-1" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></button> <button class="btn btn-secondary m-1" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></button>
} }
@if (_endPage < _pages) @if (_endPage < _pages)
{ {
<button class="btn btn-secondary mr-1" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></button> <button class="btn btn-secondary m-1" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></button>
} }
@if (_endPage > 1) @if (_endPage > 1)
{ {
<button class="btn btn-secondary mr-1" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></button> <button class="btn btn-secondary m-1" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></button>
} }
@if (_endPage > 1) @if (_endPage > 1)
{ {

6
Oqtane.Client/Modules/Controls/PermissionGrid.razor
View File

@ -8,7 +8,7 @@
@if (_permissions != null) @if (_permissions != null)
{ {
<br /> <br />
<table class="table" style="width: 50%; min-width: 250px;"> <table class="table table-borderless" style="width: 50%; min-width: 250px;">
<tbody> <tbody>
<tr> <tr>
<th scope="col">@Localizer["Role"]</th> <th scope="col">@Localizer["Role"]</th>
@ -34,7 +34,7 @@
</table> </table>
@if (_users.Count != 0) @if (_users.Count != 0)
{ {
<table class="table" style="width: 50%; min-width: 250px;"> <table class="table table-borderless" style="width: 50%; min-width: 250px;">
<thead> <thead>
<tr> <tr>
<th scope="col">@Localizer["User"]</th> <th scope="col">@Localizer["User"]</th>
@ -62,7 +62,7 @@
</tbody> </tbody>
</table> </table>
} }
<table class="table" style="width: 50%; min-width: 250px;"> <table class="table table-borderless" style="width: 50%; min-width: 250px;">
<tbody> <tbody>
<tr> <tr>
<td class="input-group"> <td class="input-group">

4
Oqtane.Client/Modules/Controls/RichTextEditor.razor
View File

@ -14,7 +14,7 @@
<ModuleMessage Message="@_message" Type="MessageType.Warning"></ModuleMessage> <ModuleMessage Message="@_message" Type="MessageType.Warning"></ModuleMessage>
<br /> <br />
} }
<div class="row justify-content-center" style="margin-bottom: 20px;"> <div class="d-flex justify-content-center mb-2">
<button type="button" class="btn btn-secondary" @onclick="RefreshRichText">@Localizer["SynchronizeContent"]</button>&nbsp;&nbsp; <button type="button" class="btn btn-secondary" @onclick="RefreshRichText">@Localizer["SynchronizeContent"]</button>&nbsp;&nbsp;
<button type="button" class="btn btn-primary" @onclick="InsertImage">@Localizer["InsertImage"]</button> <button type="button" class="btn btn-primary" @onclick="InsertImage">@Localizer["InsertImage"]</button>
@if (_filemanagervisible) @if (_filemanagervisible)
@ -66,7 +66,7 @@
</div> </div>
</TabPanel> </TabPanel>
<TabPanel Name="Raw" Heading="Raw HTML Editor" ResourceKey="HtmlEditor"> <TabPanel Name="Raw" Heading="Raw HTML Editor" ResourceKey="HtmlEditor">
<div class="row justify-content-center" style="margin-bottom: 20px;"> <div class="d-flex justify-content-center mb-2">
<button type="button" class="btn btn-secondary" @onclick="RefreshRawHtml">@Localizer["SynchronizeContent"]</button> <button type="button" class="btn btn-secondary" @onclick="RefreshRawHtml">@Localizer["SynchronizeContent"]</button>
</div> </div>
@if (ReadOnly) @if (ReadOnly)

8
Oqtane.Client/Modules/Controls/Section.razor
View File

@ -1,14 +1,14 @@
@namespace Oqtane.Modules.Controls @namespace Oqtane.Modules.Controls
@inherits LocalizableComponent @inherits LocalizableComponent
<div class="d-flex"> <div class="d-flex mt-2">
<div> <div>
<a data-toggle="collapse" class="app-link-unstyled" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true"> <a data-bs-toggle="collapse" class="app-link-unstyled" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true">
<h5>@_heading</h5> <h5>@_heading</h5>
</a> </a>
</div> </div>
<div class="ml-auto"> <div class="ms-auto">
<a data-toggle="collapse" class="app-link-unstyled float-right" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true"> <a data-bs-toggle="collapse" class="app-link-unstyled float-right" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true">
<i class="oi oi-chevron-bottom"></i>&nbsp; <i class="oi oi-chevron-bottom"></i>&nbsp;
</a> </a>
</div> </div>

4
Oqtane.Client/Modules/Controls/TabStrip.razor
View File

@ -10,13 +10,13 @@
<li class="nav-item" @key="tabPanel.Name"> <li class="nav-item" @key="tabPanel.Name">
@if (tabPanel.Name == ActiveTab) @if (tabPanel.Name == ActiveTab)
{ {
<a class="nav-link active" data-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true"> <a class="nav-link active" data-bs-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
@tabPanel.DisplayHeading() @tabPanel.DisplayHeading()
</a> </a>
} }
else else
{ {
<a class="nav-link" data-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true"> <a class="nav-link" data-bs-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
@tabPanel.DisplayHeading() @tabPanel.DisplayHeading()
</a> </a>
} }

4
Oqtane.Client/Modules/HtmlText/Settings.razor
View File

@ -7,11 +7,11 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="files" ResourceKey="Allow File Management" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label> <Label For="files" ResourceKey="Allow File Management" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
</td> </td>
<td> <td>
<select id="files" class="form-control" @bind="@_allowfilemanagement"> <select id="files" class="form-select" @bind="@_allowfilemanagement">
<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>

30
Oqtane.Client/Resources/Modules/Admin/Register/Index.resx
View File

@ -147,4 +147,34 @@
<data name="Error.User.Add" xml:space="preserve"> <data name="Error.User.Add" xml:space="preserve">
<value>Error Adding User</value> <value>Error Adding User</value>
</data> </data>
<data name="Confirm.HelpText" xml:space="preserve">
<value>If you are changing your password you must enter it again to confirm it matches</value>
</data>
<data name="Confirm.Text" xml:space="preserve">
<value>Confirm Password:</value>
</data>
<data name="DisplayName.HelpText" xml:space="preserve">
<value>Your full name</value>
</data>
<data name="DisplayName.Text" xml:space="preserve">
<value>Full Name:</value>
</data>
<data name="Email.HelpText" xml:space="preserve">
<value>Your email address where you wish to receive notifications</value>
</data>
<data name="Email.Text" xml:space="preserve">
<value>Email:</value>
</data>
<data name="Password.HelpText" xml:space="preserve">
<value>If you wish to change your password you can enter it here. Please choose a sufficiently secure password.</value>
</data>
<data name="Password.Text" xml:space="preserve">
<value>Password:</value>
</data>
<data name="Username.HelpText" xml:space="preserve">
<value>Your username. Note that this field can not be modified once it is saved.</value>
</data>
<data name="Username.Text" xml:space="preserve">
<value>Username:</value>
</data>
</root> </root>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -136,7 +136,7 @@
<value>Default Admin Container</value> <value>Default Admin Container</value>
</data> </data>
<data name="Smtp.Required.EnableNotificationJob" xml:space="preserve"> <data name="Smtp.Required.EnableNotificationJob" xml:space="preserve">
<value>Please Note That SMTP Requires The Notification Job To Be Enabled In Scheduled Jobs</value> <value>** Please Note That SMTP Requires The Notification Job To Be Enabled In Scheduled Jobs</value>
</data> </data>
<data name="Smtp.TestConfig" xml:space="preserve"> <data name="Smtp.TestConfig" xml:space="preserve">
<value>Test SMTP Configuration</value> <value>Test SMTP Configuration</value>

45
Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx
View File

@ -117,18 +117,9 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="Password" xml:space="preserve">
<value>Password:</value>
</data>
<data name="Password.Confirm" xml:space="preserve">
<value>Confirm Password:</value>
</data>
<data name="Message.Password.Invalid" xml:space="preserve"> <data name="Message.Password.Invalid" xml:space="preserve">
<value>Passwords Entered Do Not Match</value> <value>Passwords Entered Do Not Match</value>
</data> </data>
<data name="Photo" xml:space="preserve">
<value>Photo:</value>
</data>
<data name="From" xml:space="preserve"> <data name="From" xml:space="preserve">
<value>From</value> <value>From</value>
</data> </data>
@ -177,4 +168,40 @@
<data name="Identity.Name" xml:space="preserve"> <data name="Identity.Name" xml:space="preserve">
<value>Identity</value> <value>Identity</value>
</data> </data>
<data name="Confirm.HelpText" xml:space="preserve">
<value>If you are changing your password you must enter it again to confirm it matches</value>
</data>
<data name="Confirm.Text" xml:space="preserve">
<value>Confirm Password:</value>
</data>
<data name="DisplayName.HelpText" xml:space="preserve">
<value>Your full name</value>
</data>
<data name="DisplayName.Text" xml:space="preserve">
<value>Full Name:</value>
</data>
<data name="Email.HelpText" xml:space="preserve">
<value>Your email address where you wish to receive notifications</value>
</data>
<data name="Email.Text" xml:space="preserve">
<value>Email:</value>
</data>
<data name="Password.HelpText" xml:space="preserve">
<value>If you wish to change your password you can enter it here. Please choose a sufficiently secure password.</value>
</data>
<data name="Password.Text" xml:space="preserve">
<value>Password:</value>
</data>
<data name="Photo.HelpText" xml:space="preserve">
<value>A photo of yourself</value>
</data>
<data name="Photo.Text" xml:space="preserve">
<value>Photo:</value>
</data>
<data name="Username.HelpText" xml:space="preserve">
<value>Your username. Note that this field can not be modified.</value>
</data>
<data name="Username.Text" xml:space="preserve">
<value>Username:</value>
</data>
</root> </root>

33
Oqtane.Client/Resources/Modules/Admin/Users/Add.resx
View File

@ -117,9 +117,6 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="Password.Confirm" xml:space="preserve">
<value>Confirm Password:</value>
</data>
<data name="Error.User.AddCheckPass" xml:space="preserve"> <data name="Error.User.AddCheckPass" xml:space="preserve">
<value>Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use.</value> <value>Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use.</value>
</data> </data>
@ -141,4 +138,34 @@
<data name="Message.Username.Exists" xml:space="preserve"> <data name="Message.Username.Exists" xml:space="preserve">
<value>Username Already Exists</value> <value>Username Already Exists</value>
</data> </data>
<data name="Confirm.HelpText" xml:space="preserve">
<value>Please enter the password again to confirm it matches with the value above</value>
</data>
<data name="Confirm.Text" xml:space="preserve">
<value>Confirm Password:</value>
</data>
<data name="DisplayName.HelpText" xml:space="preserve">
<value>The full name of the user</value>
</data>
<data name="DisplayName.Text" xml:space="preserve">
<value>Full Name:</value>
</data>
<data name="Email.HelpText" xml:space="preserve">
<value>The email address where the user will receive notifications</value>
</data>
<data name="Email.Text" xml:space="preserve">
<value>Email:</value>
</data>
<data name="Password.HelpText" xml:space="preserve">
<value>The user's password. Please choose a password which is sufficiently secure.</value>
</data>
<data name="Password.Text" xml:space="preserve">
<value>Password:</value>
</data>
<data name="Username.HelpText" xml:space="preserve">
<value>A unique username for a user. Note that this field can not be modified once it is saved.</value>
</data>
<data name="Username.Text" xml:space="preserve">
<value>Username:</value>
</data>
</root> </root>

48
Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx
View File

@ -117,15 +117,9 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="Password.Confirm" xml:space="preserve">
<value>Confirm Password:</value>
</data>
<data name="Message.Password.NoMatch" xml:space="preserve"> <data name="Message.Password.NoMatch" xml:space="preserve">
<value>Passwords Entered Do Not Match</value> <value>Passwords Entered Do Not Match</value>
</data> </data>
<data name="Photo" xml:space="preserve">
<value>Photo:</value>
</data>
<data name="Identity.Name" xml:space="preserve"> <data name="Identity.Name" xml:space="preserve">
<value>Identity</value> <value>Identity</value>
</data> </data>
@ -141,4 +135,46 @@
<data name="Error.User.Save" xml:space="preserve"> <data name="Error.User.Save" xml:space="preserve">
<value>Error Saving User</value> <value>Error Saving User</value>
</data> </data>
<data name="Confirm.HelpText" xml:space="preserve">
<value>Please enter the password again to confirm it matches with the value above</value>
</data>
<data name="Confirm.Text" xml:space="preserve">
<value>Confirm Password:</value>
</data>
<data name="DisplayName.HelpText" xml:space="preserve">
<value>The full name of the user</value>
</data>
<data name="DisplayName.Text" xml:space="preserve">
<value>Full Name:</value>
</data>
<data name="Email.HelpText" xml:space="preserve">
<value>The email address where the user will receive notifications</value>
</data>
<data name="Email.Text" xml:space="preserve">
<value>Email:</value>
</data>
<data name="IsDeleted.HelpText" xml:space="preserve">
<value>Indicate if the user is active</value>
</data>
<data name="IsDeleted.Text" xml:space="preserve">
<value>Deleted?</value>
</data>
<data name="Password.HelpText" xml:space="preserve">
<value>The user's password. Please choose a password which is sufficiently secure.</value>
</data>
<data name="Password.Text" xml:space="preserve">
<value>Password:</value>
</data>
<data name="Photo.HelpText" xml:space="preserve">
<value>A photo of the user</value>
</data>
<data name="Photo.Text" xml:space="preserve">
<value>Photo:</value>
</data>
<data name="Username.HelpText" xml:space="preserve">
<value>The unique username for a user. Note that this field can not be modified.</value>
</data>
<data name="Username.Text" xml:space="preserve">
<value>Username:</value>
</data>
</root> </root>

4
Oqtane.Client/Themes/AdminContainer.razor
View File

@ -1,4 +1,4 @@
@namespace Oqtane.Themes @namespace Oqtane.Themes
@inherits ContainerBase @inherits ContainerBase
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager
@ -8,7 +8,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title"><ModuleTitle /></h5> <h5 class="modal-title"><ModuleTitle /></h5>
<button type="button" class="close" @onclick="CloseModal" aria-label="Close">&times;</button> <button type="button" class="btn-close" aria-label="Close" @onclick="CloseModal"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<ModuleInstance /> <ModuleInstance />

8
Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
View File

@ -13,7 +13,7 @@
<div class="main"> <div class="main">
<div class="top-row px-4"> <div class="top-row px-4">
<div class="ml-md-auto"><UserProfile /> <Login /> <ControlPanel /></div> <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
</div> </div>
<div class="container"> <div class="container">
<div class="row px-4"> <div class="row px-4">
@ -27,11 +27,9 @@
public override List<Resource> Resources => new List<Resource>() public override List<Resource> Resources => new List<Resource>()
{ {
new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css", Integrity = "sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk", CrossOrigin = "anonymous" }, new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css", Integrity = "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC", CrossOrigin = "anonymous" },
new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" }, new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://code.jquery.com/jquery-3.5.1.slim.min.js", Integrity = "sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj", CrossOrigin = "anonymous" }, new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", Integrity = "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", CrossOrigin = "anonymous" }
new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js", Integrity = "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo", CrossOrigin = "anonymous" },
new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js", Integrity = "sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI", CrossOrigin = "anonymous" }
}; };
} }

2
Oqtane.Client/Themes/Controls/Container/ModuleActions.razor
View File

@ -5,7 +5,7 @@
@if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions) && PageState.Action == Constants.DefaultAction) @if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions) && PageState.Action == Constants.DefaultAction)
{ {
<div class="app-moduleactions"> <div class="app-moduleactions">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"></a> <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"></a>
<ul class="dropdown-menu" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 37px, 0px);"> <ul class="dropdown-menu" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 37px, 0px);">
@foreach (var action in Actions.Where(item => !item.Name.Contains("Pane"))) @foreach (var action in Actions.Where(item => !item.Name.Contains("Pane")))
{ {

74
Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
View File

@ -16,19 +16,19 @@
{ {
<div class="app-controlpanel" style="@_display"> <div class="app-controlpanel" style="@_display">
<div class="@CardClass"> <div class="@CardClass">
<div class="@HeaderClass"> <div class="@HeaderClass d-flex">
<span class="font-weight-bold">@Localizer["ControlPanel"]</span> <span class="font-weight-bold">@Localizer["ControlPanel"]</span>
<button type="button" class="close" @onclick="HideControlPanel" data-dismiss="modal" aria-label="Close"> <div class="ms-auto">
<span aria-hidden="true">&times;</span> <button type="button" class="btn-close" aria-label="Close" @onclick="HideControlPanel"></button>
</button> </div>
</div> </div>
<div class="@BodyClass"> <div class="@BodyClass">
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin)) @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
{ {
<div class="row"> <div class="row d-flex">
<div class="col"> <div class="col">
<button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button> <button type="button" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
</div> </div>
</div> </div>
@ -39,31 +39,25 @@
<label class="control-label">@Localizer["Page.Manage"] </label> <label class="control-label">@Localizer["Page.Manage"] </label>
</div> </div>
</div> </div>
<div class="row"> <div class="row d-flex">
<div class="col"> <div class="col d-flex justify-content-between">
<button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button> <button type="button" class="btn btn-secondary col-3" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button>
</div> <button type="button" class="btn btn-secondary col-3" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
<div class="col"> <button type="button" class="btn btn-danger col-3" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
<button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
</div>
<div class="col">
<button class="btn btn-danger btn-block mx-auto" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
</div> </div>
</div> </div>
<br /> <br />
<div class="row"> <div class="row d-flex">
@if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone)) <div class="col">
{ @if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
<div class="col"> {
<button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button> <button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button>
</div> }
} else
else {
{ <button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("publish"))>@Localizer["Page.Publish"]</button>
<div class="col"> }
<button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("publish"))>@Localizer["Page.Publish"]</button> </div>
</div>
}
</div> </div>
} }
@ -75,7 +69,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">@Localizer["Page.Delete"]</h5> <h5 class="modal-title">@Localizer["Page.Delete"]</h5>
<button type="button" class="close" @onclick="ConfirmDelete" aria-label="Close">&times;</button> <button type="button" class="btn-close" aria-label="Close" @onclick="ConfirmDelete"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>Are You Sure You Want To Delete This Page?</p> <p>Are You Sure You Want To Delete This Page?</p>
@ -93,7 +87,7 @@
<div class="row"> <div class="row">
<div class="col text-center"> <div class="col text-center">
<label for="Module" class="control-label">@Localizer["Module.Manage"] </label> <label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
<select class="form-control" @bind="@ModuleType"> <select class="form-select" @bind="@ModuleType">
<option value="new">@Localizer["Module.AddNew"]</option> <option value="new">@Localizer["Module.AddNew"]</option>
<option value="existing">@Localizer["Module.AddExisting"]</option> <option value="existing">@Localizer["Module.AddExisting"]</option>
</select> </select>
@ -101,7 +95,7 @@
{ {
@if (_moduleDefinitions != null) @if (_moduleDefinitions != null)
{ {
<select class="form-control" @onchange="(e => CategoryChanged(e))"> <select class="form-select" @onchange="(e => CategoryChanged(e))">
@foreach (var category in _categories) @foreach (var category in _categories)
{ {
if (category == Category) if (category == Category)
@ -114,7 +108,7 @@
} }
} }
</select> </select>
<select class="form-control" @onchange="(e => ModuleChanged(e))"> <select class="form-select" @onchange="(e => ModuleChanged(e))">
@if (ModuleDefinitionName == "-") @if (ModuleDefinitionName == "-")
{ {
<option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option> <option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option>
@ -139,14 +133,14 @@
} }
else else
{ {
<select class="form-control" @onchange="(e => PageChanged(e))"> <select class="form-select" @onchange="(e => PageChanged(e))">
<option value="-">&lt;@Localizer["Page.Select"]&gt;</option> <option value="-">&lt;@Localizer["Page.Select"]&gt;</option>
@foreach (Page p in _pages) @foreach (Page p in _pages)
{ {
<option value="@p.PageId">@p.Name</option> <option value="@p.PageId">@p.Name</option>
} }
</select> </select>
<select class="form-control" @bind="@ModuleId"> <select class="form-select" @bind="@ModuleId">
<option value="-">&lt;@Localizer["Module.Select"]&gt;</option> <option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
@foreach (Module module in _modules) @foreach (Module module in _modules)
{ {
@ -167,7 +161,7 @@
<div class="row"> <div class="row">
<div class="col text-center"> <div class="col text-center">
<label for="Pane" class="control-label">@Localizer["Pane"] </label> <label for="Pane" class="control-label">@Localizer["Pane"] </label>
<select class="form-control" @bind="@Pane"> <select class="form-select" @bind="@Pane">
@foreach (string pane in PageState.Page.Panes) @foreach (string pane in PageState.Page.Panes)
{ {
<option value="@pane">@pane Pane</option> <option value="@pane">@pane Pane</option>
@ -179,7 +173,7 @@
<div class="row"> <div class="row">
<div class="col text-center"> <div class="col text-center">
<label for="Container" class="control-label">@Localizer["Container"] </label> <label for="Container" class="control-label">@Localizer["Container"] </label>
<select class="form-control" @bind="@ContainerType"> <select class="form-select" @bind="@ContainerType">
@foreach (var container in _containers) @foreach (var container in _containers)
{ {
<option value="@container.TypeName">@container.Name</option> <option value="@container.TypeName">@container.Name</option>
@ -188,12 +182,12 @@
</div> </div>
</div> </div>
<br /> <br />
<button type="button" class="btn btn-primary btn-block mx-auto" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button> <button type="button" class="btn btn-primary col-12" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
@((MarkupString) Message) @((MarkupString) Message)
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{ {
<hr class="app-rule" /> <hr class="app-rule" />
<NavLink class="btn btn-info btn-block mx-auto" href="@NavigateUrl("admin/update")">@Localizer["System.Update"]</NavLink> <NavLink class="btn btn-info col-12" href="@NavigateUrl("admin/update")">@Localizer["System.Update"]</NavLink>
} }
</div> </div>
</div> </div>
@ -209,13 +203,13 @@
{ {
if (PageState.EditMode) if (PageState.EditMode)
{ {
<button type="button" class="btn @ButtonClass active" data-toggle="button" aria-pressed="true" autocomplete="off" @onclick="(async () => await ToggleEditMode(PageState.EditMode))"> <button type="button" class="btn @ButtonClass active" data-bs-toggle="button" aria-pressed="true" autocomplete="off" @onclick="(async () => await ToggleEditMode(PageState.EditMode))">
<span class="oi oi-pencil"></span> <span class="oi oi-pencil"></span>
</button> </button>
} }
else else
{ {
<button type="button" class="btn @ButtonClass" data-toggle="button" aria-pressed="false" autocomplete="off" @onclick="(async () => await ToggleEditMode(PageState.EditMode))"> <button type="button" class="btn @ButtonClass" data-bs-toggle="button" aria-pressed="false" autocomplete="off" @onclick="(async () => await ToggleEditMode(PageState.EditMode))">
<span class="oi oi-pencil"></span> <span class="oi oi-pencil"></span>
</button> </button>
} }

2
Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
View File

@ -9,7 +9,7 @@
@if (_supportedCultures?.Count() > 1) @if (_supportedCultures?.Count() > 1)
{ {
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<button id="btnCultures" type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button id="btnCultures" type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="oi oi-globe"></span> <span class="oi oi-globe"></span>
</button> </button>
<div class="dropdown-menu" aria-labelledby="btnCultures"> <div class="dropdown-menu" aria-labelledby="btnCultures">

2
Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor
View File

@ -5,7 +5,7 @@
@if (MenuPages.Any()) @if (MenuPages.Any())
{ {
<span class="app-menu-toggler"> <span class="app-menu-toggler">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
</span> </span>

10
Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
View File

@ -10,7 +10,7 @@
{ {
<a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<span class="@childPage.Icon" aria-hidden="true" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="visually-hidden-focusable">(current)</span>
</a> </a>
} }
else else
@ -35,7 +35,7 @@ else
<li class="nav-item active"> <li class="nav-item active">
<a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<span class="@childPage.Icon" aria-hidden="true" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="visually-hidden-focusable">(current)</span>
</a> </a>
</li> </li>
} }
@ -54,9 +54,9 @@ else
if (childPage.PageId == PageState.Page.PageId) if (childPage.PageId == PageState.Page.PageId)
{ {
<li class="nav-item dropdown active"> <li class="nav-item dropdown active">
<a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="@childPage.Icon" aria-hidden="true" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="visually-hidden-focusable">(current)</span>
</a> </a>
<MenuItemsHorizontal ParentPage="childPage" Pages="Pages" /> <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />
</li> </li>
@ -64,7 +64,7 @@ else
else else
{ {
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="@childPage.Icon" aria-hidden="true" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name @childPage.Name
</a> </a>

4
Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
View File

@ -10,7 +10,7 @@
<li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;"> <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
<a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<span class="@childPage.Icon" aria-hidden="true" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="visually-hidden-focusable">(current)</span>
</a> </a>
</li> </li>
} }
@ -39,7 +39,7 @@ else
<li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;"> <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
<a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<span class="@childPage.Icon" aria-hidden="true" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="visually-hidden-focusable">(current)</span>
</a> </a>
</li> </li>
} }

2
Oqtane.Client/Themes/Controls/Theme/MenuVertical.razor
View File

@ -4,7 +4,7 @@
@if (MenuPages.Any()) @if (MenuPages.Any())
{ {
<span class="app-menu-toggler"> <span class="app-menu-toggler">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
</span> </span>

10
Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor
View File

@ -6,11 +6,11 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="title" ResourceKey="Title" HelpText="Specify If The Module Title Should Be Displayed">Display Title?</Label> <Label For="title" ResourceKey="Title" HelpText="Specify If The Module Title Should Be Displayed">Display Title?</Label>
</td> </td>
<td> <td>
<select id="title" class="form-control" @bind="@_title"> <select id="title" class="form-select" @bind="@_title">
<option value="true">Yes</option> <option value="true">Yes</option>
<option value="false">No</option> <option value="false">No</option>
</select> </select>
@ -21,7 +21,7 @@
<Label For="background\" ResourceKey="Background" HelpText="Optionally Specify A Background Color For The Container">Background Color:</Label> <Label For="background\" ResourceKey="Background" HelpText="Optionally Specify A Background Color For The Container">Background Color:</Label>
</td> </td>
<td> <td>
<select id="background" class="form-control" @bind="@_background"> <select id="background" class="form-select" @bind="@_background">
<option value="">None</option> <option value="">None</option>
<option value="bg-primary">Primary</option> <option value="bg-primary">Primary</option>
<option value="bg-secondary">Secondary</option> <option value="bg-secondary">Secondary</option>
@ -39,7 +39,7 @@
<Label For="text" ResourceKey="Text" HelpText="Optionally Specify A Text Color For The Container">Text Color:</Label> <Label For="text" ResourceKey="Text" HelpText="Optionally Specify A Text Color For The Container">Text Color:</Label>
</td> </td>
<td> <td>
<select id="text" class="form-control" @bind="@_text"> <select id="text" class="form-select" @bind="@_text">
<option value="">None</option> <option value="">None</option>
<option value="text-primary">Primary</option> <option value="text-primary">Primary</option>
<option value="text-secondary">Secondary</option> <option value="text-secondary">Secondary</option>
@ -57,7 +57,7 @@
<Label For="border" ResourceKey="Border" HelpText="Optionally Specify A Border For The Container">Border Color:</Label> <Label For="border" ResourceKey="Border" HelpText="Optionally Specify A Border For The Container">Border Color:</Label>
</td> </td>
<td> <td>
<select id="border" class="form-control" @bind="@_border"> <select id="border" class="form-select" @bind="@_border">
<option value="">None</option> <option value="">None</option>
<option value="border">Default</option> <option value="border">Default</option>
<option value="border border-primary">Primary</option> <option value="border border-primary">Primary</option>

10
Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
View File

@ -5,7 +5,7 @@
<main role="main"> <main role="main">
<nav class="navbar navbar-expand-md navbar-dark bg-primary fixed-top"> <nav class="navbar navbar-expand-md navbar-dark bg-primary fixed-top">
<Logo /><Menu Orientation="Horizontal" /> <Logo /><Menu Orientation="Horizontal" />
<div class="controls ml-md-auto"> <div class="controls ms-auto">
<div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div> <div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div>
</div> </div>
</nav> </nav>
@ -111,12 +111,10 @@
public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width,Footer"; public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width,Footer";
public override List<Resource> Resources => new List<Resource>() public override List<Resource> Resources => new List<Resource>()
{ {
new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.5.0/cyborg/bootstrap.min.css", Integrity = "sha384-GKugkVcT8wqoh3M8z1lqHbU+g6j498/ZT/zuXbepz7Dc09/otQZxTimkEMTkRWHP", CrossOrigin = "anonymous" }, new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.0.2/cyborg/bootstrap.min.css", Integrity = "sha512-X2u8dAWrVfvanPTlHwLh0fXttDDhkdV79q7cOibXR7hm9R3pRMFi53OwpGMdcbUiRk97isaXCRqFbm5LX1MiYw==", CrossOrigin = "anonymous" },
new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" }, new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://code.jquery.com/jquery-3.5.1.slim.min.js", Integrity = "sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj", CrossOrigin = "anonymous" }, new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", Integrity = "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", CrossOrigin = "anonymous" }
new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js", Integrity = "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo", CrossOrigin = "anonymous" },
new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js", Integrity = "sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI", CrossOrigin = "anonymous" }
}; };
private bool _footer = false; private bool _footer = false;

4
Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
View File

@ -6,11 +6,11 @@
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <td width="30%">
<Label For="footer" ResourceKey="Footer" HelpText="Specify If A Footer Should Always Be Displayed In A Fixed Location At The Bottom Of The Browser Window">Display Fixed Footer?</Label> <Label For="footer" ResourceKey="Footer" HelpText="Specify If A Footer Should Always Be Displayed In A Fixed Location At The Bottom Of The Browser Window">Display Fixed Footer?</Label>
</td> </td>
<td> <td>
<select id="footer" class="form-control" @bind="@_footer"> <select id="footer" class="form-select" @bind="@_footer">
<option value="true">Yes</option> <option value="true">Yes</option>
<option value="false">No</option> <option value="false">No</option>
</select> </select>

35
Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
View File

@ -1,4 +1,32 @@
.breadcrumbs { .table > :not(caption) > * > * {
box-shadow: none;
}
.table .form-control {
background-color: #ffffff !important;
border-width: 0.5px !important;
border-bottom-color: #ccc !important;
}
.table .form-select {
background-color: #ffffff !important;
border-width: 0.5px !important;
border-bottom-color: #ccc !important;
}
.table .btn-primary {
background-color: var(--bs-primary);
}
.table .btn-secondary {
background-color: var(--bs-secondary);
}
.alert-dismissible .btn-close {
z-index: 1;
}
.breadcrumbs {
background-color: #e6e6e6; background-color: #e6e6e6;
border-bottom: 1px solid #d6d5d5; border-bottom: 1px solid #d6d5d5;
} }
@ -69,6 +97,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
line-height: 3rem; line-height: 3rem;
padding-left: 1rem;
} }
.app-menu .nav-item a.active { .app-menu .nav-item a.active {
@ -87,7 +116,7 @@
.navbar-toggler { .navbar-toggler {
background-color: rgba(255, 255, 255, 0.1); background-color: rgba(255, 255, 255, 0.1);
margin-left: auto; margin: .5rem;
} }
@media (max-width: 767.98px) { @media (max-width: 767.98px) {
@ -110,7 +139,7 @@
.breadcrumbs { .breadcrumbs {
position: fixed; position: fixed;
left: 275px; left: 275px;
top: 0; top: 15px;
z-index: 3 z-index: 3
} }

11153
Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/BootswatchCyborg.css
View File

File diff suppressed because it is too large Load Diff

31
Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css
View File

@ -4,6 +4,34 @@ body {
padding-top: 7rem; padding-top: 7rem;
} }
.table > :not(caption) > * > * {
box-shadow: none;
}
.table .form-control {
background-color: #ffffff !important;
border-width: 0.5px !important;
border-bottom-color: #ccc !important;
}
.table .form-select {
background-color: #ffffff !important;
border-width: 0.5px !important;
border-bottom-color: #ccc !important;
}
.table .btn-primary {
background-color: var(--bs-primary);
}
.table .btn-secondary {
background-color: var(--bs-secondary);
}
.alert-dismissible .btn-close {
z-index: 1;
}
.controls { .controls {
z-index: 2000; z-index: 2000;
padding-top: 15px; padding-top: 15px;
@ -22,6 +50,7 @@ body {
display: flex; display: flex;
align-items: center; align-items: center;
line-height: 3rem; line-height: 3rem;
padding-left: 1rem;
} }
.app-menu .nav-item a.active { .app-menu .nav-item a.active {
@ -43,7 +72,7 @@ body {
.navbar-toggler { .navbar-toggler {
background-color: rgba(255, 255, 255, 0.1); background-color: rgba(255, 255, 255, 0.1);
margin-left: auto; margin: .5rem;
} }
div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu { div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu {

3
Oqtane.Server/wwwroot/css/app.css
View File

@ -116,6 +116,7 @@ app {
color: gray; color: gray;
height: 1px; height: 1px;
background-color: gray; background-color: gray;
margin: 0.5rem;
} }
.app-link-unstyled, .app-link-unstyled:visited, .app-link-unstyled:hover, .app-link-unstyled:active, .app-link-unstyled:focus, .app-link-unstyled:active:hover { .app-link-unstyled, .app-link-unstyled:visited, .app-link-unstyled:hover, .app-link-unstyled:active, .app-link-unstyled:focus, .app-link-unstyled:active:hover {
@ -185,7 +186,7 @@ app {
.app-tooltip::after { .app-tooltip::after {
background: #3E474F; background: #3E474F;
border-radius: .25em; border-radius: .25em;
bottom: 180%; bottom: 140%;
color: #EDEFF0; color: #EDEFF0;
content: attr(data-tip); content: attr(data-tip);
margin-left: -8.75em; margin-left: -8.75em;