Merge pull request #5685 from oqtane/master

6.2.1 Release

.gitignore

@@ -35,4 +35,4 @@ Oqtane.Server/wwwroot/Themes/*
 !Oqtane.Server/wwwroot/Themes/Oqtane.Themes.*
 !Oqtane.Server/wwwroot/Themes/Templates
 Oqtane.Server/wwwroot/Themes/Templates/*
-Oqtane.Server/wwwroot/Themes/Templates/External
+!Oqtane.Server/wwwroot/Themes/Templates/External

Directory.Build.props

@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Configurations>Debug;Release</Configurations>
+    <Version>6.2.1</Version>
+    <Product>Oqtane</Product>
+    <Authors>Shaun Walker</Authors>
+    <Company>.NET Foundation</Company>
+    <Description>CMS and Application Framework for Blazor and .NET MAUI</Description>
+    <Copyright>.NET Foundation</Copyright>
+    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.2.1</PackageReleaseNotes>
+    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
+  </PropertyGroup>
+</Project>

Oqtane.Application/.template.config/template.json

@@ -7,13 +7,80 @@
     "Blazor",
     "Oqtane"
   ],
+  "name": "Oqtane Application Template",
+  "shortName": "oqtane-app",
+  "defaultName": "MyCompany.MyProject",
+  "identity": "Oqtane.Application.Template",
   "tags": {
     "language": "C#",
-    "type": "project"
+    "type": "solution",
+    "editorTreatAs":"solution"
   },
-  "identity": "Oqtane.Application.Template",
-  "name": "Oqtane Application Solution For Blazor",
-  "shortName": "oqtane-app",
   "sourceName": "Oqtane.Application",
-  "preferNameDirectory": true
+  "preferNameDirectory": true,
+  "guids": [
+    "04B05448-788F-433D-92C0-FED35122D45A",
+    "AA8E58A1-CD09-4208-BF66-A8BB341FD669",
+    "18D73F73-D7BE-4388-85BA-FBD9AC96FCA2"
+  ],
+  "symbols": {
+    "Framework": {
+      "type": "parameter",
+      "description": "The target framework for the project",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "net9.0",
+          "description": "Target net9.0"
+        }
+      ],
+      "replaces": "net9.0",
+      "defaultValue": "net9.0"
+    },
+    "HttpPort": {
+      "type": "parameter",
+      "datatype": "integer",
+      "description": "Port number to use for the HTTP endpoint in launchSettings.json."
+    },
+    "HttpPortGenerated": {
+      "type": "generated",
+      "generator": "port"
+    },
+    "HttpPortReplacer": {
+      "type": "generated",
+      "generator": "coalesce",
+      "parameters": {
+        "sourceVariableName": "HttpPort",
+        "fallbackVariableName": "HttpPortGenerated"
+      },
+      "replaces": "44358"
+    },
+    "HttpsPort": {
+      "type": "parameter",
+      "datatype": "integer",
+      "description": "Port number to use for the HTTPS endpoint in launchSettings.json."
+    },
+    "HttpsPortGenerated": {
+      "type": "generated",
+      "generator": "port",
+      "parameters": {
+        "low": 44300,
+        "high": 44399
+      }
+    },
+    "HttpsPortReplacer": {
+      "type": "generated",
+      "generator": "coalesce",
+      "parameters": {
+        "sourceVariableName": "HttpsPort",
+        "fallbackVariableName": "HttpsPortGenerated"
+      },
+      "replaces": "44359"
+    }
+  },
+  "primaryOutputs": [
+    {
+      "path": "Oqtane.Application.sln"
+    }
+  ]
 }

Oqtane.Application/Client/Modules/MyModule/Settings.razor

@@ -13,7 +13,7 @@
 </div>
 
 @code {
-    private string resourceType = "Oqtane.Application.Settings, Oqtane.Application.Client.Oqtane"; // for localization
+    private string resourceType = "Oqtane.Application.MyModule.Settings, Oqtane.Application.Client.Oqtane"; // for localization
     public override string Title => "MyModdule Settings";
 
     string _value;

Oqtane.Application/Client/Oqtane.Application.Client.csproj

@@ -1,21 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
-	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.0.0</Version>
-		<AssemblyName>Oqtane.Application.Client.Oqtane</AssemblyName>
-		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
-		<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
-		<BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
-		<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <Version>1.0.0</Version>
+    <AssemblyName>Oqtane.Application.Client.Oqtane</AssemblyName>
+    <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+    <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+    <PublishTrimmed>false</PublishTrimmed>
+    <BlazorEnableCompression>false</BlazorEnableCompression>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.9" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Oqtane.Client" Version="6.2.0" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Oqtane.Client" Version="6.2.1" />
+  </ItemGroup>
 
 </Project>

Oqtane.Application/Oqtane.Application.Template.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Oqtane.Application.Template</id>
-    <version>6.2.0</version>
+    <version>6.2.1</version>
     <title>Oqtane Application Template For Blazor</title>
     <authors>Shaun Walker</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

Oqtane.Application/README.md

@@ -5,15 +5,18 @@ This is a Visual Studio Project Template designed for Oqtane development project
 ```
 dotnet new install Oqtane.Application.Template
 dotnet new oqtane-app -o MyCompany.MyProject
+cd MyCompany.MyProject
+dotnet build
+cd Server
+dotnet run
+browse to Url
 ```
 
 When using this approach you do not need to have a local copy of the oqtane.framework source code - you simply utilize Oqtane as a standard application dependency.
 
-The solution contains an AppHost project which must be identified as the Startup project. It is responsible for loading the development environment and launching the Oqtane framework.
-
-The solution also contains Build, Client, Server, and Shared folders which is where you you would implement your custom functionality. An example module and theme are included for reference, and you can add additional modules and themes within the same projects by following the standard Oqtane folder/namespace conventions. 
+The solution also contains Client, Server, and Shared folders which is where you you would implement your custom functionality. An example module and theme are included for reference, and you can add additional modules and themes within the same projects by following the standard Oqtane folder/namespace conventions. 
 
 *Known Issues*
 
-- do not use the term "Oqtane" in your output name or else you will experience namespace conflicts
+- do not use the term "Oqtane" or "Module" in your output name or else you will experience namespace conflicts
 

Oqtane.Application/Server/Oqtane.Application.Server.csproj

@@ -1,18 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.0.0</Version>
-		<AssemblyName>Oqtane.Application.Server.Oqtane</AssemblyName>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>1.0.0</Version>
+    <AssemblyName>Oqtane.Application.Server.Oqtane</AssemblyName>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <SatelliteResourceLanguages>none</SatelliteResourceLanguages>
+    <CompressionEnabled>false</CompressionEnabled>
+    <StaticWebAssetsFingerprintContent>false</StaticWebAssetsFingerprintContent>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
-		<ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Oqtane.Server" Version="6.2.0" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
+    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Oqtane.Server" Version="6.2.1" />
+  </ItemGroup>
 	
 </Project>

Oqtane.Application/Server/Properties/launchSettings.json

@@ -6,7 +6,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5000",
+        "applicationUrl": "http://localhost:44358",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -16,7 +16,7 @@
         "dotnetRunMessages": true,
         "launchBrowser": true,
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:5001;http://localhost:5000",
+        "applicationUrl": "https://localhost:44359;http://localhost:44358",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }

Oqtane.Application/Server/wwwroot/Modules/Oqtane.Modules.Admin.Login/Module.css

@@ -1,5 +0,0 @@
-/* Login Module Custom Styles */
-
-.Oqtane-Modules-Admin-Login {
-    width: 200px;
-}

Oqtane.Application/Server/wwwroot/Modules/Oqtane.Modules.HtmlText/Module.css

@@ -1 +0,0 @@
-/* HtmlText Module Custom Styles */

Oqtane.Application/Server/wwwroot/Oqtane.Server.lib.module.js

@@ -1,90 +0,0 @@
-const pageScriptInfoBySrc = new Map();
-
-function registerPageScriptElement(src) {
-    if (!src) {
-        throw new Error('Must provide a non-empty value for the "src" attribute.');
-    }
-
-    let pageScriptInfo = pageScriptInfoBySrc.get(src);
-
-    if (pageScriptInfo) {
-        pageScriptInfo.referenceCount++;
-    } else {
-        pageScriptInfo = { referenceCount: 1, module: null };
-        pageScriptInfoBySrc.set(src, pageScriptInfo);
-        initializePageScriptModule(src, pageScriptInfo);
-    }
-}
-
-function unregisterPageScriptElement(src) {
-    if (!src) {
-        return;
-    }
-
-    const pageScriptInfo = pageScriptInfoBySrc.get(src);
-    if (!pageScriptInfo) {
-        return;
-    }
-
-    pageScriptInfo.referenceCount--;
-}
-
-async function initializePageScriptModule(src, pageScriptInfo) {
-    // If the path is relative, normalize it by by making it an absolute URL
-    // with document's the base HREF.
-    if (src.startsWith("./")) {
-        src = new URL(src.substr(2), document.baseURI).toString();
-    }
-
-    const module = await import(src);
-
-    if (pageScriptInfo.referenceCount <= 0) {
-        // All page-script elements with the same 'src' were
-        // unregistered while we were loading the module.
-        return;
-    }
-
-    pageScriptInfo.module = module;
-    module.onLoad?.();
-    module.onUpdate?.();
-}
-
-function onEnhancedLoad() {
-    // Start by invoking 'onDispose' on any modules that are no longer referenced.
-    for (const [src, { module, referenceCount }] of pageScriptInfoBySrc) {
-        if (referenceCount <= 0) {
-            module?.onDispose?.();
-            pageScriptInfoBySrc.delete(src);
-        }
-    }
-
-    // Then invoke 'onUpdate' on the remaining modules.
-    for (const { module } of pageScriptInfoBySrc.values()) {
-        module?.onUpdate?.();
-    }
-}
-
-export function afterWebStarted(blazor) {
-    customElements.define('page-script', class extends HTMLElement {
-        static observedAttributes = ['src'];
-
-        // We use attributeChangedCallback instead of connectedCallback
-        // because a page-script element might get reused between enhanced
-        // navigations.
-        attributeChangedCallback(name, oldValue, newValue) {
-            if (name !== 'src') {
-                return;
-            }
-
-            this.src = newValue;
-            unregisterPageScriptElement(oldValue);
-            registerPageScriptElement(newValue);
-        }
-
-        disconnectedCallback() {
-            unregisterPageScriptElement(this.src);
-        }
-    });
-
-    blazor.addEventListener('enhancedload', onEnhancedLoad);
-}

Oqtane.Application/Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css

@@ -1,290 +0,0 @@
-.table > :not(caption) > * > * {
-    box-shadow: none;
-}
-
-.table .form-control {
-    background-color: #ffffff !important;
-    border-width: 0.5px !important;
-    border-bottom-color: #ccc !important;
-    color: #000 !important;
-}
-
-.table .form-select {
-    background-color: #ffffff !important;
-    border-width: 0.5px !important;
-    border-bottom-color: #ccc !important;
-    color: #000 !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;
-}
-
-.top-row {
-    height: 3.5rem;
-    display: flex;
-    align-items: center;
-}
-
-.main {
-    flex: 1;
-}
-
-    .main .top-row {
-        background-color: #e6e6e6;
-        border-bottom: 1px solid #d6d5d5;
-    }
-
-.sidebar {
-    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
-    .sidebar .top-row {
-        background-color: rgba(0,0,0,0.4);
-    }
-
-    .sidebar .navbar-toggler .navbar-toggler-icon {
-        background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
-    }
-
-    .sidebar .oi {
-        width: 2rem;
-        font-size: 1.1rem;
-        vertical-align: text-top;
-        top: -2px;
-    }
-
-.app-menu {
-    width: 100%
-}
-
-.breadcrumb {
-    margin-bottom: 0;
-}
-
-.app-menu .nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-.app-menu .nav-item:first-of-type {
-    padding-top: 1rem;
-}
-
-.app-menu .nav-item:last-of-type {
-    padding-bottom: 1rem;
-}
-
-.app-menu .nav-item a {
-    color: #d7d7d7;
-    border-radius: 4px;
-    height: 3rem;
-    display: flex;
-    align-items: center;
-    line-height: 3rem;
-    padding-left: 1rem;
-}
-
-.app-menu .nav-item a.active {
-    background-color: rgba(255,255,255,0.25);
-    color: white;
-}
-
-.app-menu .nav-item a:hover {
-    background-color: rgba(255,255,255,0.1);
-    color: white;
-}
-
-.content {
-    padding-top: 1.1rem;
-}
-
-.navbar-toggler {
-    background-color: rgba(255, 255, 255, 0.1);
-    margin: .5rem;
-}
-
-.app-logo .navbar-brand {
-    color: white;
-}
-@media (max-width: 991.98px) {
-    .app-search {
-        border-radius: 6px;
-    }
-    .app-search input{
-        display: none !important;
-    }
-
-    .app-search input + button {
-        position: initial;
-        padding-top: 7px;
-        padding-bottom: 7px;
-    }
-
-    .app-search:active, .app-search:hover {
-        display: block;
-        position: absolute;
-        color: #fff;
-        top: 0;
-        min-height: 60px;
-        width: 100%;
-        left: 0;
-        z-index: 999;
-        border-radius: 0;
-        background-color: #e6e6e6;
-    }
-
-    .app-search:active .app-form-inline, .app-search:hover .app-form-inline {
-        margin: 10px auto;
-        position: relative;
-        display: block;
-        max-width: 80%;
-    }
-
-    .app-search:active .app-form-inline input, .app-search:hover .app-form-inline input {
-        width: 100%;
-        display: block !important;
-    }
-    .app-search:active .app-form-inline input + button, .app-search:hover .app-form-inline input + button {
-        position: absolute;
-        color: rgb(42, 159, 214);
-        padding-top: 6px;
-        padding-bottom: 6px;
-    }
-}
-@media (max-width: 767.98px) {
-    .main .top-row {
-        display: none;
-    }
-}
-
-@media (min-width: 768px) {
-    app {
-        flex-direction: row;
-        display: block;
-    }
-
-    .app-logo {
-        display: block;
-        margin-left: auto;
-        margin-right: auto;
-    }
-
-    .breadcrumbs {
-        position: fixed;
-        left: 275px;
-        top: 15px;
-        z-index: 6
-    }
-
-    .sidebar {
-        width: 250px;
-        height: 100vh;
-        position: sticky;
-        top: 0;
-        z-index: 4
-    }
-
-    .main .top-row {
-        position: sticky;
-        top: 0;
-        z-index: 5
-    }
-
-    .main > div {
-        padding-left: 2rem !important;
-        padding-right: 1.5rem !important;
-    }
-
-    .navbar-toggler {
-        display: none;
-    }
-
-    .sidebar .collapse {
-        /* Never collapse the sidebar for wide screens */
-        display: block;
-    }
-
-    .main > .container {
-        margin-top: 30px;
-    }
-}
-
-@-webkit-keyframes sk-stretchdelay {
-    0%, 40%, 100% {
-        -webkit-transform: scaleY(0.4)
-    }
-
-    20% {
-        -webkit-transform: scaleY(1.0)
-    }
-}
-
-@keyframes sk-stretchdelay {
-    0%, 40%, 100% {
-        transform: scaleY(0.4);
-        -webkit-transform: scaleY(0.4);
-    }
-
-    20% {
-        transform: scaleY(1.0);
-        -webkit-transform: scaleY(1.0);
-    }
-}
-
-@media (max-width: 767.98px) {
-    .app-logo {
-        height: 80px;
-        display: flex;
-        align-items: center;
-    }
-
-    .breadcrumbs {
-        position: fixed;
-        top: 150px;
-        width: 100%;
-        left: 0;
-        z-index: 4;
-        border-bottom: 1px solid #d6d5d5;
-    }
-
-    .sidebar {
-        margin-top: 3.5rem;
-        position: fixed;
-        width: 100%;
-        z-index: 4;
-    }
-
-    .main .top-row {
-        z-index: 4;
-    }
-
-    .main > .top-row.px-4 {
-        display: flex;
-        position: fixed;
-        left: 0;
-        top: 0;
-        width: 100%;
-    }
-
-    .ml-md-auto {
-        margin-left: auto;
-    }
-
-    .main > .container {
-        margin-top: 200px;
-    }
-}
-

Oqtane.Application/Server/wwwroot/app_offline.bak

@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width">
-    <title>Upgrade Framework</title>
-    <base href="/" />
-	<link rel="stylesheet" type="text/css" href="[BOOTSTRAPCSSURL]" integrity="[BOOTSTRAPCSSINTEGRITY]"  crossorigin="anonymous" />
-    <link rel="stylesheet" type="text/css" href="https://www.oqtane.net/css/app.css">
-</head>
-<body onload="refresh()">
-    <div>
-	    <br /><br />
-        <h1 align="center">Please Wait... Upgrade In Progress...</h1>
-        <p align="center">(this process can take a few minutes... please be patient)</p>
-    </div>
-	<div class="w-50 mx-auto mt-5">
-		<div class="progress" role="progressbar" aria-label="Basic example" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">
-			<div class="progress-bar progress-bar-striped progress-bar-animated [PROGRESSCLASS]" style="width: [PROGRESS]%"></div>
-		</div>
-		<div class="fs-6 fst-italic mt-1">
-			[STATUS]
-		</div>
-	</div>
-
-    <script>
-        function refresh() {
-            setTimeout(function () {
-                window.location.href = "/?reload";
-            }, 1000);
-        }
-    </script>
-</body>
-</html>

Oqtane.Application/Server/wwwroot/css/app.css

@@ -1,288 +0,0 @@
-@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
-
-html, body {
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-}
-
-app {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-/* Admin Modal */
-.app-admin-modal .modal {
-    position: fixed; /* Stay in place */
-    z-index: 9999; /* Sit on top */
-    left: 0;
-    top: 0;
-    display: block;
-    width: 100%; /* Full width */
-    height: 100%; /* Full height */
-    overflow: auto; /* Enable scroll if needed */
-    background: rgba(0,0,0,0.3); /* Dim background */
-}
-
-    .app-admin-modal .modal-dialog {
-        width: 100%; /* Full width */
-        height: 100%; /* Full height */
-        max-width: none; /* Override default of 500px */
-    }
-
-    .app-admin-modal .modal-content {
-        margin: 5% auto; /* 5% from the top and centered */
-        width: 80%; /* Could be more or less, depending on screen size */
-    }
-
-/* Action Dialog */
-.app-actiondialog{
-    position: absolute;
-}
-.app-actiondialog .modal {
-    position: fixed; /* Stay in place */
-    z-index: 9999; /* Sit on top */
-    left: 0;
-    top: 0;
-    display: block;
-    width: 100%; /* Full width */
-    height: 100%; /* Full height */
-    overflow: auto; /* Enable scroll if needed */
-    background: rgba(0,0,0,0.3); /* Dim background */
-}
-
-.app-actiondialog .modal-dialog {
-    width: 100%; /* Full width */
-    height: 100%; /* Full height */
-    max-width: none; /* Override default of 500px */
-}
-
-.app-actiondialog .modal-content {
-    margin: 15% auto; /* 15% from the top and centered */
-    width: 40%; /* Could be more or less, depending on screen size */
-}
-
-/* Admin Pane */
-.app-pane-admin-border {
-    width: 100%;
-    border-width: 1px;
-    border-style: dashed;
-    border-color: gray;
-}
-
-.app-pane-admin-title {
-    width: 100%;
-    text-align: center;
-    color: gray;
-}
-
-.app-moduleactions .dropdown-menu {
-    z-index: 9999;
-}
-
-.app-moduleactions .dropdown-submenu {
-    position: relative;
-}
-
-    .app-moduleactions .dropdown-submenu > .dropdown-menu {
-        top: 0;
-        left: 100%;
-        margin-top: 0px;
-        margin-left: 0px;
-    }
-
-.app-progress-indicator {
-    background: rgba(0,0,0,0.2) url('../loading.gif') no-repeat 50% 50%;
-    width: 100%;
-    height: 100%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 9999; /* Sit on top */
-}
-
-.app-rule {
-    width: 100%;
-    color: gray;
-    height: 1px;
-    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 {
-    font-style: inherit;
-    color: inherit;
-    background-color: transparent;
-    font-size: inherit;
-    text-decoration: none;
-    font-variant: inherit;
-    font-weight: inherit;
-    line-height: inherit;
-    font-family: inherit;
-    border-radius: inherit;
-    border: inherit;
-    outline: inherit;
-    box-shadow: inherit;
-    padding: inherit;
-    vertical-align: inherit;
-}
-
-.app-alert {
-    padding: 20px;
-    background-color: #f44336; /* red */
-    color: white;
-    margin-bottom: 15px;
-}
-
-.app-moduletitle a {
-    scroll-margin-top: 7rem;
-}
-
-/* Tooltips */
-.app-tooltip {
-    cursor: help;
-    position: relative;
-}
-
-    .app-tooltip::before,
-    .app-tooltip::after {
-        left: 25%;
-        opacity: 0;
-        position: absolute;
-        z-index: -100;
-    }
-
-    .app-tooltip:hover::before,
-    .app-tooltip:focus::before,
-    .app-tooltip:hover::after,
-    .app-tooltip:focus::after {
-        opacity: 1;
-        transform: scale(1) translateY(0);
-        z-index: 100;
-    }
-
-    .app-tooltip::before {
-        border-style: solid;
-        border-width: 1em 0.75em 0 0.75em;
-        border-color: #3E474F transparent transparent transparent;
-        bottom: 100%;
-        content: "";
-        margin-left: -0.5em;
-        transition: all .65s cubic-bezier(.84,-0.18,.31,1.26), opacity .65s .5s;
-        transform: scale(.6) translateY(-90%);
-    }
-
-    .app-tooltip:hover::before,
-    .app-tooltip:focus::before {
-        transition: all .65s cubic-bezier(.84,-0.18,.31,1.26) .2s;
-    }
-
-    .app-tooltip::after {
-        background: #3E474F;
-        border-radius: .25em;
-        bottom: 140%;
-        color: #EDEFF0;
-        content: attr(data-tip);
-        margin-left: -8.75em;
-        padding: 1em;
-        transition: all .65s cubic-bezier(.84,-0.18,.31,1.26) .2s;
-        transform: scale(.6) translateY(50%);
-        width: 17.5em;
-    }
-
-    .app-tooltip:hover::after,
-    .app-tooltip:focus::after {
-        transition: all .65s cubic-bezier(.84,-0.18,.31,1.26);
-    }
-
-@media (max-width: 760px) {
-    .app-tooltip::after {
-        font-size: .75em;
-        margin-left: -5em;
-        width: 10em;
-    }
-}
-
-#blazor-error-ui {
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-    display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-#blazor-error-ui .dismiss {
-    cursor: pointer;
-    position: absolute;
-    right: 0.75rem;
-    top: 0.5rem;
-}
-
-/* Oqtane Control Styles */
-
-/* Pager */
-.app-pager-pointer {
-    cursor: pointer;
-}
-
-.app-sort-th {
-    cursor: pointer;
-}
-
-.app-fas {
-    margin-left: 5px;
-}
-
-.app-form-inline {
-    display: inline;
-}
-
-.app-search {
-    display: inline-block;
-    position: relative;
-}
-.app-search input + button {
-    background: none;
-    border: none;
-    position: absolute;
-    right: 0;
-    top: 0;
-}
-.app-search input + button .oi {
-    top: 0;
-}
-.app-search-noinput {
-    display: inline-block;
-    position: relative;
-}
-.app-search-noinput button {
-    background: none;
-    border: none;
-    color: var(--bs-heading-color);
-}
-.app-search-noinput button:hover {
-    color: var(--bs-heading-color);
-}
-
-/* Text Editor */
-.text-area-editor > textarea {
-    width: 100%;
-    min-height: 250px;
-}
-
-.app-logo .navbar-brand {
-    padding: 5px 20px 5px 20px;
-}
-
-/* cookie consent */
-.gdpr-consent-bar .btn-show {
-    bottom: -3px;
-    left: 5px;
-}
-.gdpr-consent-bar .btn-hide {
-    top: 0;
-    right: 5px;
-}

Oqtane.Application/Server/wwwroot/css/open-iconic/FONT-LICENSE

@@ -1,86 +0,0 @@
-SIL OPEN FONT LICENSE Version 1.1
-
-Copyright (c) 2014 Waybury
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

Oqtane.Application/Server/wwwroot/css/open-iconic/ICON-LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Waybury
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

Oqtane.Application/Server/wwwroot/css/open-iconic/README.md

@@ -1,114 +0,0 @@
-[Open Iconic v1.1.1](http://useiconic.com/open)
-===========
-
-### Open Iconic is the open source sibling of [Iconic](http://useiconic.com). It is a hyper-legible collection of 223 icons with a tiny footprint—ready to use with Bootstrap and Foundation. [View the collection](http://useiconic.com/open#icons)
-
-
-
-## What's in Open Iconic?
-
-* 223 icons designed to be legible down to 8 pixels
-* Super-light SVG files - 61.8 for the entire set 
-* SVG sprite—the modern replacement for icon fonts
-* Webfont (EOT, OTF, SVG, TTF, WOFF), PNG and WebP formats
-* Webfont stylesheets (including versions for Bootstrap and Foundation) in CSS, LESS, SCSS and Stylus formats
-* PNG and WebP raster images in 8px, 16px, 24px, 32px, 48px and 64px.
-
-
-## Getting Started
-
-#### For code samples and everything else you need to get started with Open Iconic, check out our [Icons](http://useiconic.com/open#icons) and [Reference](http://useiconic.com/open#reference) sections.
-
-### General Usage
-
-#### Using Open Iconic's SVGs
-
-We like SVGs and we think they're the way to display icons on the web. Since Open Iconic are just basic SVGs, we suggest you display them like you would any other image (don't forget the `alt` attribute).
-
-```
-<img src="/open-iconic/svg/icon-name.svg" alt="icon name">
-```
-
-#### Using Open Iconic's SVG Sprite
-
-Open Iconic also comes in a SVG sprite which allows you to display all the icons in the set with a single request. It's like an icon font, without being a hack.
-
-Adding an icon from an SVG sprite is a little different than what you're used to, but it's still a piece of cake. *Tip: To make your icons easily style able, we suggest adding a general class to the* `<svg>` *tag and a unique class name for each different icon in the* `<use>` *tag.*  
-
-```
-<svg class="icon">
-  <use xlink:href="open-iconic.svg#account-login" class="icon-account-login"></use>
-</svg>
-```
-
-Sizing icons only needs basic CSS. All the icons are in a square format, so just set the `<svg>` tag with equal width and height dimensions.
-
-```
-.icon {
-  width: 16px;
-  height: 16px;
-}
-```
-
-Coloring icons is even easier. All you need to do is set the `fill` rule on the `<use>` tag.
-
-```
-.icon-account-login {
-  fill: #f00;
-}
-```
-
-To learn more about SVG Sprites, read [Chris Coyier's guide](http://css-tricks.com/svg-sprites-use-better-icon-fonts/).
-
-#### Using Open Iconic's Icon Font...
-
-
-##### …with Bootstrap
-
-You can find our Bootstrap stylesheets in `font/css/open-iconic-bootstrap.{css, less, scss, styl}`
-
-
-```
-<link href="/open-iconic/font/css/open-iconic-bootstrap.css" rel="stylesheet">
-```
-
-
-```
-<span class="oi oi-icon-name" title="icon name" aria-hidden="true"></span>
-```
-
-##### …with Foundation
-
-You can find our Foundation stylesheets in `font/css/open-iconic-foundation.{css, less, scss, styl}`
-
-```
-<link href="/open-iconic/font/css/open-iconic-foundation.css" rel="stylesheet">
-```
-
-
-```
-<span class="fi-icon-name" title="icon name" aria-hidden="true"></span>
-```
-
-##### …on its own
-
-You can find our default stylesheets in `font/css/open-iconic.{css, less, scss, styl}`
-
-```
-<link href="/open-iconic/font/css/open-iconic.css" rel="stylesheet">
-```
-
-```
-<span class="oi" data-glyph="icon-name" title="icon name" aria-hidden="true"></span>
-```
-
-
-## License
-
-### Icons
-
-All code (including SVG markup) is under the [MIT License](http://opensource.org/licenses/MIT).
-
-### Fonts
-
-All fonts are under the [SIL Licensed](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web).

Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.svg

@@ -1,543 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<!--
-2014-7-1: Created.
--->
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-Created by FontForge 20120731 at Tue Jul  1 20:39:22 2014
- By P.J. Onori
-Created by P.J. Onori with FontForge 2.0 (http://fontforge.sf.net)
-</metadata>
-<defs>
-<font id="open-iconic" horiz-adv-x="800" >
-  <font-face 
-    font-family="Icons"
-    font-weight="400"
-    font-stretch="normal"
-    units-per-em="800"
-    panose-1="2 0 5 3 0 0 0 0 0 0"
-    ascent="800"
-    descent="0"
-    bbox="-0.5 -101 802 800.126"
-    underline-thickness="50"
-    underline-position="-100"
-    unicode-range="U+E000-E0DE"
-  />
-    <missing-glyph />
-    <glyph glyph-name="" unicode="&#xe000;" 
-d="M300 700h500v-700h-500v100h400v500h-400v100zM400 500l200 -150l-200 -150v100h-400v100h400v100z" />
-    <glyph glyph-name="1" unicode="&#xe001;" 
-d="M300 700h500v-700h-500v100h400v500h-400v100zM200 500v-100h400v-100h-400v-100l-200 150z" />
-    <glyph glyph-name="2" unicode="&#xe002;" 
-d="M350 700c193 0 350 -157 350 -350v-50h100l-200 -200l-200 200h100v50c0 138 -112 250 -250 250s-250 -112 -250 -250c0 193 157 350 350 350z" />
-    <glyph glyph-name="3" unicode="&#xe003;" 
-d="M450 700c193 0 350 -157 350 -350c0 138 -112 250 -250 250s-250 -112 -250 -250v-50h100l-200 -200l-200 200h100v50c0 193 157 350 350 350z" />
-    <glyph glyph-name="4" unicode="&#xe004;" 
-d="M0 700h800v-100h-800v100zM100 500h600v-100h-600v100zM0 300h800v-100h-800v100zM100 100h600v-100h-600v100z" />
-    <glyph glyph-name="5" unicode="&#xe005;" 
-d="M0 700h800v-100h-800v100zM0 500h600v-100h-600v100zM0 300h800v-100h-800v100zM0 100h600v-100h-600v100z" />
-    <glyph glyph-name="6" unicode="&#xe006;" 
-d="M0 700h800v-100h-800v100zM200 500h600v-100h-600v100zM0 300h800v-100h-800v100zM200 100h600v-100h-600v100z" />
-    <glyph glyph-name="7" unicode="&#xe007;" 
-d="M400 700c75 0 146 -23 206 -59l-75 -225l-322 234c57 31 122 50 191 50zM125 588l191 -138l-310 -222c-4 24 -6 47 -6 72c0 114 49 215 125 288zM688 575c69 -72 112 -168 112 -275c0 -35 -8 -68 -16 -100h-218zM216 253l112 -347c-128 23 -232 109 -287 222zM372 100
-h372c-64 -109 -177 -185 -310 -197z" />
-    <glyph glyph-name="8" unicode="&#xe008;" horiz-adv-x="600" 
-d="M200 800h100v-500h200l-247 -300l-253 300h200v500z" />
-    <glyph glyph-name="9" unicode="&#xe009;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM300 700v-300h-200l300 -300l300 300h-200v300h-200z" />
-    <glyph glyph-name="a" unicode="&#xe00a;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700l-300 -300l300 -300v200h300v200h-300v200z" />
-    <glyph glyph-name="b" unicode="&#xe00b;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700v-200h-300v-200h300v-200l300 300z" />
-    <glyph glyph-name="c" unicode="&#xe00c;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700l-300 -300h200v-300h200v300h200z" />
-    <glyph glyph-name="d" unicode="&#xe00d;" 
-d="M300 600v-200h500v-100h-500v-200l-300 247z" />
-    <glyph glyph-name="e" unicode="&#xe00e;" 
-d="M500 600l300 -247l-300 -253v200h-500v100h500v200z" />
-    <glyph glyph-name="f" unicode="&#xe00f;" horiz-adv-x="600" 
-d="M200 800h200v-500h200l-297 -300l-303 300h200v500z" />
-    <glyph glyph-name="10" unicode="&#xe010;" 
-d="M300 700v-200h500v-200h-500v-200l-300 297z" />
-    <glyph glyph-name="11" unicode="&#xe011;" 
-d="M500 700l300 -297l-300 -303v200h-500v200h500v200z" />
-    <glyph glyph-name="12" unicode="&#xe012;" horiz-adv-x="600" 
-d="M297 800l303 -300h-200v-500h-200v500h-200z" />
-    <glyph glyph-name="13" unicode="&#xe013;" horiz-adv-x="600" 
-d="M247 800l253 -300h-200v-500h-100v500h-200z" />
-    <glyph glyph-name="14" unicode="&#xe014;" 
-d="M400 800h100v-800h-100v800zM200 700h100v-600h-100v600zM600 600h100v-400h-100v400zM0 500h100v-200h-100v200z" />
-    <glyph glyph-name="15" unicode="&#xe015;" 
-d="M116 600l72 -72c-54 -54 -88 -126 -88 -209s34 -159 88 -213l-72 -72c-72 72 -116 175 -116 285s44 209 116 281zM684 600c72 -72 116 -171 116 -281s-44 -213 -116 -285l-72 72c54 54 88 130 88 213s-34 155 -88 209zM259 460l69 -72c-18 -18 -28 -41 -28 -69
-s10 -54 28 -72l-69 -72c-36 36 -59 89 -59 144s23 105 59 141zM541 459c36 -36 59 -85 59 -140s-23 -108 -59 -144l-69 72c18 18 28 44 28 72s-10 51 -28 69z" />
-    <glyph glyph-name="16" unicode="&#xe016;" horiz-adv-x="400" 
-d="M200 800c110 0 200 -90 200 -200s-90 -200 -200 -200s-200 90 -200 200s90 200 200 200zM100 319c31 -11 65 -19 100 -19s68 8 100 19v-319l-100 100l-100 -100v319z" />
-    <glyph glyph-name="17" unicode="&#xe017;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300c0 -66 21 -126 56 -175l419 419c-49 35 -109 56 -175 56zM644 575l-419 -419c49 -35 109 -56 175 -56c166 0 300 134 300 300
-c0 66 -21 126 -56 175z" />
-    <glyph glyph-name="18" unicode="&#xe018;" 
-d="M0 700h100v-600h700v-100h-800v700zM500 700h200v-500h-200v500zM200 500h200v-300h-200v300z" />
-    <glyph glyph-name="19" unicode="&#xe019;" 
-d="M397 800c13 1 23 -4 34 -13c2 -2 214 -254 241 -287h128v-100h-100v-366c0 -18 -16 -34 -34 -34h-532c-18 0 -34 16 -34 34v366h-100v100h128l234 281c9 11 22 18 35 19zM400 672l-144 -172h288zM250 300c-28 0 -50 -22 -50 -50v-100c0 -28 22 -50 50 -50s50 22 50 50
-v100c0 28 -22 50 -50 50zM550 300c-28 0 -50 -22 -50 -50v-100c0 -28 22 -50 50 -50s50 22 50 50v100c0 28 -22 50 -50 50z" />
-    <glyph glyph-name="1a" unicode="&#xe01a;" 
-d="M9 700h682c6 0 9 -4 9 -10v-190h100v-200h-100v-191c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v582c0 6 3 9 9 9zM100 600v-400h500v400h-500z" />
-    <glyph glyph-name="1b" unicode="&#xe01b;" 
-d="M9 700h682c6 0 9 -4 9 -10v-190h100v-200h-100v-191c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v582c0 6 3 9 9 9z" />
-    <glyph glyph-name="1c" unicode="&#xe01c;" 
-d="M92 650c0 23 19 50 45 50h3h5h5h500c28 0 50 -22 50 -50s-22 -50 -50 -50h-50v-141c9 -17 120 -231 166 -309c16 -26 34 -61 34 -106c0 -39 -15 -77 -41 -103h-3c-26 -25 -62 -41 -100 -41h-512c-39 0 -77 15 -103 41s-41 64 -41 103c0 46 18 80 34 106
-c46 78 157 292 166 309v141h-50c-2 0 -6 -1 -8 -1c-28 0 -50 23 -50 51zM500 600h-200v-162l-6 -10s-63 -123 -119 -228h450c-56 105 -119 228 -119 228l-6 10v162z" />
-    <glyph glyph-name="1d" unicode="&#xe01d;" 
-d="M400 800c110 0 200 -90 200 -200c0 -104 52 -198 134 -266c41 -34 66 -82 66 -134h-800c0 52 25 100 66 134c82 68 134 162 134 266c0 110 90 200 200 200zM300 100h200c0 -55 -45 -100 -100 -100s-100 45 -100 100z" />
-    <glyph glyph-name="1e" unicode="&#xe01e;" horiz-adv-x="600" 
-d="M150 800h50l350 -250l-225 -147l225 -153l-350 -250h-50v250l-75 -75l-75 75l150 150l-150 150l75 75l75 -75v250zM250 650v-200l150 100zM250 350v-200l150 100z" />
-    <glyph glyph-name="1f" unicode="&#xe01f;" 
-d="M0 800h500c110 0 200 -90 200 -200c0 -47 -17 -91 -44 -125c85 -40 144 -125 144 -225c0 -138 -112 -250 -250 -250h-550v100c55 0 100 45 100 100v400c0 55 -45 100 -100 100v100zM300 700v-200h100c55 0 100 45 100 100s-45 100 -100 100h-100zM300 400v-300h150
-c83 0 150 67 150 150s-67 150 -150 150h-150z" />
-    <glyph glyph-name="20" unicode="&#xe020;" horiz-adv-x="600" 
-d="M300 800v-300h200l-300 -500v300h-200z" />
-    <glyph glyph-name="21" unicode="&#xe021;" 
-d="M100 800h300v-300l100 100l100 -100v300h50c28 0 50 -22 50 -50v-550h-550c-28 0 -50 -22 -50 -50s22 -50 50 -50h550v-100h-550c-83 0 -150 67 -150 150v550l3 19c8 39 39 70 78 78z" />
-    <glyph glyph-name="22" unicode="&#xe022;" horiz-adv-x="400" 
-d="M0 800h400v-800l-200 200l-200 -200v800z" />
-    <glyph glyph-name="23" unicode="&#xe023;" 
-d="M0 800h800v-100h-800v100zM0 600h300v-103h203v103h297v-591c0 -6 -3 -9 -9 -9h-782c-6 0 -9 3 -9 9v591z" />
-    <glyph glyph-name="24" unicode="&#xe024;" 
-d="M300 800h200c55 0 100 -45 100 -100v-100h191c6 0 9 -3 9 -9v-241c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v241c0 6 3 9 9 9h191v100c0 55 45 100 100 100zM300 700v-100h200v100h-200zM0 209c16 -6 32 -9 50 -9h700c18 0 34 3 50 9v-200c0 -6 -3 -9 -9 -9h-782
-c-6 0 -9 3 -9 9v200z" />
-    <glyph glyph-name="25" unicode="&#xe025;" horiz-adv-x="600" 
-d="M300 800c58 0 110 -16 147 -53s53 -89 53 -147h-100c0 39 -11 61 -25 75s-36 25 -75 25c-35 0 -55 -10 -72 -31s-28 -55 -28 -94c0 -51 20 -107 28 -175h172v-100h-178c-14 -60 -49 -127 -113 -200h491v-100h-600v122l16 12c69 69 95 121 106 166h-122v100h125
-c-8 50 -25 106 -25 175c0 58 16 114 50 156c34 43 88 69 150 69z" />
-    <glyph glyph-name="26" unicode="&#xe026;" 
-d="M34 700h4h3h4h5h700c28 0 50 -22 50 -50v-700c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v700v2c0 20 15 42 34 48zM150 600c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50zM350 600c-28 0 -50 -22 -50 -50s22 -50 50 -50h300c28 0 50 22 50 50
-s-22 50 -50 50h-300zM100 400v-400h600v400h-600z" />
-    <glyph glyph-name="27" unicode="&#xe027;" 
-d="M744 797l6 -3l44 -44c4 -4 3 -8 0 -12l-266 -375l-15 -13l-25 -12c-23 72 -78 127 -150 150l12 25l13 15l375 266zM266 400c74 0 134 -60 134 -134c0 -147 -119 -266 -266 -266c-48 0 -95 12 -134 34c80 46 134 133 134 232c0 74 58 134 132 134z" />
-    <glyph glyph-name="28" unicode="&#xe028;" 
-d="M9 451c0 23 19 50 46 50c8 0 19 -3 26 -7l131 -66l29 22c-79 81 -1 250 118 250s197 -167 119 -250l28 -22l131 66c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-115 -56c9 -16 19 -33 25 -50h68c28 0 50 -22 50 -50s-22 -50 -50 -50h-50
-c0 -23 -2 -45 -6 -66l78 -40c21 -5 37 -28 37 -49c0 -28 -22 -50 -50 -50c-10 0 -23 5 -31 11l-65 35c-24 -46 -62 -86 -103 -110c-35 19 -60 45 -60 72v135v4v5v6v5v5v87c0 28 -22 50 -50 50c-24 0 -45 -17 -50 -40c1 -3 1 -8 1 -11s0 -8 -1 -11v-82v-4v-5v-144
-c0 -28 -24 -53 -59 -72c-41 25 -79 64 -103 110l-66 -35c-8 -6 -21 -11 -31 -11c-28 0 -50 22 -50 50c0 21 16 44 37 49l78 40c-4 21 -6 43 -6 66h-50h-5c-28 0 -50 22 -50 50c0 26 22 50 50 50h5h69c6 17 16 34 25 50l-116 56c-16 7 -28 27 -28 45z" />
-    <glyph glyph-name="29" unicode="&#xe029;" 
-d="M600 700h91c6 0 9 -3 9 -9v-582c0 -6 -3 -9 -9 -9h-91v600zM210 503l290 147v-500l-250 125v-3c-15 0 -25 -8 -28 -22l75 -178c11 -25 0 -58 -25 -69s-58 0 -69 25l-103 272h-91c-6 0 -9 3 -9 9v182c0 6 3 9 9 9h182z" />
-    <glyph glyph-name="2a" unicode="&#xe02a;" 
-d="M9 800h682c6 0 9 -3 9 -9v-782c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v782c0 6 3 9 9 9zM100 700v-200h500v200h-500zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400v-300h100v300h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100z" />
-    <glyph glyph-name="2b" unicode="&#xe02b;" 
-d="M0 800h700v-200h-700v200zM0 500h700v-491c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v491zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100z" />
-    <glyph glyph-name="2c" unicode="&#xe02c;" 
-d="M409 800h182c6 0 10 -4 12 -9l94 -182c2 -5 6 -9 12 -9h82c6 0 9 -3 9 -9v-582c0 -6 -3 -9 -9 -9h-782c-6 0 -9 3 -9 9v441c0 83 67 150 150 150h141c6 0 10 4 12 9l94 182c2 5 6 9 12 9zM150 500c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z
-M500 500c-110 0 -200 -90 -200 -200s90 -200 200 -200s200 90 200 200s-90 200 -200 200zM500 400c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100s45 100 100 100z" />
-    <glyph glyph-name="2d" unicode="&#xe02d;" 
-d="M0 600h800l-400 -400z" />
-    <glyph glyph-name="2e" unicode="&#xe02e;" horiz-adv-x="400" 
-d="M400 800v-800l-400 400z" />
-    <glyph glyph-name="2f" unicode="&#xe02f;" horiz-adv-x="400" 
-d="M0 800l400 -400l-400 -400v800z" />
-    <glyph glyph-name="30" unicode="&#xe030;" 
-d="M400 600l400 -400h-800z" />
-    <glyph glyph-name="31" unicode="&#xe031;" 
-d="M0 550c0 23 20 50 46 50h3h5h4h200c17 0 37 -13 44 -28l38 -72h444c14 0 19 -12 15 -25l-81 -250c-4 -13 -21 -25 -35 -25h-350c-14 0 -30 12 -34 25c-27 83 -54 167 -81 250l-10 25h-150c-2 0 -5 -1 -7 -1c-28 0 -51 23 -51 51zM358 100c28 0 50 -22 50 -50
-s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM658 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
-    <glyph glyph-name="32" unicode="&#xe032;" 
-d="M0 700h500v-100h-300v-300h-100l-100 -100v500zM300 500h500v-500l-100 100h-400v400z" />
-    <glyph glyph-name="33" unicode="&#xe033;" 
-d="M641 700l143 -141l-493 -493c-71 76 -146 148 -219 222l-72 71l141 141c50 -51 101 -101 153 -150c116 117 234 231 347 350z" />
-    <glyph glyph-name="34" unicode="&#xe034;" 
-d="M150 600l250 -250l250 250l150 -150l-400 -400l-400 400z" />
-    <glyph glyph-name="35" unicode="&#xe035;" horiz-adv-x="600" 
-d="M400 800l150 -150l-250 -250l250 -250l-150 -150l-400 400z" />
-    <glyph glyph-name="36" unicode="&#xe036;" horiz-adv-x="600" 
-d="M150 800l400 -400l-400 -400l-150 150l250 250l-250 250z" />
-    <glyph glyph-name="37" unicode="&#xe037;" 
-d="M400 600l400 -400l-150 -150l-250 250l-250 -250l-150 150z" />
-    <glyph glyph-name="38" unicode="&#xe038;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM600 622l-250 -250l-100 100l-72 -72l172 -172l322 322z" />
-    <glyph glyph-name="39" unicode="&#xe039;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM250 622l-72 -72l150 -150l-150 -150l72 -72l150 150l150 -150l72 72l-150 150l150 150l-72 72l-150 -150z" />
-    <glyph glyph-name="3a" unicode="&#xe03a;" 
-d="M350 800c28 0 50 -22 50 -50v-50h75c14 0 25 -11 25 -25v-75h-300v75c0 14 11 25 25 25h75v50c0 28 22 50 50 50zM25 700h75v-200h500v200h75c14 0 25 -11 25 -25v-650c0 -14 -11 -25 -25 -25h-650c-14 0 -25 11 -25 25v650c0 14 11 25 25 25z" />
-    <glyph glyph-name="3b" unicode="&#xe03b;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM350 600h100v-181c23 -24 47 -47 72 -69l-72 -72c-27 30 -55 59 -84 88l-16 12
-v222z" />
-    <glyph glyph-name="3c" unicode="&#xe03c;" 
-d="M450 800c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -18 -3 -34 -9 -50h-191v50c0 83 -67 150 -150 150s-150 -67 -150 -150v-50h-272c-17 30 -28 63 -28 100c0 110 90 200 200 200c23 114 129 200 250 200zM434 400h3h4c3 0 6 1 9 1c28 0 50 -22 50 -50v-1
-v-150h150l-200 -200l-200 200h150v150v2c0 20 15 42 34 48z" />
-    <glyph glyph-name="3d" unicode="&#xe03d;" 
-d="M450 800c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -18 -3 -34 -9 -50h-141l-200 200l-200 -200h-222c-17 30 -28 63 -28 100c0 110 90 200 200 200c23 114 129 200 250 200zM450 350l250 -250h-200v-50c0 -28 -22 -50 -50 -50s-50 22 -50 50v50h-200z" />
-    <glyph glyph-name="3e" unicode="&#xe03e;" 
-d="M450 700c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -83 -67 -150 -150 -150h-450c-110 0 -200 90 -200 200s90 200 200 200c23 114 129 200 250 200z" />
-    <glyph glyph-name="3f" unicode="&#xe03f;" 
-d="M250 800c82 0 154 -40 200 -100c-143 0 -270 -85 -325 -209c-36 -10 -70 -25 -100 -47c-16 33 -25 67 -25 106c0 138 112 250 250 250zM450 600c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -83 -67 -150 -150 -150h-450c-110 0 -200 90 -200 200
-s90 200 200 200c23 114 129 200 250 200z" />
-    <glyph glyph-name="40" unicode="&#xe040;" 
-d="M500 700h100l-300 -600h-100zM100 600h100l-100 -200l100 -200h-100l-100 200zM600 600h100l100 -200l-100 -200h-100l100 200z" />
-    <glyph glyph-name="41" unicode="&#xe041;" 
-d="M350 800h100l50 -119l28 -12l119 50l72 -72l-50 -119l12 -28l119 -50v-100l-119 -50l-12 -28l50 -119l-72 -72l-119 50l-28 -12l-50 -119h-100l-50 119l-28 12l-119 -50l-72 72l50 119l-12 28l-119 50v100l119 50l12 28l-50 119l72 72l119 -50l28 12zM400 550
-c-83 0 -150 -67 -150 -150s67 -150 150 -150s150 67 150 150s-67 150 -150 150z" />
-    <glyph glyph-name="42" unicode="&#xe042;" 
-d="M0 800h800v-200h-800v200zM200 500h400l-200 -200zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="43" unicode="&#xe043;" 
-d="M0 800h100v-800h-100v800zM600 800h200v-800h-200v800zM500 600v-400l-200 200z" />
-    <glyph glyph-name="44" unicode="&#xe044;" 
-d="M0 800h200v-800h-200v800zM700 800h100v-800h-100v800zM300 600l200 -200l-200 -200v400z" />
-    <glyph glyph-name="45" unicode="&#xe045;" 
-d="M0 800h800v-100h-800v100zM400 500l200 -200h-400zM0 200h800v-200h-800v200z" />
-    <glyph glyph-name="46" unicode="&#xe046;" 
-d="M150 700c83 0 150 -67 150 -150v-50h100v50c0 83 67 150 150 150s150 -67 150 -150s-67 -150 -150 -150h-50v-100h50c83 0 150 -67 150 -150s-67 -150 -150 -150s-150 67 -150 150v50h-100v-50c0 -83 -67 -150 -150 -150s-150 67 -150 150s67 150 150 150h50v100h-50
-c-83 0 -150 67 -150 150s67 150 150 150zM150 600c-28 0 -50 -22 -50 -50s22 -50 50 -50h50v50c0 28 -22 50 -50 50zM550 600c-28 0 -50 -22 -50 -50v-50h50c28 0 50 22 50 50s-22 50 -50 50zM300 400v-100h100v100h-100zM150 200c-28 0 -50 -22 -50 -50s22 -50 50 -50
-s50 22 50 50v50h-50zM500 200v-50c0 -28 22 -50 50 -50s50 22 50 50s-22 50 -50 50h-50z" />
-    <glyph glyph-name="47" unicode="&#xe047;" 
-d="M0 791c0 5 4 9 9 9h782c6 0 9 -4 9 -10v-790l-200 200h-591c-6 0 -9 3 -9 9v582z" />
-    <glyph glyph-name="48" unicode="&#xe048;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM600 600l-100 -300l-300 -100l100 300zM400 450c-28 0 -50 -22 -50 -50
-s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="49" unicode="&#xe049;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700v-600c166 0 300 134 300 300s-134 300 -300 300z" />
-    <glyph glyph-name="4a" unicode="&#xe04a;" 
-d="M0 800h800v-100h-800v100zM0 600h500v-100h-500v100zM0 300h800v-100h-800v100zM0 100h600v-100h-600v100zM750 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
-    <glyph glyph-name="4b" unicode="&#xe04b;" 
-d="M25 700h750c14 0 25 -11 25 -25v-75h-800v75c0 14 11 25 25 25zM0 500h800v-375c0 -14 -11 -25 -25 -25h-750c-14 0 -25 11 -25 25v375zM100 300v-100h100v100h-100zM300 300v-100h100v100h-100z" />
-    <glyph glyph-name="4c" unicode="&#xe04c;" 
-d="M100 800h100v-100h450l100 100l50 -50l-100 -100v-450h100v-100h-100v-100h-100v100h-500v500h-100v100h100v100zM200 600v-350l350 350h-350zM600 550l-350 -350h350v350z" />
-    <glyph glyph-name="4d" unicode="&#xe04d;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM400 600c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z
-M200 452c0 20 15 42 34 48h3h3h8c12 0 28 -7 36 -16l91 -90l25 6c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100l6 25l-90 91c-9 8 -16 24 -16 36zM550 500c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
-    <glyph glyph-name="4e" unicode="&#xe04e;" 
-d="M300 800h200v-300h200l-300 -300l-300 300h200v300zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="4f" unicode="&#xe04f;" 
-d="M0 800h800v-100h-800v100zM400 600l300 -300h-200v-300h-200v300h-200z" />
-    <glyph glyph-name="50" unicode="&#xe050;" 
-d="M200 700h600v-600h-600l-200 300zM350 622l-72 -72l150 -150l-150 -150l72 -72l150 150l150 -150l72 72l-150 150l150 150l-72 72l-150 -150z" />
-    <glyph glyph-name="51" unicode="&#xe051;" 
-d="M400 700c220 0 400 -180 400 -400h-100c0 166 -134 300 -300 300s-300 -134 -300 -300h-100c0 220 180 400 400 400zM341 491l59 -88l59 88c81 -25 141 -101 141 -191c0 -110 -90 -200 -200 -200s-200 90 -200 200c0 90 60 166 141 191z" />
-    <glyph glyph-name="52" unicode="&#xe052;" 
-d="M0 800h300v-400h400v-400h-700v800zM400 800l300 -300h-300v300zM100 600v-100h100v100h-100zM100 400v-100h100v100h-100zM100 200v-100h400v100h-400z" />
-    <glyph glyph-name="53" unicode="&#xe053;" horiz-adv-x="600" 
-d="M200 700h100v-100h75c30 0 58 -6 81 -22s44 -44 44 -78v-100h-100v94c-4 3 -13 6 -25 6h-250c-14 0 -25 -11 -25 -25v-50c0 -15 20 -40 34 -44l257 -65c66 -16 109 -73 109 -141v-50c0 -68 -57 -125 -125 -125h-75v-100h-100v100h-75c-30 0 -58 6 -81 22s-44 44 -44 78
-v100h100v-94c4 -3 13 -6 25 -6h250c14 0 25 11 25 25v50c0 15 -20 40 -34 44l-257 65c-66 16 -109 73 -109 141v50c0 68 57 125 125 125h75v100z" />
-    <glyph glyph-name="54" unicode="&#xe054;" 
-d="M0 700h300v-300l-300 -300v600zM500 700h300v-300l-300 -300v600z" />
-    <glyph glyph-name="55" unicode="&#xe055;" 
-d="M300 700v-600h-300v300zM800 700v-600h-300v300z" />
-    <glyph glyph-name="56" unicode="&#xe056;" 
-d="M300 700v-100c-111 0 -200 -89 -200 -200h200v-300h-300v300c0 165 135 300 300 300zM800 700v-100c-111 0 -200 -89 -200 -200h200v-300h-300v300c0 165 135 300 300 300z" />
-    <glyph glyph-name="57" unicode="&#xe057;" 
-d="M0 700h300v-300c0 -165 -135 -300 -300 -300v100c111 0 200 89 200 200h-200v300zM500 700h300v-300c0 -165 -135 -300 -300 -300v100c111 0 200 89 200 200h-200v300z" />
-    <glyph glyph-name="58" unicode="&#xe058;" horiz-adv-x="600" 
-d="M300 800l34 -34c11 -11 266 -270 266 -488c0 -165 -135 -300 -300 -300s-300 135 -300 300c0 218 255 477 266 488zM150 328c-28 0 -50 -22 -50 -50c0 -110 90 -200 200 -200c28 0 50 22 50 50s-22 50 -50 50c-55 0 -100 45 -100 100c0 28 -22 50 -50 50z" />
-    <glyph glyph-name="59" unicode="&#xe059;" 
-d="M400 800l400 -500h-800zM0 200h800v-200h-800v200z" />
-    <glyph glyph-name="5a" unicode="&#xe05a;" horiz-adv-x="600" 
-d="M300 800l300 -300h-600zM0 300h600l-300 -300z" />
-    <glyph glyph-name="5b" unicode="&#xe05b;" 
-d="M0 500h200v-200h-200v200zM300 500h200v-200h-200v200zM600 500h200v-200h-200v200z" />
-    <glyph glyph-name="5c" unicode="&#xe05c;" 
-d="M0 700h800v-100l-400 -200l-400 200v100zM0 500l400 -200l400 200v-400h-800v400z" />
-    <glyph glyph-name="5d" unicode="&#xe05d;" 
-d="M400 800l400 -200v-600h-800v600zM400 688l-300 -150v-188l300 -150l300 150v188zM200 500h400v-100l-200 -100l-200 100v100z" />
-    <glyph glyph-name="5e" unicode="&#xe05e;" 
-d="M600 700c69 0 134 -19 191 -50l-16 -106c-49 35 -109 56 -175 56c-131 0 -240 -84 -281 -200h331l-16 -100h-334c0 -36 8 -68 19 -100h297l-16 -100h-222c55 -61 133 -100 222 -100c78 0 147 30 200 78v-122c-59 -35 -127 -56 -200 -56c-147 0 -274 82 -344 200h-256
-l19 100h197c-8 32 -16 66 -16 100h-200l25 100h191c45 172 198 300 384 300z" />
-    <glyph glyph-name="5f" unicode="&#xe05f;" 
-d="M0 700h700v-100h-700v100zM0 500h500v-100h-500v100zM0 300h800v-100h-800v100zM0 100h100v-100h-100v100zM200 100h100v-100h-100v100zM400 100h100v-100h-100v100z" />
-    <glyph glyph-name="60" unicode="&#xe060;" 
-d="M0 800h800v-100h-800v100zM200 600h400l-200 -200zM0 200h800v-200h-800v200z" />
-    <glyph glyph-name="61" unicode="&#xe061;" 
-d="M0 800h100v-800h-100v800zM600 800h200v-800h-200v800zM200 600l200 -200l-200 -200v400z" />
-    <glyph glyph-name="62" unicode="&#xe062;" 
-d="M0 800h200v-800h-200v800zM700 800h100v-800h-100v800zM600 600v-400l-200 200z" />
-    <glyph glyph-name="63" unicode="&#xe063;" 
-d="M0 800h800v-200h-800v200zM400 400l200 -200h-400zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="64" unicode="&#xe064;" 
-d="M0 800h200v-100h-100v-600h600v100h100v-200h-800v800zM400 800h400v-400l-150 150l-250 -250l-100 100l250 250z" />
-    <glyph glyph-name="65" unicode="&#xe065;" 
-d="M403 700c247 0 397 -300 397 -300s-150 -300 -397 -300c-253 0 -403 300 -403 300s150 300 403 300zM400 600c-110 0 -200 -90 -200 -200s90 -200 200 -200s200 90 200 200s-90 200 -200 200zM400 500c10 0 19 -3 28 -6c-16 -8 -28 -24 -28 -44c0 -28 22 -50 50 -50
-c20 0 36 12 44 28c3 -9 6 -18 6 -28c0 -55 -45 -100 -100 -100s-100 45 -100 100s45 100 100 100z" />
-    <glyph glyph-name="66" unicode="&#xe066;" horiz-adv-x="900" 
-d="M331 700h3h3c3 1 7 1 10 1c12 0 29 -8 37 -17l94 -93l66 65c57 57 155 57 212 0c58 -58 58 -154 0 -212l-65 -66l93 -94c10 -8 18 -25 18 -38c0 -28 -22 -50 -50 -50c-13 0 -32 9 -40 20l-62 65l-381 -381h-269v272l375 381l-63 63c-9 8 -16 24 -16 36c0 20 16 42 35 48z
-M447 481l-313 -315l128 -132l316 316z" />
-    <glyph glyph-name="67" unicode="&#xe067;" 
-d="M0 800h300v-400h400v-400h-700v800zM400 800l300 -300h-300v300z" />
-    <glyph glyph-name="68" unicode="&#xe068;" 
-d="M200 800c0 0 200 -100 200 -300s-298 -302 -200 -500c0 0 -200 100 -200 300s300 300 200 500zM500 500c0 0 200 -100 200 -300c0 -150 -60 -200 -100 -200h-300c0 200 300 300 200 500z" />
-    <glyph glyph-name="69" unicode="&#xe069;" 
-d="M0 800h100v-800h-100v800zM200 800h300v-100h300l-200 -203l200 -197h-400v100h-200v400z" />
-    <glyph glyph-name="6a" unicode="&#xe06a;" horiz-adv-x="400" 
-d="M150 800h150l-100 -200h200l-150 -300h150l-300 -300l-100 300h134l66 200h-200z" />
-    <glyph glyph-name="6b" unicode="&#xe06b;" 
-d="M0 800h300v-100h500v-100h-800v200zM0 500h800v-450c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v450z" />
-    <glyph glyph-name="6c" unicode="&#xe06c;" 
-d="M150 800c83 0 150 -67 150 -150c0 -66 -41 -121 -100 -141v-118c15 5 33 9 50 9h200c28 0 50 22 50 50v59c-59 20 -100 75 -100 141c0 83 67 150 150 150s150 -67 150 -150c0 -66 -41 -121 -100 -141v-59c0 -82 -68 -150 -150 -150h-200c-14 0 -25 -7 -34 -16
-c50 -24 84 -74 84 -134c0 -83 -67 -150 -150 -150s-150 67 -150 150c0 66 41 121 100 141v218c-59 20 -100 75 -100 141c0 83 67 150 150 150z" />
-    <glyph glyph-name="6d" unicode="&#xe06d;" 
-d="M0 800h400l-150 -150l150 -150l-100 -100l-150 150l-150 -150v400zM500 400l150 -150l150 150v-400h-400l150 150l-150 150z" />
-    <glyph glyph-name="6e" unicode="&#xe06e;" 
-d="M100 800l150 -150l150 150v-400h-400l150 150l-150 150zM400 400h400l-150 -150l150 -150l-100 -100l-150 150l-150 -150v400z" />
-    <glyph glyph-name="6f" unicode="&#xe06f;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM400 700c-56 0 -108 -17 -153 -44l22 -19c33 -18 13 -48 -13 -59c-30 -13 -77 10 -65 -41c13 -55 -27 -3 -47 -15c-42 -26 49 -152 31 -156l-59 34c-8 0 -13 -5 -16 -10
-c1 -30 10 -57 19 -84c28 -11 77 -2 100 -25c47 -28 97 -115 75 -159c34 -13 68 -22 106 -22c101 0 193 48 247 125c3 24 -8 44 -50 44c-69 0 -156 13 -153 97c2 46 101 108 66 143c-30 30 12 39 12 66c0 37 -65 32 -69 50s20 36 41 56c-30 10 -60 19 -94 19zM631 591
-c-38 -11 -94 -35 -87 -53c6 -15 52 -1 65 -13c11 -10 16 -59 44 -31l22 22v3c-11 26 -26 50 -44 72z" />
-    <glyph glyph-name="70" unicode="&#xe070;" 
-d="M703 800l97 -100l-400 -400l-100 100l-200 -203l-100 100l300 303l100 -100zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="71" unicode="&#xe071;" 
-d="M0 700h100v-100h-100v100zM200 700h100v-100h-100v100zM400 700h100v-100h-100v100zM600 700h100v-100h-100v100zM0 500h100v-100h-100v100zM200 500h100v-100h-100v100zM400 500h100v-100h-100v100zM600 500h100v-100h-100v100zM0 300h100v-100h-100v100zM200 300h100
-v-100h-100v100zM400 300h100v-100h-100v100zM600 300h100v-100h-100v100zM0 100h100v-100h-100v100zM200 100h100v-100h-100v100zM400 100h100v-100h-100v100zM600 100h100v-100h-100v100z" />
-    <glyph glyph-name="72" unicode="&#xe072;" 
-d="M0 800h200v-200h-200v200zM300 800h200v-200h-200v200zM600 800h200v-200h-200v200zM0 500h200v-200h-200v200zM300 500h200v-200h-200v200zM600 500h200v-200h-200v200zM0 200h200v-200h-200v200zM300 200h200v-200h-200v200zM600 200h200v-200h-200v200z" />
-    <glyph glyph-name="73" unicode="&#xe073;" 
-d="M0 800h300v-300h-300v300zM500 800h300v-300h-300v300zM0 300h300v-300h-300v300zM500 300h300v-300h-300v300z" />
-    <glyph glyph-name="74" unicode="&#xe074;" 
-d="M19 800h662c11 0 19 -8 19 -19v-331c0 -28 -22 -50 -50 -50h-600c-28 0 -50 22 -50 50v331c0 11 8 19 19 19zM0 309c16 -6 32 -9 50 -9h600c18 0 34 3 50 9v-290c0 -11 -8 -19 -19 -19h-662c-11 0 -19 8 -19 19v290zM550 200c-28 0 -50 -22 -50 -50s22 -50 50 -50
-s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="75" unicode="&#xe075;" 
-d="M0 700h300v-100h-50c-28 0 -50 -22 -50 -50v-150h300v150c0 28 -22 50 -50 50h-50v100h300v-100h-50c-28 0 -50 -22 -50 -50v-400c0 -28 22 -50 50 -50h50v-100h-300v100h50c28 0 50 22 50 50v150h-300v-150c0 -28 22 -50 50 -50h50v-100h-300v100h50c28 0 50 22 50 50
-v400c0 28 -22 50 -50 50h-50v100z" />
-    <glyph glyph-name="76" unicode="&#xe076;" 
-d="M400 700c165 0 300 -135 300 -300v-100h50c28 0 50 -22 50 -50v-200c0 -28 -22 -50 -50 -50h-100c-28 0 -50 22 -50 50v350c0 111 -89 200 -200 200s-200 -89 -200 -200v-350c0 -28 -22 -50 -50 -50h-100c-28 0 -50 22 -50 50v200c0 28 22 50 50 50h50v100
-c0 165 135 300 300 300z" />
-    <glyph glyph-name="77" unicode="&#xe077;" 
-d="M0 500c0 109 91 200 200 200s200 -91 200 -200c0 109 91 200 200 200s200 -91 200 -200c0 -55 -23 -105 -59 -141l-341 -340l-341 340c-36 36 -59 86 -59 141z" />
-    <glyph glyph-name="78" unicode="&#xe078;" 
-d="M400 700l400 -300l-100 3v-403h-200v200h-200v-200h-200v400h-100z" />
-    <glyph glyph-name="79" unicode="&#xe079;" 
-d="M0 800h800v-800h-800v800zM100 700v-300l100 100l400 -400h100v100l-200 200l100 100l100 -100v300h-600z" />
-    <glyph glyph-name="7a" unicode="&#xe07a;" 
-d="M19 800h762c11 0 19 -8 19 -19v-762c0 -11 -8 -19 -19 -19h-762c-11 0 -19 8 -19 19v762c0 11 8 19 19 19zM100 600v-300h100l100 -100h200l100 100h100v300h-600z" />
-    <glyph glyph-name="7b" unicode="&#xe07b;" 
-d="M200 600c80 0 142 -56 200 -122c58 66 119 122 200 122c131 0 200 -101 200 -200s-69 -200 -200 -200c-81 0 -142 56 -200 122c-58 -66 -121 -122 -200 -122c-131 0 -200 101 -200 200s69 200 200 200zM200 500c-74 0 -100 -54 -100 -100s26 -100 100 -100
-c42 0 88 47 134 100c-46 53 -92 100 -134 100zM600 500c-43 0 -88 -47 -134 -100c46 -53 91 -100 134 -100c74 0 100 54 100 100s-26 100 -100 100z" />
-    <glyph glyph-name="7c" unicode="&#xe07c;" horiz-adv-x="400" 
-d="M300 800c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100s45 100 100 100zM150 550c83 0 150 -69 150 -150c0 -66 -100 -214 -100 -250c0 -28 22 -50 50 -50s50 22 50 50h100c0 -83 -67 -150 -150 -150s-150 64 -150 150s100 222 100 250s-22 50 -50 50
-s-50 -22 -50 -50h-100c0 83 67 150 150 150z" />
-    <glyph glyph-name="7d" unicode="&#xe07d;" 
-d="M200 800h500v-100h-122c-77 -197 -156 -392 -234 -588l-6 -12h162v-100h-500v100h122c77 197 156 392 234 588l7 12h-163v100z" />
-    <glyph glyph-name="7e" unicode="&#xe07e;" 
-d="M0 700h800v-100h-800v100zM0 500h800v-100h-800v100zM0 300h800v-100h-800v100zM100 100h600v-100h-600v100z" />
-    <glyph glyph-name="7f" unicode="&#xe07f;" 
-d="M0 700h800v-100h-800v100zM0 500h800v-100h-800v100zM0 300h800v-100h-800v100zM0 100h600v-100h-600v100z" />
-    <glyph glyph-name="80" unicode="&#xe080;" 
-d="M0 700h800v-100h-800v100zM0 500h800v-100h-800v100zM0 300h800v-100h-800v100zM200 100h600v-100h-600v100z" />
-    <glyph glyph-name="81" unicode="&#xe081;" 
-d="M550 800c138 0 250 -112 250 -250s-112 -250 -250 -250c-16 0 -32 0 -47 3l-3 -3v-100h-200v-200h-300v200l303 303c-3 15 -3 31 -3 47c0 138 112 250 250 250zM600 700c-55 0 -100 -45 -100 -100s45 -100 100 -100s100 45 100 100s-45 100 -100 100z" />
-    <glyph glyph-name="82" unicode="&#xe082;" 
-d="M134 600h3h4h4h5h500c28 0 50 -22 50 -50v-350h100v-150c0 -28 -22 -50 -50 -50h-700c-28 0 -50 22 -50 50v150h100v350v2c0 20 15 42 34 48zM200 500v-300h100v-100h200v100h100v300h-400z" />
-    <glyph glyph-name="83" unicode="&#xe083;" 
-d="M0 800h400v-400h-400v400zM500 600h100v-400h-400v100h300v300zM700 400h100v-400h-400v100h300v300z" />
-    <glyph glyph-name="84" unicode="&#xe084;" horiz-adv-x="600" 
-d="M337 694c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-300 -150c-8 -6 -21 -11 -31 -11c-28 0 -50 22 -50 50c0 21 16 44 37 49zM437 544c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-400 -200c-8 -6 -21 -11 -31 -11c-28 0 -50 22 -50 50
-c0 21 16 44 37 49zM437 344c6 4 12 7 21 7c28 0 50 -22 50 -50c0 -17 -12 -37 -27 -45l-106 -56c24 -4 43 -26 43 -50c0 -28 -23 -51 -51 -51c-2 0 -6 1 -8 1h-200c-26 1 -48 24 -48 50c0 16 12 36 26 44zM151 -50c0 23 20 50 46 50h3h4h5h100c28 0 50 -22 50 -50
-s-22 -50 -50 -50h-100c-2 0 -6 -1 -8 -1c-28 0 -50 23 -50 51z" />
-    <glyph glyph-name="85" unicode="&#xe085;" 
-d="M199 800h100v-200h-200v100h100v100zM586 797h1c18 1 38 1 56 -3c36 -8 69 -26 97 -54c78 -78 78 -203 0 -281l-150 -150c-8 -13 -28 -24 -43 -24c-28 0 -50 22 -50 50c0 15 11 35 24 43l150 150c40 40 39 105 0 144c-41 41 -110 34 -144 0l-44 -44
-c-8 -13 -27 -24 -42 -24c-28 0 -50 22 -50 50c0 15 11 35 24 43l43 44c32 33 72 53 128 56zM208 490c4 5 14 16 22 16h3c2 0 6 1 8 1c28 0 50 -22 50 -50c0 -11 -6 -27 -14 -35l-150 -150c-40 -40 -39 -105 0 -144c41 -41 110 -34 144 0l44 44c8 13 27 24 42 24
-c28 0 50 -22 50 -50c0 -15 -11 -35 -24 -43l-43 -44c-22 -22 -48 -37 -75 -47c-70 -25 -151 -9 -207 47c-78 78 -78 203 0 281zM499 200h200v-100h-100v-100h-100v200z" />
-    <glyph glyph-name="86" unicode="&#xe086;" 
-d="M586 797c18 1 39 1 57 -3c36 -8 69 -26 97 -54c78 -78 78 -203 0 -281l-150 -150c-62 -62 -132 -81 -182 -78s-69 17 -84 25s-26 27 -26 44c0 28 22 51 50 51c8 0 19 -3 26 -7c0 0 15 -11 41 -13s62 3 106 47l150 150c40 40 39 105 0 144c-41 41 -110 34 -144 0
-c-8 -13 -28 -24 -43 -24c-28 0 -50 22 -50 50c0 15 11 35 24 43c32 33 72 53 128 56zM386 566c50 -2 64 -17 85 -22s37 -28 37 -49c0 -28 -22 -50 -50 -50c-10 0 -23 5 -31 11c0 0 -19 9 -47 10s-63 -4 -103 -44l-150 -150c-40 -40 -39 -105 0 -144c41 -41 110 -34 144 0
-c8 13 27 24 42 24c28 0 50 -22 50 -50c0 -15 -10 -35 -23 -43c-22 -22 -48 -37 -75 -47c-70 -25 -151 -9 -207 47c-78 78 -78 203 0 281l150 150c60 60 128 78 178 76z" />
-    <glyph glyph-name="87" unicode="&#xe087;" 
-d="M0 700h300v-300h-300v300zM400 700h400v-100h-400v100zM400 500h300v-100h-300v100zM0 300h300v-300h-300v300zM400 300h400v-100h-400v100zM400 100h300v-100h-300v100z" />
-    <glyph glyph-name="88" unicode="&#xe088;" 
-d="M50 700c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM200 700h600v-100h-600v100zM50 500c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM200 500h600v-100h-600v100zM50 300c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50
-s22 50 50 50zM200 300h600v-100h-600v100zM50 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM200 100h600v-100h-600v100z" />
-    <glyph glyph-name="89" unicode="&#xe089;" 
-d="M800 800l-400 -800l-100 300l-300 100z" />
-    <glyph glyph-name="8a" unicode="&#xe08a;" horiz-adv-x="600" 
-d="M300 700c110 0 200 -90 200 -200v-100h100v-400h-600v400h100v100c0 110 90 200 200 200zM300 600c-56 0 -100 -44 -100 -100v-100h200v100c0 56 -44 100 -100 100z" />
-    <glyph glyph-name="8b" unicode="&#xe08b;" horiz-adv-x="600" 
-d="M300 800c110 0 200 -90 200 -200v-200h100v-400h-600v400h400v200c0 56 -44 100 -100 100s-100 -44 -100 -100h-100c0 110 90 200 200 200z" />
-    <glyph glyph-name="8c" unicode="&#xe08c;" 
-d="M400 700v-100c-111 0 -200 -89 -200 -200h100l-150 -200l-150 200h100c0 165 135 300 300 300zM650 600l150 -200h-100c0 -165 -135 -300 -300 -300v100c111 0 200 89 200 200h-100z" />
-    <glyph glyph-name="8d" unicode="&#xe08d;" 
-d="M100 800h600v-300h100l-150 -250l-150 250h100v200h-400v-100h-100v200zM150 550l150 -250h-100v-200h400v100h100v-200h-600v300h-100z" />
-    <glyph glyph-name="8e" unicode="&#xe08e;" 
-d="M600 700l200 -150l-200 -150v100h-500v-100h-100v100c0 55 45 100 100 100h500v100zM200 300v-100h500v100h100v-100c0 -55 -45 -100 -100 -100h-500v-100l-200 150z" />
-    <glyph glyph-name="8f" unicode="&#xe08f;" horiz-adv-x="900" 
-d="M350 800c193 0 350 -157 350 -350c0 -60 -17 -117 -44 -166c5 -3 12 -8 16 -12l100 -100c16 -16 30 -49 30 -72c0 -56 -46 -102 -102 -102c-23 0 -56 14 -72 30l-100 100c-4 3 -9 9 -12 13c-49 -26 -107 -41 -166 -41c-193 0 -350 157 -350 350s157 350 350 350zM350 200
-c142 0 250 108 250 250c0 139 -111 250 -250 250s-250 -111 -250 -250s111 -250 250 -250z" />
-    <glyph glyph-name="90" unicode="&#xe090;" horiz-adv-x="600" 
-d="M300 800c166 0 300 -134 300 -300c0 -200 -300 -500 -300 -500s-300 300 -300 500c0 166 134 300 300 300zM300 700c-110 0 -200 -90 -200 -200s90 -200 200 -200s200 90 200 200s-90 200 -200 200z" />
-    <glyph glyph-name="91" unicode="&#xe091;" horiz-adv-x="900" 
-d="M0 800h800v-541c1 -3 1 -8 1 -11s0 -7 -1 -10v-238h-800v800zM495 250c0 26 22 50 50 50h5h150v400h-600v-600h600v100h-150h-5c-28 0 -50 22 -50 50zM350 600c83 0 150 -67 150 -150c0 -100 -150 -250 -150 -250s-150 150 -150 250c0 83 67 150 150 150zM350 500
-c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="92" unicode="&#xe092;" horiz-adv-x="600" 
-d="M0 700h200v-600h-200v600zM400 700h200v-600h-200v600z" />
-    <glyph glyph-name="93" unicode="&#xe093;" horiz-adv-x="600" 
-d="M0 700l600 -300l-600 -300v600z" />
-    <glyph glyph-name="94" unicode="&#xe094;" horiz-adv-x="600" 
-d="M300 700c166 0 300 -134 300 -300s-134 -300 -300 -300s-300 134 -300 300s134 300 300 300z" />
-    <glyph glyph-name="95" unicode="&#xe095;" 
-d="M400 700v-600l-400 300zM400 400l400 300v-600z" />
-    <glyph glyph-name="96" unicode="&#xe096;" 
-d="M0 700l400 -300l-400 -300v600zM400 100v600l400 -300z" />
-    <glyph glyph-name="97" unicode="&#xe097;" 
-d="M0 700h200v-600h-200v600zM200 400l500 300v-600z" />
-    <glyph glyph-name="98" unicode="&#xe098;" 
-d="M0 700l500 -300l-500 -300v600zM500 100v600h200v-600h-200z" />
-    <glyph glyph-name="99" unicode="&#xe099;" horiz-adv-x="600" 
-d="M0 700h600v-600h-600v600z" />
-    <glyph glyph-name="9a" unicode="&#xe09a;" 
-d="M200 800h400v-200h200v-400h-200v-200h-400v200h-200v400h200v200z" />
-    <glyph glyph-name="9b" unicode="&#xe09b;" 
-d="M0 700h800v-100h-800v100zM0 403h800v-100h-800v100zM0 103h800v-100h-800v100z" />
-    <glyph glyph-name="9c" unicode="&#xe09c;" horiz-adv-x="600" 
-d="M278 700c7 2 13 4 22 4c55 0 100 -45 100 -100v-4v-200c0 -55 -45 -100 -100 -100s-100 45 -100 100v200v2c0 44 35 88 78 98zM34 500h4h3c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-50c0 -111 89 -200 200 -200s200 89 200 200v50c0 28 22 50 50 50s50 -22 50 -50v-50
-c0 -148 -109 -270 -250 -294v-106h50c55 0 100 -45 100 -100h-400c0 55 45 100 100 100h50v106c-141 24 -250 146 -250 294v50v2c0 20 15 42 34 48z" />
-    <glyph glyph-name="9d" unicode="&#xe09d;" 
-d="M0 500h800v-200h-800v200z" />
-    <glyph glyph-name="9e" unicode="&#xe09e;" 
-d="M34 700h4h3h4h5h700c28 0 50 -22 50 -50v-500c0 -28 -22 -50 -50 -50h-250v-100h100c55 0 100 -45 100 -100h-600c0 55 45 100 100 100h100v100h-250c-28 0 -50 22 -50 50v500v2c0 20 15 42 34 48zM100 600v-400h600v400h-600z" />
-    <glyph glyph-name="9f" unicode="&#xe09f;" 
-d="M272 700c-14 -40 -22 -83 -22 -128c0 -221 179 -400 400 -400c45 0 88 8 128 22c-53 -158 -202 -272 -378 -272c-221 0 -400 179 -400 400c0 176 114 325 272 378z" />
-    <glyph glyph-name="a0" unicode="&#xe0a0;" 
-d="M350 700l150 -150h-100v-150h150v100l150 -150l-150 -150v100h-150v-150h100l-150 -150l-150 150h100v150h-150v-100l-150 150l150 150v-100h150v150h-100z" />
-    <glyph glyph-name="a1" unicode="&#xe0a1;" 
-d="M800 800v-550c0 -83 -67 -150 -150 -150s-150 67 -150 150s67 150 150 150c17 0 35 -4 50 -9v206c-201 -6 -327 -27 -400 -50v-397c0 -83 -67 -150 -150 -150s-150 67 -150 150s67 150 150 150c17 0 35 -4 50 -9v409s100 100 600 100z" />
-    <glyph glyph-name="a2" unicode="&#xe0a2;" horiz-adv-x="700" 
-d="M499 700c51 0 102 -20 141 -59c78 -78 78 -203 0 -281l-250 -244c-48 -48 -127 -48 -175 0s-48 127 0 175l96 97l69 -69l-90 -94l-7 -3c-10 -10 -10 -28 0 -38s28 -10 38 0l250 247c37 40 39 102 0 141s-104 40 -144 0l-278 -275c-66 -69 -68 -179 0 -247
-c69 -69 181 -69 250 0l9 12l116 113l69 -69l-125 -125c-107 -107 -281 -107 -388 0s-107 281 0 388l278 272c39 39 90 59 141 59z" />
-    <glyph glyph-name="a3" unicode="&#xe0a3;" 
-d="M600 800l200 -200l-100 -100l-200 200zM400 600l200 -200l-400 -400h-200v200z" />
-    <glyph glyph-name="a4" unicode="&#xe0a4;" 
-d="M550 800c83 0 150 -90 150 -200s-67 -200 -150 -200c-22 0 -40 8 -59 19c6 26 9 52 9 81c0 84 -27 158 -72 212c27 52 71 88 122 88zM250 700c83 0 150 -90 150 -200s-67 -200 -150 -200s-150 90 -150 200s67 200 150 200zM725 384c44 -22 75 -66 75 -118v-166h-200v66
-c0 50 -17 96 -44 134c66 2 126 33 169 84zM75 284c45 -53 106 -84 175 -84s130 31 175 84c44 -22 75 -66 75 -118v-166h-500v166c0 52 31 96 75 118z" />
-    <glyph glyph-name="a5" unicode="&#xe0a5;" 
-d="M400 800c110 0 200 -112 200 -250s-90 -250 -200 -250s-200 112 -200 250s90 250 200 250zM191 300c54 -61 128 -100 209 -100s155 39 209 100c106 -5 191 -92 191 -200v-100h-800v100c0 108 85 195 191 200z" />
-    <glyph glyph-name="a6" unicode="&#xe0a6;" horiz-adv-x="600" 
-d="M19 800h462c11 0 19 -8 19 -19v-762c0 -11 -8 -19 -19 -19h-462c-11 0 -19 8 -19 19v762c0 11 8 19 19 19zM100 700v-500h300v500h-300zM250 150c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="a7" unicode="&#xe0a7;" 
-d="M350 800c17 0 34 -1 50 -3v-397l-297 297c63 64 150 103 247 103zM500 694c169 -25 300 -168 300 -344c0 -193 -157 -350 -350 -350c-85 0 -161 31 -222 81l272 272v341zM91 562l237 -234l-212 -212c-70 55 -116 138 -116 234c0 84 35 158 91 212z" />
-    <glyph glyph-name="a8" unicode="&#xe0a8;" 
-d="M92 650c0 23 20 50 46 50h3h4h5h400c28 0 50 -22 50 -50s-22 -50 -50 -50h-50v-200h100c55 0 100 -45 100 -100h-300v-300l-56 -100l-44 100v300h-300c0 55 45 100 100 100h100v200h-50c-2 0 -6 -1 -8 -1c-28 0 -50 23 -50 51z" />
-    <glyph glyph-name="a9" unicode="&#xe0a9;" 
-d="M400 800c221 0 400 -179 400 -400s-179 -400 -400 -400s-400 179 -400 400s179 400 400 400zM300 600v-400l300 200z" />
-    <glyph glyph-name="aa" unicode="&#xe0aa;" 
-d="M300 800h200v-300h300v-200h-300v-300h-200v300h-300v200h300v300z" />
-    <glyph glyph-name="ab" unicode="&#xe0ab;" 
-d="M300 800h100v-400h-100v400zM172 656l62 -78l-40 -31c-58 -46 -94 -117 -94 -197c0 -139 111 -250 250 -250s250 111 250 250c0 80 -39 151 -97 197l-37 31l62 78l38 -31c82 -64 134 -164 134 -275c0 -193 -157 -350 -350 -350s-350 157 -350 350c0 111 53 211 134 275z
-" />
-    <glyph glyph-name="ac" unicode="&#xe0ac;" 
-d="M200 800h400v-200h-400v200zM9 500h782c6 0 9 -3 9 -9v-282c0 -6 -3 -9 -9 -9h-91v200h-600v-200h-91c-6 0 -9 3 -9 9v282c0 6 3 9 9 9zM200 300h400v-300h-400v300z" />
-    <glyph glyph-name="ad" unicode="&#xe0ad;" 
-d="M0 700h100v-700h-100v700zM700 700h100v-700h-100v700zM200 600h200v-100h-200v100zM300 400h200v-100h-200v100zM400 200h200v-100h-200v100z" />
-    <glyph glyph-name="ae" unicode="&#xe0ae;" 
-d="M325 700c42 -141 87 -280 131 -419c29 74 59 148 88 222c30 -57 58 -114 87 -172h169v-100h-231l-13 28c-37 -92 -74 -184 -112 -275c-38 129 -79 257 -119 385c-42 -133 -83 -267 -125 -400c-28 88 -56 175 -84 262h-116v100h188l9 -34l3 -6c42 137 83 273 125 409z" />
-    <glyph glyph-name="af" unicode="&#xe0af;" 
-d="M200 600c0 57 43 100 100 100s100 -43 100 -100c0 -28 -18 -48 -28 -72c-3 -6 -3 -16 -3 -28h231v-231c12 0 22 0 28 3c24 10 44 28 72 28c57 0 100 -43 100 -100s-43 -100 -100 -100c-28 0 -48 18 -72 28c-6 3 -16 3 -28 3v-231h-231c0 12 0 22 3 28c10 24 28 44 28 72
-c0 57 -43 100 -100 100s-100 -43 -100 -100c0 -28 18 -48 28 -72c3 -6 3 -16 3 -28h-231v600h231c0 12 0 22 -3 28c-10 24 -28 44 -28 72z" />
-    <glyph glyph-name="b0" unicode="&#xe0b0;" horiz-adv-x="500" 
-d="M247 700c84 0 148 -20 191 -59s59 -93 59 -141c0 -117 -69 -181 -119 -225s-81 -67 -81 -150v-25h-100v25c0 117 65 181 115 225s85 67 85 150c0 25 -8 48 -28 66s-56 34 -122 34s-97 -18 -116 -37s-27 -43 -31 -69l-100 12c5 38 19 88 59 128s103 66 188 66zM197 0h100
-v-100h-100v100z" />
-    <glyph glyph-name="b1" unicode="&#xe0b1;" 
-d="M450 800c138 0 250 -112 250 -250v-50c58 -21 100 -85 100 -150c0 -69 -48 -127 -112 -144c-22 55 -75 94 -138 94c-20 0 -39 -5 -56 -12c-17 64 -75 112 -144 112s-127 -48 -144 -112c-17 7 -36 12 -56 12c-37 0 -71 -12 -97 -34c-33 36 -53 82 -53 134
-c0 110 90 200 200 200c23 114 129 200 250 200zM334 300h4h3c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-200c0 -28 -22 -50 -50 -50s-50 22 -50 50v200v2c0 20 15 42 34 48zM134 200h4h3c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-100c0 -28 -22 -50 -50 -50s-50 22 -50 50v100v2
-c0 20 15 42 34 48zM534 200h3h4c3 0 6 1 9 1c28 0 50 -22 50 -50v-1v-100c0 -28 -22 -50 -50 -50s-50 22 -50 50v100v2c0 20 15 42 34 48z" />
-    <glyph glyph-name="b2" unicode="&#xe0b2;" 
-d="M600 800l200 -150l-200 -150v100h-50l-153 -191l175 -206l6 -3h22v100l200 -150l-200 -150v100h-25c-35 0 -56 12 -78 38l-166 190l-153 -190c-22 -27 -43 -38 -78 -38h-100v100h100l166 206l-163 191l-3 3h-100v100h100c34 0 56 -12 78 -38l153 -178l141 178
-c22 27 43 38 78 38h50v100z" />
-    <glyph glyph-name="b3" unicode="&#xe0b3;" 
-d="M400 800c110 0 209 -47 281 -119l119 119v-300h-300l109 109c-54 55 -126 91 -209 91c-166 0 -300 -134 -300 -300s134 -300 300 -300c83 0 158 34 212 88l72 -72c-72 -72 -174 -116 -284 -116c-220 0 -400 180 -400 400s180 400 400 400z" />
-    <glyph glyph-name="b4" unicode="&#xe0b4;" 
-d="M400 800h400v-400l-166 166l-400 -400l166 -166h-400v400l166 -166l400 400z" />
-    <glyph glyph-name="b5" unicode="&#xe0b5;" horiz-adv-x="600" 
-d="M250 800l250 -300h-200v-200h200l-250 -300l-250 300h200v200h-200z" />
-    <glyph glyph-name="b6" unicode="&#xe0b6;" 
-d="M300 600v-200h200v200l300 -250l-300 -250v200h-200v-200l-300 250z" />
-    <glyph glyph-name="b7" unicode="&#xe0b7;" 
-d="M0 800c441 0 800 -359 800 -800h-200c0 333 -267 600 -600 600v200zM0 500c275 0 500 -225 500 -500h-200c0 167 -133 300 -300 300v200zM0 200c110 0 200 -90 200 -200h-200v200z" />
-    <glyph glyph-name="b8" unicode="&#xe0b8;" 
-d="M100 800c386 0 700 -314 700 -700h-100c0 332 -268 600 -600 600v100zM100 600c276 0 500 -224 500 -500h-100c0 222 -178 400 -400 400v100zM100 400c165 0 300 -135 300 -300h-100c0 111 -89 200 -200 200v100zM100 200c55 0 100 -45 100 -100s-45 -100 -100 -100
-s-100 45 -100 100s45 100 100 100z" />
-    <glyph glyph-name="b9" unicode="&#xe0b9;" 
-d="M300 800h400c55 0 100 -45 100 -100v-200h-400v150c0 28 -22 50 -50 50s-50 -22 -50 -50v-250h400v-300c0 -55 -45 -100 -100 -100h-500c-55 0 -100 45 -100 100v200h100v-150c0 -28 22 -50 50 -50s50 22 50 50v550c0 55 45 100 100 100z" />
-    <glyph glyph-name="ba" unicode="&#xe0ba;" 
-d="M75 700h225v-100h-200v-500h400v100h100v-125c0 -41 -34 -75 -75 -75h-450c-41 0 -75 34 -75 75v550c0 41 34 75 75 75zM600 700l200 -200l-200 -200v100h-200c-94 0 -173 -65 -194 -153c23 199 189 353 394 353v100z" />
-    <glyph glyph-name="bb" unicode="&#xe0bb;" 
-d="M500 700l300 -284l-300 -316v200h-100c-200 0 -348 -102 -400 -300c0 295 100 500 500 500v200z" />
-    <glyph glyph-name="bc" unicode="&#xe0bc;" 
-d="M381 791l19 9l19 -9c127 -53 253 -108 381 -160v-31c0 -166 -67 -313 -147 -419c-40 -53 -83 -97 -125 -128s-82 -53 -128 -53s-86 22 -128 53s-85 75 -125 128c-80 107 -147 253 -147 419v31c128 52 254 107 381 160zM400 100v591l-294 -122c8 -126 58 -243 122 -328
-c35 -46 73 -86 106 -110s62 -31 66 -31z" />
-    <glyph glyph-name="bd" unicode="&#xe0bd;" 
-d="M600 800h100v-800h-100v800zM400 700h100v-700h-100v700zM200 500h100v-500h-100v500zM0 300h100v-300h-100v300z" />
-    <glyph glyph-name="be" unicode="&#xe0be;" 
-d="M300 800h100v-200h200l100 -100l-100 -100h-200v-400h-100v500h-200l-100 100l100 100h200v100z" />
-    <glyph glyph-name="bf" unicode="&#xe0bf;" 
-d="M200 800h100v-600h200l-250 -200l-250 200h200v600zM400 800h200v-100h-200v100zM400 600h300v-100h-300v100zM400 400h400v-100h-400v100z" />
-    <glyph glyph-name="c0" unicode="&#xe0c0;" 
-d="M200 800h100v-600h200l-250 -200l-250 200h200v600zM400 800h400v-100h-400v100zM400 600h300v-100h-300v100zM400 400h200v-100h-200v100z" />
-    <glyph glyph-name="c1" unicode="&#xe0c1;" 
-d="M75 700h650c41 0 75 -34 75 -75v-550c0 -41 -34 -75 -75 -75h-650c-41 0 -75 34 -75 75v550c0 41 34 75 75 75zM100 600v-100h100v100h-100zM300 600v-100h400v100h-400zM100 400v-100h100v100h-100zM300 400v-100h400v100h-400zM100 200v-100h100v100h-100zM300 200
-v-100h400v100h-400z" />
-    <glyph glyph-name="c2" unicode="&#xe0c2;" 
-d="M400 800l100 -300h300l-250 -200l100 -300l-250 200l-250 -200l100 300l-250 200h300z" />
-    <glyph glyph-name="c3" unicode="&#xe0c3;" 
-d="M400 800c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM150 700c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM650 700c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM400 600c110 0 200 -90 200 -200
-s-90 -200 -200 -200s-200 90 -200 200s90 200 200 200zM50 450c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM750 450c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM150 200c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50
-s22 50 50 50zM650 200c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50zM400 100c28 0 50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50s22 50 50 50z" />
-    <glyph glyph-name="c4" unicode="&#xe0c4;" 
-d="M34 800h632c18 0 34 -16 34 -34v-732c0 -18 -16 -34 -34 -34h-632c-18 0 -34 16 -34 34v732c0 18 16 34 34 34zM100 700v-500h500v500h-500zM350 150c-38 0 -63 -42 -44 -75s69 -33 88 0s-6 75 -44 75z" />
-    <glyph glyph-name="c5" unicode="&#xe0c5;" 
-d="M0 800h300l500 -500l-300 -300l-500 500v300zM200 700c-55 0 -100 -45 -100 -100s45 -100 100 -100s100 45 100 100s-45 100 -100 100z" />
-    <glyph glyph-name="c6" unicode="&#xe0c6;" 
-d="M0 600h200l300 -300l-200 -200l-300 300v200zM340 600h160l300 -300l-200 -200l-78 78l119 122zM150 500c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="c7" unicode="&#xe0c7;" 
-d="M400 800c220 0 400 -180 400 -400s-180 -400 -400 -400s-400 180 -400 400s180 400 400 400zM400 700c-166 0 -300 -134 -300 -300s134 -300 300 -300s300 134 300 300s-134 300 -300 300zM400 600c110 0 200 -90 200 -200s-90 -200 -200 -200s-200 90 -200 200
-s90 200 200 200zM400 500c-56 0 -100 -44 -100 -100s44 -100 100 -100s100 44 100 100s-44 100 -100 100z" />
-    <glyph glyph-name="c8" unicode="&#xe0c8;" 
-d="M0 700h559l-100 -100h-359v-500h500v159l100 100v-359h-700v700zM700 700l100 -100l-400 -400l-200 200l100 100l100 -100z" />
-    <glyph glyph-name="c9" unicode="&#xe0c9;" 
-d="M9 800h782c6 0 9 -3 9 -9v-782c0 -6 -3 -9 -9 -9h-782c-6 0 -9 3 -9 9v782c0 6 3 9 9 9zM150 722l-72 -72l100 -100l-100 -100l72 -72l172 172zM400 500v-100h300v100h-300z" />
-    <glyph glyph-name="ca" unicode="&#xe0ca;" 
-d="M0 800h800v-200h-50c0 55 -45 100 -100 100h-150v-550c0 -28 22 -50 50 -50h50v-100h-400v100h50c28 0 50 22 50 50v550h-150c-55 0 -100 -45 -100 -100h-50v200z" />
-    <glyph glyph-name="cb" unicode="&#xe0cb;" 
-d="M0 700h100v-400h-100v400zM200 700h350c21 0 39 -13 47 -31c0 0 103 -291 103 -319s-22 -50 -50 -50h-150c-28 0 -50 -25 -50 -50s39 -158 47 -184s-5 -55 -31 -63s-52 5 -66 31s-109 219 -128 238s-44 28 -72 28v400z" />
-    <glyph glyph-name="cc" unicode="&#xe0cc;" 
-d="M400 666c10 19 28 32 47 34l19 -3c26 -8 39 -37 31 -63s-47 -159 -47 -184s22 -50 50 -50h150c28 0 50 -22 50 -50s-103 -319 -103 -319c-8 -18 -26 -31 -47 -31h-350v400c28 0 53 9 72 28s114 212 128 238zM0 400h100v-400h-100v400z" />
-    <glyph glyph-name="cd" unicode="&#xe0cd;" 
-d="M200 700h300v-100h-100v-6c25 -4 50 -8 72 -16l-34 -94c-28 11 -58 16 -88 16c-139 0 -250 -111 -250 -250s111 -250 250 -250s250 111 250 250c0 31 -5 60 -16 88l91 37c14 -38 25 -81 25 -125c0 -193 -157 -350 -350 -350s-350 157 -350 350c0 176 130 323 300 347v3
-h-100v100zM700 584c0 0 -296 -348 -316 -368s-48 -20 -68 0s-20 48 0 68s384 300 384 300z" />
-    <glyph glyph-name="ce" unicode="&#xe0ce;" 
-d="M600 700l200 -150l-200 -150v100h-600v100h600v100zM200 300v-100h600v-100h-600v-100l-200 150z" />
-    <glyph glyph-name="cf" unicode="&#xe0cf;" 
-d="M300 800h100c55 0 100 -45 100 -100h100c55 0 100 -45 100 -100h-700c0 55 45 100 100 100h100c0 55 45 100 100 100zM100 500h100v-350c0 -28 22 -50 50 -50s50 22 50 50v350h100v-350c0 -28 22 -50 50 -50s50 22 50 50v350h100v-481c0 -11 -8 -19 -19 -19h-462
-c-11 0 -19 8 -19 19v481z" />
-    <glyph glyph-name="d0" unicode="&#xe0d0;" 
-d="M100 800h200v-400c0 -55 45 -100 100 -100s100 45 100 100v400h100v-400c0 -110 -90 -200 -200 -200h-50c-138 0 -250 90 -250 200v400zM0 100h700v-100h-700v100z" />
-    <glyph glyph-name="d1" unicode="&#xe0d1;" 
-d="M9 700h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v482c0 6 3 9 9 9zM609 700h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v482c0 6 3 9 9 9zM309 500h182c6 0 9 -3 9 -9v-282c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v282
-c0 6 3 9 9 9zM0 100h800v-100h-800v100z" />
-    <glyph glyph-name="d2" unicode="&#xe0d2;" 
-d="M10 700h181c6 0 9 -3 9 -9v-191h-200v191c0 6 4 9 10 9zM610 700h181c6 0 9 -3 9 -9v-191h-200v191c0 6 5 9 10 9zM310 600h181c6 0 9 -3 9 -9v-91h-200v91c0 6 4 9 10 9zM0 400h800v-100h-800v100zM0 200h200v-191c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v191zM300 200
-h200v-91c0 -6 -3 -9 -9 -9h-181c-6 0 -10 3 -10 9v91zM600 200h200v-191c0 -6 -3 -9 -9 -9h-181c-6 0 -10 3 -10 9v191z" />
-    <glyph glyph-name="d3" unicode="&#xe0d3;" 
-d="M0 700h800v-100h-800v100zM9 500h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v482c0 6 3 9 9 9zM309 500h182c6 0 9 -3 9 -9v-282c0 -6 -3 -9 -9 -9h-182c-6 0 -9 3 -9 9v282c0 6 3 9 9 9zM609 500h182c6 0 9 -3 9 -9v-482c0 -6 -3 -9 -9 -9h-182
-c-6 0 -9 3 -9 9v482c0 6 3 9 9 9z" />
-    <glyph glyph-name="d4" unicode="&#xe0d4;" 
-d="M50 600h500c28 0 50 -22 50 -50v-150l100 100h100v-300h-100l-100 100v-150c0 -28 -22 -50 -50 -50h-500c-28 0 -50 22 -50 50v400c0 28 22 50 50 50z" />
-    <glyph glyph-name="d5" unicode="&#xe0d5;" 
-d="M334 800h66v-800h-66l-134 200h-200v400h200zM500 600v100c26 0 52 -4 75 -10c130 -33 225 -150 225 -290s-95 -258 -225 -291h-3c-23 -6 -47 -9 -72 -9v100c17 0 34 2 50 6c86 22 150 100 150 194s-64 172 -150 194c-16 4 -33 6 -50 6zM500 500l25 -3
-c44 -11 75 -51 75 -97s-32 -86 -75 -97l-25 -3v200z" />
-    <glyph glyph-name="d6" unicode="&#xe0d6;" horiz-adv-x="600" 
-d="M334 800h66v-800h-66l-134 200h-200v400h200zM500 500l25 -3c44 -11 75 -51 75 -97s-32 -86 -75 -97l-25 -3v200z" />
-    <glyph glyph-name="d7" unicode="&#xe0d7;" horiz-adv-x="400" 
-d="M334 800h66v-800h-66l-134 200h-200v400h200z" />
-    <glyph glyph-name="d8" unicode="&#xe0d8;" 
-d="M309 800h82c6 0 10 -4 12 -9l294 -682l3 -19v-81c0 -6 -3 -9 -9 -9h-682c-6 0 -9 3 -9 9v81l3 19l294 682c2 5 6 9 12 9zM300 500v-200h100v200h-100zM300 200v-100h100v100h-100z" />
-    <glyph glyph-name="d9" unicode="&#xe0d9;" 
-d="M375 800c138 0 269 -39 378 -109l-53 -82c-93 60 -205 91 -325 91c-119 0 -229 -32 -322 -91l-53 82c109 70 237 109 375 109zM375 500c78 0 154 -23 216 -62l-53 -85c-46 30 -104 47 -163 47c-60 0 -112 -17 -159 -47l-54 85c62 40 134 62 213 62zM375 200
-c55 0 100 -45 100 -100s-45 -100 -100 -100s-100 45 -100 100s45 100 100 100z" />
-    <glyph glyph-name="da" unicode="&#xe0da;" horiz-adv-x="900" 
-d="M551 800c16 0 32 0 47 -3l-97 -97v-200h200l97 97c3 -15 3 -31 3 -47c0 -138 -112 -250 -250 -250c-32 0 -62 8 -90 19l-288 -291c-20 -20 -46 -28 -72 -28s-52 8 -72 28c-39 39 -39 105 0 144l291 287c-11 28 -19 59 -19 91c0 138 112 250 250 250zM101 150
-c-28 0 -50 -22 -50 -50s22 -50 50 -50s50 22 50 50s-22 50 -50 50z" />
-    <glyph glyph-name="db" unicode="&#xe0db;" 
-d="M141 700c84 -84 169 -167 253 -250c82 83 167 165 247 250l143 -141l-253 -253c84 -82 167 -166 253 -247l-143 -143c-81 86 -165 169 -247 253l-253 -253l-141 143c85 80 167 164 250 247c-83 84 -166 169 -250 253z" />
-    <glyph glyph-name="dc" unicode="&#xe0dc;" 
-d="M0 800h100l231 -300h38l231 300h100l-225 -300h225v-100h-300v-100h300v-100h-300v-200h-100v200h-300v100h300v100h-300v100h225z" />
-    <glyph glyph-name="dd" unicode="&#xe0dd;" horiz-adv-x="900" 
-d="M350 800c193 0 350 -157 350 -350c0 -61 -17 -119 -44 -169c4 -2 10 -6 13 -9l103 -100c16 -16 30 -49 30 -72c0 -56 -46 -102 -102 -102c-23 0 -56 14 -72 30l-100 103c-3 3 -7 9 -9 13c-50 -28 -108 -44 -169 -44c-193 0 -350 157 -350 350s157 350 350 350zM350 700
-c-139 0 -250 -111 -250 -250s111 -250 250 -250c62 0 119 23 163 60c7 11 19 25 31 31l3 3c34 43 53 97 53 156c0 139 -111 250 -250 250zM300 600h100v-100h100v-100h-100v-100h-100v100h-100v100h100v100z" />
-    <glyph glyph-name="de" unicode="&#xe0de;" horiz-adv-x="900" 
-d="M350 800c193 0 350 -157 350 -350c0 -61 -17 -119 -44 -169c4 -2 10 -6 13 -9l103 -100c16 -16 30 -49 30 -72c0 -56 -46 -102 -102 -102c-23 0 -56 14 -72 30l-100 103c-3 3 -7 9 -9 13c-50 -28 -108 -44 -169 -44c-193 0 -350 157 -350 350s157 350 350 350zM350 700
-c-139 0 -250 -111 -250 -250s111 -250 250 -250c62 0 119 23 163 60c7 11 19 25 31 31l3 3c34 43 53 97 53 156c0 139 -111 250 -250 250zM200 500h300v-100h-300v100z" />
-  </font>
-</defs></svg>

Oqtane.Application/Server/wwwroot/css/texteditors/radzen/radzentexteditor.css

@@ -1,22 +0,0 @@
-.rz-text-editor {
-    outline: none !important;
-}
-
-.rz-html-editor-dropdown-items,
-.rz-popup,
-.rz-editor-dialog-wrapper {
-    z-index: 9999 !important;
-}
-
-.rz-html-editor-dropdown-items .rz-html-editor-dropdown-item,
-.rz-html-editor-dropdown-items .rz-html-editor-dropdown-item > * {
-    color: var(--rz-editor-button-color);
-}
-.rz-text-editor .rz-html-editor-dropdown .rz-html-editor-dropdown-value,
-.rz-text-editor .rz-html-editor-dropdown .rz-html-editor-dropdown-trigger,
-.rz-text-editor .rz-html-editor-colorpicker .rz-html-editor-color {
-    color: var(--rz-editor-button-color);
-}
-.rz-text-editor .rz-colorpicker.rz-state-disabled {
-    border: none !important;
-}

Oqtane.Application/Server/wwwroot/js/app.js

@@ -1,8 +0,0 @@
-function subMenu(a) {
-    event.preventDefault();
-    event.stopPropagation();
-
-    var li = a.parentElement, submenu = li.getElementsByTagName('ul')[0];
-    submenu.style.display = submenu.style.display == "block" ? "none" : "block";
-    return false;
-}

Oqtane.Application/Server/wwwroot/js/interop.js

@@ -1,520 +0,0 @@
-var Oqtane = Oqtane || {};
-
-Oqtane.Interop = {
-    setCookie: function (name, value, days, secure, sameSite) {
-        var d = new Date();
-        d.setTime(d.getTime() + (days * 24 * 60 * 60 * 1000));
-        var expires = "expires=" + d.toUTCString();
-        var cookieString = name + "=" + value + ";" + expires + ";path=/";
-        if (secure) {
-            cookieString += "; secure";
-        }
-        if (sameSite === "Lax" || sameSite === "Strict" || sameSite === "None") {
-            cookieString += "; SameSite=" + sameSite;
-        }
-        document.cookie = cookieString;
-    },
-    setCookieString: function (cookieString) {
-        document.cookie = cookieString;
-    },
-    getCookie: function (name) {
-        name = name + "=";
-        var decodedCookie = decodeURIComponent(document.cookie);
-        var ca = decodedCookie.split(';');
-        for (var i = 0; i < ca.length; i++) {
-            var c = ca[i];
-            while (c.charAt(0) === ' ') {
-                c = c.substring(1);
-            }
-            if (c.indexOf(name) === 0) {
-                return c.substring(name.length, c.length);
-            }
-        }
-        return "";
-    },
-    updateTitle: function (title) {
-        if (document.title !== title) {
-            document.title = title;
-        }
-    },
-    includeMeta: function (id, attribute, name, content) {
-        var meta = document.querySelector("meta[" + attribute + "=\"" + CSS.escape(name) + "\"]");
-        if (meta === null) {
-            meta = document.createElement("meta");
-            meta.setAttribute(attribute, name);
-            if (id !== "") {
-                meta.id = id;
-            }
-            meta.content = content;
-            document.head.appendChild(meta);
-        }
-        else {
-            if (id !== "") {
-                meta.setAttribute("id", id);
-            }
-            if (meta.content !== content) {
-                meta.setAttribute("content", content);
-            }
-        }
-    },
-    includeLink: function (id, rel, href, type, integrity, crossorigin, insertbefore) {
-        var link = document.querySelector("link[href=\"" + CSS.escape(href) + "\"]");
-        if (link === null) {
-            link = document.createElement("link");
-            if (id !== "") {
-                link.id = id;
-            }
-            link.rel = rel;
-            if (type !== "") {
-                link.type = type;
-            }
-            link.href = href;
-            if (integrity !== "") {
-                link.integrity = integrity;
-            }
-            if (crossorigin !== "") {
-                link.crossOrigin = crossorigin;
-            }
-            if (insertbefore === "") {
-                document.head.appendChild(link);
-            }
-            else {
-                var sibling = document.getElementById(insertbefore);
-                sibling.parentNode.insertBefore(link, sibling);
-            }
-        }
-        else {
-            if (link.id !== id) {
-                link.setAttribute('id', id);
-            }
-            if (link.rel !== rel) {
-                link.setAttribute('rel', rel);
-            }
-            if (type !== "") {
-                if (link.type !== type) {
-                    link.setAttribute('type', type);
-                }
-            } else {
-                link.removeAttribute('type');
-            }
-            if (link.href !== this.getAbsoluteUrl(href)) {
-                link.removeAttribute('integrity');
-                link.removeAttribute('crossorigin');
-                link.setAttribute('href', href);
-            }
-            if (integrity !== "") {
-                if (link.integrity !== integrity) {
-                    link.setAttribute('integrity', integrity);
-                }
-            } else {
-                link.removeAttribute('integrity');
-            }
-            if (crossorigin !== "") {
-                if (link.crossOrigin !== crossorigin) {
-                    link.setAttribute('crossorigin', crossorigin);
-                }
-            } else {
-                link.removeAttribute('crossorigin');
-            }
-        }
-    },
-    includeLinks: function (links) {
-        for (let i = 0; i < links.length; i++) {
-            this.includeLink(links[i].id, links[i].rel, links[i].href, links[i].type, links[i].integrity, links[i].crossorigin, links[i].insertbefore);
-        }
-    },
-    includeScript: function (id, src, integrity, crossorigin, type, content, location, dataAttributes) {
-        var script;
-        if (src !== "") {
-            script = document.querySelector("script[src=\"" + CSS.escape(src) + "\"]");
-        }
-        else {
-            if (id !== "") {
-                script = document.getElementById(id);
-            } else {
-                const scripts = document.querySelectorAll("script:not([src])");
-                for (let i = 0; i < scripts.length; i++) {
-                    if (scripts[i].textContent.includes(content)) {
-                        script = scripts[i];
-                    }
-                }
-            }
-        }
-        if (script !== null) {
-            script.remove();
-            script = null;
-        }
-        if (script === null) {
-            script = document.createElement("script");
-            if (id !== "") {
-                script.id = id;
-            }
-            if (type !== "") {
-                script.type = type;
-            }
-            if (src !== "") {
-                script.src = src;
-                if (integrity !== "") {
-                    script.integrity = integrity;
-                }
-                if (crossorigin !== "") {
-                    script.crossOrigin = crossorigin;
-                }
-            }
-            else {
-                script.innerHTML = content;
-            }
-            if (dataAttributes !== null) {
-                for (var key in dataAttributes) {
-                    script.setAttribute(key, dataAttributes[key]);
-                }
-            }
-
-            try {
-                this.addScript(script, location);
-            } catch (error) {
-                if (src !== "") {
-                    console.error("Failed to load external script: ${src}", error);
-                } else {
-                    console.error("Failed to load inline script: ${content}", error);
-                }
-            }
-        }
-    },
-    addScript: function (script, location) {
-        return new Promise((resolve, reject) => {
-            script.async = false;
-            script.defer = false;
-
-            script.onload = () => resolve();
-            script.onerror = (error) => reject(error);
-
-            if (location === 'head') {
-                document.head.appendChild(script);
-            } else {
-                document.body.appendChild(script);
-            }
-        });
-    },
-    includeScripts: async function (scripts) {
-        const bundles = [];
-        for (let s = 0; s < scripts.length; s++) {
-            if (scripts[s].bundle === '') {
-                scripts[s].bundle = scripts[s].href;
-            }
-            if (!bundles.includes(scripts[s].bundle)) {
-                bundles.push(scripts[s].bundle);
-            }
-        }
-        const promises = [];
-        for (let b = 0; b < bundles.length; b++) {
-            const urls = [];
-            for (let s = 0; s < scripts.length; s++) {
-                if (scripts[s].bundle === bundles[b]) {
-                    urls.push(scripts[s].href);
-                }
-            }
-            promises.push(new Promise((resolve, reject) => {
-                if (loadjs.isDefined(bundles[b])) {
-                    loadjs.ready(bundles[b], () => {
-                        resolve(true);
-                    });
-                }
-                else {
-                    loadjs(urls, bundles[b], {
-                        async: false,
-                        returnPromise: true,
-                        before: function (path, element) {
-                            for (let s = 0; s < scripts.length; s++) {
-                                if (path === scripts[s].href) {
-                                    if (scripts[s].integrity !== '') {
-                                        element.integrity = scripts[s].integrity;
-                                    }
-                                    if (scripts[s].crossorigin !== '') {
-                                        element.crossOrigin = scripts[s].crossorigin;
-                                    }
-                                    if (scripts[s].type !== '') {
-                                        element.type = scripts[s].type;
-                                    }
-                                    if (scripts[s].dataAttributes !== null) {
-                                        for (var key in scripts[s].dataAttributes) {
-                                            element.setAttribute(key, scripts[s].dataAttributes[key]);
-                                        }
-                                    }
-                                    if (scripts[s].location === 'body') {
-                                        document.body.appendChild(element);
-                                        return false;  // return false to bypass default DOM insertion mechanism
-                                    }
-                                }
-                            }
-                        }
-                    })
-                    .then(function () { resolve(true) })
-                    .catch(function (pathsNotFound) { reject(false) });
-                }
-            }));
-        }
-        if (promises.length !== 0) {
-            await Promise.all(promises);
-        }
-    },
-    getAbsoluteUrl: function (url) {
-        var a = document.createElement('a');
-        getAbsoluteUrl = function (url) {
-            a.href = url;
-            return a.href;
-        }
-        return getAbsoluteUrl(url);
-    },
-    removeElementsById: function (prefix, first, last) {
-        var elements = document.querySelectorAll('[id^=' + prefix + ']');
-        for (var i = elements.length - 1; i >= 0; i--) {
-            var element = elements[i];
-            if (element.id.startsWith(prefix) && (first === '' || element.id >= first) && (last === '' || element.id <= last)) {
-                element.parentNode.removeChild(element);
-            }
-        }
-    },
-    getElementByName: function (name) {
-        var elements = document.getElementsByName(name);
-        if (elements.length) {
-            return elements[0].value;
-        } else {
-            return "";
-        }
-    },
-    submitForm: function (path, fields) {
-        const form = document.createElement('form');
-        form.method = 'post';
-        form.action = path;
-
-        for (const key in fields) {
-            if (fields.hasOwnProperty(key)) {
-                const hiddenField = document.createElement('input');
-                hiddenField.type = 'hidden';
-                hiddenField.name = key;
-                hiddenField.value = fields[key];
-                form.appendChild(hiddenField);
-            }
-        }
-
-        document.body.appendChild(form);
-        form.submit();
-    },
-    getFiles: function (id) {
-        var files = [];
-        var fileinput = document.getElementById(id);
-        if (fileinput !== null) {
-            for (var i = 0; i < fileinput.files.length; i++) {
-                files.push(fileinput.files[i].name + ":" + fileinput.files[i].size);
-            }
-        }
-        return files;
-    },
-    uploadFiles: async function (posturl, folder, id, antiforgerytoken, jwt, chunksize, anonymizeuploadfilenames) {
-        var success = true;
-        var fileinput = document.getElementById('FileInput_' + id);
-        var progressinfo = document.getElementById('ProgressInfo_' + id);
-        var progressbar = document.getElementById('ProgressBar_' + id);
-
-        var totalSize = 0;
-        for (var i = 0; i < fileinput.files.length; i++) {
-            totalSize += fileinput.files[i].size;
-        }
-        let uploadSize = 0;
-
-        if (!chunksize || chunksize < 1) {
-            chunksize = 1; // 1 MB default
-        }
-
-        if (progressinfo !== null && progressbar !== null) {
-            progressinfo.setAttribute('style', 'display: inline;');
-            if (fileinput.files.length > 1) {
-                progressinfo.innerHTML = fileinput.files[0].name + ', ...';
-            }
-            else {
-                progressinfo.innerHTML = fileinput.files[0].name;
-            }
-            progressbar.setAttribute('style', 'width: 100%; display: inline;');
-            progressbar.value = 0;
-        }
-
-        const uploadFile = (file) => {
-            const chunkSize = chunksize * (1024 * 1024);
-            const totalParts = Math.ceil(file.size / chunkSize);
-            let partCount = 0;
-
-            let filename = file.name;
-            if (anonymizeuploadfilenames) {
-                filename = crypto.randomUUID() + '.' + filename.split('.').pop();
-            }
-
-            const uploadPart = () => {
-                const start = partCount * chunkSize;
-                const end = Math.min(start + chunkSize, file.size);
-                const chunk = file.slice(start, end);
-
-                return new Promise((resolve, reject) => {
-
-                    let formdata = new FormData();
-                    formdata.append('__RequestVerificationToken', antiforgerytoken);
-                    formdata.append('folder', folder);
-                    formdata.append('formfile', chunk, filename);
-
-                    var credentials = 'same-origin';
-                    var headers = new Headers();
-                    headers.append('PartCount', partCount + 1);
-                    headers.append('TotalParts', totalParts);
-                    if (jwt !== "") {
-                        headers.append('Authorization', 'Bearer ' + jwt);
-                        credentials = 'include';
-                    }
-
-                    return fetch(posturl, {
-                        method: 'POST',
-                        headers: headers,
-                        credentials: credentials,
-                        body: formdata
-                    })
-                        .then(response => {
-                            if (!response.ok) {
-                                if (progressinfo !== null) {
-                                    progressinfo.innerHTML = 'Error: ' + response.statusText;
-                                }
-                                throw new Error('Failed');
-                            }
-                            return;
-                        })
-                        .then(data => {
-                            partCount++;
-                            if (progressbar !== null) {
-                                uploadSize += chunk.size;
-                                var percent = Math.ceil((uploadSize / totalSize) * 100);
-                                progressbar.value = (percent / 100);
-                            }
-                            if (partCount < totalParts) {
-                                uploadPart().then(resolve).catch(reject);
-                            }
-                            else {
-                                resolve(data);
-                            }
-                        })
-                        .catch(error => {
-                            reject(error);
-                        });
-                });
-            };
-
-            return uploadPart();
-        };
-
-        try {
-            for (const file of fileinput.files) {
-                await uploadFile(file);
-            }
-        } catch (error) {
-            success = false;
-        }
-
-        fileinput.value = '';
-        return success;
-    },
-    refreshBrowser: function (verify, wait) {
-        async function attemptReload (verify) {
-            if (verify) {
-                await fetch('');
-            }
-            window.location.reload();
-        }
-        attemptReload(verify);
-        setInterval(attemptReload, wait * 1000);
-    },
-    redirectBrowser: function (url, wait) {
-        setInterval(function () {
-            window.location.href = url;
-        }, wait * 1000);
-    },
-    formValid: function (formRef) {
-        return formRef.checkValidity();
-    },
-    setElementAttribute: function (id, attribute, value) {
-        var element = document.getElementById(id);
-        if (element !== null) {
-            element.setAttribute(attribute, value);
-        }
-    },
-    scrollTo: function (top, left, behavior) {
-        const modal = document.querySelector('.modal');
-        if (modal) {
-            modal.scrollTo({
-                top: top,
-                left: left,
-                behavior: behavior
-            });
-        } else {
-            window.scrollTo({
-                top: top,
-                left: left,
-                behavior: behavior
-            });
-        }
-    },
-    scrollToId: function (id) {
-        var element = document.getElementById(id);
-        if (element instanceof HTMLElement) {
-            element.scrollIntoView({
-                behavior: "smooth",
-                block: "start",
-                inline: "nearest"
-            });
-        }
-    },
-    getCaretPosition: function (id) {
-        var element = document.getElementById(id);
-        return element.selectionStart;
-    },
-    manageIndexedDBItems: async function (action, key, value) {
-        var idb = indexedDB.open("oqtane", 1);
-
-        idb.onupgradeneeded = function () {
-            let db = idb.result;
-            db.createObjectStore("items");
-        }
-
-        if (action.startsWith("get")) {
-            let request = new Promise((resolve) => {
-                idb.onsuccess = function () {
-                    let transaction = idb.result.transaction("items", "readonly");
-                    let collection = transaction.objectStore("items");
-                    let result;
-                    if (action === "get") {
-                        result = collection.get(key);
-                    }
-                    if (action === "getallkeys") {
-                        result = collection.getAllKeys();
-                    }
-
-                    result.onsuccess = function (e) {
-                        resolve(result.result);
-                    }
-                }
-            });
-
-            let result = await request;
-
-            return result;
-        }
-        else {
-            idb.onsuccess = function () {
-                let transaction = idb.result.transaction("items", "readwrite");
-                let collection = transaction.objectStore("items");
-                if (action === "put") {
-                    collection.put(value, key);
-                }
-                if (action === "delete") {
-                    collection.delete(key);
-                }
-            }
-        }
-    }
-};

Oqtane.Application/Server/wwwroot/js/loadjs.min.js

@@ -1 +0,0 @@
-loadjs=function(){var h=function(){},c={},u={},f={};function o(e,n){if(e){var r=f[e];if(u[e]=n,r)for(;r.length;)r[0](e,n),r.splice(0,1)}}function l(e,n){e.call&&(e={success:e}),n.length?(e.error||h)(n):(e.success||h)(e)}function d(r,t,s,i){var c,o,e=document,n=s.async,u=(s.numRetries||0)+1,f=s.before||h,l=r.replace(/[\?|#].*$/,""),a=r.replace(/^(css|img)!/,"");i=i||0,/(^css!|\.css$)/.test(l)?((o=e.createElement("link")).rel="stylesheet",o.href=a,(c="hideFocus"in o)&&o.relList&&(c=0,o.rel="preload",o.as="style")):/(^img!|\.(png|gif|jpg|svg|webp)$)/.test(l)?(o=e.createElement("img")).src=a:((o=e.createElement("script")).src=r,o.async=void 0===n||n),!(o.onload=o.onerror=o.onbeforeload=function(e){var n=e.type[0];if(c)try{o.sheet.cssText.length||(n="e")}catch(e){18!=e.code&&(n="e")}if("e"==n){if((i+=1)<u)return d(r,t,s,i)}else if("preload"==o.rel&&"style"==o.as)return o.rel="stylesheet";t(r,n,e.defaultPrevented)})!==f(r,o)&&e.head.appendChild(o)}function r(e,n,r){var t,s;if(n&&n.trim&&(t=n),s=(t?r:n)||{},t){if(t in c)throw"LoadJS";c[t]=!0}function i(n,r){!function(e,t,n){var r,s,i=(e=e.push?e:[e]).length,c=i,o=[];for(r=function(e,n,r){if("e"==n&&o.push(e),"b"==n){if(!r)return;o.push(e)}--i||t(o)},s=0;s<c;s++)d(e[s],r,n)}(e,function(e){l(s,e),n&&l({success:n,error:r},e),o(t,e)},s)}if(s.returnPromise)return new Promise(i);i()}return r.ready=function(e,n){return function(e,r){e=e.push?e:[e];var n,t,s,i=[],c=e.length,o=c;for(n=function(e,n){n.length&&i.push(e),--o||r(i)};c--;)t=e[c],(s=u[t])?n(t,s):(f[t]=f[t]||[]).push(n)}(e,function(e){l(n,e)}),r},r.done=function(e){o(e,[])},r.reset=function(){c={},u={},f={}},r.isDefined=function(e){return e in c},r}();

Oqtane.Application/Server/wwwroot/js/reload.js

@@ -1,84 +0,0 @@
-const scriptKeys = new Set();
-
-export function onUpdate() {
-    // determine if this is an initial request
-    let initialRequest = scriptKeys.size === 0;
-
-    // iterate over all script elements in document
-    const scripts = document.getElementsByTagName('script');
-    for (const script of Array.from(scripts)) {
-        // only process scripts that include a data-reload attribute
-        if (script.hasAttribute('data-reload')) {
-            let key = getKey(script);
-
-            if (!initialRequest) {
-                // reload the script if data-reload is "always" or "true"... or if the script has not been loaded previously and data-reload is "once"
-                let dataReload = script.getAttribute('data-reload');
-                if ((dataReload === 'always' || dataReload === 'true') || (!scriptKeys.has(key) && dataReload == 'once')) {
-                    reloadScript(script);
-                }
-            }
-
-            // save the script key
-            if (!scriptKeys.has(key)) {
-                scriptKeys.add(key);
-            }
-        }
-    }
-}
-
-function getKey(script) {
-    if (script.src) {
-        return script.src;
-    } else if (script.id) {
-        return script.id;
-    } else {
-        return script.innerHTML;
-    }
-}
-
-function reloadScript(script) {
-    try {
-        if (isValid(script)) {
-            injectScript(script);
-        }
-    } catch (error) {
-        console.error(`Blazor Script Reload failed to load script: ${getKey(script)}`, error);
-    }
-}
-
-function isValid(script) {
-    if (script.innerHTML.includes('document.write(')) {
-        console.log(`Blazor Script Reload does not support scripts using document.write(): ${script.innerHTML}`);
-        return false;
-    }
-    return true;
-}
-
-function injectScript(script) {
-    return new Promise((resolve, reject) => {
-        var newScript = document.createElement('script');
-
-        // replicate attributes and content
-        for (let i = 0; i < script.attributes.length; i++) {
-            if (script.attributes[i].name !== 'data-reload') {
-                newScript.setAttribute(script.attributes[i].name, script.attributes[i].value);
-            }
-        }
-        newScript.nonce = script.nonce; // must be referenced explicitly
-        newScript.innerHTML = script.innerHTML;
-
-        // dynamically injected scripts cannot be async or deferred
-        newScript.async = false;
-        newScript.defer = false;
-
-        newScript.onload = () => resolve();
-        newScript.onerror = (error) => reject(error);
-
-        // inject script element in head to force execution in Blazor
-        document.head.appendChild(newScript);
-
-        // remove data-reload attribute
-        script.removeAttribute('data-reload');
-    });
-}

Oqtane.Application/Server/wwwroot/service-worker.js

@@ -1,2 +0,0 @@
-// always fetch from the network and do not enable offline support
-self.addEventListener('fetch', () => { });

Oqtane.Application/Server/wwwroot/users.txt

@@ -1 +0,0 @@
-Email	Username	DisplayName	Roles	FirstName	LastName	Street	City	Region	Country	PostalCode	Phone

Oqtane.Application/Shared/Oqtane.Application.Shared.csproj

@@ -1,13 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.0.0</Version>
-		<AssemblyName>Oqtane.Application.Shared.Oqtane</AssemblyName>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>1.0.0</Version>
+    <AssemblyName>Oqtane.Application.Shared.Oqtane</AssemblyName>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Oqtane.Shared" Version="6.2.0" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Oqtane.Shared" Version="6.2.1" />
+  </ItemGroup>
 
 </Project>

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -56,6 +56,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<ILocalizationCookieService, LocalizationCookieService>();
             services.AddScoped<ICookieConsentService, CookieConsentService>();
             services.AddScoped<ITimeZoneService, TimeZoneService>();
+            services.AddScoped<IMigrationHistoryService, MigrationHistoryService>();
             services.AddScoped<IOutputCacheService, OutputCacheService>();
 
             // providers

Oqtane.Client/Modules/Admin/Login/Index.razor

@@ -94,7 +94,7 @@ else
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
+        new Stylesheet(ModulePath() + "Module.css")
     };
 
     protected override async Task OnInitializedAsync()

Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor

@@ -101,13 +101,20 @@
                                             <small>@SharedLocalizer["Search.By"]:</small> <strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
                                             @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
                                             <br />
-                                            @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                            @if (_moduledefinitions.Exists(item => item.PackageName == context.PackageId))
                                             {
-                                                <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                                <button type="button" class="btn btn-info">@SharedLocalizer["Installed"]</button>
                                             }
-                                            @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                                            else
                                             {
-                                                <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
+                                                @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                                {
+                                                    <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                                }
+                                                @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                                                {
+                                                    <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
+                                                }
                                             }
                                             <br />
                                         </div>
@@ -171,6 +178,7 @@
 
 @code {
     private bool _initialized = false;
+    private List<ModuleDefinition> _moduledefinitions;
     private int _page = 1;
     private List<Package> _packages;
     private string _price = "free";
@@ -187,7 +195,8 @@
     {
         try
         {
-            await LoadModuleDefinitions();
+            _moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+            await LoadPackages();
             _initialized = true;
         }
         catch (Exception ex)
@@ -197,24 +206,10 @@
         }
     }
 
-    private async Task LoadModuleDefinitions()
+    private async Task LoadPackages()
     {
         ShowProgressIndicator();
-
-        var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
         _packages = await PackageService.GetPackagesAsync("module", _search, _price, "", _sort);
-
-        if (_packages != null)
-        {
-            foreach (Package package in _packages.ToArray())
-            {
-                if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
-                {
-                    _packages.Remove(package);
-                }
-            }
-        }
-
         HideProgressIndicator();
     }
 
@@ -222,25 +217,25 @@
     {
         _price = price;
         _sort = "popularity";
-        await LoadModuleDefinitions();
+        await LoadPackages();
         StateHasChanged();
     }
 
     private async Task Search()
     {
-        await LoadModuleDefinitions();
+        await LoadPackages();
     }
 
     private async Task Reset()
     {
         _page = 1;
         _search = "";
-        await LoadModuleDefinitions();
+        await LoadPackages();
     }
 
     private async Task Refresh()
     {
-        await LoadModuleDefinitions();
+        await LoadPackages();
     }
 
     private void OnPageChange(int page)
@@ -251,7 +246,7 @@
     private async void SortChanged(ChangeEventArgs e)
     {
         _sort = (string)e.Value;
-        await LoadModuleDefinitions();
+        await LoadPackages();
     }
 
     private void HideModal()

Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor

@@ -14,7 +14,7 @@
 @if (_initialized)
 {
 	<TabStrip>
-        <TabPanel Name="Definition" ResourceKey="Definition" Heading="Definition">
+        <TabPanel Name="Module" ResourceKey="Module" Heading="Module">
 			<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
 				<div class="container">
 					<div class="row mb-1 align-items-center">
@@ -236,11 +236,10 @@
     private DateTime _createdon;
     private string _modifiedby;
     private DateTime _modifiedon;
-    private List<Page> _pagesWithModules;
 
-#pragma warning disable 649
     private PermissionGrid _permissionGrid;
-#pragma warning restore 649
+
+    private List<Page> _pagesWithModules;
 
     private List<Package> _packages;
     private List<Language> _languages;

Oqtane.Client/Modules/Admin/Pages/Add.razor

@@ -269,8 +269,16 @@
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) || (_parent != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, _parent.PermissionList)))
             {
                 _themetype = PageState.Site.DefaultThemeType;
-                _themes = ThemeService.GetThemeControls(PageState.Site.Themes);
-                _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+                var themes = new List<Theme>();
+                foreach (var theme in PageState.Site.Themes)
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, theme.PermissionList))
+                    {
+                        themes.Add(theme);
+                    }
+                }
+                _themes = ThemeService.GetThemeControls(themes);
+                _containers = ThemeService.GetContainerControls(themes, _themetype);
                 _containertype = PageState.Site.DefaultContainerType;
                 _children = new List<Page>();
                 foreach (Page p in _pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))

Oqtane.Client/Modules/Admin/Pages/Edit.razor

@@ -443,8 +443,16 @@
                 {
                     _themetype = PageState.Site.DefaultThemeType;
                 }
-                _themes = ThemeService.GetThemeControls(PageState.Site.Themes);
-                _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+                var themes = new List<Theme>();
+                foreach (var theme in PageState.Site.Themes)
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, theme.PermissionList))
+                    {
+                        themes.Add(theme);
+                    }
+                }
+                _themes = ThemeService.GetThemeControls(themes);
+                _containers = ThemeService.GetContainerControls(themes, _themetype);
                 _containertype = _page.DefaultContainerType;
                 if (string.IsNullOrEmpty(_containertype))
                 {

Oqtane.Client/Modules/Admin/Profiles/Edit.razor

@@ -2,6 +2,7 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IProfileService ProfileService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -56,9 +57,25 @@
             </div>
         </div>
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="options" HelpText="A comma delimited list of options. Options can contain a key and value if they are seperated by a colon (ie. key:value). You can also dynamically load your options from custom Settings (ie. 'EntityName:Countries')." ResourceKey="Options">Options: </Label>
+            <Label Class="col-sm-3" For="options" HelpText="A comma delimited list of options. Options can contain a key and value if they are seperated by a colon (ie. key:value). You can also dynamically load your options from Settings." ResourceKey="Options">Options: </Label>
             <div class="col-sm-9">
-                <input id="options" class="form-control" @bind="@_options" maxlength="2000" />
+                <div class="input-group">
+                    @if (_optiontype == "Settings")
+                    {
+                        <input id="options" class="form-control" @bind="@_options" maxlength="2000" />
+                    }
+                    else
+                    {
+                        <select id="entityName" class="form-select" @bind="@_options">
+                            <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                            @foreach (var entityname in _entitynames)
+                            {
+                                <option value="@entityname">@entityname</option>
+                            }
+                        </select>
+                    }
+                    <button type="button" class="btn btn-secondary" @onclick="ToggleOptionType">@Localizer[_optiontype]</button>
+                </div>
             </div>
         </div>
         <div class="row mb-1 align-items-center">
@@ -95,7 +112,7 @@
     <br />
     <button type="button" class="btn btn-success" @onclick="SaveProfile">@SharedLocalizer["Save"]</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-        @if (PageState.QueryString.ContainsKey("id"))
+    @if (PageState.QueryString.ContainsKey("id"))
     {
         <br />
         <br />
@@ -116,6 +133,8 @@
     private string _rows = "1";
     private string _defaultvalue = string.Empty;
     private string _options = string.Empty;
+    private string _optiontype = "Settings";
+    private List<string> _entitynames;
     private string _validation = string.Empty;
     private string _autocomplete = string.Empty;
     private string _isrequired = "False";
@@ -133,6 +152,8 @@
     {
         try
         {
+            _entitynames = await SettingService.GetEntityNamesAsync();
+
             if (PageState.QueryString.ContainsKey("id"))
             {
                 _profileid = Int32.Parse(PageState.QueryString["id"]);
@@ -148,6 +169,11 @@
                     _rows = profile.Rows.ToString();
                     _defaultvalue = profile.DefaultValue;
                     _options = profile.Options;
+                    if (_options.StartsWith("EntityName:"))
+                    {
+                        _optiontype = "Options";
+                        _options = _options.Substring(11);
+                    }
                     _validation = profile.Validation;
                     _autocomplete = profile.Autocomplete;
                     _isrequired = profile.IsRequired.ToString();
@@ -166,6 +192,18 @@
         }
     }
 
+    private void ToggleOptionType()
+    {
+        if (_optiontype == "Options")
+        {
+            _optiontype = "Settings";
+        }
+        else
+        {
+            _optiontype = "Options";
+        }
+    }
+
     private async Task SaveProfile()
     {
         validated = true;
@@ -193,7 +231,14 @@
                 profile.MaxLength = int.Parse(_maxlength);
                 profile.Rows = int.Parse(_rows);
                 profile.DefaultValue = _defaultvalue;
-                profile.Options = _options;
+                if (_optiontype == "Options" && !string.IsNullOrEmpty(_options))
+                {
+                    profile.Options = "EntityName:" + _options;
+                }
+                else
+                {
+                    profile.Options = _options;
+                }
                 profile.Validation = _validation;
                 profile.Autocomplete = _autocomplete;
                 profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired));

Oqtane.Client/Modules/Admin/SearchResults/Index.razor

@@ -40,6 +40,9 @@
                     {
                         <Pager Items="@_searchResults?.Results"
                                 Format="Grid"
+                                PageSize="@_pageSize"
+                                DisplayPages="@_displayPages"
+                                CurrentPage="@_currentPage"
                                 Columns="1"
                                 Toolbar="Bottom"
                                 Parameters="@($"q={_keywords}")">
@@ -66,6 +69,7 @@
 
 @code {
     public override string RenderMode => RenderModes.Static;
+    private const string SearchDefaultPageSize = "10";
 
     private string _includeEntities;
     private string _excludeEntities;
@@ -75,6 +79,8 @@
     private string _sortField;
     private string _sortOrder;
     private string _bodyLength;
+    private string _currentPage = "0";
+    private string _displayPages = "7";
     
     private string _keywords;
     private SearchResults _searchResults;
@@ -89,11 +95,16 @@
         _excludeEntities = SettingService.GetSetting(ModuleState.Settings, "SearchResults_ExcludeEntities", "");
         _fromDate = SettingService.GetSetting(ModuleState.Settings, "SearchResults_FromDate", DateTime.MinValue.ToString());
         _toDate = SettingService.GetSetting(ModuleState.Settings, "SearchResults_ToDate", DateTime.MaxValue.ToString());
-        _pageSize = SettingService.GetSetting(ModuleState.Settings, "SearchResults_PageSize", int.MaxValue.ToString());
+        _pageSize = SettingService.GetSetting(ModuleState.Settings, "SearchResults_PageSize", SearchDefaultPageSize);
         _sortField = SettingService.GetSetting(ModuleState.Settings, "SearchResults_SortField", "Relevance");
         _sortOrder = SettingService.GetSetting(ModuleState.Settings, "SearchResults_SortOrder", "Descending");
         _bodyLength = SettingService.GetSetting(ModuleState.Settings, "SearchResults_BodyLength", "255");
 
+        if (PageState.QueryString.ContainsKey("p"))
+        {
+            _currentPage = PageState.QueryString["p"];
+        }
+
         if (_keywords == null && PageState.QueryString.ContainsKey("q"))
         {
             _keywords = WebUtility.UrlDecode(PageState.QueryString["q"]);
@@ -122,7 +133,7 @@
                 ExcludeEntities = _excludeEntities,
                 FromDate = (!string.IsNullOrEmpty(_fromDate)) ? DateTime.Parse(_fromDate) : DateTime.MinValue,
                 ToDate = (!string.IsNullOrEmpty(_toDate)) ? DateTime.Parse(_toDate) : DateTime.MaxValue,
-                PageSize = (!string.IsNullOrEmpty(_pageSize)) ? int.Parse(_pageSize) : int.MaxValue,
+                PageSize = int.MaxValue,
                 PageIndex = 0,
                 SortField = (!string.IsNullOrEmpty(_sortField)) ? (SearchSortField)Enum.Parse(typeof(SearchSortField), _sortField) : SearchSortField.Relevance,
                 SortOrder = (!string.IsNullOrEmpty(_sortOrder)) ? (SearchSortOrder)Enum.Parse(typeof(SearchSortOrder), _sortOrder) : SearchSortOrder.Descending,

Oqtane.Client/Modules/Admin/Site/Index.razor

@@ -592,9 +592,17 @@
                 {
                     _faviconfileid = site.FaviconFileId.Value;
                 }
-                _themes = ThemeService.GetThemeControls(PageState.Site.Themes);
+                var themes = new List<Theme>();
+                foreach (var theme in PageState.Site.Themes)
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, theme.PermissionList))
+                    {
+                        themes.Add(theme);
+                    }
+                }
+                _themes = ThemeService.GetThemeControls(themes);
                 _themetype = (!string.IsNullOrEmpty(site.DefaultThemeType)) ? site.DefaultThemeType : Constants.DefaultTheme;
-                _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+                _containers = ThemeService.GetContainerControls(themes, _themetype);
                 _containertype = (!string.IsNullOrEmpty(site.DefaultContainerType)) ? site.DefaultContainerType : Constants.DefaultContainer;
                 _admincontainertype = (!string.IsNullOrEmpty(site.AdminContainerType)) ? site.AdminContainerType : Constants.DefaultAdminContainer;
                 _cookieconsent = SettingService.GetSetting(settings, "CookieConsent", string.Empty);

Oqtane.Client/Modules/Admin/Sites/Add.razor

@@ -216,7 +216,7 @@ else
             _tenantid = _tenants.First(item => item.Name == TenantNames.Master).TenantId.ToString();
         }
         _urls = PageState.Alias.Name;
-        _themeList = await ThemeService.GetThemesAsync();
+        _themeList = await ThemeService.GetThemesAsync(PageState.Site.SiteId);
         _themes = ThemeService.GetThemeControls(_themeList);
         if (_themes.Any(item => item.TypeName == Constants.DefaultTheme))
         {

Oqtane.Client/Modules/Admin/SystemInfo/Index.razor

@@ -2,241 +2,280 @@
 @inherits ModuleBase
 @inject ISystemService SystemService
 @inject IInstallationService InstallationService
+@inject IMigrationHistoryService MigrationHistoryService
+@inject ITenantService TenantService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Info" Heading="Info" ResourceKey="Info">
-        <div class="container">
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
-                <div class="col-sm-9">
-                    <input id="version" class="form-control" @bind="@_version" readonly />
+@if (_initialized)
+{
+    <TabStrip>
+        <TabPanel Name="Info" Heading="Info" ResourceKey="Info">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
+                    <div class="col-sm-9">
+                        <input id="version" class="form-control" @bind="@_version" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="CLRVersion">CLR Version: </Label>
+                    <div class="col-sm-9">
+                        <input id="clrversion" class="form-control" @bind="@_clrversion" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="osversion" HelpText="Operating System Version" ResourceKey="OSVersion">OS Version: </Label>
+                    <div class="col-sm-9">
+                        <input id="osversion" class="form-control" @bind="@_osversion" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="process" HelpText="Indicates if the current process is 32 bit or 64 bit" ResourceKey="Process">Process: </Label>
+                    <div class="col-sm-9">
+                        <input id="process" class="form-control" @bind="@_process" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="machinename" HelpText="Machine Name" ResourceKey="MachineName">Machine Name: </Label>
+                    <div class="col-sm-9">
+                        <input id="machinename" class="form-control" @bind="@_machinename" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="ipaddress" HelpText="Server IP Address" ResourceKey="IPAddress">IP Address: </Label>
+                    <div class="col-sm-9">
+                        <input id="ipaddress" class="form-control" @bind="@_ipaddress" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="environment" HelpText="Environment name" ResourceKey="Environment">Environment: </Label>
+                    <div class="col-sm-9">
+                        <input id="environment" class="form-control" @bind="@_environment" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="contentrootpath" HelpText="Root Path" ResourceKey="ContentRootPath">Root Path: </Label>
+                    <div class="col-sm-9">
+                        <input id="contentrootpath" class="form-control" @bind="@_contentrootpath" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="webrootpath" HelpText="Web Path" ResourceKey="WebRootPath">Web Path: </Label>
+                    <div class="col-sm-9">
+                        <input id="webrootpath" class="form-control" @bind="@_webrootpath" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="servertime" HelpText="Server Date/Time (in UTC)" ResourceKey="ServerTime">Server Date/Time: </Label>
+                    <div class="col-sm-9">
+                        <input id="servertime" class="form-control" @bind="@_servertime" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="workingset" HelpText="Memory Allocation Of Service (in MB)" ResourceKey="WorkingSet">Memory Allocation: </Label>
+                    <div class="col-sm-9">
+                        <input id="workingset" class="form-control" @bind="@_workingset" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label>
+                    <div class="col-sm-9">
+                        <input id="installationid" class="form-control" @bind="@_installationid" readonly />
+                    </div>
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="CLRVersion">CLR Version: </Label>
-                <div class="col-sm-9">
-                    <input id="clrversion" class="form-control" @bind="@_clrversion" readonly />
+            <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" />
+        </TabPanel>
+        <TabPanel Name="Options" Heading="Options" ResourceKey="Options">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" 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>
+                    <div class="col-sm-9">
+                        <select id="detailederrors" class="form-select" @bind="@_detailederrors">
+                            <option value="true">@SharedLocalizer["True"]</option>
+                            <option value="false">@SharedLocalizer["False"]</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" 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>
+                    <div class="col-sm-9">
+                        <select id="logginglevel" class="form-select" @bind="@_logginglevel">
+                            <option value="Trace">@Localizer["Trace"]</option>
+                            <option value="Debug">@Localizer["Debug"]</option>
+                            <option value="Information">@Localizer["Information"]</option>
+                            <option value="Warning">@Localizer["Warning"]</option>
+                            <option value="Error">@Localizer["Error"]</option>
+                            <option value="Critical">@Localizer["Critical"]</option>
+                            <option value="None">@Localizer["None"]</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="notificationlevel" HelpText="The Minimum Logging Level For Which Notifications Should Be Sent To Host Users." ResourceKey="NotificationLevel">Notification Level: </Label>
+                    <div class="col-sm-9">
+                        <select id="notificationlevel" class="form-select" @bind="@_notificationlevel">
+                            <option value="Trace">@Localizer["Trace"]</option>
+                            <option value="Debug">@Localizer["Debug"]</option>
+                            <option value="Information">@Localizer["Information"]</option>
+                            <option value="Warning">@Localizer["Warning"]</option>
+                            <option value="Error">@Localizer["Error"]</option>
+                            <option value="Critical">@Localizer["Critical"]</option>
+                            <option value="None">@Localizer["None"]</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label>
+                    <div class="col-sm-9">
+                        <select id="swagger" class="form-select" @bind="@_swagger">
+                            <option value="true">@SharedLocalizer["True"]</option>
+                            <option value="false">@SharedLocalizer["False"]</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="cachecontrol" HelpText="Provide a Cache-Control directive for static assets. For example 'public, max-age=60' indicates that static assets should be cached for 60 seconds. A blank value indicates caching is not enabled." ResourceKey="CacheControl">Static Asset Caching: </Label>
+                    <div class="col-sm-9">
+                        <input id="cachecontrol" class="form-control" @bind="@_cachecontrol" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="packageregistryurl" HelpText="Specify The Url Of The Package Manager Service For Installing Modules, Themes, And Translations. If This Field Is Blank It Means The Package Manager Service Is Disabled For This Installation." ResourceKey="PackageManager">Package Manager Url: </Label>
+                    <div class="col-sm-9">
+                        <input id="packageregistryurl" class="form-control" @bind="@_packageregistryurl" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="packageregistryemail" HelpText="Specify The Email Address Of The User Account Used For Interacting With The Package Manager Service. This Account Is Used For Managing Packages Across Multiple Installations." ResourceKey="PackageManagerEmail">Package Manager Email: </Label>
+                    <div class="col-sm-9">
+                        <input id="packageregistryemail" class="form-control" @bind="@_packageregistryemail" />
+                    </div>
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="osversion" HelpText="Operating System Version" ResourceKey="OSVersion">OS Version: </Label>
-                <div class="col-sm-9">
-                    <input id="osversion" class="form-control" @bind="@_osversion" readonly />
+            <br /><br />
+            <button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>&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" />
+            <br /><br />
+            <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Swagger"]</a>&nbsp;
+            <a class="btn btn-secondary" href="api/endpoint" target="_new">@Localizer["Endpoints"]</a>
+        </TabPanel>
+        <TabPanel Name="Log" Heading="Log" ResourceKey="Log">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="log" HelpText="System log information for current day" ResourceKey="Log">Log: </Label>
+                    <div class="col-sm-9">
+                        <textarea id="log" class="form-control" rows="10" @bind="@_log" readonly />
+                    </div>
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="process" HelpText="Indicates if the current process is 32 bit or 64 bit" ResourceKey="Process">Process: </Label>
-                <div class="col-sm-9">
-                    <input id="process" class="form-control" @bind="@_process" readonly />
+            <br /><br />
+            <button type="button" class="btn btn-danger" @onclick="ClearLog">@Localizer["Clear"]</button>
+        </TabPanel>
+        <TabPanel Name="Migrations" Heading="Migrations" ResourceKey="Migrations">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="tenant" HelpText="The name of the current database. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database." ResourceKey="Tenant">Database: </Label>
+                    <div class="col-sm-9">
+                        <input id="tenant" class="form-control" @bind="@_tenant" readonly />
+                    </div>
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="machinename" HelpText="Machine Name" ResourceKey="MachineName">Machine Name: </Label>
-                <div class="col-sm-9">
-                    <input id="machinename" class="form-control" @bind="@_machinename" readonly />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="ipaddress" HelpText="Server IP Address" ResourceKey="IPAddress">IP Address: </Label>
-                <div class="col-sm-9">
-                    <input id="ipaddress" class="form-control" @bind="@_ipaddress" readonly />
-                </div>
-            </div>
-			<div class="row mb-1 align-items-center">
-				<Label Class="col-sm-3" For="environment" HelpText="Environment name" ResourceKey="Environment">Environment: </Label>
-				<div class="col-sm-9">
-					<input id="environment" class="form-control" @bind="@_environment" readonly />
-				</div>
-			</div>
-			<div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="contentrootpath" HelpText="Root Path" ResourceKey="ContentRootPath">Root Path: </Label>
-                <div class="col-sm-9">
-                    <input id="contentrootpath" class="form-control" @bind="@_contentrootpath" readonly />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="webrootpath" HelpText="Web Path" ResourceKey="WebRootPath">Web Path: </Label>
-                <div class="col-sm-9">
-                    <input id="webrootpath" class="form-control" @bind="@_webrootpath" readonly />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="servertime" HelpText="Server Date/Time (in UTC)" ResourceKey="ServerTime">Server Date/Time: </Label>
-                <div class="col-sm-9">
-                    <input id="servertime" class="form-control" @bind="@_servertime" readonly />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="workingset" HelpText="Memory Allocation Of Service (in MB)" ResourceKey="WorkingSet">Memory Allocation: </Label>
-                <div class="col-sm-9">
-                    <input id="workingset" class="form-control" @bind="@_workingset" readonly />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label>
-                <div class="col-sm-9">
-                    <input id="installationid" class="form-control" @bind="@_installationid" readonly />
-                </div>
-            </div>
-        </div>
-        <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" />
-    </TabPanel>
-    <TabPanel Name="Options" Heading="Options" ResourceKey="Options">
-        <div class="container">
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" 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>
-                <div class="col-sm-9">
-                    <select id="detailederrors" class="form-select" @bind="@_detailederrors">
-                        <option value="true">@SharedLocalizer["True"]</option>
-                        <option value="false">@SharedLocalizer["False"]</option>
-                    </select>
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" 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>
-                <div class="col-sm-9">
-                    <select id="logginglevel" class="form-select" @bind="@_logginglevel">
-                        <option value="Trace">@Localizer["Trace"]</option>
-                        <option value="Debug">@Localizer["Debug"]</option>
-                        <option value="Information">@Localizer["Information"]</option>
-                        <option value="Warning">@Localizer["Warning"]</option>
-                        <option value="Error">@Localizer["Error"]</option>
-                        <option value="Critical">@Localizer["Critical"]</option>
-                        <option value="None">@Localizer["None"]</option>
-                    </select>
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="notificationlevel" HelpText="The Minimum Logging Level For Which Notifications Should Be Sent To Host Users." ResourceKey="NotificationLevel">Notification Level: </Label>
-                <div class="col-sm-9">
-                    <select id="notificationlevel" class="form-select" @bind="@_notificationlevel">
-                        <option value="Trace">@Localizer["Trace"]</option>
-                        <option value="Debug">@Localizer["Debug"]</option>
-                        <option value="Information">@Localizer["Information"]</option>
-                        <option value="Warning">@Localizer["Warning"]</option>
-                        <option value="Error">@Localizer["Error"]</option>
-                        <option value="Critical">@Localizer["Critical"]</option>
-                        <option value="None">@Localizer["None"]</option>
-                    </select>
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label>
-                <div class="col-sm-9">
-                    <select id="swagger" class="form-select" @bind="@_swagger">
-                        <option value="true">@SharedLocalizer["True"]</option>
-                        <option value="false">@SharedLocalizer["False"]</option>
-                    </select>
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="cachecontrol" HelpText="Provide a Cache-Control directive for static assets. For example 'public, max-age=60' indicates that static assets should be cached for 60 seconds. A blank value indicates caching is not enabled." ResourceKey="CacheControl">Static Asset Caching: </Label>
-                <div class="col-sm-9">
-                    <input id="cachecontrol" class="form-control" @bind="@_cachecontrol" />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="packageregistryurl" HelpText="Specify The Url Of The Package Manager Service For Installing Modules, Themes, And Translations. If This Field Is Blank It Means The Package Manager Service Is Disabled For This Installation." ResourceKey="PackageManager">Package Manager Url: </Label>
-                <div class="col-sm-9">
-                    <input id="packageregistryurl" class="form-control" @bind="@_packageregistryurl" />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="packageregistryemail" HelpText="Specify The Email Address Of The User Account Used For Interacting With The Package Manager Service. This Account Is Used For Managing Packages Across Multiple Installations." ResourceKey="PackageManagerEmail">Package Manager Email: </Label>
-                <div class="col-sm-9">
-                    <input id="packageregistryemail" class="form-control" @bind="@_packageregistryemail" />
-                </div>
-            </div>
-        </div>
-        <br /><br />
-        <button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>&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" />
-        <br /><br />
-        <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Swagger"]</a>&nbsp;
-        <a class="btn btn-secondary" href="api/endpoint" target="_new">@Localizer["Endpoints"]</a>
-    </TabPanel>
-    <TabPanel Name="Log" Heading="Log" ResourceKey="Log">
-        <div class="container">
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="log" HelpText="System log information for current day" ResourceKey="Log">Log: </Label>
-                <div class="col-sm-9">
-                    <textarea id="log" class="form-control" rows="10" @bind="@_log" readonly />
-                </div>
-            </div>
-		</div>
-		<br /><br />
-		<button type="button" class="btn btn-danger" @onclick="ClearLog">@Localizer["Clear"]</button>
-	</TabPanel>
-</TabStrip>
-<br /><br />
+            <br />
+            <Pager Items="@_history" SearchProperties="MigrationId">
+                <Header>
+                    <th>@Localizer["Migration"]</th>
+                    <th>@Localizer["Date"]</th>
+                    <th>@Localizer["Version"]</th>
+                </Header>
+                <Row>
+                    <td>@context.MigrationId</td>
+                    <td>@UtcToLocal(context.AppliedDate)</td>
+                    <td>@context.AppliedVersion</td>
+                </Row>
+            </Pager>
+        </TabPanel>
+    </TabStrip>
+    <br /><br />
+}
 
 @code {
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-	private string _version = string.Empty;
-	private string _clrversion = string.Empty;
-	private string _osversion = string.Empty;
+    private bool _initialized = false;
+
+    private string _version = string.Empty;
+    private string _clrversion = string.Empty;
+    private string _osversion = string.Empty;
     private string _process = string.Empty;
     private string _machinename = string.Empty;
-	private string _ipaddress = string.Empty;
-	private string _environment = string.Empty;
-	private string _contentrootpath = string.Empty;
-	private string _webrootpath = string.Empty;
-	private string _servertime = string.Empty;
-	private string _workingset = string.Empty;
-	private string _installationid = string.Empty;
+    private string _ipaddress = string.Empty;
+    private string _environment = string.Empty;
+    private string _contentrootpath = string.Empty;
+    private string _webrootpath = string.Empty;
+    private string _servertime = string.Empty;
+    private string _workingset = string.Empty;
+    private string _installationid = string.Empty;
 
-	private string _detailederrors = string.Empty;
-	private string _logginglevel = string.Empty;
-	private string _notificationlevel = string.Empty;
-	private string _swagger = string.Empty;
+    private string _detailederrors = string.Empty;
+    private string _logginglevel = string.Empty;
+    private string _notificationlevel = string.Empty;
+    private string _swagger = string.Empty;
     private string _cachecontrol = string.Empty;
     private string _packageregistryurl = string.Empty;
     private string _packageregistryemail = string.Empty;
 
     private string _log = string.Empty;
 
-	protected override async Task OnInitializedAsync()
-	{
-		_version = Constants.Version;
+    private string _tenant = string.Empty;
+    private List<MigrationHistory> _history;
 
-		var systeminfo = await SystemService.GetSystemInfoAsync("environment");
-		if (systeminfo != null)
-		{
-			_clrversion = systeminfo["CLRVersion"].ToString();
-			_osversion = systeminfo["OSVersion"].ToString();
+    protected override async Task OnInitializedAsync()
+    {
+        _version = Constants.Version;
+
+        var systeminfo = await SystemService.GetSystemInfoAsync("environment");
+        if (systeminfo != null)
+        {
+            _clrversion = systeminfo["CLRVersion"].ToString();
+            _osversion = systeminfo["OSVersion"].ToString();
             _process = systeminfo["Process"].ToString();
             _machinename = systeminfo["MachineName"].ToString();
-			_ipaddress = systeminfo["IPAddress"].ToString();
-			_environment = systeminfo["Environment"].ToString();
-			_contentrootpath = systeminfo["ContentRootPath"].ToString();
-			_webrootpath = systeminfo["WebRootPath"].ToString();
-			_servertime = systeminfo["ServerTime"].ToString() + " UTC";
-			_workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
-		}
+            _ipaddress = systeminfo["IPAddress"].ToString();
+            _environment = systeminfo["Environment"].ToString();
+            _contentrootpath = systeminfo["ContentRootPath"].ToString();
+            _webrootpath = systeminfo["WebRootPath"].ToString();
+            _servertime = systeminfo["ServerTime"].ToString() + " UTC";
+            _workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
+        }
 
-		systeminfo = await SystemService.GetSystemInfoAsync("configuration");
-		if (systeminfo != null)
-		{
-			_installationid = systeminfo["InstallationId"].ToString();
-			_detailederrors = systeminfo["DetailedErrors"].ToString();
-			_logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
-			_notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
+        systeminfo = await SystemService.GetSystemInfoAsync("configuration");
+        if (systeminfo != null)
+        {
+            _installationid = systeminfo["InstallationId"].ToString();
+            _detailederrors = systeminfo["DetailedErrors"].ToString();
+            _logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
+            _notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
             _swagger = systeminfo["UseSwagger"].ToString();
             _cachecontrol = systeminfo["CacheControl"].ToString();
             _packageregistryurl = systeminfo["PackageRegistryUrl"].ToString();
             _packageregistryemail = systeminfo["PackageRegistryEmail"].ToString();
         }
 
-		systeminfo = await SystemService.GetSystemInfoAsync("log");
-		if (systeminfo != null)
-		{
-			_log = systeminfo["Log"].ToString();
-		}
-	}
+        systeminfo = await SystemService.GetSystemInfoAsync("log");
+        if (systeminfo != null)
+        {
+            _log = systeminfo["Log"].ToString();
+        }
+
+        var tenants = await TenantService.GetTenantsAsync();
+        _tenant = tenants.Find(item => item.TenantId == PageState.Site.TenantId).Name;
+        _history = await MigrationHistoryService.GetMigrationHistoryAsync();
+
+        _initialized = true;
+    }
 
 	private async Task SaveConfig()
 	{

Oqtane.Client/Modules/Admin/Themes/Add.razor

@@ -101,13 +101,20 @@
                                             <small>@SharedLocalizer["Search.By"]:</small> <strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
                                             @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
                                             <br />
-                                            @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                            @if (_themes.Exists(item => item.PackageName == context.PackageId))
                                             {
-                                                <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                                <button type="button" class="btn btn-info">@SharedLocalizer["Installed"]</button>
                                             }
-                                            @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                                            else
                                             {
-                                                <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
+                                                @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                                {
+                                                    <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                                }
+                                                @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                                                {
+                                                    <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
+                                                }
                                             }
                                             <br />
                                         </div>
@@ -171,6 +178,7 @@
 
 @code {
     private bool _initialized = false;
+    private List<Theme> _themes;
     private int _page = 1;
     private List<Package> _packages;
     private string _price = "free";
@@ -187,7 +195,8 @@
     {
         try
         {
-            await LoadThemes();
+            _themes = await ThemeService.GetThemesAsync(PageState.Site.SiteId);
+            await LoadPackages();
             _initialized = true;
         }
         catch (Exception ex)
@@ -197,24 +206,10 @@
         }
     }
 
-    private async Task LoadThemes()
+    private async Task LoadPackages()
     {
-        ShowProgressIndicator();
- 
-        var themes = await ThemeService.GetThemesAsync();
+        ShowProgressIndicator(); 
         _packages = await PackageService.GetPackagesAsync("theme", _search, _price, "", _sort);
-
-        if (_packages != null)
-        {
-            foreach (Package package in _packages.ToArray())
-            {
-                if (themes.Exists(item => item.PackageName == package.PackageId))
-                {
-                    _packages.Remove(package);
-                }
-            }
-        }
-
         HideProgressIndicator();
     }
 
@@ -222,25 +217,25 @@
     {
         _price = price;
         _sort = "popularity";
-        await LoadThemes();
+        await LoadPackages();
         StateHasChanged();
     }
 
     private async Task Search()
     {
-        await LoadThemes();
+        await LoadPackages();
     }
 
     private async Task Reset()
     {
         _page = 1;
         _search = "";
-        await LoadThemes();
+        await LoadPackages();
     }
 
     private async Task Refresh()
     {
-        await LoadThemes();
+        await LoadPackages();
     }
 
     private void OnPageChange(int page)
@@ -251,7 +246,7 @@
     private async void SortChanged(ChangeEventArgs e)
     {
         _sort = (string)e.Value;
-        await LoadThemes();
+        await LoadPackages();
     }
 
     private void HideModal()

Oqtane.Client/Modules/Admin/Themes/Edit.razor

@@ -9,84 +9,98 @@
 
 @if (_initialized)
 {
-    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-        <div class="container">
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
-                <div class="col-sm-9">
-                    <input id="name" class="form-control" @bind="@_name" />
+    <TabStrip>
+        <TabPanel Name="Theme" ResourceKey="Theme" Heading="Theme">
+            <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="name" HelpText="The name of the theme" ResourceKey="Name">Name: </Label>
+                        <div class="col-sm-9">
+                            <input id="name" class="form-control" @bind="@_name" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="isenabled" HelpText="Is theme enabled for this site?" ResourceKey="IsEnabled">Enabled? </Label>
+                        <div class="col-sm-9">
+                            <select id="isenabled" class="form-select" @bind="@_isenabled" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <Section Name="Information" ResourceKey="Information" Heading="Information">
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="themename" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
+                        <div class="col-sm-9">
+                            <input id="themename" class="form-control" @bind="@_themeName" disabled />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="version" HelpText="The version of the theme" ResourceKey="Version">Version: </Label>
+                        <div class="col-sm-9">
+                            <input id="version" class="form-control" @bind="@_version" disabled />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="packagename" HelpText="The unique name of the package from which this theme was installed. This value must be specified within the theme's ITheme interface specification." ResourceKey="PackageName">Package Name: </Label>
+                        <div class="col-sm-9">
+                            <input id="packagename" class="form-control" @bind="@_packagename" disabled />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the theme" ResourceKey="Owner">Owner: </Label>
+                        <div class="col-sm-9">
+                            <input id="owner" class="form-control" @bind="@_owner" disabled />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="url" HelpText="The url of the theme" ResourceKey="Url">Url: </Label>
+                        <div class="col-sm-9">
+                            <input id="url" class="form-control" @bind="@_url" disabled />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="contact" HelpText="The contact for the theme" ResourceKey="Contact">Contact: </Label>
+                        <div class="col-sm-9">
+                            <input id="contact" class="form-control" @bind="@_contact" disabled />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="license" HelpText="The license of the theme" ResourceKey="License">License: </Label>
+                        <div class="col-sm-9">
+                            @if (_license.StartsWith("http") || _license.StartsWith("/") || _license.StartsWith("~"))
+                            {
+                                <a href="@_license.Replace("~", PageState?.Alias.BaseUrl + "/Themes/" + Utilities.GetTypeName(_themeName))" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
+                            }
+                            else
+                            {
+                                <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
+                            }
+                        </div>
+                    </div>
+                </div>
+            </Section>
+            <br />
+            <button type="button" class="btn btn-success" @onclick="SaveTheme">@SharedLocalizer["Save"]</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            <br />
+            <br />
+            <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+        </TabPanel>
+        <TabPanel Name="Permissions" ResourceKey="Permissions" Heading="Permissions">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <PermissionGrid EntityName="@EntityNames.Theme" PermissionNames="@PermissionNames.Utilize" PermissionList="@_permissions" @ref="_permissionGrid" />
                 </div>
             </div>
-             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="isenabled" HelpText="Is theme enabled for this site?" ResourceKey="IsEnabled">Enabled? </Label>
-                <div class="col-sm-9">
-                    <select id="isenabled" class="form-select" @bind="@_isenabled" required>
-                        <option value="True">@SharedLocalizer["Yes"]</option>
-                        <option value="False">@SharedLocalizer["No"]</option>
-                    </select>
-                </div>
-            </div>
-        </div>
-    </form>
-    <Section Name="Information" ResourceKey="Information" Heading="Information">
-        <div class="container">
-             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="themename" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
-                <div class="col-sm-9">
-                    <input id="themename" class="form-control" @bind="@_themeName" disabled />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="version" HelpText="The version of the theme" ResourceKey="Version">Version: </Label>
-                <div class="col-sm-9">
-                    <input id="version" class="form-control" @bind="@_version" disabled />
-                </div>
-            </div>
-	        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="packagename" HelpText="The unique name of the package from which this theme was installed. This value must be specified within the theme's ITheme interface specification." ResourceKey="PackageName">Package Name: </Label>
-		        <div class="col-sm-9">
-                    <input id="packagename" class="form-control" @bind="@_packagename" disabled />
-                </div>
-	        </div>
-	        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the theme" ResourceKey="Owner">Owner: </Label>
-                <div class="col-sm-9">
-                    <input id="owner" class="form-control" @bind="@_owner" disabled />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="url" HelpText="The url of the theme" ResourceKey="Url">Url: </Label>
-                <div class="col-sm-9">
-                    <input id="url" class="form-control" @bind="@_url" disabled />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="contact" HelpText="The contact for the theme" ResourceKey="Contact">Contact: </Label>
-                <div class="col-sm-9">
-                    <input id="contact" class="form-control" @bind="@_contact" disabled />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="license" HelpText="The license of the theme" ResourceKey="License">License: </Label>
-                <div class="col-sm-9">
-                    @if (_license.StartsWith("http") || _license.StartsWith("/") || _license.StartsWith("~"))
-                    {
-                        <a href="@_license.Replace("~", PageState?.Alias.BaseUrl + "/Themes/" + Utilities.GetTypeName(_themeName))" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
-                    }
-                    else
-                    {
-                        <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
-                    }
-                </div>
-            </div>
-        </div>
-    </Section>
-    <br />
-    <button type="button" class="btn btn-success" @onclick="SaveTheme">@SharedLocalizer["Save"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-    <br />
-    <br />
-    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+            <br />
+            <button type="button" class="btn btn-success" @onclick="SaveTheme">@SharedLocalizer["Save"]</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+        </TabPanel>
+    </TabStrip>
 }
 
 @code {
@@ -103,11 +117,14 @@
     private string _url = "";
     private string _contact = "";
     private string _license = "";
+    private List<Permission> _permissions = null;
     private string _createdby;
     private DateTime _createdon;
     private string _modifiedby;
     private DateTime _modifiedon;
 
+    private PermissionGrid _permissionGrid;
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
@@ -126,6 +143,7 @@
                 _url = theme.Url;
                 _contact = theme.Contact;
                 _license = theme.License;
+                _permissions = theme.PermissionList;
                 _createdby = theme.CreatedBy;
                 _createdon = theme.CreatedOn;
                 _modifiedby = theme.ModifiedBy;
@@ -152,6 +170,7 @@
                 var theme = await ThemeService.GetThemeAsync(_themeId, ModuleState.SiteId);
                 theme.Name = _name;
                 theme.IsEnabled = (_isenabled == null ? true : bool.Parse(_isenabled));
+                theme.PermissionList = _permissionGrid.GetPermissionList();
                 await ThemeService.UpdateThemeAsync(theme);
                 await logger.LogInformation("Theme Saved {Theme}", theme);
                 NavigationManager.NavigateTo(NavigateUrl());

Oqtane.Client/Modules/Admin/Themes/Index.razor

@@ -78,7 +78,7 @@ else
     {
         try
         {
-            _themes = await ThemeService.GetThemesAsync();
+            _themes = await ThemeService.GetThemesAsync(PageState.Site.SiteId);
             _packages = await PackageService.GetPackageUpdatesAsync("theme");
         }
         catch (Exception ex)
@@ -161,7 +161,7 @@ else
     {
         try
         {
-            await ThemeService.DeleteThemeAsync(Theme.ThemeName);
+            await ThemeService.DeleteThemeAsync(Theme.ThemeId, PageState.Site.SiteId);
             AddModuleMessage(Localizer["Success.Theme.Delete"], MessageType.Success);
             NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
         }

Oqtane.Client/Modules/Admin/UserProfile/Index.razor

@@ -124,7 +124,6 @@
                                         @if (!string.IsNullOrEmpty(p.Autocomplete))
                                         {
                                             <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete">
-                                                <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                                                 @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                                 {
                                                     var values = option.Split(':');
@@ -144,7 +143,6 @@
                                         else
                                         {
                                             <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
-                                                <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                                                 @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                                 {
                                                     var values = option.Split(':');
@@ -417,7 +415,8 @@
                 if (profile.Options.ToLower().StartsWith("entityname:"))
                 {
                     var options = await SettingService.GetSettingsAsync(profile.Options.Substring(11), -1);
-                    profile.Options = string.Join(",", options.Select(kvp => $"{kvp.Key}:{kvp.Value}"));
+                    options.Add("", $"<{SharedLocalizer["Not Specified"]}>");
+                    profile.Options = string.Join(",", options.OrderBy(item => item.Value).Select(kvp => $"{kvp.Key}:{kvp.Value}"));
                 }
             }
             _timezones = TimeZoneService.GetTimeZones();

Oqtane.Client/Modules/Admin/Users/Add.razor

@@ -86,7 +86,6 @@
                                 @if (!string.IsNullOrEmpty(p.Options))
                                 {
                                     <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
-                                        <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                                         @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                         {
                                             var values = option.Split(':');
@@ -154,7 +153,8 @@
                 if (profile.Options.ToLower().StartsWith("entityname:"))
                 {
                     var options = await SettingService.GetSettingsAsync(profile.Options.Substring(11), -1);
-                    profile.Options = string.Join(",", options.Select(kvp => $"{kvp.Key}:{kvp.Value}"));
+                    options.Add("", $"<{SharedLocalizer["Not Specified"]}>");
+                    profile.Options = string.Join(",", options.OrderBy(item => item.Value).Select(kvp => $"{kvp.Key}:{kvp.Value}"));
                 }
             }
             _settings = new Dictionary<string, string>();

Oqtane.Client/Modules/Admin/Users/Edit.razor

@@ -119,7 +119,6 @@
                                 @if (!string.IsNullOrEmpty(p.Options))
                                 {
                                     <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
-                                        <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                                         @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                         {
                                             var values = option.Split(':');
@@ -213,7 +212,8 @@
                 if (profile.Options.ToLower().StartsWith("entityname:"))
                 {
                     var options = await SettingService.GetSettingsAsync(profile.Options.Substring(11), -1);
-                    profile.Options = string.Join(",", options.Select(kvp => $"{kvp.Key}:{kvp.Value}"));
+                    options.Add("", $"<{SharedLocalizer["Not Specified"]}>");
+                    profile.Options = string.Join(",", options.OrderBy(item => item.Value).Select(kvp => $"{kvp.Key}:{kvp.Value}"));
                 }
             }
             _timezones = TimeZoneService.GetTimeZones();

Oqtane.Client/Modules/Admin/Users/Index.razor

@@ -329,6 +329,15 @@ else
                                         </select>
                                     </div>
                                 </div>
+                                <div class="row mb-1 align-items-center">
+                                    <Label Class="col-sm-3" For="singlelogout" HelpText="Specify if users should be logged out of both the application and provider (the default is false indicating they will only be logged out of the application)" ResourceKey="SingleLogout">Use Single Logout?</Label>
+                                    <div class="col-sm-9">
+                                        <select id="singlelogout" class="form-select" @bind="@_singlelogout" required>
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                    </div>
+                                </div>
                             }
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="scopes" HelpText="A list of Scopes to request from the provider (separated by commas). If none are specified, standard Scopes will be used by default." ResourceKey="Scopes">Scopes:</Label>
@@ -560,6 +569,7 @@ else
     private string _toggleclientsecret = string.Empty;
     private string _authresponsetype;
     private string _requirenonce;
+    private string _singlelogout;
     private string _scopes;
     private string _parameters;
     private string _pkce;
@@ -648,6 +658,7 @@ else
         _toggleclientsecret = SharedLocalizer["ShowPassword"];
         _authresponsetype = SettingService.GetSetting(settings, "ExternalLogin:AuthResponseType", "code");
         _requirenonce = SettingService.GetSetting(settings, "ExternalLogin:RequireNonce", "true");
+        _singlelogout = SettingService.GetSetting(settings, "ExternalLogin:SingleLogout", "false");
         _scopes = SettingService.GetSetting(settings, "ExternalLogin:Scopes", "");
         _parameters = SettingService.GetSetting(settings, "ExternalLogin:Parameters", "");
         _pkce = SettingService.GetSetting(settings, "ExternalLogin:PKCE", "false");
@@ -771,6 +782,7 @@ else
                 settings = SettingService.SetSetting(settings, "ExternalLogin:ClientSecret", _clientsecret, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:AuthResponseType", _authresponsetype, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:RequireNonce", _requirenonce, true);
+                settings = SettingService.SetSetting(settings, "ExternalLogin:SingleLogout", _singlelogout, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:Scopes", _scopes, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:Parameters", _parameters, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:PKCE", _pkce, true);

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -345,11 +345,11 @@
         try
         {
             FolderId = int.Parse((string)e.Value);
-            await OnSelectFolder.InvokeAsync(FolderId);
             FileId = -1;
             GetFolderPermission();
             await SetImage();
             await GetFiles();
+            await OnSelectFolder.InvokeAsync(FolderId);
             StateHasChanged();
         }
         catch (Exception ex)
@@ -364,11 +364,11 @@
     {
         _message = string.Empty;
         FileId = int.Parse((string)e.Value);
+        await SetImage();
     #pragma warning disable CS0618
         await OnSelect.InvokeAsync(FileId);
     #pragma warning restore CS0618
         await OnSelectFile.InvokeAsync(FileId);
-        await SetImage();
         StateHasChanged();
     }
 
@@ -460,13 +460,14 @@
                             }
                         }
 
+                        await SetImage();
+
                         await OnUpload.InvokeAsync(FileId);
 #pragma warning disable CS0618
                         await OnSelect.InvokeAsync(FileId);
 #pragma warning restore CS0618
                         await OnSelectFile.InvokeAsync(FileId);
 
-                        await SetImage();
                         await GetFiles();
                         StateHasChanged();
                     }
@@ -518,12 +519,13 @@
             }
 
             FileId = -1;
+            await SetImage();
+
 #pragma warning disable CS0618
             await OnSelect.InvokeAsync(FileId);
 #pragma warning restore CS0618
             await OnSelectFile.InvokeAsync(FileId);
 
-            await SetImage();
             await GetFiles();
             StateHasChanged();
         }

Oqtane.Client/Modules/Controls/ModuleMessage.razor

@@ -4,29 +4,43 @@
 
 @if (!string.IsNullOrEmpty(Message))
 {
-    <div class="@_classname alert-dismissible fade show mb-3" role="alert">
-        @((MarkupString)Message)
-        @if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-        {
-            <NavLink class="ms-2" href="@NavigateUrl("admin/log")">View Details</NavLink>
-        }
-        @if (ModuleState != null)
-        {
-            @if (ModuleState.RenderMode == RenderModes.Static)
+    @if (_style == MessageStyle.Alert)
+    {
+        <div class="@_classname alert-dismissible fade show mb-3" role="alert">
+            @((MarkupString)Message)
+            @if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
-                <a href="@NavigationManager.Uri" class="btn-close" data-dismiss="alert" aria-label="close"></a>
+                <NavLink class="ms-2" href="@NavigateUrl("admin/log")">View Details</NavLink>
             }
-            else
-            {
-                <button type="button" class="btn-close" data-dismiss="alert" aria-label="close" @onclick="CloseMessage"></button>
-            }
-        }
-    </div>
+            <form method="post" class="app-form-inline" @formname="ModuleMessageForm" @onsubmit="CloseMessage" data-enhance>
+                <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                <button type="submit" class="btn-close" data-dismiss="alert" aria-label="close"></button>
+            </form>
+        </div>
+    }
+
+    @if (_style == MessageStyle.Toast)
+    {
+        <div class="app-modulemessage-toast bottom-0 end-0">
+            <div class="@_classname alert-dismissible fade show mb-3" role="alert">
+                @((MarkupString)Message)
+                @if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                {
+                    <NavLink class="ms-2" href="@NavigateUrl("admin/log")">View Details</NavLink>
+                }
+                <form method="post" class="app-form-inline" @formname="ModuleMessageForm" @onsubmit="CloseMessage" data-enhance>
+                    <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                    <button type="submit" class="btn-close" data-dismiss="alert" aria-label="close"></button>
+                </form>
+            </div>
+        </div>
+    }
 }
 
 @code {
     private string _message = string.Empty;
     private string _classname = string.Empty;
+    private MessageStyle _style;
 
     [Parameter]
     public string Message { get; set; }
@@ -34,6 +48,9 @@
     [Parameter]
     public MessageType Type { get; set; }
 
+    [Parameter]
+    public MessageStyle Style { get; set; } = MessageStyle.Alert;
+
     [Parameter]
     public RenderModeBoundary Parent { get; set; }
 
@@ -43,6 +60,11 @@
         if (!string.IsNullOrEmpty(_message))
         {
             _classname = GetMessageType(Type);
+            _style = Style;
+            if (Type == MessageType.Error)
+            {
+                _style = MessageStyle.Alert; // errors should always be displayed as alerts
+            }
         }
     }
 
@@ -67,9 +89,10 @@
 
         return classname;
     }
-    private void CloseMessage(MouseEventArgs e)
+
+    private void CloseMessage()
     {
-        if(Parent != null)
+        if (Parent != null)
         {
             Parent.DismissMessage();
         }

Oqtane.Client/Modules/Controls/TextEditors/Radzen/RadzenFileManagerDialog.razor

@@ -1,19 +1,23 @@
 @namespace Oqtane.Modules.Controls
-@using System.IO
 @using Radzen
 @using Radzen.Blazor
 @inject DialogService DialogService
 @inject IStringLocalizer<Oqtane.Modules.Controls.RadzenTextEditor> Localizer
 
-<div class="d-flex">
+@if (!string.IsNullOrEmpty(_message))
+{
+    <div class="rz-html-editor-dialog-item">
+        <div class="alert alert-warning alert-dismissible fade show mb-3" role="alert">
+            @((MarkupString)_message)
+        </div>
+    </div>
+}
+<div class="rz-html-editor-dialog-item">
     <FileManager @ref="_fileManager" Filter="@Filters" />
 </div>
-<div class="d-flex">
-    <ModuleMessage Message="@_message" Type="MessageType.Warning"></ModuleMessage>
-</div>
-<div class="mt-1 text-end">
-    <RadzenButton Text="OK" Click=@OnOkClick />
-    <RadzenButton Text="Cancel" Click=@OnCancelClick ButtonStyle="ButtonStyle.Secondary" />
+<div class="rz-html-editor-dialog-buttons">
+    <RadzenButton Text="@Localizer["InsertImage"]" Click="InsertImage" />
+    <RadzenButton Text="@Localizer["Cancel"]" Click="() => DialogService.Close()" ButtonStyle="ButtonStyle.Secondary" />
 </div>
 @code {
     private FileManager _fileManager;
@@ -22,12 +26,7 @@
     [Parameter]
     public string Filters { get; set; }
 
-    private void OnCancelClick()
-    {
-        DialogService.Close(null);
-    }
-
-    private void OnOkClick()
+    private void InsertImage()
     {
         _message = string.Empty;
         var file = _fileManager.GetFile();

Oqtane.Client/Modules/Controls/TextEditors/Radzen/RadzenInsertLinkDialog.razor

@@ -0,0 +1,148 @@
+@namespace Oqtane.Modules.Controls
+@using Radzen
+@using Radzen.Blazor
+@using System.Text
+@inject DialogService DialogService
+@inject IStringLocalizer<Oqtane.Modules.Controls.RadzenTextEditor> Localizer
+
+@if (_linkAttributes != null)
+{
+    @if (!string.IsNullOrWhiteSpace(_message))
+    {
+        <div class="rz-html-editor-dialog-item">
+            <div class="alert alert-warning alert-dismissible fade show mb-3" role="alert">
+                @((MarkupString)_message)
+            </div>
+        </div>
+    }
+    <div class="rz-html-editor-dialog-item">
+        <RadzenDropDown TValue="int" class="form-control" PopupStyle="color: var(--rz-input-value-color);" @bind-Value="_linkType" Data="_linkTypes" TextProperty="Value" ValueProperty="Key" />
+    </div>
+    @if (_linkType == 0)
+    {
+        <div class="rz-html-editor-dialog-item">
+            <RadzenTextBox class="form-control" @bind-Value="@_linkAttributes.Href" Placeholder="@Localizer["WebAddress"]" />
+        </div>
+    }
+    else
+    {
+        <div class="rz-html-editor-dialog-item">
+            <FileManager @ref="_fileManager" OnSelectFile="SelectFile" OnSelectFolder="SelectFile" />
+        </div>
+    }
+    @if (_linkTextEditable)
+    {
+        <div class="rz-html-editor-dialog-item">
+            <RadzenTextBox class="form-control" @bind-Value="@_linkAttributes.InnerText" Placeholder="@Localizer["LinkText"]" />
+        </div>
+    }
+    <div class="rz-html-editor-dialog-item">
+        <RadzenDropDown TValue="bool" class="form-control" PopupStyle="color: var(--rz-input-value-color);" @bind-Value="_blank" Data="_linkTargets" TextProperty="Value" ValueProperty="Key" />
+    </div>
+}
+<div class="rz-html-editor-dialog-buttons">
+    <RadzenButton Text=@Localizer["InsertLink"] Click="InsertLink" />
+    <RadzenButton Text=@Localizer["Cancel"] Click="() => DialogService.Close()" ButtonStyle="ButtonStyle.Secondary" />
+</div>
+
+@code {
+    class LinkAttributes
+    {
+        public string InnerText { get; set; }
+        public string InnerHtml { get; set; }
+        public string Href { get; set; }
+        public string Target { get; set; }
+    }
+
+    [Parameter]
+    public RadzenHtmlEditor Editor { get; set; }
+
+    private IDictionary<int, string> _linkTypes;
+    private IDictionary<bool, string> _linkTargets;
+    private LinkAttributes _linkAttributes;
+    private bool _blank;
+    private int _linkType;
+    private string _message;
+    private bool _linkTextEditable;
+    private FileManager _fileManager;
+    private File _previousFile;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+        _linkAttributes = await Editor.GetSelectionAttributes<LinkAttributes>("a", new[] { "innerText", "href", "target" });
+        if (_linkAttributes.Target == "_blank")
+        {
+            _blank = true;
+        }
+
+        _linkTextEditable = string.IsNullOrWhiteSpace(_linkAttributes.InnerHtml) || _linkAttributes.InnerHtml == "<br>";
+
+        _linkTypes = new Dictionary<int, string>
+        {
+            { 0, Localizer["WebLink"] },
+            { 1, Localizer["FileLink"] }
+        };
+
+        _linkTargets = new Dictionary<bool, string>
+        {
+            { false, Localizer["OpenInCurrentWindow"] },
+            { true, Localizer["OpenInNewWindow"] }
+        };
+    }
+
+    private void SelectFile()
+    {
+        var file = _fileManager.GetFile();
+        if(file != null)
+        {
+            _linkAttributes.Href = file.Url;
+            if ((string.IsNullOrWhiteSpace(_linkAttributes.InnerText) || _linkAttributes.InnerText == _previousFile?.Name) && _linkTextEditable)
+            {
+                _linkAttributes.InnerText = file.Name;
+            }
+        }
+        else
+        {
+            _linkAttributes.Href = string.Empty;
+            if (_linkAttributes.InnerText == _previousFile?.Name)
+            {
+                _linkAttributes.InnerText = string.Empty;
+            }
+        }
+        _previousFile = file;
+
+        StateHasChanged();
+    }
+
+    private void InsertLink()
+    {
+        _message = string.Empty;
+        if (string.IsNullOrWhiteSpace(_linkAttributes.Href))
+        {
+            _message = _linkType == 1 ? Localizer["Message.Require.File"] : Localizer["Message.Require.WebAddress"];
+        }
+        else if (string.IsNullOrWhiteSpace(_linkAttributes.InnerText) && _linkTextEditable)
+        {
+            _message = Localizer["Message.Require.LinkText"];
+        }
+
+        if (string.IsNullOrWhiteSpace(_message))
+        {
+            var html = new StringBuilder();
+            html.AppendFormat("<a href=\"{0}\"", _linkAttributes.Href);
+            if (_blank)
+            {
+                html.Append(" target=\"_blank\"");
+            }
+
+            html.AppendFormat(">{0}</a>", string.IsNullOrWhiteSpace(_linkAttributes.InnerText) ? _linkAttributes.InnerHtml : _linkAttributes.InnerText);
+
+            DialogService.Close(html.ToString());
+        }
+        else
+        {
+            StateHasChanged();
+        }
+    }
+}

Oqtane.Client/Modules/Controls/TextEditors/Radzen/RadzenTextEditor.placeholder.cs

@@ -0,0 +1,12 @@
+// This is just a placeholder file
+// It is necessary for the documentation to successfully build this project.
+// Reason is that docfx will run the .net compiler and find references
+// to this class in the project.
+// But since the real class is just a .razor file, ATM docfx will fail.
+//
+// Note added 2025-09-23 by @tvatavuk.
+// We hope that as .net and docfx improve, the razor-compiler will work in that scenario
+// as well, and this file can be removed.
+
+namespace Oqtane.Modules.Controls;
+public partial class RadzenTextEditor;

Oqtane.Client/Modules/Controls/TextEditors/Radzen/RadzenTextEditor.razor

@@ -51,8 +51,8 @@
 
     public override List<Resource> Resources { get; set; } = new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Script, Url = "_content/Radzen.Blazor/Radzen.Blazor.js", Location = ResourceLocation.Body },
-        new Resource { ResourceType = ResourceType.Script, Url = "js/texteditors/radzen/radzen-interop.js", Location = ResourceLocation.Body }
+        new Script("_content/Radzen.Blazor/Radzen.Blazor.js"),
+        new Script("js/texteditors/radzen/radzen-interop.js")
     };
 
     protected override void OnInitialized()
@@ -147,13 +147,17 @@
 
     private async Task OnExecute(HtmlEditorExecuteEventArgs args)
     {
-        if (args.CommandName == "InsertImage")
+        switch(args.CommandName)
         {
-            await InsertImage(args.Editor);
-        }
-        else if (args.CommandName == "Settings")
-        {
-            await UpdateSettings(args.Editor);
+            case "InsertImage":
+                await InsertImage(args.Editor);
+                break;
+            case "InsertLink":
+                await InsertLink(args.Editor);
+                break;
+            case "Settings":
+                await UpdateSettings(args.Editor);
+                break;
         }
     }
 
@@ -161,10 +165,27 @@
     {
         await editor.SaveSelectionAsync();
 
-        var result = await DialogService.OpenAsync<FileManagerDialog>(Localizer["DialogTitle.SelectImage"], new Dictionary<string, object>
+        var result = await DialogService.OpenAsync<RadzenFileManagerDialog>(Localizer["DialogTitle.SelectImage"], new Dictionary<string, object>
         {
             { "Filters", PageState.Site.ImageFiles }
-        });
+        }, new DialogOptions { CssClass = "rz-text-editor-dialog" });
+
+        await editor.RestoreSelectionAsync();
+
+        if (result != null)
+        {
+            await editor.ExecuteCommandAsync(HtmlEditorCommands.InsertHtml, result);
+        }
+    }
+
+    private async Task InsertLink(RadzenHtmlEditor editor)
+    {
+        await editor.SaveSelectionAsync();
+
+        var result = await DialogService.OpenAsync<RadzenInsertLinkDialog>(Localizer["DialogTitle.InsertLink"], new Dictionary<string, object>
+        {
+            { "Editor", editor }
+        }, new DialogOptions { CssClass = "rz-text-editor-dialog" });
 
         await editor.RestoreSelectionAsync();
 
@@ -178,7 +199,7 @@
     {
         await editor.SaveSelectionAsync();
 
-        var result = await DialogService.OpenAsync<SettingsDialog>(Localizer["Settings"], null, new DialogOptions { Width = "650px" });
+        var result = await DialogService.OpenAsync<RadzenTextEditorSettingsDialog>(Localizer["Settings"], null, new DialogOptions { Width = "650px" });
         if (result == true)
         {
             NavigationManager.NavigateTo(NavigationManager.Uri);

Oqtane.Client/Modules/Controls/TextEditors/Radzen/RadzenTextEditorDefinitions.cs

@@ -33,7 +33,7 @@ namespace Oqtane.Modules.Controls
             { "InsertImage", (builder, sequence) => CreateFragment(builder, sequence, "InsertImage", "RadzenHtmlEditorCustomTool", "InsertImage", "image") },
             { "Italic", (builder, sequence) => CreateFragment(builder, sequence, "Italic", "RadzenHtmlEditorItalic") },
             { "Justify", (builder, sequence) => CreateFragment(builder, sequence, "Justify", "RadzenHtmlEditorJustify") },
-            { "Link", (builder, sequence) => CreateFragment(builder, sequence, "Link", "RadzenHtmlEditorLink") },
+            { "Link", (builder, sequence) => CreateFragment(builder, sequence, "InsertLink", "RadzenHtmlEditorCustomTool", "InsertLink", "insert_link") },
             { "OrderedList", (builder, sequence) => CreateFragment(builder, sequence, "OrderedList", "RadzenHtmlEditorOrderedList") },
             { "Outdent", (builder, sequence) => CreateFragment(builder, sequence, "Outdent", "RadzenHtmlEditorOutdent") },
             { "Redo", (builder, sequence) => CreateFragment(builder, sequence, "Redo", "RadzenHtmlEditorRedo") },

Oqtane.Client/Modules/Enums/MessageStyle.cs

@@ -0,0 +1,8 @@
+namespace Oqtane.Modules
+{
+    public enum MessageStyle
+    {
+        Alert,
+        Toast
+    }
+}

Oqtane.Client/Modules/HtmlText/ModuleInfo.cs

@@ -18,7 +18,7 @@ namespace Oqtane.Modules.HtmlText
             SettingsType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client",
             Resources = new List<Resource>()
             {
-                new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Module.css" }
+                new Stylesheet("~/Module.css")
             }
         };
     }

Oqtane.Client/Modules/ModuleBase.cs

@@ -379,7 +379,17 @@ namespace Oqtane.Modules
 
         public void AddModuleMessage(string message, MessageType type, string position)
         {
-            RenderModeBoundary.AddModuleMessage(message, type, position);
+            AddModuleMessage(message, type, position, MessageStyle.Alert);
+        }
+
+        public void AddModuleMessage(string message, MessageType type, MessageStyle style)
+        {
+            AddModuleMessage(message, type, "top", style);
+        }
+
+        public void AddModuleMessage(string message, MessageType type, string position, MessageStyle style)
+        {
+            RenderModeBoundary.AddModuleMessage(message, type, position, style);
         }
 
         public void ClearModuleMessage()

Oqtane.Client/Oqtane.Client.csproj

@@ -1,32 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <Configurations>Debug;Release</Configurations>
-    <Version>6.2.0</Version>
-    <Product>Oqtane</Product>
-    <Authors>Shaun Walker</Authors>
-    <Company>.NET Foundation</Company>
-    <Description>CMS and Application Framework for Blazor and .NET MAUI</Description>
-    <Copyright>.NET Foundation</Copyright>
-    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.2.0</PackageReleaseNotes>
-    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
-    <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
-    <IsPackable>true</IsPackable>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
     <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
-    <PackageReference Include="Radzen.Blazor" Version="7.3.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
+    <PackageReference Include="Radzen.Blazor" Version="7.4.3" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx

@@ -183,8 +183,8 @@
   <data name="Runtimes.Text" xml:space="preserve">
     <value>Runtimes: </value>
   </data>
-  <data name="Definition.Heading" xml:space="preserve">
-    <value>Definition</value>
+  <data name="Module.Heading" xml:space="preserve">
+    <value>Module</value>
   </data>
   <data name="Information.Heading" xml:space="preserve">
     <value>Information</value>

Oqtane.Client/Resources/Modules/Admin/Profiles/Edit.resx

@@ -157,7 +157,7 @@
     <value>The default value for this profile item</value>
   </data>
   <data name="Options.HelpText" xml:space="preserve">
-    <value>A comma delimited list of options. Options can contain a key and value if they are seperated by a colon (ie. key:value). You can also dynamically load your options from custom Settings (ie. 'EntityName:Countries').</value>
+    <value>A comma delimited list of options. Options can contain a key and value if they are seperated by a colon (ie. key:value). You can also dynamically load your options from Settings.</value>
   </data>
   <data name="Required.HelpText" xml:space="preserve">
     <value>Should a user be required to provide a value for this profile item?</value>
@@ -201,4 +201,10 @@
   <data name="Autocomplete.Text" xml:space="preserve">
     <value>Autocomplete: </value>
   </data>
+  <data name="Options" xml:space="preserve">
+    <value>Options</value>
+  </data>
+    <data name="Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx

@@ -309,4 +309,19 @@
   <data name="Endpoints" xml:space="preserve">
     <value>API Endpoints</value>
   </data>
+  <data name="Migration" xml:space="preserve">
+    <value>Migration</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Date</value>
+  </data>
+  <data name="Version" xml:space="preserve">
+    <value>Framework Version</value>
+  </data>
+  <data name="Tenant.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Tenant.HelpText" xml:space="preserve">
+    <value>The name of the current database. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database.</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Themes/Edit.resx

@@ -180,4 +180,10 @@
   <data name="View License" xml:space="preserve">
     <value>View License</value>
   </data>
+  <data name="Theme.Heading" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="Permissions.Heading" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Users/Index.resx

@@ -555,4 +555,10 @@
   <data name="CookieDomain.HelpText" xml:space="preserve">
     <value>If you would like to share cookies across subdomains you will need to specify a root domain with a leading dot (ie. '.example.com')</value>
   </data>
+  <data name="SingleLogout.Text" xml:space="preserve">
+    <value>Allow Single Logout?</value>
+  </data>
+  <data name="SingleLogout.HelpText" xml:space="preserve">
+    <value>Specify if users should be logged out of both the application and provider (the default is false indicating they will only be logged out of the application)</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Controls/RadzenTextEditor.resx

@@ -216,4 +216,37 @@
   <data name="Reset" xml:space="preserve">
     <value>Reset</value>
   </data>
+  <data name="InsertLink" xml:space="preserve">
+    <value>Insert Link</value>
+  </data>
+  <data name="DialogTitle.InsertLink" xml:space="preserve">
+    <value>Insert Link</value>
+  </data>
+  <data name="WebAddress" xml:space="preserve">
+    <value>Enter Web Address</value>
+  </data>
+  <data name="LinkText" xml:space="preserve">
+    <value>Enter Link Text</value>
+  </data>
+  <data name="OpenInNewWindow" xml:space="preserve">
+    <value>Open In New Window</value>
+  </data>
+  <data name="WebLink" xml:space="preserve">
+    <value>Web Link</value>
+  </data>
+  <data name="FileLink" xml:space="preserve">
+    <value>File Link</value>
+  </data>
+  <data name="OpenInCurrentWindow" xml:space="preserve">
+    <value>Open In Current Window</value>
+  </data>
+  <data name="Message.Require.WebAddress" xml:space="preserve">
+    <value>The Web Address is Empty</value>
+  </data>
+  <data name="Message.Require.LinkText" xml:space="preserve">
+    <value>The Link Text is Empty</value>
+  </data>
+  <data name="Message.Require.File" xml:space="preserve">
+    <value>You Must Select a File</value>
+  </data>
 </root>

Oqtane.Client/Resources/SharedResources.resx

@@ -477,4 +477,7 @@
   <data name="Path" xml:space="preserve">
     <value>Path</value>
   </data>
+  <data name="Installed" xml:space="preserve">
+    <value>Installed</value>
+  </data>
 </root>

Oqtane.Client/Services/FileService.cs

@@ -101,7 +101,6 @@ namespace Oqtane.Services
         /// Unzips the contents of a zip file
         /// </summary>
         /// <param name="fileId">Reference to the <see cref="File"/></param>
-        /// </param>
         /// <returns></returns>
         Task UnzipFileAsync(int fileId);
     }

Oqtane.Client/Services/MigrationHistoryService.cs

@@ -0,0 +1,34 @@
+using Oqtane.Models;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Oqtane.Documentation;
+using Oqtane.Shared;
+
+namespace Oqtane.Services
+{
+    /// <summary>
+    /// Service to manage <see cref="MigrationHistory/>s on the Oqtane installation.
+    /// </summary>
+    public interface IMigrationHistoryService
+    {
+        /// <summary>
+        /// Get all <see cref="MigrationHistory"/>s
+        /// </summary>
+        /// <returns></returns>
+        Task<List<MigrationHistory>> GetMigrationHistoryAsync();
+    }
+
+    [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
+    public class MigrationHistoryService : ServiceBase, IMigrationHistoryService
+    {
+        public MigrationHistoryService(HttpClient http, SiteState siteState) : base(http, siteState) { }
+
+        private string Apiurl => CreateApiUrl("MigrationHistory");
+
+        public async Task<List<MigrationHistory>> GetMigrationHistoryAsync()
+        {
+            return await GetJsonAsync<List<MigrationHistory>>(Apiurl);
+        }
+    }
+}

Oqtane.Client/Services/SettingService.cs

@@ -429,49 +429,20 @@ namespace Oqtane.Services
 
         public async Task UpdateSettingsAsync(Dictionary<string, string> settings, string entityName, int entityId)
         {
-            var settingsList = await GetSettingsAsync(entityName, entityId, "");
+            var settingsList = new List<Setting>();
 
             foreach (KeyValuePair<string, string> kvp in settings)
             {
-                string value = kvp.Value;
-                bool modified = false;
-                bool isprivate = false;
-
-                // manage settings modified with SetSetting method
-                if (value.StartsWith("[Private]"))
-                {
-                    modified = true;
-                    isprivate = true;
-                    value = value.Substring(9);                  
-                }
-                if (value.StartsWith("[Public]"))
-                {
-                    modified = true;
-                    isprivate = false;
-                    value = value.Substring(8);                   
-                }
-
-                Setting setting = settingsList.FirstOrDefault(item => item.SettingName.Equals(kvp.Key, StringComparison.OrdinalIgnoreCase));
-                if (setting == null)
-                {
-                    setting = new Setting();
-                    setting.EntityName = entityName;
-                    setting.EntityId = entityId;
-                    setting.SettingName = kvp.Key;
-                    setting.SettingValue = value;
-                    setting.IsPrivate = isprivate;
-                    setting = await AddSettingAsync(setting);
-                }
-                else
-                {
-                    if (setting.SettingValue != value || (modified && setting.IsPrivate != isprivate))
-                    {
-                        setting.SettingValue = value;
-                        setting.IsPrivate = isprivate;
-                        setting = await UpdateSettingAsync(setting);
-                    }
-                }
+                var setting = new Setting();
+                setting.EntityName = entityName;
+                setting.EntityId = entityId;
+                setting.SettingName = kvp.Key;
+                setting.SettingValue = kvp.Value;
+                setting.IsPrivate = true;
+                settingsList.Add(setting);
             }
+
+            await PutJsonAsync<List<Setting>>($"{Apiurl}/{entityName}/{entityId}", settingsList);
         }
 
         public async Task AddOrUpdateSettingAsync(string entityName, int entityId, string settingName, string settingValue, bool isPrivate)

Oqtane.Client/Services/ThemeService.cs

@@ -17,8 +17,9 @@ namespace Oqtane.Services
         /// <summary>
         /// Returns a list of available themes
         /// </summary>
+        /// <param name="siteId"></param>
         /// <returns></returns>
-        Task<List<Theme>> GetThemesAsync();
+        Task<List<Theme>> GetThemesAsync(int siteId);
 
         /// <summary>
         /// Returns a specific theme
@@ -69,9 +70,10 @@ namespace Oqtane.Services
         /// <summary>
         /// Deletes a theme
         /// </summary>
-        /// <param name="themeName"></param>
+        /// <param name="themeId"></param>
+        /// <param name="siteId"></param>
         /// <returns></returns>
-        Task DeleteThemeAsync(string themeName);
+        Task DeleteThemeAsync(int themeId, int siteId);
 
         /// <summary>
         /// Creates a new theme
@@ -103,9 +105,9 @@ namespace Oqtane.Services
 
         private string ApiUrl => CreateApiUrl("Theme");
 
-        public async Task<List<Theme>> GetThemesAsync()
+        public async Task<List<Theme>> GetThemesAsync(int siteId)
         {
-            List<Theme> themes = await GetJsonAsync<List<Theme>>(ApiUrl);
+            List<Theme> themes = await GetJsonAsync<List<Theme>>($"{ApiUrl}?siteid={siteId}");
             return themes.OrderBy(item => item.Name).ToList();
         }
         public async Task<Theme> GetThemeAsync(int themeId, int siteId)
@@ -139,9 +141,9 @@ namespace Oqtane.Services
             await PutJsonAsync($"{ApiUrl}/{theme.ThemeId}", theme);
         }
 
-        public async Task DeleteThemeAsync(string themeName)
+        public async Task DeleteThemeAsync(int themeId, int siteId)
         {
-            await DeleteAsync($"{ApiUrl}/{themeName}");
+            await DeleteAsync($"{ApiUrl}/{themeId}?siteid={siteId}");
         }
 
         public async Task<Theme> CreateThemeAsync(Theme theme)

Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor

@@ -15,13 +15,13 @@
         <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
         @if (PageState.EditMode)
         {
-            <button type="submit" class="btn @ButtonClass active" aria-pressed="true" autocomplete="off">
+            <button type="submit" class="app-editmode btn @ButtonClass active" aria-pressed="true" autocomplete="off">
                 <span class="oi oi-pencil"></span>
             </button>
         }
         else
         {
-            <button type="submit" class="btn @ButtonClass" aria-pressed="false" autocomplete="off">
+            <button type="submit" class="app-editmode btn @ButtonClass" aria-pressed="false" autocomplete="off">
                 <span class="oi oi-pencil"></span>
             </button>
         }

Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor

@@ -16,7 +16,7 @@
 @inject IStringLocalizer<ControlPanelInteractive> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<button type="button" class="btn @ButtonClass ms-1" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel" @onclick="ClearMessage">
+<button type="button" class="app-controlpanel btn @ButtonClass ms-1" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel" @onclick="ClearMessage">
     <span class="oi oi-cog"></span>
 </button>
 

Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor

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

Oqtane.Client/UI/RenderModeBoundary.razor

@@ -12,7 +12,7 @@
             {
                 @if (!string.IsNullOrEmpty(_messageContent) && _messagePosition == "top")
                 {
-                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" />
+                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" Style="@_messageStyle" />
                 }
                 @DynamicComponent
                 @if (_progressIndicator)
@@ -21,7 +21,7 @@
                 }
                 @if (!string.IsNullOrEmpty(_messageContent) && _messagePosition == "bottom")
                 {
-                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" />
+                    <ModuleMessage Message="@_messageContent" Type="@_messageType" Parent="@this" Style="@_messageStyle" />
                 }
             }
         }
@@ -45,6 +45,7 @@
     private string _messageContent;
     private MessageType _messageType;
     private string _messagePosition;
+    private MessageStyle _messageStyle;
     private bool _progressIndicator = false;
     private string _error;
 
@@ -87,6 +88,7 @@
                     _messageContent = string.Format(Localizer["Error.Module.InvalidName"], Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0));
                     _messageType = MessageType.Error;
                     _messagePosition = "top";
+                    _messageStyle = MessageStyle.Alert;
                 }
             }
             else
@@ -94,6 +96,7 @@
                 _messageContent = string.Format(Localizer["Error.Module.InvalidType"], ModuleState.ModuleDefinitionName);
                 _messageType = MessageType.Error;
                 _messagePosition = "top";
+                _messageStyle = MessageStyle.Alert;
             }
         }
     }
@@ -105,13 +108,22 @@
 
     public void AddModuleMessage(string message, MessageType type, string position)
     {
-        if (message != _messageContent
-            || type != _messageType
-            || position != _messagePosition)
+        AddModuleMessage(message, type, position, MessageStyle.Alert);
+    }
+
+    public void AddModuleMessage(string message, MessageType type, MessageStyle style)
+    {
+        AddModuleMessage(message, type, "top", style);
+    }
+
+    public void AddModuleMessage(string message, MessageType type, string position, MessageStyle style)
+    {
+        if (message != _messageContent || type != _messageType || position != _messagePosition || style != _messageStyle)
         {
             _messageContent = message;
             _messageType = type;
             _messagePosition = position;
+            _messageStyle = style;
             _progressIndicator = false;
 
             StateHasChanged();

Oqtane.Maui/Oqtane.Maui.csproj

@@ -6,17 +6,6 @@
     <!-- <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks> -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
-    <Version>6.2.0</Version>
-    <Product>Oqtane</Product>
-    <Authors>Shaun Walker</Authors>
-    <Company>.NET Foundation</Company>
-    <Description>Modular Application Framework for Blazor and MAUI</Description>
-    <Copyright>.NET Foundation</Copyright>
-    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.2.0</PackageReleaseNotes>
-    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
-    <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane.Maui</RootNamespace>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
@@ -30,7 +19,7 @@
 		<ApplicationId>com.oqtane.maui</ApplicationId>
     
 		<!-- Versions -->
-		<ApplicationDisplayVersion>6.2.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>6.2.1</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
     <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
@@ -67,14 +56,14 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.100" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.100" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.100" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.110" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.110" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Maui/wwwroot/css/app.css

@@ -286,3 +286,34 @@ app {
     top: 0;
     right: 5px;
 }
+
+.app-modulemessage-toast {
+    position: fixed;
+    width: 350px;
+    z-index: 1000;
+    animation: slide-in 0.5s ease-out, slide-out 0.5s ease-in 5s forwards;
+}
+
+@keyframes slide-in {
+    from {
+        transform: translateX(100%);
+        opacity: 0;
+    }
+
+    to {
+        transform: translateX(0);
+        opacity: 1;
+    }
+}
+
+@keyframes slide-out {
+    from {
+        transform: translateX(0);
+        opacity: 1;
+    }
+
+    to {
+        transform: translateX(100%);
+        opacity: 0;
+    }
+}

Oqtane.Maui/wwwroot/css/texteditors/radzen/radzentexteditor.css

@@ -0,0 +1,42 @@
+.rz-text-editor {
+    outline: none !important;
+}
+
+.rz-html-editor-dropdown-items,
+.rz-popup,
+.rz-editor-dialog-wrapper {
+    z-index: 9999 !important;
+}
+
+.rz-html-editor-dropdown-items .rz-html-editor-dropdown-item,
+.rz-html-editor-dropdown-items .rz-html-editor-dropdown-item > * {
+    color: var(--rz-editor-button-color);
+}
+.rz-text-editor .rz-html-editor-dropdown .rz-html-editor-dropdown-value,
+.rz-text-editor .rz-html-editor-dropdown .rz-html-editor-dropdown-trigger,
+.rz-text-editor .rz-html-editor-colorpicker .rz-html-editor-color {
+    color: var(--rz-editor-button-color);
+}
+.rz-text-editor .rz-colorpicker.rz-state-disabled {
+    border: none !important;
+}
+.rz-text-editor-dialog .rz-html-editor-dialog-item select{
+    border: var(--rz-input-border);
+    border-block-end: var(--rz-input-border-block-end);
+    border-radius: var(--rz-input-border-radius);
+    box-shadow: var(--rz-input-shadow);
+    background-color: var(--rz-input-background-color);
+    padding-block: var(--rz-input-padding-block);
+    padding-inline: var(--rz-input-padding-inline);
+    font-size: var(--rz-input-font-size);
+    color: var(--rz-input-value-color);
+}
+.rz-text-editor-dialog .rz-html-editor-dialog-item select:hover, .rz-text-edit-dialog .rz-html-editor-dialog-item select:active {
+    box-shadow: var(--rz-input-hover-shadow);
+    background-color: var(--rz-input-hover-background-color);
+    border: var(--rz-input-hover-border);
+    border-block-end: var(--rz-input-hover-border-block-end);
+}
+.rz-text-editor-dialog .alert form{
+    display: none;
+}