Merge pull request #636 from sbwalker/master

added ModuleControlBase

Oqtane.Client/Modules/Controls/ActionDialog.razor

@@ -1,6 +1,6 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
+
 @if (_visible)
 {
     <div class="app-admin-modal">

Oqtane.Client/Modules/Controls/ActionLink.razor

@@ -1,6 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase  
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 @inject IUserService UserService
 
 @if (_authorized)
@@ -90,7 +89,7 @@
 
         if (!string.IsNullOrEmpty(IconName))
         {
-            _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>{(IconOnly?"":"&nbsp")}";
+            _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
 
         }
 

Oqtane.Client/Modules/Controls/AuditInfo.razor

@@ -1,6 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase            
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 
 @if (_text != string.Empty)
 {

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -1,7 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase
+@inherits ModuleControlBase
-
-@attribute [OqtaneIgnore]
 @inject IFolderService FolderService
 @inject IFileService FileService
 
@@ -56,11 +54,11 @@
                     <div>
                         @if (UploadMultiple)
                         {
-                            <input type="file" id="@_fileinputid" name="file" accept="@_filter" multiple/>
+                            <input type="file" id="@_fileinputid" name="file" accept="@_filter" multiple />
                         }
                         else
                         {
-                            <input type="file" id="@_fileinputid" name="file" accept="@_filter"/>
+                            <input type="file" id="@_fileinputid" name="file" accept="@_filter" />
                         }
                         <span id="@_progressinfoid"></span><progress id="@_progressbarid" style="width: 150px; visibility: hidden;"></progress>
                         <span class="float-right">
@@ -134,7 +132,7 @@
 
         if (!string.IsNullOrEmpty(Folder))
         {
-            _folders = new List<Folder> {new Folder {FolderId = -1, Name = Folder}};
+            _folders = new List<Folder> { new Folder { FolderId = -1, Name = Folder } };
             FolderId = -1;
         }
         else
@@ -211,7 +209,7 @@
         _message = string.Empty;
         try
         {
-            FolderId = int.Parse((string) e.Value);
+            FolderId = int.Parse((string)e.Value);
             await GetFiles();
             FileId = -1;
             _image = string.Empty;
@@ -227,7 +225,7 @@
     private async Task FileChanged(ChangeEventArgs e)
     {
         _message = string.Empty;
-        FileId = int.Parse((string) e.Value);
+        FileId = int.Parse((string)e.Value);
 
         await SetImage();
         StateHasChanged();
@@ -244,8 +242,8 @@
                 var maxwidth = 200;
                 var maxheight = 200;
 
-                var ratioX = (double) maxwidth / (double) file.ImageWidth;
+                var ratioX = (double)maxwidth / (double)file.ImageWidth;
-                var ratioY = (double) maxheight / (double) file.ImageHeight;
+                var ratioY = (double)maxheight / (double)file.ImageHeight;
                 var ratio = ratioX < ratioY ? ratioX : ratioY;
 
                 _image = "<img src=\"" + ContentUrl(FileId) + "\" alt=\"" + file.Name +

Oqtane.Client/Modules/Controls/Label.razor

@@ -1,6 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase   
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 
 @if (!string.IsNullOrEmpty(HelpText))
 {

Oqtane.Client/Modules/Controls/ModuleMessage.razor

@@ -1,6 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase      
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 
 @if (!string.IsNullOrEmpty(_message))
 {

Oqtane.Client/Modules/Controls/Pager.razor

@@ -1,11 +1,9 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 @typeparam TableItem
 
-
 <p>
-    @if(Format == "Table")
+    @if (Format == "Table")
     {
         <table class="@Class">
             <thead>
@@ -23,7 +21,7 @@
             </tbody>
         </table>
     }
-    @if(Format == "Grid")
+    @if (Format == "Grid")
     {
         <div class="@Class">
             <div class="row">@Header</div>

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -1,6 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase       
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 @inject IRoleService RoleService
 @inject IUserService UserService
 
@@ -48,7 +47,7 @@
                 {
                     string userid = "[" + user.UserId.ToString() + "]";
                     <tr>
-                        <td >@user.DisplayName</td>
+                        <td>@user.DisplayName</td>
                         @foreach (PermissionString permission in _permissions)
                         {
                             var p = permission;

Oqtane.Client/Modules/Controls/RichTextEditor.razor

@@ -1,6 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 
 <div class="row" style="margin-bottom: 50px;">
     <div class="col">
@@ -108,7 +107,7 @@
     public string DebugLevel { get; set; } = "info";
 
     public override List<Resource> Resources => new List<Resource>()
-    {
+{
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill1.3.6.min.js" },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js" },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }

Oqtane.Client/Modules/Controls/Section.razor

@@ -1,6 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase  
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 
 <div class="d-flex">
     <div>

Oqtane.Client/Modules/Controls/TabPanel.razor

@@ -1,6 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase  
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 
 @if (Name == Parent.ActiveTab)
 {

Oqtane.Client/Modules/Controls/TabStrip.razor

@@ -1,6 +1,5 @@
 @namespace Oqtane.Modules.Controls
-@inherits ModuleBase      
+@inherits ModuleControlBase
-@attribute [OqtaneIgnore]
 
 <CascadingValue Value="this">
     <div class="container-fluid">

Oqtane.Client/Modules/Controls/TriStateCheckBox.razor

@@ -1,4 +1,5 @@
 @namespace Oqtane.Modules.Controls
+@inherits ModuleControlBase
 
 <img src="@_src" title="@_title" @onclick="SetValue" />
 

Oqtane.Client/Modules/ModuleControlBase.cs

@@ -0,0 +1,10 @@
+using Oqtane.Shared;
+
+namespace Oqtane.Modules
+{
+    [OqtaneIgnore]
+    public abstract class ModuleControlBase : ModuleBase
+    {
+
+    }
+}