fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in jonathanquispe/processmaker/pm2352 (pull request #2048)

Browse Source 
pm2352 update
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-30 20:38:18 -04:00
parent 396a0dc137 3f46369ac6
commit 32503f915c
10 changed files with 210 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/skinEngine/neoclassic/css/loginStyle.css
View File

@@ -8,11 +8,11 @@
font-weight: normal; font-weight: normal;
src: local("?"), url("/fonts/Chivo-Regular.ttf") format("truetype"); 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-position-y: -30px; background-color: #444;
font-family: "Chivo",sans-serif; background: url(/images/backgroundpm3.jpg);
height: 100%; background-size: cover;
} }
.vertical-offset-100 { .vertical-offset-100 {

3
workflow/engine/skinEngine/neoclassic/layout.html
View File

@@ -1,8 +1,9 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<link rel="stylesheet" href="/lib/pmdynaform/libs/bootstrap-3.1.1/css/bootstrap.min.css"> <link rel="stylesheet" href="/lib/pmdynaform/libs/bootstrap-3.1.1/css/bootstrap.min.css">
{$meta} {$meta}
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon" />
{$header} {$header}
</head> </head>

4
workflow/engine/xmlform/login/forgotPasswordpm3.html
View File

@@ -23,8 +23,10 @@
{$form.JS} {$form.JS}
</script> </script>
</form> </form>
<script src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script>
<script src="/lib/pmdynaform/libs/html5shiv/html5shiv.js"></script>
<script type="text/javascript"> <script type="text/javascript">
try {literal}{{/literal} dynaformSetFocus();}catch(e){literal}{{/literal}} try {literal}{{/literal} dynaformSetFocus();}catch(e){literal}{{/literal}}
</script> </script>

57
workflow/engine/xmlform/login/forgotPasswordpm3.xml
View File

@@ -19,13 +19,56 @@
</BCANCEL> </BCANCEL>
<JS type="javascript"><![CDATA[ <JS type="javascript"><![CDATA[
window.onload= function(){ function getElementsByClassNameIE8(node, classname) {
document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER'); var a = [];
document.getElementById('form[USR_EMAIL]').placeholder = _('ID_EMAIL'); var re = new RegExp('(^| )'+classname+'( |$)');
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray'); var els = node.getElementsByTagName("*");
document.getElementById('form[BSUBMIT]').classList.add('button-login-success'); for(var i=0,j=els.length; i<j; i++)
document.getElementById('form[BCANCEL]').classList.remove('module_app_button___gray'); if(re.test(els[i].className))a.push(els[i]);
document.getElementById('form[BCANCEL]').classList.add('button-login-cancel'); return a;
};
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');
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray');
document.getElementById('form[BSUBMIT]').classList.add('button-login-success');
document.getElementById('form[BCANCEL]').classList.remove('module_app_button___gray');
document.getElementById('form[BCANCEL]').classList.add('button-login-cancel');
}
}; };
var panel; var panel;

2
workflow/engine/xmlform/login/licenseExpiredpm3.html
View File

@@ -23,6 +23,8 @@
{$form.JS} {$form.JS}
</script> </script>
</form> </form>
<script src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script>
<script src="/lib/pmdynaform/libs/html5shiv/html5shiv.js"></script>

18
workflow/engine/xmlform/login/licenseExpiredpm3.xml
View File

@@ -10,9 +10,23 @@
<en>Update License</en> <en>Update License</en>
</updateButton> </updateButton>
<JS type="javascript"><![CDATA[ <JS type="javascript"><![CDATA[
function getElementsByClassNameIE8(node, classname) {
var a = [];
var re = new RegExp('(^| )'+classname+'( |$)');
var els = node.getElementsByTagName("*");
for(var i=0,j=els.length; i<j; i++)
if(re.test(els[i].className))a.push(els[i]);
return a;
};
window.onload= function(){ window.onload= function(){
document.getElementById('form[updateButton]').classList.remove('module_app_button___gray'); if(document.getElementById('form[updateButton]').classList == undefined){
document.getElementById('form[updateButton]').classList.add('button-login-success'); document.getElementById('form[updateButton]').className = "button-login-success";
}else{
document.getElementById('form[updateButton]').classList.remove('module_app_button___gray');
document.getElementById('form[updateButton]').classList.add('button-login-success');
}
}; };
]]></JS> ]]></JS>
</dynaForm> </dynaForm>

5
workflow/engine/xmlform/login/loginpm3.html
View File

@@ -25,7 +25,10 @@
<script type="text/javascript"> <script type="text/javascript">
{$form.JS} {$form.JS}
</script> </script>
</form> </form>
<script src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script>
<script src="/lib/pmdynaform/libs/html5shiv/html5shiv.js"></script>
<script type="text/javascript"> <script type="text/javascript">
try {literal}{{/literal} dynaformSetFocus();}catch(e){literal}{{/literal}} try {literal}{{/literal} dynaformSetFocus();}catch(e){literal}{{/literal}}
</script> </script>

57
workflow/engine/xmlform/login/loginpm3.xml
View File

@@ -25,11 +25,56 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
<en><![CDATA[Forgot Password]]></en> <en><![CDATA[Forgot Password]]></en>
</FORGOT_PASWORD_LINK> </FORGOT_PASWORD_LINK>
<JS type="javascript"><![CDATA[ <JS type="javascript"><![CDATA[
function getElementsByClassNameIE8(node, classname) {
var a = [];
var re = new RegExp('(^| )'+classname+'( |$)');
var els = node.getElementsByTagName("*");
for(var i=0,j=els.length; i<j; i++)
if(re.test(els[i].className))a.push(els[i]);
return a;
};
window.onload= function(){ window.onload= function(){
document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER'); var inputUser,
document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD'); inputPass;
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray'); if(document.getElementById('form[USR_USERNAME]').placeholder == undefined && document.getElementById('form[BSUBMIT]').classList == undefined){
document.getElementById('form[BSUBMIT]').classList.add('button-login-success'); 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";
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');
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray');
document.getElementById('form[BSUBMIT]').classList.add('button-login-success');
}
}; };
// enable/disable forgot password link // enable/disable forgot password link
@@ -113,8 +158,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]").value = document.getElementById("form[USR_PASSWORD_MASK]").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(); document.login.submit();
}.extend(document.getElementById('form[BSUBMIT]'))); }.extend(document.getElementById('form[BSUBMIT]')));

4
workflow/engine/xmlform/login/sysLoginNoWSpm3.html
View File

@@ -21,7 +21,9 @@
<br> <br>
{$form.BSUBMIT} {$form.BSUBMIT}
</fieldset> </fieldset>
<script src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script>
<script src="/lib/pmdynaform/libs/html5shiv/html5shiv.js"></script>
<script type="text/javascript"> <script type="text/javascript">
{$form.JS} {$form.JS}
</script> </script>
</form> </form>

86
workflow/engine/xmlform/login/sysLoginNoWSpm3.xml
View File

@@ -24,12 +24,78 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
</BSUBMIT> </BSUBMIT>
<JS type="javascript"><![CDATA[ <JS type="javascript"><![CDATA[
function getElementsByClassNameIE8(node, classname) {
var a = [];
var re = new RegExp('(^| )'+classname+'( |$)');
var els = node.getElementsByTagName("*");
for(var i=0,j=els.length; i<j; i++)
if(re.test(els[i].className))a.push(els[i]);
return a;
};
function createEvent(elem, event, fn) {
if (elem.addEventListener) {
elem.addEventListener(event, fn, false);
} else {
elem.attachEvent("on" + event, fn);
}
};
window.onload= function(){ window.onload= function(){
document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER'); var inputUser,
document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD'); inputWs,
document.getElementById('form[USER_ENV]').placeholder = _('ID_WORKSPACE'); inputPass;
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray'); if(document.getElementById('form[USR_USERNAME]').placeholder === undefined && document.getElementById('form[BSUBMIT]').classList == undefined){
document.getElementById('form[BSUBMIT]').classList.add('button-login-success'); 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');
}
}; };
setFocus (getField ('USR_USERNAME')); setFocus (getField ('USR_USERNAME'));
@@ -64,14 +130,10 @@ leimnud.event.add(document.getElementById('form[USER_ENV]'), 'keypress', functio
leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() { leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() {
createCookie("pm_sys_sys", "{\"sys_sys\": \"" + getField("USER_ENV").value + "\"}", 365); createCookie("pm_sys_sys", "{\"sys_sys\": \"" + getField("USER_ENV").value + "\"}", 365);
var client = getBrowserClient();
if (client.browser == "msie" || client.browser == "safari"){
document.sysLogin.submit();
}
document.getElementById('form[USR_PASSWORD]').value = document.getElementById('form[USR_PASSWORD_MASK]').value; 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]').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.sysLogin.submit(); document.sysLogin.submit();
}.extend(document.getElementById('form[BSUBMIT]'))); }.extend(document.getElementById('form[BSUBMIT]')));