diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index c64115b7..10f33cc8 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -36,8 +36,8 @@ else
- @if(Logs.Any())
- {
+ @if (Logs.Any())
+ {
|
@@ -47,11 +47,11 @@ else
Function |
- |
- @context.LogDate |
- @context.Level |
- @context.Feature |
- @context.Function |
+ |
+ @context.LogDate |
+ @context.Level |
+ @context.Feature |
+ @context.Function |
}
@@ -132,4 +132,31 @@ else
{
Logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((level == "-") ? "" : level), ((function == "-") ? "" : function), int.Parse(rows));
}
+
+ private string GetClass(string function)
+ {
+ string classname = "";
+ switch (function)
+ {
+ case "Create":
+ classname = "table-primary";
+ break;
+ case "Read":
+ classname = "table-secondary";
+ break;
+ case "Update":
+ classname = "table-success";
+ break;
+ case "Delete":
+ classname = "table-danger";
+ break;
+ case "Security":
+ classname = "table-warning";
+ break;
+ default:
+ classname = "";
+ break;
+ }
+ return classname;
+ }
}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index 2ae44820..b2180d43 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -94,9 +94,8 @@ else
}
}
- private async Task Upgrade()
+ private void Upgrade()
{
- await InstallationService.Upgrade();
NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
}
diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor
index 57d4eeb1..b9bded82 100644
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@@ -5,7 +5,7 @@
@if(Format == "Table")
{
-
+
@Header
@@ -19,7 +19,7 @@
}
@if(Format == "Grid")
{
-
+
@Header
@foreach (var item in ItemList)
{
@@ -81,6 +81,9 @@
[Parameter]
public string DisplayPages { get; set; }
+ [Parameter]
+ public string Class { get; set; }
+
IEnumerable
ItemList { get; set; }
protected override void OnParametersSet()
@@ -89,6 +92,17 @@
{
Format = "Table";
}
+ if (string.IsNullOrEmpty(Class))
+ {
+ if (Format == "Table")
+ {
+ Class = "table table-borderless";
+ }
+ else
+ {
+ Class = "container";
+ }
+ }
if (string.IsNullOrEmpty(PageSize))
{
MaxItems = 10;
diff --git a/Oqtane.Framework.nuspec b/Oqtane.Framework.nuspec
new file mode 100644
index 00000000..50e48e6f
--- /dev/null
+++ b/Oqtane.Framework.nuspec
@@ -0,0 +1,24 @@
+
+
+
+ Oqtane.Framework
+ 0.0.1
+ Shaun Walker
+ .NET Foundation
+ Oqtane Framework
+ A modular application framework for Blazor
+ .NET Foundation
+ false
+ MIT
+ https://github.com/oqtane/oqtane.framework
+ https://www.oqtane.org/Portals/0/icon.jpg
+ oqtane framework
+ Initial Release
+ A modular application framework for Blazor
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs
index 38cc4785..aaa10f5d 100644
--- a/Oqtane.Server/Infrastructure/LogManager.cs
+++ b/Oqtane.Server/Infrastructure/LogManager.cs
@@ -47,15 +47,17 @@ namespace Oqtane.Infrastructure
log.Url = request.Scheme.ToString() + "://" + request.Host.ToString() + request.Path.ToString() + request.QueryString.ToString();
}
- if (Class.GetType() != null)
+ Type type = Type.GetType(Class.ToString());
+ if (type != null)
{
- log.Category = Class.GetType().AssemblyQualifiedName;
+ log.Category = type.AssemblyQualifiedName;
+ log.Feature = Utilities.GetTypeNameLastSegment(log.Category, 0);
}
else
{
log.Category = Class.ToString();
+ log.Feature = log.Category;
}
- log.Feature = Utilities.GetTypeNameLastSegment(log.Category, 0);
log.Function = Enum.GetName(typeof(LogFunction), Function);
log.Level = Enum.GetName(typeof(LogLevel), Level);
if (Exception != null)
diff --git a/pack.cmd b/pack.cmd
new file mode 100644
index 00000000..af7998a6
--- /dev/null
+++ b/pack.cmd
@@ -0,0 +1,3 @@
+DEL "*.nupkg"
+C:\Nuget\nuget.exe pack Oqtane.Framework.nuspec
+
\ No newline at end of file