changing default theme to Oqtane theme

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -98,9 +98,6 @@
     private string _message = string.Empty;
     private string _image = string.Empty;
     private string _guid;
-    private int _folderId = -1;
-    private bool _uploadMultiple;
-    private int _fileId;
 
     [Parameter]
     public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility

Oqtane.Client/Themes/ContainerBase.cs

@@ -17,7 +17,6 @@ namespace Oqtane.Themes
         [CascadingParameter]
         protected Module ModuleState { get; set; }
 
-        public virtual string Name { get; set; }
 
         public string ThemePath()
         {

Oqtane.Client/Themes/IContainerControl.cs

@@ -2,6 +2,5 @@
 {
     public interface IContainerControl
     {
-        string Name { get; }
     }
 }

Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor

@@ -0,0 +1,9 @@
+@namespace Oqtane.Themes.OqtaneTheme
+@inherits ContainerBase
+<div class="container">
+    @if (PageState.EditMode)
+    {
+        <ModuleActions />
+    }
+    <ModuleInstance />
+</div>

Oqtane.Client/Themes/ThemeBase.cs

@@ -13,32 +13,21 @@ namespace Oqtane.Themes
         [Inject]
         protected IJSRuntime JSRuntime { get; set; }
 
+        // optional interface properties
+
         [CascadingParameter]
         protected PageState PageState { get; set; }
         public virtual string Panes { get; set; }
         public virtual List<Resource> Resources { get; set; }
 
+        // path method
+
         public string ThemePath()
         {
             return "Themes/" + GetType().Namespace + "/";
         }
 
-        public async Task IncludeCSS(string Url)
-        {
-            if (!Url.StartsWith("http"))
-            {
-                Url = ThemePath() + Url;
-            }
-            var interop = new Interop(JSRuntime);
-            await interop.IncludeCSS("Theme", Url);
-        }
-
-        public async Task LoadBootstrapTheme(string url, string integrity = null)
-        {
-            var interop = new Interop(JSRuntime);
-            string crossorigin = string.IsNullOrEmpty(integrity) ? string.Empty : "anonymous";
-            await interop.IncludeLink("bootstrap", "stylesheet", url, "text/css", integrity, crossorigin);
-        }
+        // url methods
 
         public string NavigateUrl()
         {

Oqtane.Client/UI/Installer.razor

@@ -7,7 +7,7 @@
 <div class="container">
     <div class="row">
         <div class="mx-auto text-center">
-            <img src="oqtane.png" />
+            <img src="oqtane-black.png" />
         </div>
     </div>
     <hr class="app-rule" />

Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs

@@ -56,7 +56,7 @@ namespace Oqtane.SiteTemplates
                             new Permission(PermissionNames.Edit, Constants.AdminRole, true)
                         }.EncodePermissions(),
                         Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a <b>fully dynamic</b> web development experience which can be executed on a client or server. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
-                        "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane.png\"></a></p><p align=\"center\"><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a></p>" +
+                        "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane-white.png\"></a></p><p align=\"center\"><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a></p>" +
                         "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Client-side Blazor relies on WebAssembly, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Server-side Blazor uses SignalR to host your application on a web server and provide a responsive and robust debugging experience. Blazor applications works in all modern web browsers, including mobile browsers.</p>" +
                         "<p>Blazor is a feature of <a href=\"https://dotnet.microsoft.com/apps/aspnet\" target=\"_new\">ASP.NET Core 3</a>, the popular cross platform web development framework from Microsoft that extends the <a href=\"https://dotnet.microsoft.com/learn/dotnet/what-is-dotnet\" target=\"_new\" >.NET developer platform</a> with tools and libraries for building web apps.</p>"
                     },
@@ -132,16 +132,16 @@ namespace Oqtane.SiteTemplates
                 }
             });
 
-            if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo.png")))
+            if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo-white.png")))
             {
                 string folderpath = Utilities.PathCombine(_environment.ContentRootPath, "Content", "Tenants", site.TenantId.ToString(), "Sites", site.SiteId.ToString(),"\\");
                 System.IO.Directory.CreateDirectory(folderpath);
-                if (!System.IO.File.Exists(Path.Combine(folderpath, "logo.png")))
+                if (!System.IO.File.Exists(Path.Combine(folderpath, "logo-white.png")))
                 {
-                    System.IO.File.Copy(Path.Combine(_environment.WebRootPath, "images", "logo.png"), Path.Combine(folderpath, "logo.png"));
+                    System.IO.File.Copy(Path.Combine(_environment.WebRootPath, "images", "logo-white.png"), Path.Combine(folderpath, "logo-white.png"));
                 }
                 Folder folder = _folderRepository.GetFolder(site.SiteId, "");
-                Oqtane.Models.File file = _fileRepository.AddFile(new Oqtane.Models.File { FolderId = folder.FolderId, Name = "logo.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 });
+                Oqtane.Models.File file = _fileRepository.AddFile(new Oqtane.Models.File { FolderId = folder.FolderId, Name = "logo-white.png", Extension = "png", Size = 8192, ImageHeight = 80, ImageWidth = 250 });
                 site.LogoFileId = file.FileId;
                 _siteRepository.UpdateSite(site);
             }

Oqtane.Server/app_offline.bak

@@ -10,7 +10,7 @@
 <body>
     <div>
 	<br /><br /><h1 align="center">Please Wait... Upgrade In Progress....</h1>
-        <img src="https://www.oqtane.org/Portals/0/oqtane.png" style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%);" />
+        <img src="https://www.oqtane.org/Portals/0/oqtane-black.png" style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%);" />
     </div>
 </body>
 </html>

Oqtane.Shared/Shared/Constants.cs

@@ -11,9 +11,9 @@ namespace Oqtane.Shared
         public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client";
         public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client";
 
-        public const string DefaultTheme = "Oqtane.Themes.BlazorTheme.Default, Oqtane.Client";
-        public const string DefaultLayout = "";
-        public const string DefaultContainer = "Oqtane.Themes.BlazorTheme.Container, Oqtane.Client";
+        public const string DefaultTheme = "Oqtane.Themes.OqtaneTheme.Default, Oqtane.Client";
+        public const string DefaultLayout = "Oqtane.Themes.OqtaneTheme.SinglePane, Oqtane.Client";
+        public const string DefaultContainer = "Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client";
         public const string DefaultAdminContainer = "Oqtane.Themes.AdminContainer, Oqtane.Client";
 
         public const string ActionToken = "{Action}";