From aeb8cd34f620723fa9fbf2ddf860d7f28e2d065a Mon Sep 17 00:00:00 2001 From: David Benque Date: Fri, 21 Jun 2024 16:42:06 +0100 Subject: [PATCH 1/3] Ajust temporary microcopy --- customize.dist/messages.js | 24 +++++++++++++++++++----- www/admin/inner.js | 6 ------ www/install/onboardscreen.js | 12 ------------ 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/customize.dist/messages.js b/customize.dist/messages.js index c80311c55..e3581cf0f 100755 --- a/customize.dist/messages.js +++ b/customize.dist/messages.js @@ -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 = ``; +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; }); diff --git a/www/admin/inner.js b/www/admin/inner.js index 75a2c4aa4..a00bbf615 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -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; diff --git a/www/install/onboardscreen.js b/www/install/onboardscreen.js index c37941057..6272da418 100644 --- a/www/install/onboardscreen.js +++ b/www/install/onboardscreen.js @@ -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; } From acfec441e075a040d9b55be31ff3c0b18d86278c Mon Sep 17 00:00:00 2001 From: David Benque Date: Fri, 21 Jun 2024 17:08:07 +0100 Subject: [PATCH 2/3] Onbaording layout adjustments --- customize.dist/src/less2/include/admin.less | 14 ++- www/install/onboarding.less | 127 +------------------- 2 files changed, 16 insertions(+), 125 deletions(-) diff --git a/customize.dist/src/less2/include/admin.less b/customize.dist/src/less2/include/admin.less index e30c5b242..13fe5360e 100644 --- a/customize.dist/src/less2/include/admin.less +++ b/customize.dist/src/less2/include/admin.less @@ -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; + } + } } - } diff --git a/www/install/onboarding.less b/www/install/onboarding.less index 801fa5978..d0f2c33ac 100644 --- a/www/install/onboarding.less +++ b/www/install/onboarding.less @@ -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; } @@ -121,120 +116,4 @@ nav.cp-onboardscreen-nav { align-items: flex-end; 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; - - -// } - +} \ No newline at end of file From ac9eff541a4037df404804571e23a8da2b6765a4 Mon Sep 17 00:00:00 2001 From: David Benque Date: Fri, 21 Jun 2024 17:33:41 +0100 Subject: [PATCH 3/3] Admin: change app tab icon --- www/admin/inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/admin/inner.js b/www/admin/inner.js index a00bbf615..574cbb800 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -94,7 +94,7 @@ define([ ] }, 'apps': { // Msg.admin_cat_apps - icon: 'fa fa-cog', + icon: 'fa fa-wrench', content: [ 'apps', ]