From 29acf3509f98a3e4de1f7c96d7d1ff02cc550dc1 Mon Sep 17 00:00:00 2001 From: jonathan Date: Thu, 9 Apr 2015 17:41:52 -0400 Subject: [PATCH] update changes in login.html --- .../engine/xmlform/login/forgotPasswordpm3.xml | 4 ++-- workflow/engine/xmlform/login/loginpm3.html | 4 ++-- workflow/engine/xmlform/login/loginpm3.xml | 16 ++++++++++++---- .../engine/xmlform/login/sysLoginNoWSpm3.html | 3 ++- .../engine/xmlform/login/sysLoginNoWSpm3.xml | 17 ++++++++++++----- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index 5cd64dd19..6c046ca72 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -3,10 +3,10 @@ <en><![CDATA[I forgot my password]]></en> - + - + diff --git a/workflow/engine/xmlform/login/loginpm3.html b/workflow/engine/xmlform/login/loginpm3.html index 6a38dc9b3..95e292ce3 100755 --- a/workflow/engine/xmlform/login/loginpm3.html +++ b/workflow/engine/xmlform/login/loginpm3.html @@ -46,13 +46,13 @@ id="{$form_id}" name="{$form_name}" action="{$form_action}" method="post" encType="multipart/form-data" onsubmit="return validateForm('{$form_objectRequiredFields}');"> - +
{$form.USR_PASSWORD}
{$form.USR_USERNAME} - {$form.USR_PASSWORD} + {$form.USR_PASSWORD_MASK} {$form.USER_LANG} {$form.URL} diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml index a12b154d4..5a27ec84e 100755 --- a/workflow/engine/xmlform/login/loginpm3.xml +++ b/workflow/engine/xmlform/login/loginpm3.xml @@ -3,19 +3,22 @@ <en><![CDATA[Login]]></en> - + - + + + + SELECT LANG_ID, LANG_NAME FROM langOptions - + @@ -25,7 +28,7 @@ SELECT LANG_ID, LANG_NAME FROM langOptions window.onload= function(){ document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER'); - document.getElementById('form[USR_PASSWORD]').placeholder = _('ID_PASSWORD'); + document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD'); }; // enable/disable forgot password link @@ -98,6 +101,11 @@ leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() if (client.browser != "firefox") { document.login.submit(); } + document.getElementById('form[USR_PASSWORD]').value = document.getElementById('form[USR_PASSWORD_MASK]').value; + document.getElementById('form[USR_PASSWORD_MASK]').value = ''; + document.getElementById('form[USR_PASSWORD_MASK]').setAttribute('type', 'text'); + document.login.submit(); + //return true; }.extend(document.getElementById('form[BSUBMIT]'))); ]]> diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.html b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html index bd8dda6f6..dca2ff902 100644 --- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.html +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html @@ -46,12 +46,13 @@ +
{$form.USR_PASSWORD}
{$form.USR_USERNAME} - {$form.USR_PASSWORD} + {$form.USR_PASSWORD_MASK}
diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml index 93b382609..c152669c6 100755 --- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml @@ -3,27 +3,30 @@ <en><![CDATA[Login]]></en> - + - + - + + + + SELECT LANG_ID, LANG_NAME FROM langOptions - +