From f6e7460b2468e0fc13c2433a9c76797804bb2b2b Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Fri, 20 Oct 2023 21:31:23 -0700
Subject: [PATCH 1/5] Fix Formatting + Add No Notifictions Message

---
 .../Modules/Admin/UserProfile/Index.razor     | 186 ++++++++++--------
 1 file changed, 100 insertions(+), 86 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 694f28aa..af2521cf 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -165,116 +165,130 @@ else
             </select>
             <br />
             <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" />
-            <br /><br />
+            <br />
+            <br />
             @if (filter == "to")
             {
-                <Pager Items="@notifications">
-                    <Header>
+                @if (notifications.Any())
+                {
+                    <Pager Items="@notifications">
+                        <Header>
                         <th style="width: 1px;">&nbsp;</th>
                         <th style="width: 1px;">&nbsp;</th>
                         <th>@Localizer["From"]</th>
                         <th>@Localizer["Subject"]</th>
                         <th>@Localizer["Received"]</th>
-                    </Header>
-                    <Row>
-                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
-                        <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
-                        
-                        @if (context.IsRead)
-                        {
-                            <td>@context.FromDisplayName</td>
-                            <td>@context.Subject</td>
-                            <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
-                        } 
-                        else 
-                        {
-                            <td><b>@context.FromDisplayName</b></td>
-                            <td><b>@context.Subject</b></td>
-                            <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
-                        }
-                    </Row>
-                    <Detail>
-                        <td colspan="2"></td>
-                        <td colspan="3">
-                            @{
-                                string input = "___";
-                                if (context.Body.Contains(input))
-                                {
-                                    context.Body = context.Body.Split(input)[0];
-                                    context.Body = context.Body.Replace("\n", "");
-                                    context.Body = context.Body.Replace("\r", "");
-                                }
-                                notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
-                            }
+                        </Header>
+                        <Row>
+                            <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
+                            <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
+
                             @if (context.IsRead)
                             {
-                                @notificationSummary
+                                <td>@context.FromDisplayName</td>
+                                <td>@context.Subject</td>
+                                <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
                             }
                             else
                             {
-                                <b>@notificationSummary</b>
+                                <td><b>@context.FromDisplayName</b></td>
+                                <td><b>@context.Subject</b></td>
+                                <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
                             }
-                        </td>
-                    </Detail>
-                </Pager>
+                        </Row>
+                        <Detail>
+                            <td colspan="2"></td>
+                            <td colspan="3">
+                                @{
+                                    string input = "___";
+                                    if (context.Body.Contains(input))
+                                    {
+                                        context.Body = context.Body.Split(input)[0];
+                                        context.Body = context.Body.Replace("\n", "");
+                                        context.Body = context.Body.Replace("\r", "");
+                                    }
+                                    notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                }
+                                @if (context.IsRead)
+                                {
+                                    @notificationSummary
+                                }
+                                else
+                                {
+                                    <b>@notificationSummary</b>
+                                }
+                            </td>
+                        </Detail>
+                    </Pager>
+                    <br />
+                    <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
+                }
+                else
+                {
+                    <b>You have not received any notifications.</b>
+                }
             }
             else
             {
-                <Pager Items="@notifications">
-                    <Header>
-                        <th>&nbsp;</th>
-                        <th>&nbsp;</th>
+                @if (notifications.Any())
+                {
+                    <Pager Items="@notifications">
+                        <Header>
+                        <th style="width: 1px;"></th>
+                        <th style="width: 1px;"></th>
                         <th>@Localizer["To"]</th>
                         <th>@Localizer["Subject"]</th>
                         <th>@Localizer["Sent"]</th>
-                    </Header>
-                    <Row>
-                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
-                        <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
+                        </Header>
+                        <Row>
+                            <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
+                            <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
 
-                        @if (context.IsRead)
-                        {
-                            <td>@context.ToDisplayName</td>
-                            <td>@context.Subject</td>
-                            <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
-                        } 
-                        else
-                        {
-                            <td><b>@context.ToDisplayName</b></td>
-                            <td><b>@context.Subject</b></td>
-                            <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
-                        }
-
-                    </Row>
-                    <Detail>
-                        <td colspan="2"></td>
-                        <td colspan="3">
-                            @{
-                                string input = "___";
-                                if (context.Body.Contains(input))
-                                {
-                                    context.Body = context.Body.Split(input)[0];
-                                    context.Body = context.Body.Replace("\n", "");
-                                    context.Body = context.Body.Replace("\r", "");
-                                }
-                                notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
-                            }
                             @if (context.IsRead)
                             {
-                                @notificationSummary
+                                <td>@context.ToDisplayName</td>
+                                <td>@context.Subject</td>
+                                <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
                             }
-                            else 
+                            else
                             {
-                                <b>@notificationSummary</b>
-                            } 
-                        </td>
-                    </Detail>
-                </Pager>
-            }
-            @if (notifications.Any())
-            {
-                <br />
-                <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
+                                <td><b>@context.ToDisplayName</b></td>
+                                <td><b>@context.Subject</b></td>
+                                <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
+                            }
+
+                        </Row>
+                        <Detail>
+                            <td colspan="2"></td>
+                            <td colspan="3">
+                                @{
+                                    string input = "___";
+                                    if (context.Body.Contains(input))
+                                    {
+                                        context.Body = context.Body.Split(input)[0];
+                                        context.Body = context.Body.Replace("\n", "");
+                                        context.Body = context.Body.Replace("\r", "");
+                                    }
+                                    notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                }
+                                @if (context.IsRead)
+                                {
+                                    @notificationSummary
+                                }
+                                else
+                                {
+                                    <b>@notificationSummary</b>
+                                }
+                            </td>
+                        </Detail>
+                    </Pager>
+                    <br />
+                    <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
+                }
+                else
+                {
+                    <b>You have not sent any notifications.</b>
+                }
             }
         }
     </TabPanel>

From 17289099642f5f65e11686ebb47ebd4744d305e6 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Fri, 20 Oct 2023 21:34:43 -0700
Subject: [PATCH 2/5] Adds Localization To No Notification Messages

---
 Oqtane.Client/Modules/Admin/UserProfile/Index.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index af2521cf..526544fa 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -225,7 +225,7 @@ else
                 }
                 else
                 {
-                    <b>You have not received any notifications.</b>
+                    <b>@Localizer["NoNotificationsReceived"]</b>
                 }
             }
             else
@@ -287,7 +287,7 @@ else
                 }
                 else
                 {
-                    <b>You have not sent any notifications.</b>
+                    <b>@Localizer["NoNotificationsSent"]</b>
                 }
             }
         }

From f3a4881261a6ef90893203e8193fe25a24ad84b8 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Fri, 20 Oct 2023 21:38:06 -0700
Subject: [PATCH 3/5] No notification messages.

---
 .../Resources/Modules/Admin/UserProfile/Index.resx     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx b/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx
index 7021f4a8..7d201217 100644
--- a/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx
@@ -233,5 +233,11 @@
   </data>
   <data name="DeleteNotification.Text" xml:space="preserve">
     <value>Delete</value>
-  </data>    
-</root>
\ No newline at end of file
+  </data>
+    <data name="NoNotificationsReceived.Text" xml:space="preserve">
+    <value>You have no notifications received.</value>
+  </data>
+    <data name="NoNotificationsSent.Text" xml:space="preserve">
+    <value>You have no sent notififications.</value>
+  </data>
+</root>

From d0050f7d5906b693684cd1e89e4b59150f5e7dd7 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Fri, 20 Oct 2023 21:39:19 -0700
Subject: [PATCH 4/5] Updates Localization of No Notifications Messages

---
 Oqtane.Client/Modules/Admin/UserProfile/Index.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 526544fa..e6b2bcc6 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -225,7 +225,7 @@ else
                 }
                 else
                 {
-                    <b>@Localizer["NoNotificationsReceived"]</b>
+                    <b>@Localizer["NoNotificationsReceived.Text"]</b>
                 }
             }
             else
@@ -287,7 +287,7 @@ else
                 }
                 else
                 {
-                    <b>@Localizer["NoNotificationsSent"]</b>
+                    <b>@Localizer["NoNotificationsSent.Text"]</b>
                 }
             }
         }

From c00012f28b561ea2da471f98eaaa22f474ef0848 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Fri, 20 Oct 2023 21:57:42 -0700
Subject: [PATCH 5/5] class=

---
 Oqtane.Client/Modules/Admin/UserProfile/Index.razor | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index e6b2bcc6..dd1b4065 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -225,7 +225,9 @@ else
                 }
                 else
                 {
-                    <b>@Localizer["NoNotificationsReceived.Text"]</b>
+                    <div class="no-notifications-text">
+                        @Localizer["NoNotificationsReceived.Text"]
+                    </div>
                 }
             }
             else
@@ -287,7 +289,9 @@ else
                 }
                 else
                 {
-                    <b>@Localizer["NoNotificationsSent.Text"]</b>
+                    <div class="no-notifications-text">
+                        @Localizer["NoNotificationsSent.Text"]
+                    </div>
                 }
             }
         }