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

Merge remote-tracking branch 'oqtane/dev' into dev

Browse Source
This commit is contained in:
Leigh Pointer 2023-03-06 05:54:29 +01:00
commit 4c8cb31a6f
7 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Client/Resources/Modules/Admin/Jobs/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
@ -193,6 +193,6 @@
<value>Execute Once</value> <value>Execute Once</value>
</data> </data>
<data name="Message.NoJobs" xml:space="preserve"> <data name="Message.NoJobs" xml:space="preserve">
<value>Please Note That After An Initial Installation You Must &amp;lt;a href={0}&amp;gt;Restart&amp;lt;/a&amp;gt; The Application In Order To Activate The Default Scheduled Jobs.</value> <value>Please Note That After An Initial Installation You Must &lt;a href={0}&gt;Restart&lt;/a&gt; The Application In Order To Activate The Default Scheduled Jobs.</value>
</data> </data>
</root> </root>

1
Oqtane.Server/wwwroot/Modules/Templates/External/Server/Manager/[Module]Manager.cs vendored
View File

@ -6,6 +6,7 @@ using Oqtane.Modules;
using Oqtane.Models; using Oqtane.Models;
using Oqtane.Infrastructure; using Oqtane.Infrastructure;
using Oqtane.Enums; using Oqtane.Enums;
using Oqtane.Repository;
using [Owner].[Module].Repository; using [Owner].[Module].Repository;
namespace [Owner].[Module].Manager namespace [Owner].[Module].Manager

2
Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/[Module]Context.cs vendored
View File

@ -11,7 +11,7 @@ namespace [Owner].[Module].Repository
{ {
public virtual DbSet<Models.[Module]> [Module] { get; set; } public virtual DbSet<Models.[Module]> [Module] { get; set; }
public [Module]Context(IDBContextDependencies DBContextDependencies) : base(DBContextDependencies) { } public [Module]Context(IDBContextDependencies DBContextDependencies) : base(DBContextDependencies)
{ {
// ContextBase handles multi-tenant database connections // ContextBase handles multi-tenant database connections
} }

2
Oqtane.Server/wwwroot/Modules/Templates/External/[Owner].[Module].sln vendored
View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.28621.142 VisualStudioVersion = 16.0.28621.142
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\oqtane.framework\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\[RootFolder]\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Module].Client", "Client\[Owner].[Module].Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Module].Client", "Client\[Owner].[Module].Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
EndProject EndProject

2
Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor vendored
View File

@ -2,7 +2,7 @@
@inherits ThemeBase @inherits ThemeBase
<main role="main"> <main role="main">
<nav class="navbar navbar-expand-md navbar-dark bg-primary fixed-top"> <nav class="navbar navbar-dark bg-primary fixed-top">
<Logo /><Menu Orientation="Horizontal" /> <Logo /><Menu Orientation="Horizontal" />
<div class="controls ms-auto"> <div class="controls ms-auto">
<div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div> <div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div>

8
Oqtane.Server/wwwroot/Themes/Templates/External/Client/wwwroot/Themes/[Owner].[Theme]/Theme.css vendored
View File

@ -4,6 +4,12 @@ body {
padding-top: 7rem; padding-top: 7rem;
} }
.div main {
color: black;
filter: invert(1);
mix-blend-mode: difference;
}
.table > :not(caption) > * > * { .table > :not(caption) > * > * {
box-shadow: none; box-shadow: none;
} }
@ -76,7 +82,7 @@ body {
} }
div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu { div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu {
color:#000000;
} }
@media (max-width: 767px) { @media (max-width: 767px) {

2
Oqtane.Server/wwwroot/Themes/Templates/External/[Owner].[Theme].sln vendored
View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.28621.142 VisualStudioVersion = 16.0.28621.142
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\oqtane.framework\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\[RootFolder]\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Theme].Client", "Client\[Owner].[Theme].Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "[Owner].[Theme].Client", "Client\[Owner].[Theme].Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
EndProject EndProject