diff --git a/customize.dist/pages/login.js b/customize.dist/pages/login.js index f1841717d..d35a27777 100644 --- a/customize.dist/pages/login.js +++ b/customize.dist/pages/login.js @@ -17,7 +17,7 @@ define([ h('div.cp-login-instance', Msg._getKey('login_instance', [ Pages.Instance.name ])), h('div.big-container', [ h('div.input-container', [ - h('label.label', { for: 'name' }, Msg.login_username + ':'), // XXX label not visible + h('label.cp-default-label', { for: 'name' }, Msg.login_username), // XXX label not visible h('input.form-control#name', { name: 'name', type: 'text', @@ -30,7 +30,7 @@ define([ }), ]), h('div.input-container', [ - h('label.label', { for: 'password' }, Msg.login_password + ':'), // XXX label not visible + h('label.cp-default-label', { for: 'password' }, Msg.login_password), // XXX label not visible h('input.form-control#password', { type: 'password', 'name': 'password', diff --git a/customize.dist/pages/recovery.js b/customize.dist/pages/recovery.js index 949297784..beb8f0f0e 100644 --- a/customize.dist/pages/recovery.js +++ b/customize.dist/pages/recovery.js @@ -29,7 +29,7 @@ define([ h('div.alert.alert-danger.wrong-cred.cp-hidden', Msg.login_noSuchUser), h('div.big-container', [ h('div.input-container', [ - h('label.label', {for: 'username'}, Msg.login_username + ':'), // XXX label not visible + h('label.cp-default-label', {for: 'username'}, Msg.login_username), // XXX label not visible h('input.form-control#username', { type: 'text', autocomplete: 'off', @@ -41,7 +41,7 @@ define([ }), ]), h('div.input-container', [ - h('label.label', {for: 'password'}, Msg.login_password + ':'), // XXX label not visible + h('label.cp-default-label', {for: 'password'}, Msg.login_password), // XXX label not visible h('input.form-control#password', { type: 'password', placeholder: Msg.login_password, diff --git a/customize.dist/pages/register.js b/customize.dist/pages/register.js index 06c20ca35..ffcb4a569 100644 --- a/customize.dist/pages/register.js +++ b/customize.dist/pages/register.js @@ -59,7 +59,7 @@ define([ ]), h('div.big-container', [ h('div.input-container', [ - h('label.register-label', { for: 'username' }, Msg.login_username + ':'), + h('label.cp-register-label', { for: 'username' }, Msg.login_username), h('input.form-control#username', { type: 'text', autocomplete: 'off', @@ -71,14 +71,14 @@ define([ }), ]), h('div.input-container', [ - h('label.register-label', { for: 'password' }, Msg.login_password + ':'), // XXX label not visible + h('label.cp-register-label', { for: 'password' }, Msg.login_password), // XXX label not visible h('input.form-control#password', { type: 'password', placeholder: Msg.login_password, }), ]), h('div.input-container', [ - h('label.register-label', { for: 'password-confirm' }, Msg.login_confirm + ':'), // XXX label not visible + h('label.cp-register-label', { for: 'password-confirm' }, Msg.login_confirm), // XXX label not visible h('input.form-control#password-confirm', { type: 'password', placeholder: Msg.login_confirm, diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less index 2a0dfd26e..0b7515c79 100644 --- a/customize.dist/src/less2/include/sidebar-layout.less +++ b/customize.dist/src/less2/include/sidebar-layout.less @@ -82,7 +82,7 @@ pre { color: @cryptpad_text_col; } - label:not(.noTitle), .label { + label:not(.noTitle), .cp-default-label { display: block; font-weight: bold; margin-bottom: 0; diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less index 24e946694..1745fdb7e 100644 --- a/customize.dist/src/less2/pages/page-login.less +++ b/customize.dist/src/less2/pages/page-login.less @@ -52,7 +52,7 @@ margin-right: 0px; } } - .label { + .cp-default-label { display: none; } } diff --git a/customize.dist/src/less2/pages/page-recovery.less b/customize.dist/src/less2/pages/page-recovery.less index 39519141a..6197e0cc0 100644 --- a/customize.dist/src/less2/pages/page-recovery.less +++ b/customize.dist/src/less2/pages/page-recovery.less @@ -36,7 +36,7 @@ .cp-hidden { display: none; } - .label { + .cp-default-label { display: none; } } diff --git a/customize.dist/src/less2/pages/page-register.less b/customize.dist/src/less2/pages/page-register.less index fa053594a..a0e4a0b21 100644 --- a/customize.dist/src/less2/pages/page-register.less +++ b/customize.dist/src/less2/pages/page-register.less @@ -35,9 +35,7 @@ margin-top: 5px; } } - .register-label { - display: none; - } + .cp-register-label { display: none; } padding-bottom: 3em; min-height: 5vh; } diff --git a/www/admin/inner.js b/www/admin/inner.js index 8cb1a7a22..103796555 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -1296,7 +1296,7 @@ define([ var textarea = h('textarea', { id: 'textarea-input' }); var $input = $(textarea); - Messages.add_here = "Add here:"; // XXX temporary solution + Messages.add_here = "Add here"; // XXX temporary solution var label = h('label', { for: 'textarea-input' },Messages.add_here); var box = h('div.cp-admin-setter', [ @@ -1486,7 +1486,7 @@ Example }); var $input = $(input); - Messages.email = "Email:"; // XXX temporary solution + Messages.email = "Email"; // XXX temporary solution var label = h('label', { for: 'emailInput' },Messages.email); diff --git a/www/calendar/inner.js b/www/calendar/inner.js index 733b82516..3d5362f5a 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -715,13 +715,13 @@ define([ } }); } - Messages.calendarSettings = "Calendar Settings"; // XXX + Messages.calendar_settings = "Calendar Settings"; // XXX var dropdownConfig = { text: '', options: options, // Entries displayed in the menu common: common, buttonCls: 'btn btn-default fa fa-gear small cp-calendar-actions', - ariaLabel: Messages.calendarSettings, + ariaLabel: Messages.calendar_settings, }; return UIElements.createDropdown(dropdownConfig)[0]; }; diff --git a/www/teams/inner.js b/www/teams/inner.js index 48368a029..c0c57544a 100644 --- a/www/teams/inner.js +++ b/www/teams/inner.js @@ -532,7 +532,7 @@ define([ content.push(h('h3', Messages.team_createLabel)); let label = h('label', { for: 'cp-team-name' } , Messages.team_createName); content.push(label); - let input = h('input', {type:'text', id:'cp-team-name', maxlength:50}); + let input = h('input#cp-team-name', {type:'text', maxlength:50}); content.push(input); var button = h('button.btn.btn-success', Messages.creation_create); content.push(h('br')); @@ -1057,10 +1057,10 @@ define([ APP.module.execCommand('GET_TEAM_METADATA', { teamId: APP.team }, function (obj) { - Messages.team_nameAlreadySet = "Team name is already set to "; // XXX + Messages.team_nameAlreadySet = "Team name is already set to {0}"; // XXX if (obj && obj.error) { return void UI.warn(Messages.error); } if (obj.name === newName) { - return void UI.warn(Messages.team_nameAlreadySet + newName); + return void UI.warn(Messages._getKey('team_nameAlreadySet', [Util.fixHTML(newName)])); } $spinner.show(); var oldName = obj.name;