From 521964cf4fc5d6f1c6e57a75b805beb64fe13afd Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Mon, 25 Mar 2024 14:58:55 +0100
Subject: [PATCH] MOBILE-4219 blog: Fix empty blog entries page and some styles

---
 src/addons/blog/pages/index/index.html | 23 +++++++++++++----------
 src/addons/blog/pages/index/index.scss | 12 ++++++++++++
 src/addons/blog/pages/index/index.ts   |  3 +++
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/addons/blog/pages/index/index.html b/src/addons/blog/pages/index/index.html
index 7baa5871f..ce9ec0f9d 100644
--- a/src/addons/blog/pages/index/index.html
+++ b/src/addons/blog/pages/index/index.html
@@ -28,7 +28,6 @@
         }
 
         @for (entry of entries; track entry.id) {
-        @if (!onlyMyEntries || entry.userid === currentUserId) {
         <div class="entry ion-padding-start ion-padding-top ion-padding-end" [id]="'entry-' + entry.id">
             <div class="entry-subject flex ion-text-wrap ion-justify-content-between ion-align-items-center">
                 <h3>
@@ -56,10 +55,13 @@
                     <core-user-avatar [user]="entry.user" [courseId]="entry.courseid" />
                 </span>
 
+                @if (entry.user?.fullname && entry.created) {
                 <span [innerHTML]="'core.bynameondate' | translate: {
-                        '$a': { name: '<strong>' + entry?.user?.fullname + '</strong>', date: (entry.created | coreDateDayOrTime) }
-                    }">
-                </span>
+                    '$a': { name: '<strong>' + entry.user?.fullname + '</strong>', date: (entry.created | coreDateDayOrTime) }
+                }"></span>
+                } @else if (!entry.user?.fullname && entry.created) {
+                <span>{{ entry.created | coreDateDayOrTime }}</span>
+                }
             </div>
 
 
@@ -92,20 +94,22 @@
                 </div>
             </ion-label>
 
-            @if (entry.lastmodified > entry.created) {
-            <div class="entry-last-modification flex ion-justify-content-between border-bottom ion-padding-top ion-padding-bottom">
-                <ion-note class="flex ion-align-items-center">
+            @if (entry.lastmodified > entry.created || (entry.userid === currentUserId && entry.publishstate !== 'draft')) {
+            <ion-item class="entry-last-modification">
+                @if (entry.lastmodified > entry.created) {
+                <ion-note class="flex ion-align-items-center" slot="start">
                     <ion-icon name="fas-clock" [attr.aria-label]="'core.lastmodified' | translate" />
                     {{ entry.lastmodified | coreTimeAgo }}
                 </ion-note>
+                }
 
                 @if (entry.userid === currentUserId && entry.publishstate !== 'draft') {
-                <ion-badge class="entry-visibility-permission" color="success">
+                <ion-badge class="entry-visibility-permission" color="success" slot="end">
                     <ion-icon name="fas-eye" />
                     {{ 'addon.blog.' + entry.publishTranslated | translate }}
                 </ion-badge>
                 }
-            </div>
+            </ion-item>
             }
 
             @if (commentsEnabled) {
@@ -114,7 +118,6 @@
             }
 
         </div>
-        }
         } @empty {
         <core-empty-box icon="far-newspaper" [message]="'addon.blog.noentriesyet' | translate" />
         }
diff --git a/src/addons/blog/pages/index/index.scss b/src/addons/blog/pages/index/index.scss
index ab579b29e..16cd7210f 100644
--- a/src/addons/blog/pages/index/index.scss
+++ b/src/addons/blog/pages/index/index.scss
@@ -45,6 +45,18 @@
         }
 
         &-last-modification {
+            --border-width: 0 0 1px 0;
+
+            &::part(native) {
+                padding: 0;
+            }
+
+            ion-note {
+                padding-top: 0.9rem;
+                font-size: 0.875rem;
+                font-weight: 500;
+            }
+
             ion-icon {
                 margin-right: .3rem;
             }
diff --git a/src/addons/blog/pages/index/index.ts b/src/addons/blog/pages/index/index.ts
index 186c5b25c..b1b3d4b8e 100644
--- a/src/addons/blog/pages/index/index.ts
+++ b/src/addons/blog/pages/index/index.ts
@@ -229,6 +229,8 @@ export class AddonBlogIndexPage implements OnInit, OnDestroy {
                     .sort((a, b) => b.created - a.created);
             }
 
+            this.entries = this.entries.filter(entry => !this.onlyMyEntries || entry.userid === this.currentUserId);
+
             if (this.onlyMyEntries) {
                 const count = this.entries.filter((entry) => entry.userid == this.currentUserId).length;
                 this.canLoadMoreUserEntries = result.totalentries > count;
@@ -273,6 +275,7 @@ export class AddonBlogIndexPage implements OnInit, OnDestroy {
             // First time but no entry loaded. Try to load some.
             this.loadMore();
         }
+
     }
 
     /**