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

update change login

Browse Source
This commit is contained in:
jonathan
2015-04-17 12:37:34 -04:00
parent fb9132eeb0
commit 8c0cfe3ed9
7 changed files with 70 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,18 @@
/* /*
* LOGIN PM3 STYLES * 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 { body.login {
background: url("/images/backgroundpm3.jpg") repeat scroll 0 0 / cover rgba(0, 0, 0, 0); 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 { .vertical-offset-100 {
@@ -48,7 +57,8 @@ img.img-responsive {
.module_app_input___gray { .module_app_input___gray {
background-color: #fff; font-family: "Chivo",sans-serif;
background-color: #fff;
background-image: none; background-image: none;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 4px; border-radius: 4px;
@@ -71,9 +81,11 @@ img.img-responsive {
color: #555; color: #555;
display: block; display: block;
font-size: 14px; font-size: 14px;
height: 45px; //height: 45px;
box-sizing: border-box;
//padding-top: 12px;
line-height: 1.42857; 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; transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%; width: 100%;
} }
@@ -82,6 +94,7 @@ img.img-responsive {
box-sizing: border-box; box-sizing: border-box;
color: #444; color: #444;
font-family: "Open Sans",Arial,Helvetica,sans-serif; font-family: "Open Sans",Arial,Helvetica,sans-serif;
//font-family: "Chivo",sans-serif;
font-size: 16px; font-size: 16px;
height: 45px; height: 45px;
padding: 10px; padding: 10px;
@@ -159,7 +172,7 @@ p {
font-weight: 700; font-weight: 700;
//transition: all 0.3s ease-in-out 0s; //transition: all 0.3s ease-in-out 0s;
max-width: 400px; max-width: 400px;
filter:none; filter:none;
} }
.button-login-success:hover{ .button-login-success:hover{
@@ -211,13 +224,10 @@ p {
font-size: 11px; font-size: 11px;
} }
.footer-login .content{ .footer-login span{
color: white; color: white;
font-weight: 900; font-weight: 900;
} font-size: 12px;
.footer-login{
text-align: center;
} }
.login_result span{ .login_result span{
@@ -227,6 +237,7 @@ p {
.login .module_app_inputFailed___gray{ .login .module_app_inputFailed___gray{
font-family: "Chivo",sans-serif;
background-color: #fff; background-color: #fff;
background-image: none; background-image: none;
border: 1px solid #ccc; 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; transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%; width: 100%;
border:1px solid #e14333; border:1px solid #e14333;
} }
.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;
}

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

@@ -78,10 +78,8 @@
</table> </table>
</body> </body>
{else} {else}
<body id="page-top" class="login" data-spy="scroll" data-target=".navbar-custom"> <body id="page-top" class="login" data-spy="scroll" data-target=".navbar-custom">
<div style="display: none;" id="preloader"> <div class="page-wrap">
<div style="display: none;" id="load"></div>
</div>
<div class="container"> <div class="container">
<div class="row vertical-offset-100"> <div class="row vertical-offset-100">
<div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3"> <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
@@ -102,8 +100,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class ="footer-login"> </div>
<div class="content">{$footer}</div> <div class="footer-login">
<div class="container">
<span>
{$footer}
</span>
</div>
</div> </div>
</body> </body>
{/if} {/if}

14
workflow/engine/skinEngine/skinEngine.php
View File

@@ -377,8 +377,8 @@ class SkinEngine
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
$freeOfChargeText = ""; $freeOfChargeText = "";
if (! defined('SKIP_FREE_OF_CHARGE_TEXT')) if (! defined('SKIP_FREE_OF_CHARGE_TEXT'))
$freeOfChargeText = "Supplied free of charge with no support, certification, warranty, <br>maintenance nor indemnity by Colosa and its Certified Partners."; $freeOfChargeText = "Supplied free of charge with no support, certification, warranty, <br>maintenance nor indemnity by Processmaker and its Certified Partners.";
if(class_exists('pmLicenseManager')) $freeOfChargeText=""; if(file_exists(PATH_CLASSES."/class.pmLicenseManager.php")) $freeOfChargeText="";
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html'; $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) { if (file_exists($fileFooter)) {
@@ -392,7 +392,7 @@ class SkinEngine
if (file_exists($fileFooter)) { if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter); $footer .= file_get_contents($fileFooter);
} else { } else {
$footer .= "<br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>"; $footer .= "$freeOfChargeText <br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker </a>Inc. All rights reserved.<br />" . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>";
} }
} }
} }
@@ -505,7 +505,7 @@ class SkinEngine
if (file_exists($fileFooter)) { if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter); $footer .= file_get_contents($fileFooter);
} else { } else {
$footer .= "<br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>"; $footer .= "$freeOfChargeText <br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker </a>Inc. All rights reserved.<br /> " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>";
} }
} }
} }
@@ -698,8 +698,8 @@ class SkinEngine
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
$freeOfChargeText = ""; $freeOfChargeText = "";
if (! defined('SKIP_FREE_OF_CHARGE_TEXT')) 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."; $freeOfChargeText = "Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by ProcessMaker and its Certified Partners.";
if(class_exists('pmLicenseManager')) $freeOfChargeText=""; if(file_exists(PATH_CLASSES."/class.pmLicenseManager.php")) $freeOfChargeText="";
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html'; $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) { if (file_exists($fileFooter)) {
@@ -713,7 +713,7 @@ class SkinEngine
if (file_exists($fileFooter)) { if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter); $footer .= file_get_contents($fileFooter);
} else { } else {
$footer .= " $freeOfChargeText <br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker Inc.</a> All rights reserved.<br />" . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>"; $footer .= "$freeOfChargeText <br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker </a>Inc. All rights reserved.<br />" . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>";
} }
} }
} }

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

@@ -25,7 +25,9 @@ window.onload= function(){
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray'); 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[BCANCEL]').classList.remove('module_app_button___gray'); 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; var panel;

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

@@ -29,7 +29,8 @@ window.onload= function(){
document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER'); document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER');
document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD'); document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD');
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray'); 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 // enable/disable forgot password link

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

@@ -29,7 +29,8 @@ window.onload= function(){
document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD'); document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD');
document.getElementById('form[USER_ENV]').placeholder = _('ID_WORKSPACE'); document.getElementById('form[USER_ENV]').placeholder = _('ID_WORKSPACE');
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray'); 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')); setFocus (getField ('USR_USERNAME'));

BIN
workflow/public_html/fonts/Chivo-Regular.ttf Normal file
View File

Binary file not shown.