From 38ddb6cd46637e6dbb91f6c0c1975170ac0fdd9e Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Mon, 16 Dec 2024 17:23:25 +0200
Subject: [PATCH 01/22] Fix profile layout on small screens #1090

---
 www/profile/app-profile.less | 2 ++
 www/profile/inner.js         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 924102787..eb7953506 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -23,6 +23,7 @@
 
     #cp-app-profile-header {
         display: flex;
+        flex-flow: row wrap;
         #cp-app-profile-rightside {
             flex: 1;
             display: flex;
@@ -153,6 +154,7 @@
         position: relative;
         font-size: 16px;
         margin-bottom: 20px;
+        margin-top: 1em;
         .cp-app-profile-description-code {
             display: none;
         }
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 63e2c8d2a..c95ab9b14 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -575,10 +575,10 @@ define([
             addLink($rightside);
             addFriendRequest($rightside);
             addMuteButton($rightside);
-            addDescription(APP.$rightside);
             addPublicKey($rightside);
             addCopyData($rightside);
             addViewButton($rightside);
+            addDescription($rightside);
             APP.initialized = true;
             createLeftside();
         }

From 6fcc3497673fbd1406d4f323d02bea90ad18e4e9 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Mon, 16 Dec 2024 18:38:20 +0200
Subject: [PATCH 02/22] Center avatar on small screens #1090

---
 www/profile/app-profile.less | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index eb7953506..cfd1c6531 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -80,6 +80,12 @@
             margin: 5px !important;
         }
     }
+
+    @media screen and (max-width: 550px) {
+        #cp-app-profile-avatar {
+            margin: auto;
+        }
+    }
     .cp-app-profile-resizer {
         text-align: center;
     }

From 43d851dd7f6bd1859105a7cc4f277c7f0290e712 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:27:51 +0200
Subject: [PATCH 03/22] Implement review fixes #1090

---
 www/profile/app-profile.less | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index cfd1c6531..ccf97fbcc 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -24,6 +24,7 @@
     #cp-app-profile-header {
         display: flex;
         flex-flow: row wrap;
+        justify-content: center;
         #cp-app-profile-rightside {
             flex: 1;
             display: flex;
@@ -32,17 +33,15 @@
         }
     }
     #cp-app-profile-avatar {
-        width: 300px;
-        //height: 350px;
         margin: 10px;
         margin-right: 20px;
         text-align: center;
+        max-width: 300px;
+        max-height: 300px;
+        margin-bottom: 5rem;
         &> span {
             display: inline-block;
             text-align: center;
-            height: 300px;
-            width: 300px;
-            border: 1px solid @cp_profile-border;
             border-radius: 4px;
             overflow: hidden;
             position: relative;
@@ -59,6 +58,7 @@
             max-width: 100%;
             max-height: 100%;
             vertical-align: top;
+            border-radius: @variables_radius_L;
         }
         media-tag {
             height: 100%;
@@ -81,11 +81,6 @@
         }
     }
 
-    @media screen and (max-width: 550px) {
-        #cp-app-profile-avatar {
-            margin: auto;
-        }
-    }
     .cp-app-profile-resizer {
         text-align: center;
     }

From 6e902269968f5b0a9cb1298382bd614ec5b6ec8f Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Mon, 17 Feb 2025 12:02:11 +0200
Subject: [PATCH 04/22] Add aria-hidden to icons

---
 www/profile/app-profile.less |  4 ++--
 www/profile/inner.js         | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index ccf97fbcc..c620a7d41 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -48,9 +48,9 @@
             .cp-app-profile-avatar-delete {
                 right: 0;
                 position: absolute;
-                opacity: 0.7;
+                opacity: 1;
                 &:hover {
-                    opacity: 1;
+                    opacity: 0.7;
                 }
             }
         }
diff --git a/www/profile/inner.js b/www/profile/inner.js
index c95ab9b14..668df0707 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -116,7 +116,7 @@ define([
 
         $('<button>', {
             'class': 'btn btn-primary '+VIEW_PROFILE_BUTTON,
-        }).append(h('i.fa.fa-shhare-alt'))
+        }).append(h('i', { 'class': 'fa fa-share-alt', 'aria-hidden': 'true' }))
           .append(h('span', Messages.shareButton))
           .click(function () {
             Clipboard.copy(url, (err) => {
@@ -227,7 +227,7 @@ define([
             if (!friends[data.curvePublic].notifications) { return; }
             // Add unfriend button
             var unfriendButton = h('button.btn.btn-primary.cp-app-profile-friend-request', [
-                h('i.fa.fa-user-times'),
+                h('i', { 'class': 'fa fa-user-times', 'aria-hidden': 'true' }),
                 Messages.contacts_remove
             ]);
             $(unfriendButton).click(function () {
@@ -339,7 +339,7 @@ define([
                 return;
             }
             var muteButton = h('button.btn.btn-danger-outline.cp-app-profile-friend-request', [
-                h('i.fa.fa-bell-slash'),
+                h('i', { 'class': 'fa fa-bell-slash', 'aria-hidden': 'true' }),
                 Messages.contacts_mute || 'mute'
             ]);
             $(muteButton).click(function () {
@@ -422,7 +422,7 @@ define([
         var $upButton = common.createButton('upload', false, data);
         $upButton.removeProp('title');
         $upButton.text(Messages.profile_upload);
-        $upButton.prepend($('<span>', {'class': 'fa fa-upload'}));
+        $upButton.prepend($('<i>', {'class': 'fa fa-upload', 'aria-hidden': 'true'}));
         $block.append($upButton);
     };
     var refreshAvatar = function (data) {
@@ -437,7 +437,7 @@ define([
         if (APP.readOnly) { return; }
 
         var button = h('button.btn.btn-primary', [
-            h('i.fa.fa-pencil'),
+            h('i', { 'class': 'fa fa-pencil', 'aria-hidden': 'true' }),
             h('span', Messages.profile_addDescription)
         ]);
         APP.$descriptionEdit = $(button);
@@ -512,7 +512,7 @@ define([
         var $div = $(h('div.cp-sidebarlayout-element')).appendTo($container);
         APP.$edPublic = $('<button>', {
             'class': 'btn',
-        }).append(h('i.fa.fa-key'))
+        }).append(h('i', { 'class': 'fa fa-key', 'aria-hidden': 'true' }))
           .append(h('span', Messages.profile_copyKey))
           .click(function () {
             if (!APP.getEdPublic) { return; }

From b4da4b01fef6812579ba80e9d4929d5c1985d1e3 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Sat, 22 Feb 2025 18:31:08 +0200
Subject: [PATCH 05/22] Try an even distance between all buttons on both
 profiels

---
 www/common/translations/messages.json |  1 +
 www/profile/app-profile.less          | 21 ++++++++++++++++++---
 www/profile/inner.js                  | 14 +++++++-------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index fa940fb1f..05a17c177 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -212,6 +212,7 @@
     "canvas_imageEmbed": "Embed an image from your computer",
     "profileButton": "Profile",
     "profile_upload": " Upload a new avatar",
+    "profile_remove_avatar": "Remove this avatar",
     "profile_uploadSizeError": "Error: your avatar must be smaller than {0}",
     "profile_uploadTypeError": "Error: your avatar type is not allowed. Allowed types are: {0}",
     "profile_error": "Error while creating your profile: {0}",
diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index c620a7d41..cd9875bf0 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -21,6 +21,10 @@
         display: none !important;
     }
 
+    #cp-app-profile-rightside:has(.cp-app-profile-friend-container) #cp-app-profile-link {
+        display: none;
+    }
+
     #cp-app-profile-header {
         display: flex;
         flex-flow: row wrap;
@@ -84,8 +88,11 @@
     .cp-app-profile-resizer {
         text-align: center;
     }
+    #cp-app-profile-displayname {
+        margin-top: 1rem;
+    }
     #cp-app-profile-displayname, #cp-app-profile-link {
-        margin: 10px 0;
+        margin-bottom: 1rem;
         input {
             width: 100%;
             font-size: 20px;
@@ -144,12 +151,16 @@
         margin-top: 10px;
     }
 
+    .cp-app-profile-friend-container {
+        margin-bottom: 1rem;
+    }
+
     // I tried using flexbox but messed with how the pencil icon was displayed
     #cp-app-profile-invite-button {
         float: right;
     }
     .cp-app-profile-viewprofile-button {
-        margin-bottom: 5px !important;
+        margin-bottom: 1rem!important;
     }
     #cp-app-profile-description {
         position: relative;
@@ -197,11 +208,15 @@
         justify-content: center;
     }
     .cp-app-profile-mute-container {
-        margin-top: 5px;
         p {
             margin-top: 5px;
             font-size: 13px;
         }
+
+        margin-bottom: 1rem;
+        &:has(p) {
+            margin-bottom: 0;
+        }
     }
 }
 
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 668df0707..8bd413dc8 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -116,7 +116,7 @@ define([
 
         $('<button>', {
             'class': 'btn btn-primary '+VIEW_PROFILE_BUTTON,
-        }).append(h('i', { 'class': 'fa fa-share-alt', 'aria-hidden': 'true' }))
+        }).append(h('i', { 'class': 'fa fa-share-alt', 'aria-hidden': 'true', 'aria-labelledby': Messages.shareButton }))
           .append(h('span', Messages.shareButton))
           .click(function () {
             Clipboard.copy(url, (err) => {
@@ -227,7 +227,7 @@ define([
             if (!friends[data.curvePublic].notifications) { return; }
             // Add unfriend button
             var unfriendButton = h('button.btn.btn-primary.cp-app-profile-friend-request', [
-                h('i', { 'class': 'fa fa-user-times', 'aria-hidden': 'true' }),
+                h('i', { 'class': 'fa fa-user-times', 'aria-hidden': 'true', 'aria-labelledby': Messages.contacts_remove}),
                 Messages.contacts_remove
             ]);
             $(unfriendButton).click(function () {
@@ -339,7 +339,7 @@ define([
                 return;
             }
             var muteButton = h('button.btn.btn-danger-outline.cp-app-profile-friend-request', [
-                h('i', { 'class': 'fa fa-bell-slash', 'aria-hidden': 'true' }),
+                h('i', { 'class': 'fa fa-bell-slash', 'aria-hidden': 'true', 'aria-labelledby': Messages.contacts_mute}),
                 Messages.contacts_mute || 'mute'
             ]);
             $(muteButton).click(function () {
@@ -374,7 +374,7 @@ define([
 
         var $delButton = $('<button>', {
             'class': 'cp-app-profile-avatar-delete btn btn-danger fa fa-times',
-            title: Messages.fc_delete
+            title: Messages.profile_remove_avatar
         });
         $span.append($delButton);
         $delButton.click(function () {
@@ -422,7 +422,7 @@ define([
         var $upButton = common.createButton('upload', false, data);
         $upButton.removeProp('title');
         $upButton.text(Messages.profile_upload);
-        $upButton.prepend($('<i>', {'class': 'fa fa-upload', 'aria-hidden': 'true'}));
+        $upButton.prepend($('<i>', {'class': 'fa fa-upload', 'aria-hidden': 'true', 'aria-labelledby': Messages.profile_upload}));
         $block.append($upButton);
     };
     var refreshAvatar = function (data) {
@@ -437,7 +437,7 @@ define([
         if (APP.readOnly) { return; }
 
         var button = h('button.btn.btn-primary', [
-            h('i', { 'class': 'fa fa-pencil', 'aria-hidden': 'true' }),
+            h('i', { 'class': 'fa fa-pencil', 'aria-hidden': 'true', 'aria-labelledby': Messages.profile_addDescription}),
             h('span', Messages.profile_addDescription)
         ]);
         APP.$descriptionEdit = $(button);
@@ -512,7 +512,7 @@ define([
         var $div = $(h('div.cp-sidebarlayout-element')).appendTo($container);
         APP.$edPublic = $('<button>', {
             'class': 'btn',
-        }).append(h('i', { 'class': 'fa fa-key', 'aria-hidden': 'true' }))
+        }).append(h('i', { 'class': 'fa fa-key', 'aria-hidden': 'true', 'aria-labelledby': Messages.profile_copyKey }))
           .append(h('span', Messages.profile_copyKey))
           .click(function () {
             if (!APP.getEdPublic) { return; }

From 020f0d20a63c1d4934b5ac04fac4256adba397d4 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Sat, 22 Feb 2025 18:52:25 +0200
Subject: [PATCH 06/22] Mark new translation key #1090

---
 www/profile/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/profile/inner.js b/www/profile/inner.js
index 8bd413dc8..1e9d451c1 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -374,7 +374,7 @@ define([
 
         var $delButton = $('<button>', {
             'class': 'cp-app-profile-avatar-delete btn btn-danger fa fa-times',
-            title: Messages.profile_remove_avatar
+            title: Messages.profile_remove_avatar //XX Remove this avatar
         });
         $span.append($delButton);
         $delButton.click(function () {

From fc99a53d344749ae635621a82f3f2fd9347fb0ea Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Tue, 25 Feb 2025 19:07:59 +0200
Subject: [PATCH 07/22] Correct translation key #1090

---
 customize.dist/translations/messages.js | 2 ++
 www/common/translations/messages.json   | 1 -
 www/profile/inner.js                    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index df4096367..833c4631e 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -13,6 +13,8 @@ define(['/common/translations/messages.js'], function (Messages) {
     // Replace the existing keys in your copied file here:
     // Messages.button_newpad = "New Rich Text Document";
 
+    Messages.profile_remove_avatar = "Remove this avatar"; // XXX
+
     return Messages;
 });
 
diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 05a17c177..fa940fb1f 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -212,7 +212,6 @@
     "canvas_imageEmbed": "Embed an image from your computer",
     "profileButton": "Profile",
     "profile_upload": " Upload a new avatar",
-    "profile_remove_avatar": "Remove this avatar",
     "profile_uploadSizeError": "Error: your avatar must be smaller than {0}",
     "profile_uploadTypeError": "Error: your avatar type is not allowed. Allowed types are: {0}",
     "profile_error": "Error while creating your profile: {0}",
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 1e9d451c1..d615eef29 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -374,7 +374,7 @@ define([
 
         var $delButton = $('<button>', {
             'class': 'cp-app-profile-avatar-delete btn btn-danger fa fa-times',
-            title: Messages.profile_remove_avatar //XX Remove this avatar
+            title: Messages.profile_remove_avatar //XXX
         });
         $span.append($delButton);
         $delButton.click(function () {

From 6df989d5089bf8063a1d2ef86eff285148d42162 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Fri, 28 Feb 2025 12:33:45 +0200
Subject: [PATCH 08/22] Refactoring of profile layout #1742

---
 www/profile/app-profile.less | 41 +++++++------------
 www/profile/inner.js         | 78 ++++++++++++++++++++++--------------
 2 files changed, 63 insertions(+), 56 deletions(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index cd9875bf0..8b9a92802 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -21,9 +21,6 @@
         display: none !important;
     }
 
-    #cp-app-profile-rightside:has(.cp-app-profile-friend-container) #cp-app-profile-link {
-        display: none;
-    }
 
     #cp-app-profile-header {
         display: flex;
@@ -42,7 +39,7 @@
         text-align: center;
         max-width: 300px;
         max-height: 300px;
-        margin-bottom: 5rem;
+        margin-bottom: 1rem;
         &> span {
             display: inline-block;
             text-align: center;
@@ -88,10 +85,14 @@
     .cp-app-profile-resizer {
         text-align: center;
     }
-    #cp-app-profile-displayname {
+    .cp-app-profile-displayname {
         margin-top: 1rem;
     }
-    #cp-app-profile-displayname, #cp-app-profile-link {
+    div.cp-app-profile-link.hidden{
+        display:none;
+    }
+
+    .cp-app-profile-displayname, .cp-app-profile-link {
         margin-bottom: 1rem;
         input {
             width: 100%;
@@ -138,6 +139,14 @@
         }
     }
 
+    div.cp-app-profile-link {
+        &.cp-app-profile-description-rendered,
+        &.cp-app-profile-mute-container {
+          &:has(p) {
+            margin-bottom: 0;
+          }
+        }
+      }
     .cp-app-profile-friend {
         display: flex;
         align-items: center;
@@ -151,32 +160,17 @@
         margin-top: 10px;
     }
 
-    .cp-app-profile-friend-container {
-        margin-bottom: 1rem;
-    }
-
     // I tried using flexbox but messed with how the pencil icon was displayed
     #cp-app-profile-invite-button {
         float: right;
     }
-    .cp-app-profile-viewprofile-button {
-        margin-bottom: 1rem!important;
-    }
     #cp-app-profile-description {
         position: relative;
         font-size: 16px;
         margin-bottom: 20px;
-        margin-top: 1em;
         .cp-app-profile-description-code {
             display: none;
         }
-        .cp-app-profile-description-rendered {
-            border: 1px solid @cp_profile-border;
-            padding: 0 15px;
-            &:empty {
-                display: none;
-            }
-        }
         .cp-app-profile-description-ok, .cp-app-profile-description-spin {
             position: absolute;
             bottom: 2px;
@@ -212,11 +206,6 @@
             margin-top: 5px;
             font-size: 13px;
         }
-
-        margin-bottom: 1rem;
-        &:has(p) {
-            margin-bottom: 0;
-        }
     }
 }
 
diff --git a/www/profile/inner.js b/www/profile/inner.js
index d615eef29..b7b868f7e 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -101,32 +101,45 @@ define([
     var sFrameChan;
 
     var addViewButton = function ($container) {
-        if (APP.readOnly) {
-            return;
-        }
-
         var hash = common.getMetadataMgr().getPrivateData().hashes.viewHash;
         var url = APP.origin + '/profile/#' + hash;
-
-        $('<button>', {
-            'class': 'btn '+VIEW_PROFILE_BUTTON,
-        }).text(Messages.profile_viewMyProfile).click(function () {
-            window.open(url, '_blank');
-        }).appendTo($container);
-
-        $('<button>', {
-            'class': 'btn btn-primary '+VIEW_PROFILE_BUTTON,
-        }).append(h('i', { 'class': 'fa fa-share-alt', 'aria-hidden': 'true', 'aria-labelledby': Messages.shareButton }))
-          .append(h('span', Messages.shareButton))
-          .click(function () {
-            Clipboard.copy(url, (err) => {
-                if (!err) { UI.log(Messages.shareSuccess); }
-            });
-        }).appendTo($container);
+        
+        // Only add view and share buttons if not read-only
+        if (!APP.readOnly) {
+            var $blockView = $('<div>', {class: LINK_ID}).appendTo($container);
+            $('<button>', {
+                'class': 'btn ' + VIEW_PROFILE_BUTTON,
+            }).text(Messages.profile_viewMyProfile).click(function () {
+                window.open(url, '_blank');
+            }).appendTo($blockView);
+        }
+        
+        // Always create the description container
+        var $blockDescription = $('<div>', {class: DESCRIPTION_ID}).appendTo($container);
+        APP.$descriptionContainer = $blockDescription;
+        APP.$description = $('<div>', {
+            'id': 'cp-app-profile-description-info'
+        }).appendTo($blockDescription);
+        
+        // Add the share button only for editable profiles
+        if (!APP.readOnly) {
+            var $blockShare = $('<div>', {class: LINK_ID}).appendTo($container);
+            $('<button>', {
+                'class': 'btn btn-primary ' + VIEW_PROFILE_BUTTON,
+            }).append(
+                h('i', { 'class': 'fa fa-share-alt', 'aria-hidden': 'true', 'aria-labelledby': Messages.shareButton })
+            ).append(
+                h('span', Messages.shareButton)
+            ).click(function () {
+                Clipboard.copy(url, (err) => {
+                    if (!err) { UI.log(Messages.shareSuccess); }
+                });
+            }).appendTo($blockShare);
+        }
     };
-
+    
     var addDisplayName = function ($container) {
-        var $block = $('<div>', {id: DISPLAYNAME_ID}).appendTo($container);
+        var $block = $('<div>', {class: DISPLAYNAME_ID}).appendTo($container);
         APP.$name = $('<span>', {'class': DISPLAYNAME_ID}).appendTo($block);
     };
     var refreshName = function (data) {
@@ -134,7 +147,7 @@ define([
     };
 
     var addLink = function ($container) {
-        var $block = $('<div>', {id: LINK_ID}).appendTo($container);
+        var $block = $('<div>', {class: LINK_ID}).appendTo($container);
 
         APP.$link = $('<a>', {
             'class': LINK_ID,
@@ -199,8 +212,9 @@ define([
 
     var addFriendRequest = function ($container) {
         if (!APP.readOnly || !APP.common.isLoggedIn()) { return; }
+        var $block = $('<div>', {class: LINK_ID}).appendTo($container);
         APP.$friend = $(h('div.cp-app-profile-friend-container'));
-        $container.append(APP.$friend);
+        $block.append(APP.$friend);
     };
     var refreshFriendRequest = function (data) {
         if (!APP.$friend) { return; }
@@ -305,7 +319,7 @@ define([
 
     var addMuteButton = function ($container) {
         if (!APP.readOnly || !APP.common.isLoggedIn()) { return; }
-        APP.$mute = $(h('div.cp-app-profile-mute-container'));
+        APP.$mute = $(h('div.cp-app-profile-mute-container.cp-app-profile-link'));
         $container.append(APP.$mute);
     };
     var refreshMute = function (data) {
@@ -432,7 +446,6 @@ define([
     var addDescription = function ($container) {
         var $block = $('<div>', {id: DESCRIPTION_ID, class:'cp-sidebarlayout-element'}).appendTo($container);
 
-        APP.$description = $('<div>', {'class': 'cp-app-profile-description-rendered'}).appendTo($block);
         APP.$descriptionEdit = $();
         if (APP.readOnly) { return; }
 
@@ -486,7 +499,8 @@ define([
         });
     };
     var refreshDescription = function (data) {
-        var val = Marked.parse(data.description || "");
+        var descriptionData = data.description || "";
+        var val = Marked.parse(descriptionData);
         APP.$description.html(val);
         APP.$description.off('click');
         APP.$description.click(function (e) {
@@ -503,6 +517,11 @@ define([
         if (!APP.editor) { return; }
         APP.editor.setValue(data.description || "");
         APP.editor.save();
+        if ($.trim(descriptionData) === "") {
+            APP.$descriptionContainer.addClass('hidden');
+        } else {
+            APP.$descriptionContainer.removeClass('hidden');
+        }
     };
 
     var addPublicKey = function ($container) {
@@ -535,15 +554,14 @@ define([
 
     var addCopyData = function ($container) {
         if (!APP.isModerator) { return; }
-
-        var $div = $(h('div.cp-sidebarlayout-element')).appendTo($container);
+        var $block = $('<div>', {class:LINK_ID}).appendTo($container);
         APP.$copyData = $(h('button.btn.btn-secondary', [
             h('i.fa.fa-clipboard'),
             h('span', Messages.support_copyUserData)
         ])).click(function () {
             if (!APP.getCopyData) { return; }
             APP.getCopyData();
-        }).appendTo($div).hide();
+        }).appendTo($block).hide();
     };
     var setCopyDataButton = function (data) {
         if (!data.curvePublic) { return; }

From 8cd118c33fd7e6fc4325e893200eb3ca65506798 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Tue, 11 Mar 2025 12:12:56 +0200
Subject: [PATCH 09/22] Fix overlapping

---
 www/profile/app-profile.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 8b9a92802..a1cd9eb0d 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -39,7 +39,7 @@
         text-align: center;
         max-width: 300px;
         max-height: 300px;
-        margin-bottom: 1rem;
+        margin-bottom: 3.5rem;
         &> span {
             display: inline-block;
             text-align: center;

From eaf55e01cdf3672f9ee93f977f1c3a59766a2602 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Sun, 16 Mar 2025 15:30:33 +0200
Subject: [PATCH 10/22] Implement fixes + add accessibility refactoring of
 buttons

---
 www/profile/app-profile.less |   2 +
 www/profile/inner.js         | 102 ++++++++++++++++++++++-------------
 2 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index a1cd9eb0d..e24418366 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -31,6 +31,7 @@
             display: flex;
             flex-flow: column;
             align-items: start;
+            max-width: 100%;
         }
     }
     #cp-app-profile-avatar {
@@ -186,6 +187,7 @@
             font-family: monospace;
             font-size: 16px;
             line-height: initial;
+            width: 31rem;
             pre {
                 margin: 0;
                 font-family: inherit;
diff --git a/www/profile/inner.js b/www/profile/inner.js
index b7b868f7e..d33daba0f 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -103,15 +103,19 @@ define([
     var addViewButton = function ($container) {
         var hash = common.getMetadataMgr().getPrivateData().hashes.viewHash;
         var url = APP.origin + '/profile/#' + hash;
-        
         // Only add view and share buttons if not read-only
         if (!APP.readOnly) {
             var $blockView = $('<div>', {class: LINK_ID}).appendTo($container);
-            $('<button>', {
+            var $button = $('<button>', {
                 'class': 'btn ' + VIEW_PROFILE_BUTTON,
-            }).text(Messages.profile_viewMyProfile).click(function () {
-                window.open(url, '_blank');
+                'aria-labelledby': 'cp-view-button'
             }).appendTo($blockView);
+            $button.append(
+                h('span', { id: 'cp-view-button' }, Messages.profile_viewMyProfile)
+            );
+            $button.click(function () {
+                window.open(url, '_blank');
+            });
         }
         
         // Always create the description container
@@ -125,11 +129,11 @@ define([
         if (!APP.readOnly) {
             var $blockShare = $('<div>', {class: LINK_ID}).appendTo($container);
             $('<button>', {
-                'class': 'btn btn-primary ' + VIEW_PROFILE_BUTTON,
+                'class': 'btn btn-primary ' + VIEW_PROFILE_BUTTON, 'aria-labelledby': 'cp-share-button'
             }).append(
-                h('i', { 'class': 'fa fa-share-alt', 'aria-hidden': 'true', 'aria-labelledby': Messages.shareButton })
+                h('i', { 'class': 'fa fa-share-alt', 'aria-hidden': 'true'})
             ).append(
-                h('span', Messages.shareButton)
+                h('span', {'id': 'cp-share-button'}, Messages.shareButton)
             ).click(function () {
                 Clipboard.copy(url, (err) => {
                     if (!err) { UI.log(Messages.shareSuccess); }
@@ -171,8 +175,11 @@ define([
         }, Messages.profile_addLink);
         APP.$linkEdit = $(button);
         $block.append(button);
-        var save = h('button.btn.btn-primary', Messages.settings_save);
-        var text = h('input');
+        var save = h('button.btn.btn-primary', Messages.settings_save, { 'aria-labelledby': 'cp-save-link' });
+        var text = h('input', { 
+            id: 'cp-save-link', 
+            type: 'text' 
+        });        
         var code = h('div.cp-app-profile-link-code', [
             text,
             save
@@ -235,14 +242,17 @@ define([
         if (friends[data.curvePublic]) {
             // Add friend message
             APP.$friend.append(h('p.cp-app-profile-friend', [
-                h('i.fa.fa-address-book'),
+                h('i', { class: 'fa fa-address-book', 'aria-hidden': 'true' }),
                 Messages._getKey('isContact', [name])
             ]));
             if (!friends[data.curvePublic].notifications) { return; }
             // Add unfriend button
-            var unfriendButton = h('button.btn.btn-primary.cp-app-profile-friend-request', [
-                h('i', { 'class': 'fa fa-user-times', 'aria-hidden': 'true', 'aria-labelledby': Messages.contacts_remove}),
-                Messages.contacts_remove
+            var unfriendButton = h('button', { 
+                class: 'btn btn-primary cp-app-profile-friend-request', 
+                'aria-labelledby': 'cp-unfriend-button'
+            }, [
+                h('i', { class: 'fa fa-user-times', 'aria-hidden': 'true' }), 
+                h('span', { id: 'cp-unfriend-button' }, Messages.contacts_remove)
             ]);
             $(unfriendButton).click(function () {
                 // Unfriend confirm
@@ -260,7 +270,7 @@ define([
         }
 
         var button = h('button.btn.btn-success.cp-app-profile-friend-request', [
-            h('i.fa.fa-user-plus'),
+            h('i', { 'class': 'fa fa-user-plus', 'aria-hidden': 'true'}),
         ]);
         var $button = $(button).appendTo(APP.$friend);
 
@@ -275,10 +285,13 @@ define([
         }
 
         var addCancel = function () {
-            var cancelButton = h('button.btn.btn-danger.cp-app-profile-friend-request', [
-                h('i.fa.fa-user-times'),
-                Messages.cancel
-            ]);
+            var cancelButton = h('button', 
+                { class: 'btn btn-danger cp-app-profile-friend-request', 'aria-labelledby': 'cp-cancel-button' }, 
+                [
+                    h('i', { class: 'fa fa-user-times', 'aria-hidden': 'true' }),
+                    h('span', { id: 'cp-cancel-button' }, Messages.contacts_remove || 'Cancel Request')
+                ]
+            );
             $(cancelButton).click(function () {
                 // Unfriend confirm
                 var content = h('div', [
@@ -340,10 +353,13 @@ define([
             $mute.html('');
             var isMuted = muted[data.curvePublic];
             if (isMuted) {
-                var unmuteButton = h('button.btn.btn-secondary.cp-app-profile-friend-request', [
-                    h('i.fa.fa-bell'),
-                    Messages.contacts_unmute || 'unmute'
-                ]);
+                var unmuteButton = h('button', 
+                    { class: 'btn btn-secondary cp-app-profile-friend-request', 'aria-labelledby': 'cp-unmute-button' }, 
+                    [
+                        h('i', { class: 'fa fa-bell', 'aria-hidden': 'true' }),
+                        h('span', { id: 'cp-unmute-button' }, Messages.contacts_unmute || 'Unmute')
+                    ]
+                );
                 $(unmuteButton).click(function () {
                     module.execCommand('UNMUTE_USER', data.curvePublic, function (e) {
                         if (e) { console.error(e); return void UI.warn(Messages.error); }
@@ -352,10 +368,13 @@ define([
                 }).appendTo($mute);
                 return;
             }
-            var muteButton = h('button.btn.btn-danger-outline.cp-app-profile-friend-request', [
-                h('i', { 'class': 'fa fa-bell-slash', 'aria-hidden': 'true', 'aria-labelledby': Messages.contacts_mute}),
-                Messages.contacts_mute || 'mute'
-            ]);
+            var muteButton = h('button', 
+                { class: 'btn btn-danger-outline cp-app-profile-friend-request', 'aria-labelledby': 'cp-mute-button' }, 
+                [
+                    h('i', { class: 'fa fa-bell-slash', 'aria-hidden': 'true' }),
+                    h('span', { id: 'cp-mute-button' }, Messages.contacts_mute || 'Mute')
+                ]
+            );            
             $(muteButton).click(function () {
                 module.execCommand('MUTE_USER', {
                     curvePublic: data.curvePublic,
@@ -436,7 +455,7 @@ define([
         var $upButton = common.createButton('upload', false, data);
         $upButton.removeProp('title');
         $upButton.text(Messages.profile_upload);
-        $upButton.prepend($('<i>', {'class': 'fa fa-upload', 'aria-hidden': 'true', 'aria-labelledby': Messages.profile_upload}));
+        $upButton.prepend($('<i>', {'class': 'fa fa-upload', 'aria-hidden': 'true'}));
         $block.append($upButton);
     };
     var refreshAvatar = function (data) {
@@ -449,10 +468,13 @@ define([
         APP.$descriptionEdit = $();
         if (APP.readOnly) { return; }
 
-        var button = h('button.btn.btn-primary', [
-            h('i', { 'class': 'fa fa-pencil', 'aria-hidden': 'true', 'aria-labelledby': Messages.profile_addDescription}),
-            h('span', Messages.profile_addDescription)
-        ]);
+        var button = h('button', 
+            { class: 'btn btn-primary', 'aria-labelledby': 'cp-add-description-button' }, 
+            [
+                h('i', { class: 'fa fa-pencil', 'aria-hidden': 'true' }),
+                h('span', { id: 'cp-add-description-button' }, Messages.profile_addDescription)
+            ]
+        );        
         APP.$descriptionEdit = $(button);
         var save = h('button.btn.btn-primary', Messages.settings_save);
         var text = h('textarea');
@@ -531,9 +553,12 @@ define([
         var $div = $(h('div.cp-sidebarlayout-element')).appendTo($container);
         APP.$edPublic = $('<button>', {
             'class': 'btn',
-        }).append(h('i', { 'class': 'fa fa-key', 'aria-hidden': 'true', 'aria-labelledby': Messages.profile_copyKey }))
-          .append(h('span', Messages.profile_copyKey))
-          .click(function () {
+            'aria-labelledby': 'cp-copy-key-button'
+        }).append(
+            h('i', { 'class': 'fa fa-key', 'aria-hidden': 'true' })
+        ).append(
+            h('span', { id: 'cp-copy-key-button' }, Messages.profile_copyKey)
+        ).click(function () {
             if (!APP.getEdPublic) { return; }
             APP.getEdPublic();
         }).appendTo($div).hide();
@@ -555,10 +580,11 @@ define([
     var addCopyData = function ($container) {
         if (!APP.isModerator) { return; }
         var $block = $('<div>', {class:LINK_ID}).appendTo($container);
-        APP.$copyData = $(h('button.btn.btn-secondary', [
-            h('i.fa.fa-clipboard'),
-            h('span', Messages.support_copyUserData)
-        ])).click(function () {
+        APP.$copyData = $(h('button', 
+            { class: 'btn btn-secondary', 'aria-labelledby': 'cp-copy-data-button' }, 
+            [   h('i', { class: 'fa fa-clipboard', 'aria-hidden': 'true' }), 
+                h('span', { id: 'cp-copy-data-button' }, Messages.support_copyUserData)
+            ])).click(function () {
             if (!APP.getCopyData) { return; }
             APP.getCopyData();
         }).appendTo($block).hide();

From 75c0bf0d268eb50816524714d3c4a314f185cd79 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Mon, 17 Mar 2025 17:37:31 +0200
Subject: [PATCH 11/22] Add escape key to prevent keyboard trap inside
 description editor

---
 www/profile/inner.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/www/profile/inner.js b/www/profile/inner.js
index d33daba0f..94b8c398e 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -498,6 +498,13 @@ define([
         editor.setOption('readOnly', false);
         cm.configureTheme(common, function () {});
 
+        editor.on("keydown", function (cm, event) {
+            if (event.key === "Escape") {
+                cm.getInputField().blur();
+                event.preventDefault();
+            }
+        });
+
         var markdownTb = common.createMarkdownToolbar(editor);
         $(code).prepend(markdownTb.toolbar);
         $(markdownTb.toolbar).show();

From e670d8c4141c12ad63cb5486433d9913f15008b6 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 18 Mar 2025 11:42:34 +0200
Subject: [PATCH 12/22] fix text area responsiveness + add border-radius to
 buttons

---
 customize.dist/src/less2/include/toolbar.less | 4 ++--
 www/profile/app-profile.less                  | 2 +-
 www/profile/inner.js                          | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index e61d9fbda..c017b2098 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -64,13 +64,13 @@
     }
 
     .cp-markdown-toolbar {
-        height: @toolbar_line-height;
+        //height: @toolbar_line-height;
         background-color: @cp_toolbar-bg;
         color: @cp_toolbar-fg;
-        display: none;
         button {
             height: @toolbar_line-height !important;
             outline: 0;
+            border-radius: @variables_radius;
             color: @toolbar-color;
             .toolbar_button;
             font: normal normal normal 14px/1 FontAwesome;
diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index e24418366..4cfd4455a 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -187,7 +187,7 @@
             font-family: monospace;
             font-size: 16px;
             line-height: initial;
-            width: 31rem;
+            max-width: 31rem;
             pre {
                 margin: 0;
                 font-family: inherit;
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 94b8c398e..4407d7731 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -502,6 +502,7 @@ define([
             if (event.key === "Escape") {
                 cm.getInputField().blur();
                 event.preventDefault();
+                $(save).focus();
             }
         });
 

From fb0aae13c9cc45391029734441b4e20d478cf84a Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 18 Mar 2025 11:49:00 +0200
Subject: [PATCH 13/22] fix text area

---
 customize.dist/src/less2/include/toolbar.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index c017b2098..ef7562972 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -67,6 +67,8 @@
         //height: @toolbar_line-height;
         background-color: @cp_toolbar-bg;
         color: @cp_toolbar-fg;
+        display: flex;
+        flex-wrap: wrap;
         button {
             height: @toolbar_line-height !important;
             outline: 0;

From dc3b1c857475ea6019ea5089464f7cd4e3ac495d Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Tue, 18 Mar 2025 12:23:32 +0200
Subject: [PATCH 14/22] Fix textarea

---
 customize.dist/src/less2/include/toolbar.less | 5 ++---
 www/profile/app-profile.less                  | 5 ++++-
 www/profile/inner.js                          | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index ef7562972..d7236b1d6 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -64,11 +64,10 @@
     }
 
     .cp-markdown-toolbar {
-        //height: @toolbar_line-height;
+        height: @toolbar_line-height;
         background-color: @cp_toolbar-bg;
         color: @cp_toolbar-fg;
-        display: flex;
-        flex-wrap: wrap;
+        display: none;
         button {
             height: @toolbar_line-height !important;
             outline: 0;
diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 4cfd4455a..da60c6528 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -168,10 +168,13 @@
     #cp-app-profile-description {
         position: relative;
         font-size: 16px;
-        margin-bottom: 20px;
+        //margin-bottom: 20px;
         .cp-app-profile-description-code {
             display: none;
         }
+        #cp-app-profile-description-info {
+            overflow-wrap: anywhere;
+        }
         .cp-app-profile-description-ok, .cp-app-profile-description-spin {
             position: absolute;
             bottom: 2px;
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 4407d7731..ecb6aadc6 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -119,7 +119,7 @@ define([
         }
         
         // Always create the description container
-        var $blockDescription = $('<div>', {class: DESCRIPTION_ID}).appendTo($container);
+        var $blockDescription = $('<div>', {id: DESCRIPTION_ID}).appendTo($container);
         APP.$descriptionContainer = $blockDescription;
         APP.$description = $('<div>', {
             'id': 'cp-app-profile-description-info'

From dd4f39ed5cd9a3944c11082f46220a9d1176a2d4 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Thu, 20 Mar 2025 15:45:14 +0200
Subject: [PATCH 15/22] Implement review fixes

---
 www/profile/app-profile.less |  19 ++---
 www/profile/inner.js         | 155 ++++++++++++++++-------------------
 2 files changed, 79 insertions(+), 95 deletions(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index da60c6528..86f18e65b 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -89,11 +89,7 @@
     .cp-app-profile-displayname {
         margin-top: 1rem;
     }
-    div.cp-app-profile-link.hidden{
-        display:none;
-    }
-
-    .cp-app-profile-displayname, .cp-app-profile-link {
+    .cp-app-profile-displayname, .cp-app-profile-link, .cp-app-profile-section {
         margin-bottom: 1rem;
         input {
             width: 100%;
@@ -120,6 +116,8 @@
         .cp-app-profile-link {
             font-size: 25px;
             vertical-align: middle;
+            display: inline-block;
+            overflow-wrap: anywhere;
         }
         .cp-app-profile-displayname, .cp-app-profile-link {
             line-height: 40px;
@@ -140,14 +138,12 @@
         }
     }
 
-    div.cp-app-profile-link {
-        &.cp-app-profile-description-rendered,
-        &.cp-app-profile-mute-container {
-          &:has(p) {
+    div.cp-app-profile-mute-container.cp-app-profile-section {
+        p {
             margin-bottom: 0;
-          }
         }
-      }
+    
+    }
     .cp-app-profile-friend {
         display: flex;
         align-items: center;
@@ -174,6 +170,7 @@
         }
         #cp-app-profile-description-info {
             overflow-wrap: anywhere;
+            margin-top: 1rem;
         }
         .cp-app-profile-description-ok, .cp-app-profile-description-spin {
             position: absolute;
diff --git a/www/profile/inner.js b/www/profile/inner.js
index ecb6aadc6..c79c0ec3f 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -96,6 +96,7 @@ define([
     var HEADER_ID = "cp-app-profile-header";
     var HEADER_RIGHT_ID = "cp-app-profile-rightside";
     var VIEW_PROFILE_BUTTON = 'cp-app-profile-viewprofile-button';
+    var PROFILE_SECTION = "cp-app-profile-section";
 
     var common;
     var sFrameChan;
@@ -105,45 +106,36 @@ define([
         var url = APP.origin + '/profile/#' + hash;
         // Only add view and share buttons if not read-only
         if (!APP.readOnly) {
-            var $blockView = $('<div>', {class: LINK_ID}).appendTo($container);
+            var $blockView = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
             var $button = $('<button>', {
                 'class': 'btn ' + VIEW_PROFILE_BUTTON,
-                'aria-labelledby': 'cp-view-button'
+                'aria-labelledby': 'cp-profile-view-button'
             }).appendTo($blockView);
             $button.append(
-                h('span', { id: 'cp-view-button' }, Messages.profile_viewMyProfile)
+                h('span#cp-profile-view-button', Messages.profile_viewMyProfile)
             );
             $button.click(function () {
                 window.open(url, '_blank');
             });
         }
         
-        // Always create the description container
-        var $blockDescription = $('<div>', {id: DESCRIPTION_ID}).appendTo($container);
-        APP.$descriptionContainer = $blockDescription;
-        APP.$description = $('<div>', {
-            'id': 'cp-app-profile-description-info'
-        }).appendTo($blockDescription);
-        
         // Add the share button only for editable profiles
         if (!APP.readOnly) {
-            var $blockShare = $('<div>', {class: LINK_ID}).appendTo($container);
+            var $blockShare = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
             $('<button>', {
-                'class': 'btn btn-primary ' + VIEW_PROFILE_BUTTON, 'aria-labelledby': 'cp-share-button'
-            }).append(
-                h('i', { 'class': 'fa fa-share-alt', 'aria-hidden': 'true'})
-            ).append(
-                h('span', {'id': 'cp-share-button'}, Messages.shareButton)
-            ).click(function () {
+                'class': 'btn btn-primary ' + VIEW_PROFILE_BUTTON, 'aria-labelledby': 'cp-profile-share-button'
+            }).append([
+                    h('i.fa.fa-share-alt', {'aria-hidden': 'true'}),
+                    h('span#cp-profile-share-button', Messages.shareButton)
+            ]).click(function () {
                 Clipboard.copy(url, (err) => {
                     if (!err) { UI.log(Messages.shareSuccess); }
                 });
             }).appendTo($blockShare);
         }
     };
-    
     var addDisplayName = function ($container) {
-        var $block = $('<div>', {class: DISPLAYNAME_ID}).appendTo($container);
+        var $block = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
         APP.$name = $('<span>', {'class': DISPLAYNAME_ID}).appendTo($block);
     };
     var refreshName = function (data) {
@@ -151,7 +143,7 @@ define([
     };
 
     var addLink = function ($container) {
-        var $block = $('<div>', {class: LINK_ID}).appendTo($container);
+        var $block = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
 
         APP.$link = $('<a>', {
             'class': LINK_ID,
@@ -175,11 +167,8 @@ define([
         }, Messages.profile_addLink);
         APP.$linkEdit = $(button);
         $block.append(button);
-        var save = h('button.btn.btn-primary', Messages.settings_save, { 'aria-labelledby': 'cp-save-link' });
-        var text = h('input', { 
-            id: 'cp-save-link', 
-            type: 'text' 
-        });        
+        var save = h('button.btn.btn-secondary', { 'aria-labelledby': 'cp-save-link' }, Messages.settings_save);
+        var text = h('input#cp-save-link');
         var code = h('div.cp-app-profile-link-code', [
             text,
             save
@@ -219,7 +208,7 @@ define([
 
     var addFriendRequest = function ($container) {
         if (!APP.readOnly || !APP.common.isLoggedIn()) { return; }
-        var $block = $('<div>', {class: LINK_ID}).appendTo($container);
+        var $block = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
         APP.$friend = $(h('div.cp-app-profile-friend-container'));
         $block.append(APP.$friend);
     };
@@ -242,17 +231,16 @@ define([
         if (friends[data.curvePublic]) {
             // Add friend message
             APP.$friend.append(h('p.cp-app-profile-friend', [
-                h('i', { class: 'fa fa-address-book', 'aria-hidden': 'true' }),
+                h('i.fa.fa-address-book', {'aria-hidden': 'true' }),
                 Messages._getKey('isContact', [name])
             ]));
             if (!friends[data.curvePublic].notifications) { return; }
             // Add unfriend button
-            var unfriendButton = h('button', { 
-                class: 'btn btn-primary cp-app-profile-friend-request', 
-                'aria-labelledby': 'cp-unfriend-button'
+            var unfriendButton = h('button.btn.btn-primary.cp-app-profile-friend-request', {
+                'aria-labelledby': 'cp-profile-unfriend-button'
             }, [
-                h('i', { class: 'fa fa-user-times', 'aria-hidden': 'true' }), 
-                h('span', { id: 'cp-unfriend-button' }, Messages.contacts_remove)
+                h('i.fa.fa-user-times', {'aria-hidden': 'true' }), 
+                h('span#cp-profile-unfriend-button', Messages.contacts_remove)
             ]);
             $(unfriendButton).click(function () {
                 // Unfriend confirm
@@ -270,7 +258,7 @@ define([
         }
 
         var button = h('button.btn.btn-success.cp-app-profile-friend-request', [
-            h('i', { 'class': 'fa fa-user-plus', 'aria-hidden': 'true'}),
+            h('i.fa.fa-user-plus', {'aria-hidden': 'true'}),
         ]);
         var $button = $(button).appendTo(APP.$friend);
 
@@ -285,13 +273,12 @@ define([
         }
 
         var addCancel = function () {
-            var cancelButton = h('button', 
-                { class: 'btn btn-danger cp-app-profile-friend-request', 'aria-labelledby': 'cp-cancel-button' }, 
-                [
-                    h('i', { class: 'fa fa-user-times', 'aria-hidden': 'true' }),
-                    h('span', { id: 'cp-cancel-button' }, Messages.contacts_remove || 'Cancel Request')
-                ]
-            );
+            var cancelButton = h('button.btn.btn-danger.cp-app-profile-friend-request', { 
+                'aria-labelledby': 'cp-profile-cancel-button' 
+            },[
+                h('i.fa.fa-user-times', {'aria-hidden': 'true' }),
+                h('span#cp-profile-cancel-button' , Messages.cancel)
+            ]);
             $(cancelButton).click(function () {
                 // Unfriend confirm
                 var content = h('div', [
@@ -332,7 +319,7 @@ define([
 
     var addMuteButton = function ($container) {
         if (!APP.readOnly || !APP.common.isLoggedIn()) { return; }
-        APP.$mute = $(h('div.cp-app-profile-mute-container.cp-app-profile-link'));
+        APP.$mute = $(h('div.cp-app-profile-mute-container.cp-app-profile-section'));
         $container.append(APP.$mute);
     };
     var refreshMute = function (data) {
@@ -344,7 +331,6 @@ define([
             return;
         }
 
-
         // Add mute/unmute buttons
         var $mute = APP.$mute;
         var module = common.makeUniversal('messenger');
@@ -353,13 +339,12 @@ define([
             $mute.html('');
             var isMuted = muted[data.curvePublic];
             if (isMuted) {
-                var unmuteButton = h('button', 
-                    { class: 'btn btn-secondary cp-app-profile-friend-request', 'aria-labelledby': 'cp-unmute-button' }, 
-                    [
-                        h('i', { class: 'fa fa-bell', 'aria-hidden': 'true' }),
-                        h('span', { id: 'cp-unmute-button' }, Messages.contacts_unmute || 'Unmute')
-                    ]
-                );
+                var unmuteButton = h('button.btn.btn-secondary.cp-app-profile-friend-request', { 
+                    'aria-labelledby': 'cp-unmute-button'
+                }, [
+                    h('i.fa.fa-bell', {'aria-hidden': 'true' }),
+                    h('span#cp-profile-unmute-button', Messages.contacts_unmute || 'Unmute')
+                ]);
                 $(unmuteButton).click(function () {
                     module.execCommand('UNMUTE_USER', data.curvePublic, function (e) {
                         if (e) { console.error(e); return void UI.warn(Messages.error); }
@@ -368,13 +353,12 @@ define([
                 }).appendTo($mute);
                 return;
             }
-            var muteButton = h('button', 
-                { class: 'btn btn-danger-outline cp-app-profile-friend-request', 'aria-labelledby': 'cp-mute-button' }, 
-                [
-                    h('i', { class: 'fa fa-bell-slash', 'aria-hidden': 'true' }),
-                    h('span', { id: 'cp-mute-button' }, Messages.contacts_mute || 'Mute')
-                ]
-            );            
+            var muteButton = h('button.btn.btn-danger-outline.cp-app-profile-friend-request', {
+                 'aria-labelledby': 'cp-profile-mute-button'
+                }, [
+                    h('i.fa.fa-bell-slash', {'aria-hidden': 'true' }),
+                    h('span#cp-profile-mute-button', Messages.contacts_mute || 'Mute')
+                ]);            
             $(muteButton).click(function () {
                 module.execCommand('MUTE_USER', {
                     curvePublic: data.curvePublic,
@@ -407,7 +391,7 @@ define([
 
         var $delButton = $('<button>', {
             'class': 'cp-app-profile-avatar-delete btn btn-danger fa fa-times',
-            title: Messages.profile_remove_avatar //XXX
+            title: Messages.profile_remove_avatar
         });
         $span.append($delButton);
         $delButton.click(function () {
@@ -452,7 +436,9 @@ define([
             }
             todo();
         });
+        //upload profile photo button should be secondary
         var $upButton = common.createButton('upload', false, data);
+        $upButton.removeClass('btn-primary').addClass('btn-secondary');
         $upButton.removeProp('title');
         $upButton.text(Messages.profile_upload);
         $upButton.prepend($('<i>', {'class': 'fa fa-upload', 'aria-hidden': 'true'}));
@@ -468,13 +454,12 @@ define([
         APP.$descriptionEdit = $();
         if (APP.readOnly) { return; }
 
-        var button = h('button', 
-            { class: 'btn btn-primary', 'aria-labelledby': 'cp-add-description-button' }, 
-            [
-                h('i', { class: 'fa fa-pencil', 'aria-hidden': 'true' }),
-                h('span', { id: 'cp-add-description-button' }, Messages.profile_addDescription)
-            ]
-        );        
+        var button = h('button.btn.btn-secondary', {
+            'aria-labelledby': 'cp-profile-add-description-button' 
+            }, [
+                h('i.fa.fa-pencil', {'aria-hidden': 'true' }),
+                h('span#cp-profile-add-description-button', Messages.profile_addDescription)
+            ]);        
         APP.$descriptionEdit = $(button);
         var save = h('button.btn.btn-primary', Messages.settings_save);
         var text = h('textarea');
@@ -490,6 +475,10 @@ define([
         ]);
         $block.append(div);
 
+        APP.$description = $('<div>', {
+            'id': 'cp-app-profile-description-info'
+        }).appendTo($block);
+
         var cm = SFCodeMirror.create("gfm", CodeMirror, text);
         var editor = APP.editor = cm.editor;
         editor.setOption('lineNumbers', true);
@@ -498,10 +487,9 @@ define([
         editor.setOption('readOnly', false);
         cm.configureTheme(common, function () {});
 
-        editor.on("keydown", function (cm, event) {
-            if (event.key === "Escape") {
+        editor.setOption("extraKeys", {
+            "Esc": function () {
                 cm.getInputField().blur();
-                event.preventDefault();
                 $(save).focus();
             }
         });
@@ -529,6 +517,10 @@ define([
         });
     };
     var refreshDescription = function (data) {
+        if (!APP.$description) {
+            console.error("APP.$description is not initialized. Skipping refreshDescription.");
+            return;
+        }
         var descriptionData = data.description || "";
         var val = Marked.parse(descriptionData);
         APP.$description.html(val);
@@ -547,11 +539,6 @@ define([
         if (!APP.editor) { return; }
         APP.editor.setValue(data.description || "");
         APP.editor.save();
-        if ($.trim(descriptionData) === "") {
-            APP.$descriptionContainer.addClass('hidden');
-        } else {
-            APP.$descriptionContainer.removeClass('hidden');
-        }
     };
 
     var addPublicKey = function ($container) {
@@ -561,12 +548,11 @@ define([
         var $div = $(h('div.cp-sidebarlayout-element')).appendTo($container);
         APP.$edPublic = $('<button>', {
             'class': 'btn',
-            'aria-labelledby': 'cp-copy-key-button'
-        }).append(
-            h('i', { 'class': 'fa fa-key', 'aria-hidden': 'true' })
-        ).append(
-            h('span', { id: 'cp-copy-key-button' }, Messages.profile_copyKey)
-        ).click(function () {
+            'aria-labelledby': 'cp-profile-copy-key-button'
+        }).append([
+            h('i.fa.fa-key', {'aria-hidden': 'true' }),
+            h('span#cp-profile-copy-key-button', Messages.profile_copyKey)
+        ]).click(function () {
             if (!APP.getEdPublic) { return; }
             APP.getEdPublic();
         }).appendTo($div).hide();
@@ -587,12 +573,13 @@ define([
 
     var addCopyData = function ($container) {
         if (!APP.isModerator) { return; }
-        var $block = $('<div>', {class:LINK_ID}).appendTo($container);
-        APP.$copyData = $(h('button', 
-            { class: 'btn btn-secondary', 'aria-labelledby': 'cp-copy-data-button' }, 
-            [   h('i', { class: 'fa fa-clipboard', 'aria-hidden': 'true' }), 
-                h('span', { id: 'cp-copy-data-button' }, Messages.support_copyUserData)
-            ])).click(function () {
+        var $block = $('<div>', {class:PROFILE_SECTION}).appendTo($container);
+        APP.$copyData = $(h('button.btn.btn-secondary', { 
+            'aria-labelledby': 'cp-profile-copy-data-button' 
+        }, [   
+            h('i.fa.fa-clipboard', {'aria-hidden': 'true' }), 
+            h('span#cp-profile-copy-data-button', Messages.support_copyUserData)
+        ])).click(function () {
             if (!APP.getCopyData) { return; }
             APP.getCopyData();
         }).appendTo($block).hide();

From 22454e1585000cf65aa7cfa68c9fc966cfa0e964 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Fri, 21 Mar 2025 11:35:58 +0200
Subject: [PATCH 16/22] Add final touches

---
 www/profile/inner.js | 57 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/www/profile/inner.js b/www/profile/inner.js
index c79c0ec3f..26e1d880d 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -102,38 +102,37 @@ define([
     var sFrameChan;
 
     var addViewButton = function ($container) {
+        if (APP.readOnly) {
+            return;
+        }
+
         var hash = common.getMetadataMgr().getPrivateData().hashes.viewHash;
         var url = APP.origin + '/profile/#' + hash;
-        // Only add view and share buttons if not read-only
-        if (!APP.readOnly) {
-            var $blockView = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
-            var $button = $('<button>', {
-                'class': 'btn ' + VIEW_PROFILE_BUTTON,
-                'aria-labelledby': 'cp-profile-view-button'
-            }).appendTo($blockView);
-            $button.append(
-                h('span#cp-profile-view-button', Messages.profile_viewMyProfile)
-            );
-            $button.click(function () {
-                window.open(url, '_blank');
+
+        var $blockView = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
+        var button = h('button.btn.' + VIEW_PROFILE_BUTTON, {
+            'aria-labelledby': 'cp-profile-view-button'
+        }, [
+            h('span#cp-profile-view-button', Messages.profile_viewMyProfile)
+        ]);
+        $(button).click(function () {
+            window.open(url, '_blank');
+        }).appendTo($blockView);
+
+        var $blockShare = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
+        var button = h('button.btn.btn-primary.' + VIEW_PROFILE_BUTTON, {
+            'aria-labelledby': 'cp-profile-share-button'
+        }, [
+            h('i.fa.fa-share-alt', { 'aria-hidden': 'true' }),
+            h('span#cp-profile-share-button', Messages.shareButton)
+        ]);
+        $(button).click(function () {
+            Clipboard.copy(url, (err) => {
+                if (!err) { UI.log(Messages.shareSuccess); }
             });
-        }
-        
-        // Add the share button only for editable profiles
-        if (!APP.readOnly) {
-            var $blockShare = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
-            $('<button>', {
-                'class': 'btn btn-primary ' + VIEW_PROFILE_BUTTON, 'aria-labelledby': 'cp-profile-share-button'
-            }).append([
-                    h('i.fa.fa-share-alt', {'aria-hidden': 'true'}),
-                    h('span#cp-profile-share-button', Messages.shareButton)
-            ]).click(function () {
-                Clipboard.copy(url, (err) => {
-                    if (!err) { UI.log(Messages.shareSuccess); }
-                });
-            }).appendTo($blockShare);
-        }
+        }).appendTo($blockShare);      
     };
+
     var addDisplayName = function ($container) {
         var $block = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
         APP.$name = $('<span>', {'class': DISPLAYNAME_ID}).appendTo($block);
@@ -518,9 +517,9 @@ define([
     };
     var refreshDescription = function (data) {
         if (!APP.$description) {
-            console.error("APP.$description is not initialized. Skipping refreshDescription.");
             return;
         }
+        
         var descriptionData = data.description || "";
         var val = Marked.parse(descriptionData);
         APP.$description.html(val);

From e0ca481efaa8cadbe3ee691a390510143f8eb0a7 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Fri, 21 Mar 2025 12:40:04 +0200
Subject: [PATCH 17/22] Make link container responsive on small screens

---
 www/profile/app-profile.less |  9 +++++++--
 www/profile/inner.js         | 10 ++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 86f18e65b..856b9459a 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -6,6 +6,7 @@
 
 @import (reference) '../../customize/src/less2/include/framework.less';
 @import (reference) '../../customize/src/less2/include/sidebar-layout.less';
+@import (reference) '../../customize/src/less2/include/variables.less';
 
 &.cp-app-profile {
 
@@ -115,8 +116,7 @@
         }
         .cp-app-profile-link {
             font-size: 25px;
-            vertical-align: middle;
-            display: inline-block;
+            display: inline;
             overflow-wrap: anywhere;
         }
         .cp-app-profile-displayname, .cp-app-profile-link {
@@ -136,6 +136,11 @@
         & > button:empty {
             margin-left: 25px !important;
         }
+        @media screen and (max-width: @browser_media-medium-screen) {
+            .cp-app-profile-link-code {
+                min-width: 0;
+            }
+        }    
     }
 
     div.cp-app-profile-mute-container.cp-app-profile-section {
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 26e1d880d..6ac5815cf 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -134,7 +134,7 @@ define([
     };
 
     var addDisplayName = function ($container) {
-        var $block = $('<div>', {class: PROFILE_SECTION}).appendTo($container);
+        var $block = $('<div>', {'class': DISPLAYNAME_ID}).appendTo($container);
         APP.$name = $('<span>', {'class': DISPLAYNAME_ID}).appendTo($block);
     };
     var refreshName = function (data) {
@@ -339,10 +339,10 @@ define([
             var isMuted = muted[data.curvePublic];
             if (isMuted) {
                 var unmuteButton = h('button.btn.btn-secondary.cp-app-profile-friend-request', { 
-                    'aria-labelledby': 'cp-unmute-button'
+                    'aria-labelledby': 'cp-profile-unmute-button'
                 }, [
                     h('i.fa.fa-bell', {'aria-hidden': 'true' }),
-                    h('span#cp-profile-unmute-button', Messages.contacts_unmute || 'Unmute')
+                    h('span#cp-profile-unmute-button', Messages.contacts_unmute || 'unmute')
                 ]);
                 $(unmuteButton).click(function () {
                     module.execCommand('UNMUTE_USER', data.curvePublic, function (e) {
@@ -356,7 +356,7 @@ define([
                  'aria-labelledby': 'cp-profile-mute-button'
                 }, [
                     h('i.fa.fa-bell-slash', {'aria-hidden': 'true' }),
-                    h('span#cp-profile-mute-button', Messages.contacts_mute || 'Mute')
+                    h('span#cp-profile-mute-button', Messages.contacts_mute || 'mute')
                 ]);            
             $(muteButton).click(function () {
                 module.execCommand('MUTE_USER', {
@@ -485,7 +485,6 @@ define([
         editor.setOption('styleActiveLine', true);
         editor.setOption('readOnly', false);
         cm.configureTheme(common, function () {});
-
         editor.setOption("extraKeys", {
             "Esc": function () {
                 cm.getInputField().blur();
@@ -519,7 +518,6 @@ define([
         if (!APP.$description) {
             return;
         }
-        
         var descriptionData = data.description || "";
         var val = Marked.parse(descriptionData);
         APP.$description.html(val);

From e75916f51d9f92ccc25b2d609f55d0092d161b47 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Fri, 21 Mar 2025 13:01:44 +0200
Subject: [PATCH 18/22] Fix also view my profile section

---
 www/profile/app-profile.less | 3 +++
 www/profile/inner.js         | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 856b9459a..832354551 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -90,6 +90,9 @@
     .cp-app-profile-displayname {
         margin-top: 1rem;
     }
+    .cp-app-profile-section:empty {
+        display: none;
+    }
     .cp-app-profile-displayname, .cp-app-profile-link, .cp-app-profile-section {
         margin-bottom: 1rem;
         input {
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 6ac5815cf..25e062ff0 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -166,7 +166,7 @@ define([
         }, Messages.profile_addLink);
         APP.$linkEdit = $(button);
         $block.append(button);
-        var save = h('button.btn.btn-secondary', { 'aria-labelledby': 'cp-save-link' }, Messages.settings_save);
+        var save = h('button.btn.btn-primary', { 'aria-labelledby': 'cp-save-link' }, Messages.settings_save);
         var text = h('input#cp-save-link');
         var code = h('div.cp-app-profile-link-code', [
             text,
@@ -448,8 +448,9 @@ define([
     };
 
     var addDescription = function ($container) {
-        var $block = $('<div>', {id: DESCRIPTION_ID, class:'cp-sidebarlayout-element'}).appendTo($container);
+        var $block = $('<div>', {id: DESCRIPTION_ID, class: PROFILE_SECTION}).appendTo($container);
 
+        APP.$description = $('<div>', {'id': 'cp-app-profile-description-info'}).appendTo($block);
         APP.$descriptionEdit = $();
         if (APP.readOnly) { return; }
 
@@ -542,7 +543,7 @@ define([
         if (!APP.readOnly) { return; }
         if (!Messages.profile_copyKey) { return; }
 
-        var $div = $(h('div.cp-sidebarlayout-element')).appendTo($container);
+        var $div = $(h('div.cp-app-profile-section')).appendTo($container);
         APP.$edPublic = $('<button>', {
             'class': 'btn',
             'aria-labelledby': 'cp-profile-copy-key-button'

From 45270984ec0e281288f2d28732b04379b9b67a26 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Fri, 21 Mar 2025 13:08:50 +0200
Subject: [PATCH 19/22] Delete duplicate description info

---
 www/profile/inner.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/profile/inner.js b/www/profile/inner.js
index 25e062ff0..22a502965 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -450,7 +450,6 @@ define([
     var addDescription = function ($container) {
         var $block = $('<div>', {id: DESCRIPTION_ID, class: PROFILE_SECTION}).appendTo($container);
 
-        APP.$description = $('<div>', {'id': 'cp-app-profile-description-info'}).appendTo($block);
         APP.$descriptionEdit = $();
         if (APP.readOnly) { return; }
 

From ecb6fc9af67d7af25c758c17db34d1a94d75cf92 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Fri, 21 Mar 2025 15:08:46 +0200
Subject: [PATCH 20/22] Fix no description in view profile

---
 www/profile/inner.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/www/profile/inner.js b/www/profile/inner.js
index 22a502965..92cee36c9 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -450,6 +450,10 @@ define([
     var addDescription = function ($container) {
         var $block = $('<div>', {id: DESCRIPTION_ID, class: PROFILE_SECTION}).appendTo($container);
 
+        APP.$description = $('<div>', {
+            'id': 'cp-app-profile-description-info'
+        }).appendTo($block);
+
         APP.$descriptionEdit = $();
         if (APP.readOnly) { return; }
 
@@ -473,10 +477,7 @@ define([
             code
         ]);
         $block.append(div);
-
-        APP.$description = $('<div>', {
-            'id': 'cp-app-profile-description-info'
-        }).appendTo($block);
+        $(div).insertBefore(APP.$description);
 
         var cm = SFCodeMirror.create("gfm", CodeMirror, text);
         var editor = APP.editor = cm.editor;
@@ -515,9 +516,6 @@ define([
         });
     };
     var refreshDescription = function (data) {
-        if (!APP.$description) {
-            return;
-        }
         var descriptionData = data.description || "";
         var val = Marked.parse(descriptionData);
         APP.$description.html(val);

From f624f9d457d36040f57c7598d98a8b9461b79837 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 24 Mar 2025 10:50:22 +0100
Subject: [PATCH 21/22] Fix block id length issue

---
 lib/http-worker.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/http-worker.js b/lib/http-worker.js
index 161dac8be..1aae2ee44 100644
--- a/lib/http-worker.js
+++ b/lib/http-worker.js
@@ -360,7 +360,9 @@ app.use('/block/', function (req, res, next) {
     // identified by base64-encoded public keys
     // skip everything else, ie. /block/placeholder.txt
     if (typeof(name) !== 'string' || name.length !== 44) {
-        return void next();
+        return void res.status(404).json({
+            error: "INVALID_ID",
+        });
     }
 
     var authorization = req.headers.authorization;

From d5e4830ba104a4a442cb23aab5378b8565a95607 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 24 Mar 2025 11:00:48 +0100
Subject: [PATCH 22/22] Fix bounce issue

---
 www/bounce/main.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/www/bounce/main.js b/www/bounce/main.js
index e8d658602..ac4a10968 100644
--- a/www/bounce/main.js
+++ b/www/bounce/main.js
@@ -60,20 +60,9 @@ define(['/api/config'], function (ApiConfig) {
         window.location.href = target.href;
     };
 
-    // Local URLs don't require any warning and can navigate directly without user input.
-    if (target.host === host.host) { return void go(); }
-
-    // It's annoying to be prompted that you are leaving the platform to visit its docs
-    // but marking the docs domain as trusted undermines third-party admins' autonomy.
-    // If we ever abandon the cryptpad.fr domain someone could squat it and abuse this trust.
-    // If the docs domain is a subdomain of the current one then redirect automatically.
-    // We might make the docs domain configurable at some point in the future.
-    if (target.host === 'docs.cryptpad.org' && target.host.endsWith(host.host)) {
-        return void go();
-    }
-
-    // Everything else requires user input, so we load the platform's translations.
+    // Everything else may require user input, so we load the platform's translations.
     // FIXME: this seems to infer language preferences from the browser instead of the user's account preferences
+
     require([
         '/customize/messages.js',
     ], function (Messages) {
@@ -86,6 +75,18 @@ define(['/api/config'], function (ApiConfig) {
             return void reject();
         }
 
+        // Local URLs don't require any warning and can navigate directly without user input.
+        if (target.host === host.host) { return void go(); }
+
+        // It's annoying to be prompted that you are leaving the platform to visit its docs
+        // but marking the docs domain as trusted undermines third-party admins' autonomy.
+        // If we ever abandon the cryptpad.fr domain someone could squat it and abuse this trust.
+        // If the docs domain is a subdomain of the current one then redirect automatically.
+        // We might make the docs domain configurable at some point in the future.
+        if (target.host === 'docs.cryptpad.org' && target.host.endsWith(host.host)) {
+            return void go();
+        }
+
         // The provided URL will navigate the user away from the outer domain.
         var question = Messages._getKey('bounce_confirm', [host.hostname, target.href]);
         // Confirm that they want to leave, then navigate or reject based on their choice.