blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit modified labelledInput function + changes from review

Browse source
This commit is contained in:
DianaXWiki 2024-03-19 11:44:15 +01:00
parent b7d9e4087c
commit 2357d64a02
3 changed files with 26 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
customize.dist/src/less2/include/sidebar-layout.less
View file

@ -156,9 +156,6 @@
font-weight: bold;
}
}
li.cp-notification{
display: none;
}
}
.cp-sidebarlayout-description {
display: block;

22
www/common/inner/sidebar-layout.js
View file

@ -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;
};

43
www/newadmin/inner.js
View file

@ -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 = [];