Skip to content

Commit

Permalink
Changed keys
Browse files Browse the repository at this point in the history
  • Loading branch information
pavel-stastny authored and jirikrepl committed Apr 21, 2016
1 parent 59f1f9b commit d858d62
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
12 changes: 6 additions & 6 deletions client/src/main/webapp/WEB-INF/registration_form.vm
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,27 @@
<form id="registration_form" name="registration_form">

<label>#translatable('registration.login')</label> <label class="registration_error" id="registration_error_label" style="display:none">#translatable('registration.login.error')</label>
<input id="login" name="login" placeholder="#i18nval('registration.login.placeholder')" value="" />
<input id="login" class="translate_placeholder" data-key="registration.login.placeholder" name="login" placeholder="#i18nval('registration.login.placeholder')" value="" />

<label>#translatable('registration.fullname')</label> <label class="registration_error" id="registration_error_fullname" style="display:none">#translatable('registration.login.error')</label>
<input id="username" name="username" placeholder="#i18nval('registration.fullname.placeholder')" value="" />
<input id="username" class="translate_placeholder" data-key="registration.fullname.placeholder" name="username" placeholder="#i18nval('registration.fullname.placeholder')" value="" />

<label>#translatable('registration.email')</label> <label class="registration_error" id="registration_error_email" style="display:none">#translatable('registration.login.error')</label>
<input id="email" name="email" placeholder="#i18nval('registration.email.placeholder')" value="" />
<input id="email" class="translate_placeholder" data-key="registration.email.placeholder" name="email" placeholder="#i18nval('registration.email.placeholder')" value="" />

<label>#translatable('registration.password.placeholder')</label> <label class="registration_error" id="registration_error_password" style="display:none">#translatable('registration.password.error')</label>
<input id="password" name="password" type="password" placeholder="#i18nval('registration.password.placeholder')" value="" />
<input id="password" class="translate_placeholder" data-key="registration.password.placeholder" name="password" type="password" placeholder="#i18nval('registration.password.placeholder')" value="" />

<label>#translatable('registration.repeatpassword')</label> <label class="registration_error" id="registration_error_repeatpassword" style="display:none">#translatable('registration.repeatpassword.error')</label> <label class="registration_error" id="registration_error_differentpasswords" style="display:none">#translatable('registration.differentpass.error')</label>
<input id="repeatpassword" name="repeatpassword" type="password" placeholder="#i18nval('registration.repeatpassword.placeholder')" value="" />
<input id="repeatpassword" class="translate_placeholder" data-key="registration.repeatpassword.placeholder" name="repeatpassword" type="password" placeholder="#i18nval('registration.repeatpassword.placeholder')" value="" />

<label>#translatable('registration.captcha')</label>
<div style="width:100%">
<img src="simpleCaptcha.png"></tr>
</div>

<label>#translatable('registration.repeatcaptcha')</label> <label class="registration_error" id="registration_error_repeatcaptcha" style="display:none">#translatable('registration.repeatcaptcha.error')</label><label class="registration_error" id="registration_error_badcaptcha" style="display:none">#translatable('registration.badcaptcha.error')</label>
<input id="captcha" name="captcha" placeholder="#i18nval('registration.repeatcaptcha.placeholder')" value="" />
<input id="captcha" class="translate_placeholder" data-key="registration.repeatcaptcha.placeholder" name="captcha" placeholder="#i18nval('registration.repeatcaptcha.placeholder')" value="" />
</form>
</span>

Expand Down
7 changes: 4 additions & 3 deletions client/src/main/webapp/js/viewers/ol3/ol3utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ function _optionspane() {
if (datakey) {
div.attr("data-key",datakey);
}

div.addClass("translate_title");

if (title) {
div.attr("title",title);
}
Expand All @@ -276,11 +277,11 @@ function _optionspane() {
K5.gui.selected.fit();
});

icondiv(li(ul),"options_rotate_left","rotateleft","buttons.fit",K5.i18n.ctx.dictionary["buttons.rotateleft"],function() {
icondiv(li(ul),"options_rotate_left","rotateleft","buttons.rotateleft",K5.i18n.ctx.dictionary["buttons.rotateleft"],function() {
K5.gui.selected.rotateLeft();
});

icondiv(li(ul),"options_rotate_right","rotateright","buttons.fit",K5.i18n.ctx.dictionary["buttons.rotateright"],function() {
icondiv(li(ul),"options_rotate_right","rotateright","buttons.rotateright",K5.i18n.ctx.dictionary["buttons.rotateright"],function() {
K5.gui.selected.rotateRight();
});

Expand Down

0 comments on commit d858d62

Please sign in to comment.