diff --git a/data/static/accounts.js b/data/static/accounts.js
index 173cb0e..b651a5f 100644
--- a/data/static/accounts.js
+++ b/data/static/accounts.js
@@ -53,12 +53,16 @@ document.getElementById('accountsTabDelete').onclick = function() {
}
}
let title = " user";
+ let msg = "Notify user";
if (selected.length > 1) {
title += "s";
+ msg += "s";
}
title = "Delete " + selected.length + title;
+ msg += " of account deletion";
document.getElementById('deleteModalTitle').textContent = title;
document.getElementById('deleteModalNotify').checked = false;
+ document.getElementById('deleteModalNotifyLabel').textContent = msg;
document.getElementById('deleteModalReason').value = '';
document.getElementById('deleteModalReasonBox').classList.add('unfocused');
document.getElementById('deleteModalSend').textContent = 'Delete';
@@ -200,8 +204,12 @@ function populateUsers() {
if (admin) {
isAdmin = "Yes";
}
+ let fci = "form-check-input";
+ if (bsVersion != 5) {
+ fci = "";
+ }
return `
-
|
+ |
${username} |
${generateEmail(id, name, email)} |
${lastActive} |
@@ -246,22 +254,7 @@ document.getElementById('accountsTabSetDefaults').onclick = function() {
if (userIDs.length == 0) {
return;
}
- let radioList = document.getElementById('defaultUserRadios');
- radioList.textContent = '';
- let first = true;
- for (user of jfUsers) {
- let radio = document.createElement('div');
- radio.classList.add('radio');
- let checked = 'checked';
- if (first) {
- first = false;
- } else {
- checked = '';
- }
- radio.innerHTML = `
- `;
- radioList.appendChild(radio);
- }
+ populateRadios();
let userstring = 'user';
if (userIDs.length > 1) {
userstring += 's';
diff --git a/data/static/admin.js b/data/static/admin.js
index 7201a81..5b79ddb 100644
--- a/data/static/admin.js
+++ b/data/static/admin.js
@@ -647,6 +647,28 @@ document.getElementById('openAbout').onclick = function() {
aboutModal.show();
};
+function populateRadios() {
+ let radioList = document.getElementById('defaultUserRadios');
+ radioList.textContent = '';
+ let first = true;
+ for (user of jfUsers) {
+ let radio = document.createElement('div');
+ radio.classList.add('form-check');
+ let checked = 'checked';
+ if (first) {
+ first = false;
+ } else {
+ checked = '';
+ }
+ // radio.innerHTML =
+ // ``;
+ radio.innerHTML = `
+
+ `;
+ radioList.appendChild(radio);
+ }
+}
+
document.getElementById('openDefaultsWizard').onclick = function() {
this.disabled = true
this.innerHTML =
@@ -659,23 +681,8 @@ document.getElementById('openDefaultsWizard').onclick = function() {
req.onreadystatechange = function() {
if (this.readyState == 4) {
if (this.status == 200) {
- let users = req.response['users'];
- let radioList = document.getElementById('defaultUserRadios');
- radioList.textContent = '';
- let first = true;
- for (user of users) {
- let radio = document.createElement('div');
- radio.classList.add('radio');
- let checked = 'checked';
- if (first) {
- first = false;
- } else {
- checked = '';
- }
- radio.innerHTML =
- ``;
- radioList.appendChild(radio);
- }
+ jfUsers = req.response['users'];
+ populateRadios();
let button = document.getElementById('openDefaultsWizard');
button.disabled = false;
button.innerHTML = 'New User Defaults ';
diff --git a/data/templates/admin.html b/data/templates/admin.html
index 4abe9c8..1fa9135 100644
--- a/data/templates/admin.html
+++ b/data/templates/admin.html
@@ -162,9 +162,9 @@
-