dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rrule' of github.com:xwiki-labs/cryptpad into rrule

This commit is contained in:
yflory 2022-09-21 11:10:09 +03:00
parent b7024b23f5 5c51fb3d84
commit 89aabacc55
4 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
customize.dist/src/less2/include/alertify.less
View File

@ -183,6 +183,11 @@
}
}
}
.cp-dropdown-content {
a {
text-decoration: none;
}
}
}
.cp-alertify-type-container {
overflow: visible !important;

2
customize.dist/src/less2/include/dropdown.less
View File

@ -48,7 +48,7 @@
button {
.fa-caret-down {
margin-right: 1em !important;
margin-right: 0.5em !important;
}
* {
.tools_unselectable();

25
www/calendar/app-calendar.less
View File

@ -286,6 +286,9 @@
flex-flow: column;
.cp-notif-entry {
margin-bottom: 2px;
border-radius: @variables_radius;
background-color: fade(@cryptpad_text_col, 10%);
padding: 0.25rem;
.cp-notif-value {
width: 170px;
display: inline-flex;
@ -295,8 +298,19 @@
}
}
span:not(:last-child) {
margin-right: 5px;
margin: 0px 5px;
}
.btn-danger-outline {
margin-right: 0px !important;
background-color: transparent;
color: @cryptpad_text_col;
border-color: @cryptpad_text_col;
&:hover {
color: @cp_buttons-red-color;
background-color: @cp_buttons-red;
border-color: @cp_buttons-red;
}
}
}
}
.cp-notif-empty {
@ -346,8 +360,17 @@
width: 80px !important;
margin-bottom: 0 !important;
}
.cp-checkmark {
margin-right: 0.5rem;
}
}
.cp-calendar-rec-block {
.cp-calendar-rec-block-title {
margin-bottom: 0.5rem !important;
}
.cp-radio {
margin-bottom: 0.5rem;
}
input[type="radio"]:not(:checked) ~ .cp-checkmark-label {
input {
filter: grayscale(1);

26
www/calendar/inner.js
View File

@ -1254,9 +1254,10 @@ Messages.calendar_rec_freq_weekly = "weeks";
Messages.calendar_rec_freq_monthly = "months";
Messages.calendar_rec_freq_yearly = "years";
Messages.calendar_rec_until_no = "No end";
Messages.calendar_rec_until_date = "Until";
Messages.calendar_rec_until_count = "Ends after";
Messages.calendar_rec_until = "Stop Repeating"
Messages.calendar_rec_until_no = "Never";
Messages.calendar_rec_until_date = "On";
Messages.calendar_rec_until_count = "After";
Messages.calendar_rec_until_count2 = "occurences";
Messages.calendar_rec_monthly_pick = "Repeats on";
@ -1653,7 +1654,10 @@ APP.recurrenceRule = {
interval,
$freq[0]
]);
var until = h('div.cp-calendar-rec-block.radio-group', untilEls);
var until = h('div.cp-calendar-rec-block.radio-group', [
h('div.cp-calendar-rec-block-title', Messages.calendar_rec_until),
untilEls
]);
var expand = h('div');
var $expand = $(expand);
@ -1696,7 +1700,7 @@ APP.recurrenceRule = {
n = i * 7 + j;
if (n > 31) { break; }
l.push(h('button.btn.no-margin.cp-calendar-monthly-pick-el' +
(active.includes(n) ? '.btn-secondary' : '.btn-default'), {
(active.includes(n) ? '.btn-primary' : '.btn-default'), {
'data-value': n
}, n));
}
@ -1706,10 +1710,10 @@ APP.recurrenceRule = {
var pickr = h('div.cp-calendar-monthly-pick', lines);
$(pickr).find('button').click(function () {
var $b = $(this);
if ($b.is('.btn-secondary')) {
return $b.removeClass('btn-secondary').addClass('btn-default');
if ($b.is('.btn-primary')) {
return $b.removeClass('btn-primary').addClass('btn-default');
}
$b.removeClass('btn-default').addClass('btn-secondary');
$b.removeClass('btn-default').addClass('btn-primary');
});
var radioPickContent = [
h('span', Messages.calendar_rec_monthly_pick),
@ -1928,9 +1932,13 @@ APP.recurrenceRule = {
$list[0],
h('span.cp-notif-empty', Messages.calendar_noNotification)
]);
Messages.calendar_addNotification = "Remove reminder"; // XXX
var addNotification = function (unit, value) {
var unitValue = (unit === "minutes") ? 1 : (unit === "hours" ? 60 : (60*24));
var del = h('button.btn.btn-danger-outline.small.fa.fa-times');
var del = h('button.btn.btn-danger-outline.small.fa.fa-times',
{'title': Messages.calendar_addNotification}
);
var minutes = value * unitValue;
if ($list.find('[data-minutes="'+minutes+'"]').length) { return; }
var span = h('span.cp-notif-entry', {