diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor index 35f04706..96196b06 100644 --- a/Oqtane.Client/Modules/Controls/FileManager.razor +++ b/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 diff --git a/Oqtane.Client/Themes/ContainerBase.cs b/Oqtane.Client/Themes/ContainerBase.cs index d55b718f..af4ff355 100644 --- a/Oqtane.Client/Themes/ContainerBase.cs +++ b/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() { diff --git a/Oqtane.Client/Themes/IContainerControl.cs b/Oqtane.Client/Themes/IContainerControl.cs index e50f6859..a76959ff 100644 --- a/Oqtane.Client/Themes/IContainerControl.cs +++ b/Oqtane.Client/Themes/IContainerControl.cs @@ -2,6 +2,5 @@ { public interface IContainerControl { - string Name { get; } } } diff --git a/Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor b/Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor new file mode 100644 index 00000000..0d48bc64 --- /dev/null +++ b/Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor @@ -0,0 +1,9 @@ +@namespace Oqtane.Themes.OqtaneTheme +@inherits ContainerBase +
+ @if (PageState.EditMode) + { + + } + +
\ No newline at end of file diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs index 3e3136f5..af05f94a 100644 --- a/Oqtane.Client/Themes/ThemeBase.cs +++ b/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 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() { diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor index c3afd00d..155a5576 100644 --- a/Oqtane.Client/UI/Installer.razor +++ b/Oqtane.Client/UI/Installer.razor @@ -7,7 +7,7 @@
- +
diff --git a/Oqtane.Server/wwwroot/images/logo.png b/Oqtane.Server/Content/Tenants/1/Sites/1/logo-white.png similarity index 100% rename from Oqtane.Server/wwwroot/images/logo.png rename to Oqtane.Server/Content/Tenants/1/Sites/1/logo-white.png diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index 346e481f..c9a3a036 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -56,7 +56,7 @@ namespace Oqtane.SiteTemplates new Permission(PermissionNames.Edit, Constants.AdminRole, true) }.EncodePermissions(), Content = "

Oqtane is an open source modular application framework built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a fully dynamic web development experience which can be executed on a client or server. Whether you are looking for a platform to accelerate your web development 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.

" + - "

Join Our Community  Clone Our Repo

" + + "

Join Our Community  Clone Our Repo

" + "

Blazor 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.

" + "

Blazor is a feature of ASP.NET Core 3, the popular cross platform web development framework from Microsoft that extends the .NET developer platform with tools and libraries for building web apps.

" }, @@ -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); } diff --git a/Oqtane.Server/app_offline.bak b/Oqtane.Server/app_offline.bak index 94be8d84..d26d5e2b 100644 --- a/Oqtane.Server/app_offline.bak +++ b/Oqtane.Server/app_offline.bak @@ -10,7 +10,7 @@


Please Wait... Upgrade In Progress....

- +
diff --git a/Oqtane.Server/wwwroot/images/logo-black.png b/Oqtane.Server/wwwroot/images/logo-black.png new file mode 100644 index 00000000..9463cbf0 Binary files /dev/null and b/Oqtane.Server/wwwroot/images/logo-black.png differ diff --git a/Oqtane.Server/wwwroot/images/logo-white.png b/Oqtane.Server/wwwroot/images/logo-white.png new file mode 100644 index 00000000..94454bf6 Binary files /dev/null and b/Oqtane.Server/wwwroot/images/logo-white.png differ diff --git a/Oqtane.Server/wwwroot/oqtane-black.png b/Oqtane.Server/wwwroot/oqtane-black.png new file mode 100644 index 00000000..f3c92bf0 Binary files /dev/null and b/Oqtane.Server/wwwroot/oqtane-black.png differ diff --git a/Oqtane.Server/wwwroot/oqtane-white.png b/Oqtane.Server/wwwroot/oqtane-white.png new file mode 100644 index 00000000..1d75a012 Binary files /dev/null and b/Oqtane.Server/wwwroot/oqtane-white.png differ diff --git a/Oqtane.Server/wwwroot/oqtane.png b/Oqtane.Server/wwwroot/oqtane.png deleted file mode 100644 index 8d18cc15..00000000 Binary files a/Oqtane.Server/wwwroot/oqtane.png and /dev/null differ diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 5b91ada2..4a1c1ce4 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/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}";