From 2357d64a02bb17334f29a7898ce28e39439e08fb Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Tue, 19 Mar 2024 11:44:15 +0100
Subject: [PATCH] Commit modified labelledInput function + changes from review

---
 .../src/less2/include/sidebar-layout.less     |  3 --
 www/common/inner/sidebar-layout.js            | 22 ++++++----
 www/newadmin/inner.js                         | 43 ++++++-------------
 3 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index c7855a311..b89ea5b1c 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -156,9 +156,6 @@
                             font-weight: bold;
                         }
                     }
-                    li.cp-notification{
-                        display: none;
-                    }
                 }
                 .cp-sidebarlayout-description {
                     display: block;
diff --git a/www/common/inner/sidebar-layout.js b/www/common/inner/sidebar-layout.js
index 12e38b7cf..5ae42940b 100644
--- a/www/common/inner/sidebar-layout.js
+++ b/www/common/inner/sidebar-layout.js
@@ -23,7 +23,6 @@ define([
 ) {
     const Sidebar = {};
 
-
     Sidebar.create = function (common, app, $container) {
         const $leftside = $(h('div#cp-sidebarlayout-leftside')).appendTo($container);
         const $rightside = $(h('div#cp-sidebarlayout-rightside')).appendTo($container);
@@ -35,11 +34,10 @@ define([
             let uid = Util.uid();
             let id = `cp-${app}-item-${uid}`;
             input.setAttribute('id', id);
-            return [
-                h('label', { for: id }, label),
-                input,
-            ];
+            let labelElement = h('label', { for: id }, label);
+            return h('div', { class: 'cp-labelled-input' }, [labelElement, input]);
         };
+        
         blocks.button = (type, icon, text) => {
             type = type || 'primary';
             if (icon && icon.indexOf('-') !== -1) {
@@ -94,10 +92,16 @@ define([
 
         blocks.unorderedList = function (entries) {
             const ul = h('ul');
-            entries.forEach(entry => {
-                const li = h('li', [h('strong',  entry)]);
-                ul.appendChild(li);
-            });
+    
+            ul.updateContent = (entries) => {
+                ul.innerHTML = '';
+                entries.forEach(entry => {
+                    const li = h('li', entry);
+                    ul.appendChild(li);
+                });
+            };
+            ul.updateContent(entries);
+            
             return ul;
         };
 
diff --git a/www/newadmin/inner.js b/www/newadmin/inner.js
index 57b6b939c..4af588e63 100644
--- a/www/newadmin/inner.js
+++ b/www/newadmin/inner.js
@@ -2408,6 +2408,7 @@ define([
                         pre.append(String(e || data.error));
                         return;
                     }
+                    pre.innerText='';
                     pre.append(String(data));
                 });
             };
@@ -2433,23 +2434,12 @@ define([
             cb(pre);
         });
 
-        function updateUnorderedList(ul, entries) {
-            ul.innerHTML = '';
-            entries.forEach(entry => {
-                const li = document.createElement('li');
-                const strong = document.createElement('strong');
-                strong.textContent = entry[0] + ': ' + entry[1];
-                li.appendChild(strong);
-                ul.appendChild(li);
-            });
-        }
-
         sidebar.addItem('disk-usage', function(cb){
             var button = blocks.button('primary', '', Messages.admin_diskUsageButton);
             var $button = $(button);
             var called = false;
             var nav = blocks.nav([button]);
-            var content = blocks.unorderedList([]);
+            var content = blocks.table([], []);
             var form = blocks.form([
                 content
             ], nav);
@@ -2483,7 +2473,7 @@ define([
                                 obj[k]
                             ];
                         });
-                        updateUnorderedList(content, entries);
+                        content.updateContent(entries);
                     });
                 });
             });
@@ -2711,29 +2701,27 @@ define([
 
         sidebar.addItem('survey', function(cb){
             var form = blocks.form([]);
+            var $form = $(form);
             var refresh = getApi(function (Broadcast) {
                 var button = blocks.button('primary', '', Messages.admin_surveyButton);
-                var $button = $(button);
+                let nav = blocks.nav([button]);
                 var removeButton = blocks.button('danger', '', Messages.admin_surveyCancel);
                 var active;
-
+                var $button = $(button);
                 if (Broadcast && Broadcast.surveyURL) {
-                    var a = h('a', {href: Broadcast.surveyURL}, Messages.admin_surveyActive);
+                    var a = blocks.link(Messages.admin_surveyActive, Broadcast.surveyURL);
                     $(a).click(function (e) {
                         e.preventDefault();
                         common.openUnsafeURL(Broadcast.surveyURL);
                     });
-                    active = h('div.cp-broadcast-active', [
-                        h('p', a),
-                        removeButton
-                    ]);
+                    active = blocks.nav([a, removeButton]);
                 }
 
                 var input = blocks.input({
                     type: 'text',
                     id: 'cp-admin-survey-url-input'
                 });
-                var label = h('label', { for: 'cp-admin-survey-url-input' }, Messages.broadcast_surveyURL);
+                var labelledInput = blocks.labelledInput(Messages.broadcast_surveyURL, input);
                 var $input = $(input);
 
                 // Extract form data
@@ -2781,14 +2769,10 @@ define([
                     send("");
                 });
 
-                $(form).empty().append([
+                $form.empty().append([
                     active,
-                    label,
-                    input,
-                    h('br'),
-                    h('div.cp-broadcast-form-submit', [
-                        button
-                    ])
+                    labelledInput,
+                    nav
                 ]);
 
             });
@@ -2814,8 +2798,7 @@ define([
                 var $button = $(button);
                 var removeButton = blocks.button('danger', '', Messages.admin_broadcastCancel);
                 var activeContent = Messages.admin_broadcastActive;
-                var active = blocks.block( blocks.inline(activeContent), 'cp-broadcast-active'
-                );
+                var active = blocks.block(blocks.inline(activeContent), 'cp-broadcast-active');
                 var $active = $(active);
                 var activeUid;
                 var deleted = [];