infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'forms2' into condition

Browse Source
pull/1/head
yflory 3 years ago
parent 0f04357a7c 415ee6018b
commit ef0e1c8eaf
3 changed files with 70 additions and 35 deletions
Show Stats Download Patch File Download Diff File

6
customize.dist/src/less2/include/colortheme.less
Unescape Escape View File

@ -299,7 +299,7 @@
@cp_usergrid-selected-fg: @cryptpad_color_white; @cp_usergrid-selected-fg: @cryptpad_color_white;
// Other // Other
@cp_shadow-color: fade(@cryptpad_color_black, 40%); @cp_shadow-color: fade(@cryptpad_color_black, 30%);
// Apps // Apps
@cp_app-bg: @cryptpad_color_grey_100; @cp_app-bg: @cryptpad_color_grey_100;
@ -428,8 +428,8 @@
@cp_calendar-now-fg: @cryptpad_color_grey_200; @cp_calendar-now-fg: @cryptpad_color_grey_200;
// Forms // Forms
@cp_form-bg1: @cryptpad_color_grey_200; @cp_form-bg1: @cryptpad_color_grey_50;
@cp_form-bg2: @cryptpad_color_grey_100; @cp_form-bg2: @cryptpad_color_grey_200;
@cp_form-border: @cryptpad_color_grey_200; @cp_form-border: @cryptpad_color_grey_200;
@cp_form-poll-color: @cryptpad_color_grey_800; @cp_form-poll-color: @cryptpad_color_grey_800;
@cp_form-poll-no: fade(@cryptpad_color_light_red, 75%); @cp_form-poll-no: fade(@cryptpad_color_light_red, 75%);

29
www/form/app-form.less
Unescape Escape View File

@ -117,8 +117,19 @@
width: 100% !important; width: 100% !important;
.cp-form-creator-settings { .cp-form-creator-settings {
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
div {
flex-basis: 33.333333%;
padding-right: 20px;
}
}
}
@media screen and (max-width: 600px) {
.cp-form-creator-settings {
div {
flex-basis: 50%;
}
} }
} }
} }
@ -201,6 +212,13 @@
} }
} }
} }
div.cp-form-creator-results {
.cp-form-block {
.cp-form-block-content {
overflow-x: auto;
}
}
}
div.cp-form-creator-content, div.cp-form-creator-results { div.cp-form-creator-content, div.cp-form-creator-results {
max-width: 1000px; max-width: 1000px;
min-width: 300px; min-width: 300px;
@ -366,6 +384,7 @@
.cp-form-block { .cp-form-block {
background: @cp_form-bg1; background: @cp_form-bg1;
padding: 10px; padding: 10px;
box-shadow: 0px 0px 15px @cp_shadow-color;
&:not(:last-child) { &:not(:last-child) {
margin-bottom: 20px; margin-bottom: 20px;
} }
@ -429,7 +448,6 @@
} }
} }
.cp-form-block-content { .cp-form-block-content {
overflow-x: auto;
p { p {
a { a {
color: @cryptpad_color_link; color: @cryptpad_color_link;
@ -595,6 +613,11 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex: 1; flex: 1;
.cp-form-submit-actions {
button:not(:last-child) {
margin-right: 10px;
}
}
} }
div.cp-form-creator-results { div.cp-form-creator-results {
display: flex; display: flex;
@ -724,7 +747,7 @@
margin-top: -10px; margin-top: -10px;
margin-right: -10px; margin-right: -10px;
i { margin-right: 5px; } i { margin-right: 5px; }
background: fade(@cryptpad_text_col, 15%); background: fade(@cryptpad_text_col, 10%);
} }
} }

70
www/form/inner.js
Unescape Escape View File

@ -161,7 +161,7 @@ define([
h('span', Messages.form_textType), h('span', Messages.form_textType),
typeSelect[0] typeSelect[0]
]); ]);
typeSelect.onChange.reg(evOnSave.fire()); typeSelect.onChange.reg(evOnSave.fire);
} }
setCursorGetter(function () { setCursorGetter(function () {
@ -2229,10 +2229,18 @@ define([
} }
}; };
var addResultsButton = function (framework, content) { var getAnswersLength = function (answers) {
var $res = $(h('button.cp-toolbar-appmenu.cp-toolbar-form-button', [ return Object.keys(answers || {}).filter(function (key) {
return key && key.slice(0,1) !== "_";
}).length;
};
Messages.form_results = "Responses ({0})"; // XXX update key
var addResultsButton = function (framework, content, answers) {
var $container = $('.cp-forms-results-participant');
var l = getAnswersLength(answers);
var $res = $(h('button.btn.btn-primary.cp-toolbar-form-button', [
h('i.fa.fa-bar-chart'), h('i.fa.fa-bar-chart'),
h('span.cp-button-name', Messages.form_results) h('span.cp-button-name', Messages._getKey('form_results', [l])),
])); ]));
$res.click(function () { $res.click(function () {
$res.attr('disabled', 'disabled'); $res.attr('disabled', 'disabled');
@ -2244,20 +2252,23 @@ define([
$('body').addClass('cp-app-form-results'); $('body').addClass('cp-app-form-results');
renderResults(content, answers); renderResults(content, answers);
$res.remove(); $res.remove();
var $editor = $(h('button.cp-toolbar-appmenu', [ var $editor = $(h('button.btn.btn-primary', [
h('i.fa.fa-pencil'), h('i.fa.fa-pencil'),
h('span.cp-button-name', APP.isEditor ? Messages.form_editor : Messages.form_form) h('span.cp-button-name', Messages.form_editor)
])); ]));
$editor.click(function () { $editor.click(function () {
$('body').removeClass('cp-app-form-results'); $('body').removeClass('cp-app-form-results');
$editor.remove(); $editor.remove();
addResultsButton(framework, content); sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
var answers = obj && obj.results;
addResultsButton(framework, content, answers);
});
}); });
framework._.toolbar.$bottomL.append($editor); $container.prepend($editor);
}); });
}); });
framework._.toolbar.$bottomL.append($res); $container.prepend($res);
}; };
Messages.form_alreadyAnswered = "You've responded to this form on {0}"; // XXX Messages.form_alreadyAnswered = "You've responded to this form on {0}"; // XXX
@ -2267,7 +2278,7 @@ define([
var $formContainer = $('div.cp-form-creator-content').hide(); var $formContainer = $('div.cp-form-creator-content').hide();
var $container = $('div.cp-form-creator-answered').empty().css('display', ''); var $container = $('div.cp-form-creator-answered').empty().css('display', '');
var viewOnly = content.answers.cantEdit; var viewOnly = content.answers.cantEdit || APP.isClosed;
var action = h('button.btn.btn-primary', [ var action = h('button.btn.btn-primary', [
viewOnly ? h('i.fa.fa-bar-chart') : h('i.fa.fa-pencil'), viewOnly ? h('i.fa.fa-bar-chart') : h('i.fa.fa-pencil'),
h('span', viewOnly ? Messages.form_viewAnswer : Messages.form_editAnswer) h('span', viewOnly ? Messages.form_viewAnswer : Messages.form_editAnswer)
@ -2292,9 +2303,18 @@ define([
// If responses are public, show button to view them // If responses are public, show button to view them
var responses; var responses;
if (content.answers.privateKey) { if (content.answers.privateKey) {
responses = h('button.btn.btn-default', Messages.form_results); var l = getAnswersLength(answers);
responses = h('button.btn.btn-default', [
h('i.fa.fa-bar-chart'),
h('span.cp-button-name', Messages._getKey('form_results', [l]))
]);
var sframeChan = framework._.sfCommon.getSframeChannel();
sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
var answers = obj && obj.results;
var l = getAnswersLength(answers);
$(responses).find('.cp-button-name').text(Messages._getKey('form_results', [l]));
});
$(responses).click(function () { $(responses).click(function () {
var sframeChan = framework._.sfCommon.getSframeChannel();
sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) { sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
var answers = obj && obj.results; var answers = obj && obj.results;
if (answers) { APP.answers = answers; } if (answers) { APP.answers = answers; }
@ -2544,10 +2564,7 @@ define([
} }
evOnChange.fire(false, true); evOnChange.fire(false, true);
window.onbeforeunload = undefined; window.onbeforeunload = undefined;
if (!update && content.answers.privateKey) {
// Add results button
addResultsButton(framework, content);
}
$send.removeAttr('disabled'); $send.removeAttr('disabled');
//UI.alert(Messages.form_sent); // XXX not needed anymore? //UI.alert(Messages.form_sent); // XXX not needed anymore?
$send.text(Messages.form_update); $send.text(Messages.form_update);
@ -2677,7 +2694,7 @@ define([
APP.formBlocks = []; APP.formBlocks = [];
if (APP.isClosed && content.answers.privateKey && !APP.isEditor) { if (APP.isClosed && content.answers.privateKey && !APP.isEditor && !APP.hasAnswered) {
var sframeChan = framework._.sfCommon.getSframeChannel(); var sframeChan = framework._.sfCommon.getSframeChannel();
sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) { sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
var answers = obj && obj.results; var answers = obj && obj.results;
@ -3584,10 +3601,11 @@ define([
var $toolbarContainer = $('#cp-toolbar'); var $toolbarContainer = $('#cp-toolbar');
if (APP.isEditor || priv.form_auditorKey) { var helpMenu = framework._.sfCommon.createHelpMenu(['text', 'pad']);
var helpMenu = framework._.sfCommon.createHelpMenu(['text', 'pad']); $toolbarContainer.after(helpMenu.menu);
$toolbarContainer.after(helpMenu.menu); framework._.toolbar.$drawer.append(helpMenu.button);
framework._.toolbar.$drawer.append(helpMenu.button); if (!APP.isEditor && !priv.form_auditorKey) {
$(helpMenu.menu).hide();
} }
var offlineEl = h('div.alert.alert-danger.cp-burn-after-reading', Messages.disconnected); var offlineEl = h('div.alert.alert-danger.cp-burn-after-reading', Messages.disconnected);
@ -3637,7 +3655,7 @@ define([
}); });
}); });
Messages.form_makePublicWarning = "Are you sure you want to make responses to this form public? Past and future responses will be visible by participants. This cannot be undone." // XXX existing key Messages.form_makePublicWarning = "Are you sure you want to make responses to this form public? Past and future responses will be visible by participants. This cannot be undone."; // XXX existing key
// Private / public status // Private / public status
var resultsType = h('div.cp-form-results-type-container'); var resultsType = h('div.cp-form-results-type-container');
var $results = $(resultsType); var $results = $(resultsType);
@ -4124,7 +4142,6 @@ define([
} }
if (APP.isEditor) { if (APP.isEditor) {
addResultsButton(framework, content);
sframeChan.query("Q_FORM_FETCH_ANSWERS", { sframeChan.query("Q_FORM_FETCH_ANSWERS", {
channel: content.answers.channel, channel: content.answers.channel,
validateKey: content.answers.validateKey, validateKey: content.answers.validateKey,
@ -4132,6 +4149,7 @@ define([
cantEdit: content.answers.cantEdit cantEdit: content.answers.cantEdit
}, function (err, obj) { }, function (err, obj) {
var answers = obj && obj.results; var answers = obj && obj.results;
addResultsButton(framework, content, answers);
if (answers) { APP.answers = answers; } if (answers) { APP.answers = answers; }
checkIntegrity(false); checkIntegrity(false);
updateForm(framework, content, true); updateForm(framework, content, true);
@ -4185,9 +4203,6 @@ define([
// If we have a non-anon answer, we can't answer anonymously later // If we have a non-anon answer, we can't answer anonymously later
if (answers[curve1]) { APP.cantAnon = true; } if (answers[curve1]) { APP.cantAnon = true; }
// Add results button
if (myAnswers) { addResultsButton(framework, content); }
updateForm(framework, content, false, myAnswers); updateForm(framework, content, false, myAnswers);
}); });
return; return;
@ -4215,9 +4230,6 @@ define([
APP.hasAnswered = true; APP.hasAnswered = true;
// If we have a non-anon answer, we can't answer anonymously later // If we have a non-anon answer, we can't answer anonymously later
if (!obj._isAnon) { APP.cantAnon = true; } if (!obj._isAnon) { APP.cantAnon = true; }
// Add results button
if (content.answers.privateKey) { addResultsButton(framework, content); }
} }
checkIntegrity(false); checkIntegrity(false);
updateForm(framework, content, false, answers); updateForm(framework, content, false, answers);

Write Preview
Loading…
Cancel
Save