Permalink
Browse files

Small rework of login form for better i18n adaptation. Fix #688

  • Loading branch information...
1 parent b723e91 commit f5360087a257c00048f5cc78726e94c5ec1dd034 @cdujeu cdujeu committed Sep 3, 2016
@@ -94,7 +94,8 @@
}
if(authConfs && authConfs.get("ENABLE_FORGOT_PASSWORD") && !oForm.down('a.forgot-password-link')){
try{
- oForm.down('input[name="password"]').up("div.SF_element").insert({after:'<div class="SF_element"><a href="#" class="forgot-password-link" ajxp_message_id="479">AJXP_MESSAGE[479]</a></div>'});
+ var after = oForm.down('input[name="remember_me"]') ? oForm.down('input[name="remember_me"]').up("div.SF_element") : oForm.down('input[name="password"]').up("div.SF_element");
+ after.insert({after:'<div class="SF_element" id="forgot_element"><span class="icon-question-sign"></span><a href="#" class="forgot-password-link" ajxp_message_id="479">AJXP_MESSAGE[479]</a></div>'});
oForm.down('a.forgot-password-link').observe("click", function(e){
Event.stop(e);
pydio.getController().fireAction(authConfs.get("FORGOT_PASSWORD_ACTION"));
@@ -172,7 +173,7 @@
<div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
<div class="SF_input"><input type="password" name="password" style="width: 100px; padding:0px;" placeholder="AJXP_MESSAGE[182]"></div>
</div>
- <div class="SF_element">
+ <div class="SF_element" id="remember_element">
<input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261">AJXP_MESSAGE[261]</ajxp:message>
</div>
</div>
Oops, something went wrong.
@@ -5866,8 +5866,11 @@ div.form-switch_language_form div.dialogContent div.dialogLegend,
div.form-reset-password div.dialogContent div.dialogLegend,
div.form-reset-password-ask div.dialogContent div.dialogLegend {
text-align: center;
- font-style: italic;
- color: #ddd;
+ font-size: 15px;
+ font-weight: 500;
+ color: #ffffff;
+ padding: 0 40px;
+ line-height: 18px;
}
div.form-login_form div.dialogContent #switch_language_form div.dialogLegend,
div.form-login_form_dynamic div.dialogContent #switch_language_form div.dialogLegend,
@@ -5879,19 +5882,40 @@ div.form-reset-password-ask div.dialogContent #switch_language_form div.dialogLe
margin-top: 16px;
margin-bottom: 5px;
}
-div.form-login_form div.dialogContent a.forgot-password-link,
-div.form-login_form_dynamic div.dialogContent a.forgot-password-link,
-div.form-switch_language_form div.dialogContent a.forgot-password-link,
-div.form-reset-password div.dialogContent a.forgot-password-link,
-div.form-reset-password-ask div.dialogContent a.forgot-password-link {
- color: white !important;
- margin-right: 45px;
- margin-top: 6px;
- text-decoration: underline;
+div.form-login_form div.dialogContent div.SF_element,
+div.form-login_form_dynamic div.dialogContent div.SF_element,
+div.form-switch_language_form div.dialogContent div.SF_element,
+div.form-reset-password div.dialogContent div.SF_element,
+div.form-reset-password-ask div.dialogContent div.SF_element {
+ padding-left: 20px;
font-size: 13px;
- text-align: right;
- display: block;
- float: right;
+ color: rgba(255, 255, 255, 0.93);
+}
+div.form-login_form div.dialogContent div.SF_element div.SF_label,
+div.form-login_form_dynamic div.dialogContent div.SF_element div.SF_label,
+div.form-switch_language_form div.dialogContent div.SF_element div.SF_label,
+div.form-reset-password div.dialogContent div.SF_element div.SF_label,
+div.form-reset-password-ask div.dialogContent div.SF_element div.SF_label {
+ padding-left: 4px;
+ font-size: 13px;
+ font-weight: 500;
+ text-transform: uppercase;
+ color: #ffffff;
+}
+div.form-login_form div.dialogContent div.SF_element span.icon-question-sign,
+div.form-login_form_dynamic div.dialogContent div.SF_element span.icon-question-sign,
+div.form-switch_language_form div.dialogContent div.SF_element span.icon-question-sign,
+div.form-reset-password div.dialogContent div.SF_element span.icon-question-sign,
+div.form-reset-password-ask div.dialogContent div.SF_element span.icon-question-sign {
+ display: inline-block;
+ margin: 0 6px 0 13px;
+}
+div.form-login_form div.dialogContent div.SF_element a.forgot-password-link,
+div.form-login_form_dynamic div.dialogContent div.SF_element a.forgot-password-link,
+div.form-switch_language_form div.dialogContent div.SF_element a.forgot-password-link,
+div.form-reset-password div.dialogContent div.SF_element a.forgot-password-link,
+div.form-reset-password-ask div.dialogContent div.SF_element a.forgot-password-link {
+ color: rgba(255, 255, 255, 0.93) !important;
}
div.form-login_form div.dialogContent .captcha_container,
div.form-login_form_dynamic div.dialogContent .captcha_container,
@@ -5926,21 +5950,6 @@ div.form-reset-password div.dialogContent .ajxp_password_auth div.SF_element:fir
div.form-reset-password-ask div.dialogContent .ajxp_password_auth div.SF_element:first-of-type {
display: none !important;
}
-div.form-login_form div.dialogContent div.SF_element,
-div.form-login_form_dynamic div.dialogContent div.SF_element,
-div.form-switch_language_form div.dialogContent div.SF_element,
-div.form-reset-password div.dialogContent div.SF_element,
-div.form-reset-password-ask div.dialogContent div.SF_element {
- padding-left: 20px;
-}
-div.form-login_form div.dialogContent div.SF_element div.SF_label,
-div.form-login_form_dynamic div.dialogContent div.SF_element div.SF_label,
-div.form-switch_language_form div.dialogContent div.SF_element div.SF_label,
-div.form-reset-password div.dialogContent div.SF_element div.SF_label,
-div.form-reset-password-ask div.dialogContent div.SF_element div.SF_label {
- padding-left: 4px;
- text-transform: uppercase;
-}
div.form-login_form div.dialogContent div.dialogButtons,
div.form-login_form_dynamic div.dialogContent div.dialogButtons,
div.form-switch_language_form div.dialogContent div.dialogButtons,
@@ -5995,7 +6004,7 @@ div.dialogBox.form-login_form form,
div.dialogBox.form-login_form_dynamic form {
margin: 0 40px;
font-size: 15px;
- padding-top: 20px;
+ padding-top: 0;
padding-bottom: 20px;
}
div.dialogBox.form-login_form form.no_placeholder div.SF_label,
@@ -45,8 +45,11 @@ div.form-reset-password-ask
div.dialogLegend {
text-align: center;
- font-style: italic;
- color: #ddd;
+ font-size: 15px;
+ font-weight: 500;
+ color: rgba(255,255,255,1);
+ padding:0 40px;
+ line-height: 18px;
}
#switch_language_form div.dialogLegend{
font-style: normal;
@@ -55,15 +58,25 @@ div.form-reset-password-ask
margin-bottom: 5px;
}
- a.forgot-password-link {
- color: white !important;
- margin-right: 45px;
- margin-top: 6px;
- text-decoration: underline;
+ div.SF_element{
+
+ padding-left: 20px;
font-size: 13px;
- text-align: right;
- display: block;
- float: right;
+ color: rgba(255,255,255,0.93);
+ div.SF_label{
+ padding-left: 4px;
+ font-size:13px;
+ font-weight: 500;
+ text-transform: uppercase;
+ color: rgba(255,255,255,1);
+ }
+ span.icon-question-sign{
+ display: inline-block;
+ margin: 0 6px 0 13px;
+ }
+ a.forgot-password-link {
+ color: rgba(255,255,255,0.93) !important;
+ }
}
.captcha_container {
@@ -86,15 +99,6 @@ div.form-reset-password-ask
display: none !important;
}
- div.SF_element{
- padding-left: 20px;
-
- div.SF_label{
- padding-left: 4px;
- text-transform: uppercase;
- }
- }
-
div.dialogButtons
{
margin-top: 30px;
@@ -133,7 +137,7 @@ div.dialogBox.form-login_form_dynamic{
form {
margin: 0 40px;
font-size: 15px;
- padding-top: 20px;
+ padding-top: 0;
padding-bottom: 20px;
&.no_placeholder div.SF_label {
display: block;

0 comments on commit f536008

Please sign in to comment.