diff --git a/public/views/_default.js b/public/views/_default.js index 133bf3b97..735b1aabf 100644 --- a/public/views/_default.js +++ b/public/views/_default.js @@ -417,7 +417,6 @@ window.onload = async () => { btnColumn.appendChild(mapp.utils.html.node`
`); diff --git a/public/views/_user.html b/public/views/_user.html index d7d9c6bcc..a0b1d4e8b 100644 --- a/public/views/_user.html +++ b/public/views/_user.html @@ -14,7 +14,6 @@ @@ -128,9 +126,9 @@

Account admin

{{dir}} Logout
- +
- + @@ -166,6 +164,7 @@

Account admin

const userTable = new Tabulator(document.getElementById('userTable'), { + responsiveLayout: "hide", // hide rows that no longer fit data: data, rowFormatter: row => { const user = row.getData() @@ -184,7 +183,8 @@

Account admin

vertAlign: 'middle', headerTooltip: 'Account EMail', titleFormatter: () => '
', - resizable: false + resizable: false, + responsive: 0 // Never hide }, { field: 'verified', @@ -194,7 +194,8 @@

Account admin

titleFormatter: () => '
', formatter: 'tickCross', cellClick: cellToggle, - resizable: false + resizable: false, + responsive: 0 // Never hide }, { field: 'approved', @@ -204,7 +205,8 @@

Account admin

titleFormatter: () => '
', formatter: 'tickCross', cellClick: cellToggle, - resizable: false + resizable: false, + responsive: 0 // Never hide }, { field: 'admin', @@ -214,7 +216,8 @@

Account admin

titleFormatter: () => '
', formatter: 'tickCross', cellClick: cellToggle, - resizable: false + resizable: false, + responsive: 0 // Never hide }, { field: 'api', @@ -224,7 +227,8 @@

Account admin

titleFormatter: () => '
', formatter: 'tickCross', cellClick: cellToggle, - resizable: false + resizable: false, + responsive: 1 // Hide first }, { field: 'failedattempts', @@ -233,7 +237,8 @@

Account admin

headerTooltip: 'Failed login attempts.', titleFormatter: () => '
', formatter: (cell, formatterParams) => '' + cell.getValue() + '', - resizable: false + resizable: false, + responsive: 2 // Hide first }, { field: 'language', @@ -241,7 +246,8 @@

Account admin

vertAlign: 'middle', headerTooltip: 'Account language', titleFormatter: () => '
', - resizable: false + resizable: false, + responsive: 2 // Hide first }, { field: 'roles', @@ -255,7 +261,8 @@

Account admin

multiselect: true }, cellEdited: rolesEdited, - resizable: false + resizable: false, + responsive: 0 // Never hide }, { field: 'access_log', @@ -263,14 +270,16 @@

Account admin

vertAlign: 'middle', headerTooltip: 'Click last access log entry for full access log array.', cellClick: getAccessLog, - resizable: false + resizable: false, + responsive: 1 // Hide first }, { field: 'approved_by', title: 'Approved by', vertAlign: 'middle', headerTooltip: 'Admin who approved last modification to this account.', - resizable: false + resizable: false, + responsive: 1 // Hide first }, { visible: typeof data[0].expires_on !== 'undefined', @@ -279,6 +288,7 @@

Account admin

vertAlign: 'middle', minWidth: 120, headerTooltip: 'Date when user approval expires.', + responsive: 1, // Hide first formatter: (cell, formatterParams, onRendered) => { let val = parseInt(cell.getValue()) @@ -292,7 +302,7 @@

Account admin

}) // Colour text red if account has expired. - return val < new Date()/1000 ? `${str}` : str; + return val < new Date() / 1000 ? `${str}` : str; }, editor: expiryEdit, resizable: false @@ -305,7 +315,8 @@

Account admin

titleFormatter: () => '
', formatter: 'tickCross', cellClick: cellToggle, - resizable: false + resizable: false, + responsive: 2 // Hide second }, { field: 'delete', @@ -313,7 +324,8 @@

Account admin

headerSort: false, formatter: () => 'DELETE', cellClick: rowDelete, - resizable: false + resizable: false, + responsive: 2 // Hide second } ] }); @@ -342,7 +354,7 @@

Account admin

// Check whether email or role includes filter term. userTable.setData(data.filter(user => user.email.includes(e.target.value) || user.roles.some(role => role.includes(e.target.value)))) - } + } function expiryEdit(cell, onRendered, success, cancel) {