From 25522dec57fcbe42e86cf04467968269d15c4aaa Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 20 Mar 2024 12:30:54 +0100 Subject: [PATCH] Make newadmin default --- www/admin/app-admin.less | 373 +- www/admin/index.html | 1 + www/admin/inner.html | 2 +- www/admin/inner.js | 6980 +++++++++++-------------- www/admin/main.js | 2 +- www/common/common-constants.js | 2 +- www/newadmin/app-admin.less | 23 - www/newadmin/inner.js | 3386 ------------ www/oldadmin/app-admin.less | 380 ++ www/{newadmin => oldadmin}/index.html | 1 - www/{newadmin => oldadmin}/inner.html | 4 +- www/oldadmin/inner.js | 4038 ++++++++++++++ www/{newadmin => oldadmin}/main.js | 2 +- 13 files changed, 7597 insertions(+), 7597 deletions(-) delete mode 100644 www/newadmin/app-admin.less delete mode 100644 www/newadmin/inner.js create mode 100644 www/oldadmin/app-admin.less rename www/{newadmin => oldadmin}/index.html (97%) rename www/{newadmin => oldadmin}/inner.html (79%) create mode 100644 www/oldadmin/inner.js rename www/{newadmin => oldadmin}/main.js (97%) diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less index 2989ebea3..242f368a2 100644 --- a/www/admin/app-admin.less +++ b/www/admin/app-admin.less @@ -4,377 +4,20 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -@import (reference) '../../customize/src/less2/include/framework.less'; @import (reference) '../../customize/src/less2/include/sidebar-layout.less'; -@import (reference) '../../customize/src/less2/include/support.less'; -@import (reference) '../../customize/src/less2/include/charts.less'; -&.cp-app-admin { +@import (reference) "../../customize/src/less2/include/limit-bar.less"; +@import (reference) "../../customize/src/less2/include/creation.less"; +@import (reference) '../../customize/src/less2/include/framework.less'; +@import (reference) '../../customize/src/less2/include/export.less'; +&.cp-app-admin { .framework_min_main(); .sidebar-layout_main(); - .support_main(); - .charts_main(); - - .cp-hidden { - display: none !important; - } - - label{ - margin-top:0.5rem; - } + .limit-bar_main(); + .creation_main(); display: flex; flex-flow: column; - - a { - color: @cryptpad_color_link; - text-decoration: underline; - } - - .alert.alert-info, .alert.alert-danger { - &.cp-admin-bigger-alert { - font-size: 16px; - } - } - - .cp-sidebarlayout-element { - label:not(.cp-admin-label) { - font-weight: normal !important; - } - input { - max-width: 25rem; - } - nav { - display: flex; - margin-top: 0.5rem; - } - } - .cp-admin-setlimit-form, - .cp-admin-setter { - + button { - margin-top: 5px !important; - } - } - .cp-admin-getlimits { - td { - overflow: hidden; - text-overflow: ellipsis; - } - code { - cursor: pointer; - } - table { - td:not(:last-child) { - padding-right: 20px; - white-space: nowrap; - } - td:last-child { - min-width: 0; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - max-width: 500px; - } - @media screen and (max-width: 1200px) { - button.cp-report { - display: none; - } - :is(td, th).note { - display: none; - } - } - @media screen and (max-width: 1400px) { - :is(td, th).plan { - display: none; - } - } - } - } - - .cp-support-container { - display: flex; - flex-wrap: wrap; - .cp-support-column { - min-width: 700px; - flex: 1 0 50%; - h1 { - display: flex; - align-items: center; - button { - margin-left: 50px !important; - } - } - .cp-support-count { - margin-left: 10px; - } - &.cp-support-column-collapsed { - .cp-support-list-ticket { - display: none; - } - } - } - } - - .cp-support-list-actions { - margin: 10px 0px 10px 2px; - } - - .cp-support-list-ticket { - h2 { - font-size: 1.5rem; - display: flex; - justify-content: space-between; - align-items: top; - .cp-support-title-buttons { - flex-shrink: 0; - button i { - margin-right: 0px; - } - } - } - .cp-support-collapsed { - display: flex; - justify-content: space-between; - flex-wrap: wrap; - color: fade(@cryptpad_text_col, 80%); - .cp-support-ispremium { - padding: 0 5px; - background-color: @cp_admin-premium-bg; - } - } - &.cp-support-list-closed { - .cp-support-list-actions { - .cp-support-answer { - display: inline !important; - } - } - .cp-support-form-container { - display: block !important; - } - } - } - - .cp-support-list-ticket:not(.cp-support-list-closed) { - .cp-support-list-actions { - .cp-button-confirm, .cp-support-close { - order: 20; - margin-left: auto !important; - } - } - .cp-support-list-message { - .cp-support-showdata { - background-color: lighten(@cp_admin-last-bg, 5%); - } - .cp-support-attachments { - a { - color: @cryptpad_color_link; - text-decoration: underline; - } - } - &:last-child:not(.cp-support-fromadmin) { - color: @cp_admin-last-fg; - background-color: @cp_admin-last-bg; - } - - &:last-child { - &.cp-support-frompremium { - background-color: @cp_admin-premium-bg; - .cp-support-showdata { - background-color: fade(@cp_admin-premium-bg, 10%); - } - } - } - } - } - .cp-support-list-ticket:not(.cp-support-open) { - span:first-child { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - & > :not(h2):not(.cp-support-collapsed) { - display: none; - } - .cp-support-collapse { - display: none; - } - cursor: pointer; - } - .cp-support-list-ticket.cp-support-open { - .cp-support-collapsed { - display: none; - } - .cp-support-expand { - display: none; - } - } - - .cp-support-fromadmin { - background-color: @cp_admin-isadmin-bg !important; - .cp-support-message-from, .cp-support-showdata { - color: @cryptpad_text_col; - background-color: fade(@cp_admin-isadmin-bg, 10%) !important; - } - } - - table#cp-performance-table { - td, th { - padding: 5px; - color: @cryptpad_text_col; - border: 1px solid @cryptpad_text_col; - } - } - - input.cp-admin-inval { - border-color: red !important; - } - - .cp-admin-nopassword { - .cp-admin-pw { - display: none !important; - } - } - - .cp-admin-radio-container { - display: flex; - align-items: left; //center; - flex-wrap: wrap; - flex-direction: column; - label { - margin-right: 40px; - margin-top: 5px; - } - } - - .cp-admin-users { - .cp-admin-store-invited, .cp-admin-store-sso { - margin-bottom: 0 !important; - } - } - - .cp-admin-broadcast-form { - input.flatpickr-input { - width: 307.875px !important; // same width as flatpickr calendar - } - .cp-broadcast-active { - display: flex; - flex-flow: column; - align-items: start; - padding: 10px; - background-color: @cp_sidebar-left-bg; - color: @cp_sidebar-left-fg; - p { - margin: 0; - } - } - .cp-broadcast-form-submit { - margin-top: 30px; - button { - margin-bottom: 10px !important; - } - } - .cp-broadcast-container { - display: flex; - flex-flow: column; - } - .cp-broadcast-lang { - margin: 30px; - margin-bottom: 0; - display: flex; - flex-flow: column; - align-items: baseline; - .cp-checkmark { - margin: 5px 0; - } - } - div.cp-broadcast-languages { - & > label.cp-checkmark:not(:last-child) { - margin-right: 20px; - } - } - .cp-broadcast-preview { - vertical-align: bottom !important; - } - .cp-broadcast-delete { - width: 100%; - min-width: 600px; - tbody { - tr { - background-color: @cp_support-msg-bg; - padding: 5px; - td { - padding: 5px; - button { - margin: 0 !important; - } - } - } - } - .cp-notification { - display: flex; - align-items: center; - .cp-avatar, .cp-broadcast, .cp-notification-dismiss { - display: none; - } - p { - margin: 0 !important; - } - .cp-notification-content { - width: 100%; - padding: 10px; - } - .cp-clickable { - cursor: pointer; - &:hover { - background-color: @cp_dropdown-bg-hover; - } - } - } - } - } - span.cp-bar.profiling-percentage { - text-align: center; - padding: 5px; - } - span.profiling-label { - position: absolute; - z-index: 1; - width: 100%; - text-align: center; - padding: 5px; - } - #profiling-chart { - .cp-bar-container { - max-width: 400px; - } - } - .width-constrained { - max-width: 800px; - } - .cp-charts-row.heading { - font-weight: bold; - } - table.cp-admin-all-limits, - table.cp-metadata-history, - table.cp-account-stats, - table.cp-block-stats, - table.cp-pin-list, - table.cp-document-stats { - @color: #777; // TODO use a colotheme variable - border: 1px solid @color; - margin: 15px; - td, pre { - color: @cryptpad_text_col; - } - td, th { - max-width: 60vw; - border: 1px solid @color; - padding: 5px; - .scroll { - max-width: 500px; - overflow-x: auto; - } - } - } + font: @colortheme_app-font; } diff --git a/www/admin/index.html b/www/admin/index.html index afde85cbd..c8c6384bb 100644 --- a/www/admin/index.html +++ b/www/admin/index.html @@ -17,4 +17,5 @@ SPDX-License-Identifier: AGPL-3.0-or-later + diff --git a/www/admin/inner.html b/www/admin/inner.html index ab05a3105..db62eeedf 100644 --- a/www/admin/inner.html +++ b/www/admin/inner.html @@ -19,4 +19,4 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- + diff --git a/www/admin/inner.js b/www/admin/inner.js index f96dc55dc..71ee561e7 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -4,866 +4,1869 @@ define([ 'jquery', - '/api/config', - '/customize/application_config.js', - '/components/chainpad-crypto/crypto.js', '/common/toolbar.js', '/components/nthen/index.js', '/common/sframe-common.js', - '/common/hyperscript.js', - '/customize/messages.js', '/common/common-interface.js', '/common/common-ui-elements.js', '/common/common-util.js', '/common/common-hash.js', + '/common/inner/sidebar-layout.js', + '/customize/messages.js', '/common/common-signing-keys.js', - '/support/ui.js', + '/common/hyperscript.js', '/common/clipboard.js', 'json.sortify', - + '/customize/application_config.js', + '/api/config', '/lib/datepicker/flatpickr.js', - '/components/tweetnacl/nacl-fast.min.js', - + '/common/hyperscript.js', 'css!/lib/datepicker/flatpickr.min.css', 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/admin/app-admin.less', -], function ( +], function( $, - ApiConfig, - AppConfig, - Crypto, Toolbar, nThen, SFCommon, - h, - Messages, UI, UIElements, Util, Hash, + Sidebar, + Messages, Keys, - Support, + h, Clipboard, Sortify, + AppConfig, + ApiConfig, Flatpickr - ) -{ - var APP = { - 'instanceStatus': {} - }; +) { + var APP = window.APP = {}; var Nacl = window.nacl; var common; var sFrameChan; - var categories = { - 'general': [ // Msg.admin_cat_general - 'cp-admin-flush-cache', - 'cp-admin-update-limit', - 'cp-admin-enableembeds', - 'cp-admin-forcemfa', - 'cp-admin-email', + var andThen = function (common, $container) { + const sidebar = Sidebar.create(common, 'admin', $container); + var categories = { + 'general': { + icon: 'fa fa-user-o', + content: [ + 'flush-cache', + 'update-limit', + 'enableembeds', + 'forcemfa', + 'email', - 'cp-admin-instance-info-notice', + 'instance-info-notice', - 'cp-admin-name', - 'cp-admin-description', - 'cp-admin-jurisdiction', - 'cp-admin-notice', - ], - 'users': [ // Msg.admin_cat_quota - 'cp-admin-registration', - 'cp-admin-invitation', - 'cp-admin-users', - ], - 'quota': [ // Msg.admin_cat_quota - 'cp-admin-defaultlimit', - 'cp-admin-setlimit', - 'cp-admin-getlimits', - ], - 'database': [ // Msg.admin_cat_database - 'cp-admin-account-metadata', - 'cp-admin-document-metadata', - 'cp-admin-block-metadata', - 'cp-admin-totp-recovery', - ], - 'stats': [ // Msg.admin_cat_stats - 'cp-admin-refresh-stats', - 'cp-admin-uptime', - 'cp-admin-active-sessions', - 'cp-admin-active-pads', - 'cp-admin-open-files', - 'cp-admin-registered', - 'cp-admin-disk-usage', - ], - 'support': [ // Msg.admin_cat_support - 'cp-admin-support-list', - 'cp-admin-support-init', - 'cp-admin-support-priv', - ], - 'broadcast': [ // Msg.admin_cat_broadcast - 'cp-admin-maintenance', - 'cp-admin-survey', - 'cp-admin-broadcast', - ], - 'performance': [ // Msg.admin_cat_performance - 'cp-admin-refresh-performance', - 'cp-admin-performance-profiling', - 'cp-admin-enable-disk-measurements', - 'cp-admin-bytes-written', - ], - 'network': [ // Msg.admin_cat_network - 'cp-admin-update-available', - 'cp-admin-checkup', - 'cp-admin-block-daily-check', - 'cp-admin-provide-aggregate-statistics', - 'cp-admin-list-my-instance', - - 'cp-admin-consent-to-contact', - 'cp-admin-remove-donate-button', - 'cp-admin-instance-purpose', - ], - }; - - var create = {}; - - var keyToCamlCase = function (key) { - return key.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); }); - }; - - var makeBlock = function (key, addButton) { // Title, Hint, maybeButton - // Convert to camlCase for translation keys - var safeKey = keyToCamlCase(key); - var $div = $('
', {'class': 'cp-admin-' + key + ' cp-sidebarlayout-element'}); - $('