diff --git a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css index bcf5c1cb2..a2f350014 100644 --- a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css +++ b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css @@ -1,9 +1,18 @@ /* * LOGIN PM3 STYLES */ + +@font-face { + font-family: "Chivo"; + font-style: normal; + 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); - //background-position-y: -30px; + //background-position-y: -30px; + font-family: "Chivo",sans-serif; + height: 100%; } .vertical-offset-100 { @@ -48,7 +57,8 @@ img.img-responsive { .module_app_input___gray { - background-color: #fff; + font-family: "Chivo",sans-serif; + background-color: #fff; background-image: none; border: 1px solid #ccc; border-radius: 4px; @@ -71,9 +81,11 @@ img.img-responsive { color: #555; display: block; font-size: 14px; - height: 45px; + //height: 45px; + box-sizing: border-box; + //padding-top: 12px; line-height: 1.42857; - padding: 9px 12px; + //padding: 9px 12px; transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s; width: 100%; } @@ -82,6 +94,7 @@ img.img-responsive { box-sizing: border-box; color: #444; font-family: "Open Sans",Arial,Helvetica,sans-serif; + //font-family: "Chivo",sans-serif; font-size: 16px; height: 45px; padding: 10px; @@ -159,7 +172,7 @@ p { font-weight: 700; //transition: all 0.3s ease-in-out 0s; max-width: 400px; - filter:none; + filter:none; } .button-login-success:hover{ @@ -211,13 +224,10 @@ p { font-size: 11px; } -.footer-login .content{ +.footer-login span{ color: white; font-weight: 900; -} - -.footer-login{ - text-align: center; + font-size: 12px; } .login_result span{ @@ -227,6 +237,7 @@ p { .login .module_app_inputFailed___gray{ + font-family: "Chivo",sans-serif; background-color: #fff; background-image: none; border: 1px solid #ccc; @@ -241,4 +252,29 @@ p { transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s; width: 100%; border:1px solid #e14333; -} \ No newline at end of file +} + +.page-wrap{ + height: auto; + margin: 0 auto -60px; + min-height: 95%; + padding: 0 0 60px; +} + +.page-wrap:after{ + width: 100%; + display:block; + clear:both; +} + +.footer-login{ + text-align: center; + height: auto; + margin: -0px auto 0; +} + +#form[FORGOT_PASWORD_LINK]{ + font-family: Chivo; + font-size: 14px; + padding-top: 10px; +} diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index af628788d..a2996d5ba 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -78,10 +78,8 @@ {else} - - + +
@@ -102,8 +100,13 @@
-
-
{$footer}
+
+
+
+ + {$footer} + +
{/if} diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index fd3d6a9da..03a185256 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -377,8 +377,8 @@ class SkinEngine if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { $freeOfChargeText = ""; if (! defined('SKIP_FREE_OF_CHARGE_TEXT')) - $freeOfChargeText = "Supplied free of charge with no support, certification, warranty,
maintenance nor indemnity by Colosa and its Certified Partners."; - if(class_exists('pmLicenseManager')) $freeOfChargeText=""; + $freeOfChargeText = "Supplied free of charge with no support, certification, warranty,
maintenance nor indemnity by Processmaker and its Certified Partners."; + if(file_exists(PATH_CLASSES."/class.pmLicenseManager.php")) $freeOfChargeText=""; $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html'; if (file_exists($fileFooter)) { @@ -392,7 +392,7 @@ class SkinEngine if (file_exists($fileFooter)) { $footer .= file_get_contents($fileFooter); } else { - $footer .= "
Copyright © 2000-" . date('Y') . " ProcessMaker Inc. All rights reserved.
$freeOfChargeText " . "

"; + $footer .= "$freeOfChargeText
Copyright © 2000-" . date('Y') . " ProcessMaker Inc. All rights reserved.
" . "

"; } } } @@ -505,7 +505,7 @@ class SkinEngine if (file_exists($fileFooter)) { $footer .= file_get_contents($fileFooter); } else { - $footer .= "
Copyright © 2000-" . date('Y') . " ProcessMaker Inc. All rights reserved.
$freeOfChargeText " . "

"; + $footer .= "$freeOfChargeText
Copyright © 2000-" . date('Y') . " ProcessMaker Inc. All rights reserved.
" . "

"; } } } @@ -698,8 +698,8 @@ class SkinEngine if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { $freeOfChargeText = ""; if (! defined('SKIP_FREE_OF_CHARGE_TEXT')) - $freeOfChargeText = "Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by Colosa and its Certified Partners."; - if(class_exists('pmLicenseManager')) $freeOfChargeText=""; + $freeOfChargeText = "Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by ProcessMaker and its Certified Partners."; + if(file_exists(PATH_CLASSES."/class.pmLicenseManager.php")) $freeOfChargeText=""; $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html'; if (file_exists($fileFooter)) { @@ -713,7 +713,7 @@ class SkinEngine if (file_exists($fileFooter)) { $footer .= file_get_contents($fileFooter); } else { - $footer .= " $freeOfChargeText
Copyright © 2000-" . date('Y') . " ProcessMaker Inc. All rights reserved.
" . "

"; + $footer .= "$freeOfChargeText
Copyright © 2000-" . date('Y') . " ProcessMaker Inc. All rights reserved.
" . "

"; } } } diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index 1c148713a..2e45b7f31 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -25,7 +25,9 @@ window.onload= function(){ 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'); + document.getElementById('form[BCANCEL]').classList.add('button-login-cancel'); + document.getElementById('form[BSUBMIT]').setAttribute("tabindex",-1); + document.getElementById('form[BCANCEL]').setAttribute("tabindex",-1); }; var panel; diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml index f1811cbcb..fe6b34711 100755 --- a/workflow/engine/xmlform/login/loginpm3.xml +++ b/workflow/engine/xmlform/login/loginpm3.xml @@ -29,7 +29,8 @@ window.onload= function(){ 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'); + document.getElementById('form[BSUBMIT]').classList.add('button-login-success'); + document.getElementById('form[BSUBMIT]').setAttribute("tabindex",-1); }; // enable/disable forgot password link diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml index a0c0202a3..65413d5d9 100755 --- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml @@ -29,7 +29,8 @@ window.onload= function(){ 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'); + document.getElementById('form[BSUBMIT]').setAttribute("tabindex",-1); }; setFocus (getField ('USR_USERNAME')); diff --git a/workflow/public_html/fonts/Chivo-Regular.ttf b/workflow/public_html/fonts/Chivo-Regular.ttf new file mode 100644 index 000000000..30f8143c8 Binary files /dev/null and b/workflow/public_html/fonts/Chivo-Regular.ttf differ