Multi-tenant role authorization

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

@@ -9,7 +9,7 @@
 @inject IPageService PageService
 @inject IThemeService  ThemeService
 
-@message
+@((MarkupString)message)
 
 <table class="form-group">
     <tr>
@@ -116,7 +116,8 @@
 </table>
 <button type="button" class="btn btn-danger" @onclick="@DeletePage">Delete</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-<br /><br />
+<br />
+<br />
 <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
 
 @code {
@@ -172,7 +173,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            message = "<div class=\"alert alert-danger\" role=\"alert\">" + ex.Message + "</div><br /><br />";
         }
     }
 
@@ -182,11 +183,18 @@
         {
             await PageService.DeletePageAsync(Int32.Parse(PageState.QueryString["id"]));
             PageState.Reload = Constants.ReloadSite;
-            UriHelper.NavigateTo(NavigateUrl());
+            if (PageState.Page.Name == "Page Management")
+            {
+                UriHelper.NavigateTo(NavigateUrl());
+            }
+            else
+            {
+                UriHelper.NavigateTo(NavigateUrl(""));
+            }
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            message = "<div class=\"alert alert-danger\" role=\"alert\">" + ex.Message + "</div><br /><br />";
         }
     }
 }