Merge branch 'appconfig_ui' of github.com:cryptpad/cryptpad into appconfig_ui

This commit is contained in:
yflory 2024-06-21 18:38:47 +02:00
commit 704100b90e
5 changed files with 36 additions and 149 deletions

View File

@ -130,14 +130,28 @@ define(req, function(AppConfig, Default, Language) {
};
Messages.install_token = "Install token";
Messages.install_header = "Installation"; // XXX
Messages.install_instance = "Set up your new CryptPad instance"; // XXX
Messages.install_launch = "Launch";
Messages.install_header = "Installation";
Messages.install_instance = "Create the first admin account, then proceed to customize this instance";
Messages.install_launch = "Instance setup";
Messages.install_notes = `<ul class="cp-notes-list">
<li>This page will help you create your first administrator account and set up your instance.</li>
<li>Your password is the secret key that encrypts all of your documents. <span class="red">If you lose it there is no way we can recover your data.</span></li>
<li>Create your first administrator account on this page. Administrators manage instance settings including storage quotas, and have access to moderation tools.</li>
<li>Your password is the secret key that encrypts all of your documents and administrator privileges on this instance. <span class="red">If you lose it there is no way we can recover your data.</span></li>
<li>If you are using a shared computer, <span class="red">remember to log out</span> when you are done. Only closing the browser window leaves your account exposed. </li></ul>`;
Messages.admin_appSelection = 'App configuration';
Messages.admin_appsTitle = "Instance applications";
Messages.admin_appsHint = "Choose which apps to enable on this instance.";
Messages.admin_cat_apps = "Applications";
Messages.onboarding_save_error = "Some options could not be saved properly. Please visit the administration panel to check the values.";
Messages.onboarding_upload = "Select logo";
Messages.admin_onboardingNameTitle = 'Welcome to your CryptPad instance';
Messages.admin_onboardingNameHint = 'Please choose a title, description, accent color and logo (all are optional)';
Messages.admin_onboardingOptionsTitle = "Instance options";
Messages.admin_onboardingOptionsHint = "Please select the apropriate option for your instance. These settings can be changed later in the admin panel.";
Messages.admin_onboardingNamePlaceholder = 'Instance title';
Messages.admin_onboardingDescPlaceholder = 'Instance description text';
return Messages;
});

View File

@ -80,6 +80,18 @@
.cp-admin-customize-options-grid {
grid-template-columns: 1fr 1fr;
.cp-optionblock {
padding: 0.5rem;
border-radius: @variables_radius;
background-color: fade(@cryptpad_text_col, 10%);
align-self: start;
.cp-checkmark-label {
font-weight: bold;
}
.cp-option-hint {
margin-left: 30px;
display: inline-block;
}
}
}
}

View File

@ -49,12 +49,6 @@ define([
Onboarding,
) {
//XXX
Messages.admin_appSelection = 'App configuration';
Messages.admin_appsTitle = "Choose your applications";
Messages.admin_appsHint = "Choose which apps to disable on your instance.";
Messages.admin_cat_apps = "Apps";
var APP = window.APP = {};
var Nacl = window.nacl;
@ -100,7 +94,7 @@ define([
]
},
'apps': { // Msg.admin_cat_apps
icon: 'fa fa-cog',
icon: 'fa fa-wrench',
content: [
'apps',
]

View File

@ -25,6 +25,7 @@
justify-content: center;
align-items: center;
.cp-onboarding-box {
width: 850px;
background-color: @cp_loading-progress-bg;
border-radius: @variables_radius_L;
box-shadow: 0px 0px 10px 0px @cp_shadow-color;
@ -54,12 +55,6 @@
padding: 30px 110px 20px 110px;
}
// .cp-onboardscreen-form {
// // padding:10px;
// // position:relative;
// // height: 90%;
// }
.cp-onboardscreen-screentitle {
text-align: center;
font-size: 1rem;
@ -75,7 +70,7 @@
.cp-instance-form {
display: flex;
flex-direction: row;
gap: 2rem;
gap: 1rem;
input, textarea {
border: 0px transparent !important;
}
@ -122,119 +117,3 @@ nav.cp-onboardscreen-nav {
justify-content: space-between;
margin-top: 1rem;
}
// .cp-onboardscreen-name {
// width:70%;
// float:right;
// padding:10px
// }
// .cp-onboardscreen-desc {
// width:67% !important;
// float:right !important;
// padding:20px !important;
// margin-right:10px !important;
// }
// .cp-onboardscreen-logo {
// width:20%;
// height:30%;
// float:left;
// margin-left:10px;
// }
// .kanban-colors(@kanban-colors; @index) when (@index > 0){
// // loop through the @colors
// .kanban-colors(@kanban-colors; (@index - 1));
// @color: extract(@kanban-colors, @index);
// // make a numbered class selector for each color
// .cp-kanban-palette-color@{index}{
// background-color: @color !important;
// &.cp-kanban-palette-board {
// background-color: @color !important;
// }
// &.kanban-board-inner {
// background-color: fade(@color, 50%) !important;
// }
// }
// }
// .cp-onboardscreen-colorpick {
// padding-left:50%
// }
// .cp-onboardscreen-color {
// width:200%;
// height:20%;
// margin-left: -65%;
// margin-bottom: -10%;
// }
// .cp-onboardscreen-checkmark {
// text-align:right !important;
// color: white !important;
// }
// .cp-onboardscreen-nav {
// padding-left:90%;
// margin-right: -2px !important;
// margin-top: 300px;
// position:absolute;
// width:100%;
// display:float;
// }
// .cp-onboardscreen-prev {
// margin-left: 20px;
// left: 0;
// position: absolute;
// }
// .cp-onboardscreen-save {
// right: 0;
// position: absolute;
// margin-right: 40px
// }
// .cp-admin-customize-apps-grid {
// padding: 10px;
// margin-left: 10px;
// width: 105%;
// }
// .cp-appblock {
// width:30%;
// float:left !important;
// display:block !important;
// margin: 2px !important;
// background-color: #212121!important;
// border-color:white;
// height: 60px !important;
// padding: 10px;
// }
// .cp-admin-customize-options-grid {
// height:40%;
// float:center;
// margin-left: 20px;
// width: 105%;
// margin-bottom: -180px;
// }
// .cp-optionblock {
// width:40%;
// float:left !important;
// display:block !important;
// margin: 2px !important;
// background-color: #212121!important;
// border-color:white;
// height: 60% !important;
// padding: 10px;
// }

View File

@ -26,18 +26,6 @@ define([
nThen
) {
//XXX
Messages.onboarding_save_error = "Some options could not be saved properly. Please visit the administration panel to check the values.";
Messages.onboarding_upload = "Select logo";
Messages.admin_onboardingNameTitle = 'Welcome to your CryptPad instance';
Messages.admin_onboardingNameHint = 'Please choose a title and description';
Messages.admin_appsTitle = "Instance applications";
Messages.admin_appsHint = "Choose which apps to enable on your instance";
Messages.admin_onboardingOptionsTitle = "Instance options";
Messages.admin_onboardingOptionsHint = "Please select the apropriate option for your instance. These settings can be changed later in the admin panel.";
Messages.admin_onboardingNamePlaceholder = 'Instance title';
Messages.admin_onboardingDescPlaceholder = 'Placeholder description text';
let pages = [];
const gotoPage = function (Env, page) {
if (typeof(page) !== "number" || !page) { page = 0; }