Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

User experience improvements

Browse Source
This commit is contained in:
Shaun Walker
2021-04-17 19:18:24 -04:00
parent 1d3a79437c
commit cbe843bafc
84 changed files with 1020 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Oqtane.Shared/Models/ModuleDefinition.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace Oqtane.Models
@ -21,6 +21,7 @@ namespace Oqtane.Models
ControlTypeRoutes = "";
ReleaseVersions = "";
DefaultAction = "";
SettingsType = "";
Runtimes = "";
Template = "";
}
@ -60,6 +61,8 @@ namespace Oqtane.Models
public string ReleaseVersions { get; set; }
[NotMapped]
public string DefaultAction { get; set; }
[NotMapped]
public string SettingsType { get; set; } // added in 2.0.2
// internal properties
[NotMapped]

12
Oqtane.Shared/Models/Page.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
@ -15,7 +15,6 @@ namespace Oqtane.Models
public int Order { get; set; }
public string Url { get; set; }
public string ThemeType { get; set; }
public string LayoutType { get; set; }
public string DefaultContainerType { get; set; }
public string Icon { get; set; }
public bool IsNavigation { get; set; }
@ -37,12 +36,19 @@ namespace Oqtane.Models
[NotMapped]
public string Permissions { get; set; }
[NotMapped]
public Dictionary<string, string> Settings { get; set; }
[NotMapped]
public int Level { get; set; }
[NotMapped]
public bool HasChildren { get; set; }
[Obsolete("This property is obsolete", false)]
[Obsolete("This property is deprecated", false)]
[NotMapped]
public bool EditMode { get; set; }
[Obsolete("This property is deprecated", false)]
[NotMapped]
public string LayoutType { get; set; }
}
}

5
Oqtane.Shared/Models/Site.cs
View File

@ -11,7 +11,6 @@ namespace Oqtane.Models
public int? LogoFileId { get; set; }
public int? FaviconFileId { get; set; }
public string DefaultThemeType { get; set; }
public string DefaultLayoutType { get; set; }
public string DefaultContainerType { get; set; }
public string AdminContainerType { get; set; }
public bool PwaIsEnabled { get; set; }
@ -30,5 +29,9 @@ namespace Oqtane.Models
[NotMapped]
public string SiteTemplateType { get; set; }
[NotMapped]
[Obsolete("This property is deprecated.", false)]
public string DefaultLayoutType { get; set; }
}
}

13
Oqtane.Shared/Models/Theme.cs
View File

@ -25,17 +25,22 @@ namespace Oqtane.Models
public string Contact { get; set; }
public string License { get; set; }
public string Dependencies { get; set; }
public string ThemeSettingsType { get; set; }
public string ContainerSettingsType { get; set; }
// internal properties
public string AssemblyName { get; set; }
public List<ThemeControl> Themes { get; set; }
public List<ThemeControl> Layouts { get; set; }
public List<ThemeControl> Containers { get; set; }
public string Template { get; set; }
//[Obsolete("This property is obsolete. Use Themes instead.", false)]
[Obsolete("This property is obsolete. Use Themes instead.", false)]
public string ThemeControls { get; set; }
//[Obsolete("This property is obsolete. Use Layouts instead.", false)]
[Obsolete("This property is obsolete. Use Layouts instead.", false)]
public string PaneLayouts { get; set; }
//[Obsolete("This property is obsolete. Use Containers instead.", false)]
[Obsolete("This property is obsolete. Use Containers instead.", false)]
public string ContainerControls { get; set; }
[Obsolete("This property is obsolete.", false)]
public List<ThemeControl> Layouts { get; set; }
}
}

5
Oqtane.Shared/Shared/Constants.cs
View File

@ -12,8 +12,9 @@ namespace Oqtane.Shared {
public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, 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.DefaultTitle, Oqtane.Client";
[Obsolete("DefaultLayout is deprecated")]
public const string DefaultLayout = "";
public const string DefaultContainer = "Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client";
public const string DefaultAdminContainer = "Oqtane.Themes.AdminContainer, Oqtane.Client";
public const string ActionToken = "{Action}";

1
Oqtane.Shared/Shared/InstallConfig.cs
View File

@ -12,7 +12,6 @@ namespace Oqtane.Shared
public string HostName { get; set; }
public string SiteTemplate { get; set; }
public string DefaultTheme { get; set; }
public string DefaultLayout { get; set; }
public string DefaultContainer { get; set; }
public string DefaultAdminContainer { get; set; }
}

2
Oqtane.Shared/Shared/PaneNames.cs
View File

@ -1,5 +1,5 @@
namespace Oqtane.Shared {
public class PaneNames {
public const string Admin = "Content";
public const string Admin = "Admin";
}
}