The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'create-document-modal' into staging

Browse Source
This commit is contained in:
yflory 2025-05-23 15:35:12 +02:00
commit e20edb6636
5 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
customize.dist/messages.js
View File

@ -140,6 +140,11 @@ define(req, function(AppConfig, Default, Language) {
Messages.badges_premium = "Premium user";
Messages.badges_error = "Error while validating this user's data";
Messages.profile_badges = "Badges";
Messages.add_password = "Add your document password";
Messages.show_password = "Show password";
Messages.hide_password = "Hide password";
Messages.next_templateList = "Next template list";
Messages.previous_templateList = "Previous template list";
return Messages;
});

29
customize.dist/src/less2/include/creation.less
View File

@ -33,6 +33,11 @@
.creation_vars();
#cp-creation-container {
&:focus-visible {
outline: @variables_focus_style;
border-radius: @variables_radius;
}
position: absolute;
z-index: 100000000; // #loading * 10
top: 0px;
@ -122,6 +127,9 @@
font-size: 16px;
color: inherit;
}
a:focus-visible {
border-radius: 50%;
}
}
}
.cp-creation-early {
@ -142,9 +150,8 @@
border: none;
border-radius: @variables_radius;
cursor: pointer;
outline: none;
text-transform: uppercase;
&:hover {
&:hover, &:focus-visible {
background: contrast(@cp_creation-button-fg, lighten(@cp_creation-button-bg, 5%), darken(@cp_creation-button-bg, 5%));
}
}
@ -186,12 +193,13 @@
}
}
.cp-creation-slider {
display: block;
display: none;
overflow: hidden;
max-height: 0px;
max-width: 0px;
//margin-top: 10px;
&.active {
display: block;
transition: max-height 0.5s ease-in-out;
max-width: none;
max-height: 100px;
@ -259,13 +267,11 @@
input {
width: 45px;
margin: 0 5px;
padding: 0;
padding-left: 3px;
margin: 0 5px;
padding: 0 0 0 3px;
}
select {
margin-right: 5px;
border-radius: @variables_radius;
margin: 0.2rem;
}
}
&.active {
@ -286,10 +292,14 @@
input {
width: 150px;
padding: 0 5px;
margin: 0.2rem;
}
label {
flex: none;
}
.cp-password-reveal {
margin:0.2rem;
}
}
}
}
@ -313,9 +323,12 @@
justify-content: space-between;
.cp-creation-template-more {
font-size: 30px;
cursor: pointer;
margin: 0 5px;
text-align: center;
background-color: transparent;
border-color: transparent;
color: @cryptpad_text_col;
border-radius: @variables_radius;
&:first-child {
left: 5px;
}

3
customize.dist/src/less2/include/loading.less
View File

@ -126,13 +126,14 @@
.cp-password-form {
display: flex;
flex-wrap: wrap;
gap:0.5rem;
width: 100%;
.cp-password-container {
flex-shrink: 1;
min-width: 0;
}
.cp-password-reveal {
padding: 0px 24px;
margin-left: 0.5rem;
}
}
.cp-password-input {

14
www/common/common-interface.js
View File

@ -990,7 +990,10 @@ define([
var input = h('input.cp-password-input', attributes);
var eye = h('span.fa.fa-eye.cp-password-reveal', {
tabindex: 0
tabindex: 0,
role: 'button',
'aria-label': Messages.show_password,
'aria-pressed': 'false'
});
var $eye = $(eye);
@ -1013,12 +1016,12 @@ define([
if ($eye.hasClass('fa-eye')) {
$input.prop('type', 'text');
$input.focus();
$eye.removeClass('fa-eye').addClass('fa-eye-slash');
$eye.removeClass('fa-eye').addClass('fa-eye-slash').attr('aria-label', Messages.hide_password).attr('aria-pressed', 'true');
return;
}
$input.prop('type', 'password');
$input.focus();
$eye.removeClass('fa-eye-slash').addClass('fa-eye');
$eye.removeClass('fa-eye-slash').addClass('fa-eye').attr('aria-label', Messages.show_password).attr('aria-pressed', 'false');
});
}
@ -1036,7 +1039,7 @@ define([
href: href,
target: "_blank",
'data-tippy-placement': "right",
'aria-label': Messages.help_genericMore //TBC XXX
'aria-label': text
});
return q;
};
@ -1353,13 +1356,12 @@ define([
});
$input.change(function () {
$mark.attr('aria-checked', $input.is(':checked'));
if (!opts.labelAlt) { return; }
if ($input.is(':checked') !== checked) {
$(label).text(opts.labelAlt);
$mark.attr('aria-checked', 'true');
} else {
$(label).text(labelTxt);
$mark.attr('aria-checked', 'false');
}
});

49
www/common/common-ui-elements.js
View File

@ -2649,10 +2649,10 @@ define([
var $creationContainer = $('<div>', { id: 'cp-creation-container' }).appendTo($body);
var urlArgs = (Config.requireConf && Config.requireConf.urlArgs) || '';
var logo = h('img', { src: '/customize/CryptPad_logo.svg?' + urlArgs });
var fill1 = h('div.cp-creation-fill.cp-creation-logo',{ role: 'presentation' }, logo);
var logo = h('img', { src: '/customize/CryptPad_logo.svg?' + urlArgs, alt:'', 'aria-hidden': 'true',role: 'presentation' });
var fill1 = h('div.cp-creation-fill.cp-creation-logo', logo);
var fill2 = h('div.cp-creation-fill');
var $creation = $('<div>', { id: 'cp-creation', tabindex:1 });
var $creation = $('<div>', { id: 'cp-creation' });
$creationContainer.append([fill1, $creation, fill2]);
var createHelper = function (href, text) {
@ -2782,7 +2782,7 @@ define([
var password = h('div.cp-creation-password', [
UI.createCheckbox('cp-creation-password', Messages.properties_addPassword, false),
h('span.cp-creation-password-picker.cp-creation-slider', [
UI.passwordInput({id: 'cp-creation-password-val'})
UI.passwordInput({id: 'cp-creation-password-val', placeholder: Messages.add_password})
/*h('input#cp-creation-password-val', {
type: "text" // TODO type password with click to show
}),*/
@ -2793,8 +2793,12 @@ define([
var $w = $(window);
var big = $w.width() > 800;
var right = h('span.fa.fa-chevron-right.cp-creation-template-more');
var left = h('span.fa.fa-chevron-left.cp-creation-template-more');
var right = h('button.fa.fa-chevron-right.cp-creation-template-more', {
'aria-label': Messages.next_templateList
});
var left = h('button.fa.fa-chevron-left.cp-creation-template-more', {
'aria-label': Messages.previous_templateList
});
if (!big) {
$(left).removeClass('fa-chevron-left').addClass('fa-chevron-up');
$(right).removeClass('fa-chevron-right').addClass('fa-chevron-down');
@ -2865,19 +2869,27 @@ define([
var $span = $('<span>', {
'class': 'cp-creation-template-element',
'title': name,
'aria-label': name,
'tabindex': 0,
'role':'radio',
'aria-checked': false,
}).appendTo($container);
$span.data('id', obj.id);
if (obj.content) { $span.data('content', obj.content); }
if (idx === selected) { $span.addClass('cp-creation-template-selected'); }
if (idx === selected) {
$span.addClass('cp-creation-template-selected');
$span.attr('aria-checked', true);
}
if (!obj.thumbnail) {
$span.append(obj.icon || h('span.cptools.cptools-template'));
}
$('<span>', {'class': 'cp-creation-template-element-name'}).text(name)
.appendTo($span);
$span.click(function () {
Util.onClickEnter($span, function () {
$container.find('.cp-creation-template-selected')
.removeClass('cp-creation-template-selected');
.removeClass('cp-creation-template-selected').attr('aria-checked', 'false');
$span.addClass('cp-creation-template-selected');
$span.attr('aria-checked', true);
selected = idx;
});
@ -2889,11 +2901,13 @@ define([
$(right).off('click').removeClass('hidden').click(function () {
selected = 0;
redraw(i + TEMPLATES_DISPLAYED);
$('.cp-creation-template-container').find('[tabindex]:not([tabindex="-1"])').filter(':visible').first().focus();
});
if (i >= allData.length - TEMPLATES_DISPLAYED ) { $(right).addClass('hidden'); }
$(left).off('click').removeClass('hidden').click(function () {
selected = TEMPLATES_DISPLAYED - 1;
redraw(i - TEMPLATES_DISPLAYED);
$('.cp-creation-template-container').find('[tabindex]:not([tabindex="-1"])').filter(':visible').first().focus();
});
if (i < TEMPLATES_DISPLAYED) { $(left).addClass('hidden'); }
};
@ -2972,7 +2986,6 @@ define([
}
$creation.find('.cp-creation-expire-picker').removeClass('active');
$creation.find('.cp-creation-expire').removeClass('active');
$creation.focus();
});
// Display password form when checkbox checked
@ -2985,7 +2998,6 @@ define([
}
$creation.find('.cp-creation-password-picker').removeClass('active');
$creation.find('.cp-creation-password').removeClass('active');
$creation.focus();
});
// Keyboard shortcuts
@ -3075,19 +3087,8 @@ define([
create();
});
$creation.keydown(function (e) {
if (e.which === 9) {
e.preventDefault();
e.stopPropagation();
next(e.shiftKey);
return;
}
if (e.which === 13) {
$button.click();
return;
}
});
$creation.focus();
UI.addTabListener($creation);
$button.focus();
};
UIElements.loginErrorScreenContent = function (common) {