Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Form password warning #1690

Merged
merged 11 commits into from
Dec 12, 2024
Merged

Form password warning #1690

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8465fc0
Added password warning to Form creation modal #1455
zuzanna-maria Oct 9, 2024
c7be93a
Changed styling of warning
zuzanna-maria Oct 19, 2024
54efbe1
Fix LESS nesting
davidbenque Oct 21, 2024
3f2d856
Add temporary translation key
davidbenque Oct 21, 2024
36be1e7
Adjust alert
davidbenque Oct 21, 2024
0b677cf
Moved .form_passwordWarning key to customize.dist/messages.js
zuzanna-maria Oct 21, 2024
8daae41
Removed redundant newlines
zuzanna-maria Dec 5, 2024
a86fe96
Removed flex-flow style
zuzanna-maria Dec 6, 2024
c10bf97
.cp-creation-form>div styling
zuzanna-maria Dec 9, 2024
ef3ff95
Fix margin issues in form creation screen
yflory Dec 10, 2024
3dbc21f
Merge branch 'staging' into formpassword_warning
yflory Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjust alert 
- changed type from warning to info
- increased line-height to 120%
  • Loading branch information
@davidbenque
davidbenque committed Oct 21, 2024
commit 36be1e7fc914be4b57eea19ba5bfdbdf27f254ed
2 changes: 1 addition & 1 deletion customize.dist/src/less2/include/creation.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
.cp-creation-password-warning {
margin-top: 0.4rem;
font-size: 0.75em;
line-height: 100%;
line-height: 120%;
}
}
.cp-creation-settings {
Expand Down
4 changes: 1 addition & 3 deletions www/common/common-ui-elements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ define([
], function ($, Config, Broadcast, Util, Hash, Language, UI, Constants, Feedback, h, Clipboard,
Messages, AppConfig, Pages, NThen, InviteInner, Visible, PadTypes) {

Messages.form_passwordWarning = 'For Forms, you can only set the password during creation. It cannot be changed later.' //XX

var UIElements = {};
var urlArgs = Config.requireConf.urlArgs;

Expand Down Expand Up @@ -2775,7 +2773,7 @@ define([
// Password
let text;
if (type === 'form') {
text = h('div.cp-creation-password-warning.alert.alert-warning.dismissable', h('span.cp-inline-alert-text', Messages.form_passwordWarning));
text = h('div.cp-creation-password-warning.alert.alert-info.dismissable', h('span.cp-inline-alert-text', Messages.form_passwordWarning));
}
var password = h('div.cp-creation-password', [
UI.createCheckbox('cp-creation-password', Messages.properties_addPassword, false),
Expand Down