From 9dafb667ee158b32d4a385deaa7fc60b6125b1da Mon Sep 17 00:00:00 2001 From: jonathan Date: Thu, 30 Apr 2015 11:41:39 -0400 Subject: [PATCH 1/5] update last modified support login ie8 & ie9 --- .../skinEngine/neoclassic/css/loginStyle.css | 13 +++++--- .../engine/skinEngine/neoclassic/layout.html | 4 +++ .../xmlform/login/forgotPasswordpm3.xml | 30 +++++++++++++----- .../xmlform/login/licenseExpiredpm3.xml | 18 +++++++++-- workflow/engine/xmlform/login/loginpm3.xml | 24 +++++++++++--- .../engine/xmlform/login/sysLoginNoWSpm3.xml | 31 +++++++++++++------ 6 files changed, 93 insertions(+), 27 deletions(-) diff --git a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css index f6e2b7fe2..761d4ed32 100644 --- a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css +++ b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css @@ -8,11 +8,16 @@ font-weight: normal; src: local("?"), url("/fonts/Chivo-Regular.ttf") format("truetype"); } -body.login { - background: url("/images/backgroundpm3.jpg") repeat scroll 0 0 / cover rgba(0, 0, 0, 0); + + body.login { + //background: url("/images/backgroundpm3.jpg") repeat scroll 0 0 / cover rgba(0, 0, 0, 0); //background-position-y: -30px; - font-family: "Chivo",sans-serif; - height: 100%; + //font-family: "Chivo",sans-serif; + //height: 100%; + + background-color: #444; + background: url(/images/backgroundpm3.jpg); + background-size: cover; } .vertical-offset-100 { diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index a51562fd6..ecb8b8ea5 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -1,6 +1,10 @@ + + + + {$meta} diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index 60d8b9b6f..336f7173d 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -19,13 +19,29 @@ Update License \ No newline at end of file diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml index d424522d9..5d5f6b8a7 100755 --- a/workflow/engine/xmlform/login/loginpm3.xml +++ b/workflow/engine/xmlform/login/loginpm3.xml @@ -25,11 +25,27 @@ SELECT LANG_ID, LANG_NAME FROM langOptions Date: Thu, 30 Apr 2015 11:45:30 -0400 Subject: [PATCH 2/5] update last modified support login ie8 & ie9 v1 --- workflow/engine/skinEngine/neoclassic/css/loginStyle.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css index 761d4ed32..fa21b0a80 100644 --- a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css +++ b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css @@ -10,11 +10,6 @@ } body.login { - //background: url("/images/backgroundpm3.jpg") repeat scroll 0 0 / cover rgba(0, 0, 0, 0); - //background-position-y: -30px; - //font-family: "Chivo",sans-serif; - //height: 100%; - background-color: #444; background: url(/images/backgroundpm3.jpg); background-size: cover; From 8966966fb819a3e8ed677a41e4b4af02ddcf1160 Mon Sep 17 00:00:00 2001 From: jonathan Date: Thu, 30 Apr 2015 15:23:19 -0400 Subject: [PATCH 3/5] update login --- workflow/engine/skinEngine/neoclassic/layout.html | 5 +---- workflow/engine/xmlform/login/forgotPasswordpm3.html | 4 +++- workflow/engine/xmlform/login/licenseExpiredpm3.html | 2 ++ workflow/engine/xmlform/login/loginpm3.html | 5 ++++- workflow/engine/xmlform/login/loginpm3.xml | 4 ++-- workflow/engine/xmlform/login/sysLoginNoWSpm3.html | 4 +++- workflow/engine/xmlform/login/sysLoginNoWSpm3.xml | 5 +++-- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index ecb8b8ea5..91178298a 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -2,11 +2,8 @@ - - - {$meta} - + {$header} diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.html b/workflow/engine/xmlform/login/forgotPasswordpm3.html index 47bcf197e..13f47a9d9 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.html +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.html @@ -23,8 +23,10 @@ {$form.JS} - + + + diff --git a/workflow/engine/xmlform/login/licenseExpiredpm3.html b/workflow/engine/xmlform/login/licenseExpiredpm3.html index 3f5531645..9b0309c5f 100644 --- a/workflow/engine/xmlform/login/licenseExpiredpm3.html +++ b/workflow/engine/xmlform/login/licenseExpiredpm3.html @@ -23,6 +23,8 @@ {$form.JS} + + diff --git a/workflow/engine/xmlform/login/loginpm3.html b/workflow/engine/xmlform/login/loginpm3.html index 9294154c5..ac5c4ad2e 100755 --- a/workflow/engine/xmlform/login/loginpm3.html +++ b/workflow/engine/xmlform/login/loginpm3.html @@ -25,7 +25,10 @@ - + + + + diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml index 5d5f6b8a7..d897798fb 100755 --- a/workflow/engine/xmlform/login/loginpm3.xml +++ b/workflow/engine/xmlform/login/loginpm3.xml @@ -129,8 +129,8 @@ leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() 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"); - + if(!navigator.userAgent.indexOf("MSIE 8.0")>0) + document.getElementById("form[USR_PASSWORD_MASK]").setAttribute("type", "text"); document.login.submit(); }.extend(document.getElementById('form[BSUBMIT]'))); diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.html b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html index 1beeb6f06..836cb1303 100644 --- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.html +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html @@ -21,7 +21,9 @@
{$form.BSUBMIT} + + - \ No newline at end of file + diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml index dda62718e..433aad79e 100755 --- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml @@ -81,8 +81,9 @@ leimnud.event.add(document.getElementById('form[USER_ENV]'), 'keypress', functio leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() { createCookie("pm_sys_sys", "{\"sys_sys\": \"" + getField("USER_ENV").value + "\"}", 365); 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.getElementById('form[USR_PASSWORD_MASK]').value = ''; + if(!navigator.userAgent.indexOf("MSIE 8.0")>0) + document.getElementById("form[USR_PASSWORD_MASK]").setAttribute("type", "text"); document.sysLogin.submit(); }.extend(document.getElementById('form[BSUBMIT]'))); From 382ee48bdfba5460f2d7f4580fc462883d4f7120 Mon Sep 17 00:00:00 2001 From: jonathan Date: Thu, 30 Apr 2015 15:25:05 -0400 Subject: [PATCH 4/5] update login v1 --- workflow/engine/skinEngine/neoclassic/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index 91178298a..1f5ad976c 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -3,7 +3,7 @@ {$meta} - + {$header} From 94e130bed35cef6b6ceb678ba2ababd0d8126c31 Mon Sep 17 00:00:00 2001 From: jonathan Date: Thu, 30 Apr 2015 20:22:33 -0400 Subject: [PATCH 5/5] update v1 --- .../xmlform/login/forgotPasswordpm3.xml | 27 ++++++++++ workflow/engine/xmlform/login/loginpm3.xml | 31 ++++++++++- .../engine/xmlform/login/sysLoginNoWSpm3.xml | 52 ++++++++++++++++++- 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index 336f7173d..3f15da86a 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -29,11 +29,38 @@ function getElementsByClassNameIE8(node, classname) { }; window.onload= function(){ + var inputUser,inputEmail; if(document.getElementById('form[USR_USERNAME]').placeholder == undefined && document.getElementById('form[BSUBMIT]').classList == undefined){ document.getElementById('form[USR_USERNAME]').value = _('ID_USER'); document.getElementById('form[USR_EMAIL]').value = _('ID_EMAIL'); document.getElementById('form[BSUBMIT]').className = "button-login-success"; document.getElementById('form[BCANCEL]').className = "button-login-cancel"; + inputUser = document.getElementById('form[USR_USERNAME]'); + inputEmail = document.getElementById('form[USR_EMAIL]'); + + inputUser.attachEvent("onclick", function (){ + if(_('ID_USER') == inputUser.value){ + inputUser.value=""; + } + }); + inputUser.attachEvent("onblur", function (){ + if(inputUser.value == ""){ + inputUser.value=_('ID_USER'); + } + }); + + inputEmail.attachEvent("onclick", function (){ + if(_('ID_EMAIL') == inputEmail.value){ + inputEmail.value=""; + } + }); + inputEmail.attachEvent("onblur", function (){ + if(inputEmail.value == ""){ + inputEmail.value=_('ID_EMAIL'); + } + }); + + }else{ document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER'); document.getElementById('form[USR_EMAIL]').placeholder = _('ID_EMAIL'); diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml index d897798fb..ca2d780d0 100755 --- a/workflow/engine/xmlform/login/loginpm3.xml +++ b/workflow/engine/xmlform/login/loginpm3.xml @@ -36,10 +36,39 @@ function getElementsByClassNameIE8(node, classname) { }; window.onload= function(){ + var inputUser, + inputPass; if(document.getElementById('form[USR_USERNAME]').placeholder == undefined && document.getElementById('form[BSUBMIT]').classList == undefined){ document.getElementById('form[USR_USERNAME]').value = _('ID_USER'); document.getElementById('form[USR_PASSWORD_MASK]').value = _('ID_PASSWORD'); - document.getElementById('form[BSUBMIT]').className = "button-login-success"; + document.getElementById('form[BSUBMIT]').className = "button-login-success"; + inputUser = document.getElementById('form[USR_USERNAME]'); + inputPass = document.getElementById('form[USR_PASSWORD_MASK]'); + + inputUser.attachEvent("onclick", function (){ + if(_('ID_USER') == inputUser.value){ + inputUser.value=""; + } + }); + inputUser.attachEvent("onblur", function (){ + if(inputUser.value == ""){ + inputUser.value=_('ID_USER'); + } + }); + + inputPass.attachEvent("onclick", function (){ + if(_('ID_PASSWORD') == inputPass.value){ + inputPass.value=""; + } + }); + + inputPass.attachEvent("onblur", function (){ + if(inputPass.value == ""){ + inputPass.value = _('ID_PASSWORD'); + } + }); + + }else{ document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER'); document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD'); diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml index 433aad79e..f13b9fe5e 100755 --- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml @@ -33,18 +33,68 @@ function getElementsByClassNameIE8(node, classname) { return a; }; +function createEvent(elem, event, fn) { + if (elem.addEventListener) { + elem.addEventListener(event, fn, false); + } else { + elem.attachEvent("on" + event, fn); + } +}; + window.onload= function(){ + var inputUser, + inputWs, + inputPass; if(document.getElementById('form[USR_USERNAME]').placeholder === undefined && document.getElementById('form[BSUBMIT]').classList == undefined){ document.getElementById('form[USR_USERNAME]').value = _('ID_USER'); document.getElementById('form[USR_PASSWORD_MASK]').value = _('ID_PASSWORD'); document.getElementById('form[USER_ENV]').value = _('ID_WORKSPACE'); document.getElementById('form[BSUBMIT]').className = "button-login-success"; + inputUser = document.getElementById('form[USR_USERNAME]'); + inputPass = document.getElementById('form[USR_PASSWORD_MASK]'); + inputWs = document.getElementById('form[USER_ENV]'); + + inputUser.attachEvent("onclick", function (){ + if(_('ID_USER') == inputUser.value){ + inputUser.value=""; + } + }); + inputUser.attachEvent("onblur", function (){ + if(inputUser.value == ""){ + inputUser.value=_('ID_USER'); + } + }); + + inputPass.attachEvent("onclick", function (){ + if(_('ID_PASSWORD') == inputPass.value){ + inputPass.value=""; + } + }); + + inputPass.attachEvent("onblur", function (){ + if(inputPass.value == ""){ + inputPass.value = _('ID_PASSWORD'); + } + }); + + inputWs.attachEvent("onclick", function (){ + if(_('ID_WORKSPACE') == inputWs.value){ + inputWs.value=""; + } + }); + + inputWs.attachEvent("onblur", function (){ + if(inputWs.value == ""){ + inputWs.value = _('ID_WORKSPACE'); + } + }); + }else{ document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER'); document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD'); document.getElementById('form[USER_ENV]').placeholder = _('ID_WORKSPACE'); document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray'); - document.getElementById('form[BSUBMIT]').classList.add('button-login-success'); + document.getElementById('form[BSUBMIT]').classList.add('button-login-success'); } };