From 38c3515fbb186177a7f2a4aed3c481af1dc36a4d Mon Sep 17 00:00:00 2001 From: David Benque Date: Fri, 9 Dec 2022 10:15:22 +0000 Subject: [PATCH 1/3] Mark translation keys copied --- www/common/notifications.js | 2 +- www/form/inner.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/common/notifications.js b/www/common/notifications.js index ec9d13500..4db45adfe 100644 --- a/www/common/notifications.js +++ b/www/common/notifications.js @@ -343,7 +343,7 @@ define([ var title = Util.fixHTML(msg.content.title || Messages.unknownPad); var href = msg.content.href; - Messages.form_responseNotification = "New responses have been sent to your form {0}"; + Messages.form_responseNotification = "New responses have been sent to your form {0}"; // XXX DB done content.getFormatText = function() { return Messages._getKey('form_responseNotification', [title]); }; diff --git a/www/form/inner.js b/www/form/inner.js index 374373144..3b225d319 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -2646,7 +2646,7 @@ define([ ); }; - Messages.form_deleteAll = "Delete all"; // XXX + Messages.form_deleteAll = "Delete all"; // XXX DB done var parseAnswers = function (answers) { var _answers = {}; @@ -2710,7 +2710,7 @@ define([ }); // Export JSON - Messages.form_exportJSON = "Export as JSON"; // XXX + Messages.form_exportJSON = "Export as JSON"; // XXX DB done var exportJSONButton = h('button.btn.btn-primary', [ h('i.cptools.cptools-code'), Messages.form_exportJSON @@ -2984,7 +2984,7 @@ define([ }); } - Messages.form_answer_new = "New responses"; // XXX + Messages.form_answer_new = "New responses"; // XXX DB done var newAnswer; if (content.answers.multiple) { newAnswer = h('button.btn.btn-primary', [ @@ -3073,7 +3073,7 @@ define([ var table = h('div.cp-form-submit-table', entries); - Messages.form_alreadyAnsweredMult = "You responded to this form on:"; + Messages.form_alreadyAnsweredMult = "You responded to this form on:"; // XXX DB done var title = framework._.title.title || framework._.title.defaultTitle; @@ -4344,7 +4344,7 @@ define([ }; refreshAnon(); - Messages.form_allowNotifications = "Receive notifications on new messages"; // XXX + Messages.form_allowNotifications = "Receive notifications on new messages"; // XXX DB done // Mute form responses var notifContainer = h('div.cp-form-anon-container'); @@ -4408,7 +4408,7 @@ define([ $editable.empty(); var canDelete = content.answers.version >= 2; - Messages.form_editable_off = "One time only"; // XXX + Messages.form_editable_off = "One time only"; // XXX DB done this block Messages.form_editable_on = "One time and edit"; // XXX Messages.form_editable_on_del = "One time and edit/delete"; // XXX Messages.form_multiple = "Multiple times"; // XXX From 7563fc3d92e7ab2155e14ecbdb9cc278cc423785 Mon Sep 17 00:00:00 2001 From: David Benque Date: Mon, 12 Dec 2022 11:31:50 +0000 Subject: [PATCH 2/3] Improve form settings readability - add color to tiles that have a separate status - changed order of settings --- www/form/app-form.less | 6 ++++++ www/form/inner.js | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/www/form/app-form.less b/www/form/app-form.less index 293ea8d51..d09173b63 100644 --- a/www/form/app-form.less +++ b/www/form/app-form.less @@ -229,6 +229,9 @@ & > *:not(:last-child) { margin-bottom: 10px; } + .cp-form-setting-title { + color: @cryptpad_color_link; + } } .cp-form-color-container { @@ -1248,6 +1251,9 @@ & > div:not(:last-child) { margin-bottom: 10px; } + .cp-form-setting-title { + color: @cryptpad_color_link; + } } } & > .flatpickr-calendar { diff --git a/www/form/inner.js b/www/form/inner.js index 38c8a5fad..3279ceb9c 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -4384,7 +4384,7 @@ define([ var updateStr = function (val) { $privacyStr.empty().append([ - h('span', Messages.form_anonymous), + h('span.cp-form-setting-title', Messages.form_anonymous), h('br'), h('span', Messages['form_anonymous_'+ (val ? 'on' : 'off')]) ]); @@ -4411,7 +4411,7 @@ define([ updateStr(val); }); }); - $privacy.append(h('div.cp-form-status', Messages.form_anonymous)); + $privacy.append(h('div.cp-form-status.cp-form-setting-title', Messages.form_anonymous)); $privacy.append(h('div.cp-form-actions', radioContainer)); }; refreshPrivacy(); @@ -4442,7 +4442,7 @@ define([ if (!edit && mult) { key = 'multiple'; } if (edit && mult) { key = 'multiple_edit'; } $editableStr.empty().append([ - h('span', Messages.form_editable_str), + h('span.cp-form-setting-title', Messages.form_editable_str), h('br'), h('span', Messages['form_'+key]) ]); @@ -4500,7 +4500,7 @@ define([ updateStr(!content.answers.cantEdit, content.answers.multiple); }); }); - $editable.append(h('div.cp-form-status', Messages.form_editable_str)); + $editable.append(h('div.cp-form-status.cp-form-setting-title', Messages.form_editable_str)); $editable.append(h('div.cp-form-actions', radioContainer)); }; refreshEditable(); @@ -4648,9 +4648,9 @@ define([ endDateContainer, anonContainer, notifContainer, + resultsType, privacyContainer, editableContainer, - resultsType, ]); var modalBtn = h('button.btn.btn-secondary', [ h('i.fa.fa-wrench'), @@ -4667,9 +4667,9 @@ define([ endDateStr, anonStr, notifStr, + resultsStr, privacyStr, - editableStr, - resultsStr + editableStr ]); return [ From 3d9ec26fcb3759e5083b505e23d19c03d52727c4 Mon Sep 17 00:00:00 2001 From: David Benque Date: Mon, 12 Dec 2022 11:56:43 +0000 Subject: [PATCH 3/3] Form submit message UI --- www/form/app-form.less | 19 ++++++++++++------- www/form/inner.js | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/www/form/app-form.less b/www/form/app-form.less index d09173b63..78d0f7665 100644 --- a/www/form/app-form.less +++ b/www/form/app-form.less @@ -255,12 +255,6 @@ } } } - - .cp-form-response-msg-container button { - white-space: initial; - line-height: 25px; - padding: 5.5px 6px; - } } div.cp-form-filler-container { width: 300px; @@ -409,7 +403,7 @@ display: flex; flex-flow: column; margin: 20px 0px 0px 0px; - padding-bottom: 100px; + padding-bottom: 75px; &> div:first-child { display: flex; height: 100%; @@ -454,6 +448,17 @@ } } } + .cp-form-response-msg-container { + padding-bottom: 75px; + button { + white-space: initial; + line-height: 25px; + padding: 5.5px 6px; + } + .cp-form-response-msg-hint { + color: @cryptpad_color_link; + } + } .cp-form-send-container { text-align: center; diff --git a/www/form/inner.js b/www/form/inner.js index 3279ceb9c..cebbf887a 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -5042,7 +5042,7 @@ define([ APP.getResponseMsgEditor = function (focus) { var t = h('textarea'); - var p = h('p', Messages.form_responseMsg); + var p = h('p.cp-form-response-msg-hint', Messages.form_responseMsg); var preview = h('button.btn.btn-default.cp-form-preview-button',[ h('i.fa.fa-eye'),