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

update login

Browse Source
This commit is contained in:
jonathan
2015-04-15 16:11:04 -04:00
parent e506eac6c6
commit 14ba5ce845
11 changed files with 221 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/methods/login/login.php
View File

@@ -148,7 +148,11 @@ if (!class_exists('pmLicenseManager')) {
$licenseManager =& pmLicenseManager::getSingleton(); $licenseManager =& pmLicenseManager::getSingleton();
if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) { if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate'); if(SYS_SKIN == 'neoclassic'){
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpiredpm3', '', array(), 'licenseUpdate');
}else{
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate');
}
G::RenderPage('publish'); G::RenderPage('publish');
die(); die();
} }

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

@@ -3,10 +3,11 @@
*/ */
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;
} }
.vertical-offset-100 { .vertical-offset-100 {
padding-top: 50px; padding-top: 90px;
} }
img.img-responsive { img.img-responsive {
@@ -24,11 +25,13 @@ img.img-responsive {
padding: 20px; padding: 20px;
} }
.panel { .panel {
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.8);
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 4px; border-radius: 4px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
margin-bottom: 20px; margin-bottom: 20px;
margin-left: 50px;
margin-right: 50px;
} }
.login .panel-default > .panel-heading { .login .panel-default > .panel-heading {
@@ -36,6 +39,14 @@ img.img-responsive {
} }
.login .panel-heading {
border-bottom: 1px solid transparent;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
padding: 5px 1px;
}
.module_app_input___gray { .module_app_input___gray {
background-color: #fff; background-color: #fff;
background-image: none; background-image: none;
@@ -51,11 +62,25 @@ img.img-responsive {
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%;
} }
.login .module_app_input___gray_file{
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border-radius: 4px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset;
color: #555;
display: block;
font-size: 14px;
height: 45px;
line-height: 1.42857;
padding: 9px 12px;
transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%;
}
.form-signin .module_app_input___gray { .form-signin .module_app_input___gray {
border-radius: 0; border-radius: 0;
box-sizing: border-box; box-sizing: border-box;
color: #949494; color: #444;
font-family: "Open Sans",Arial,Helvetica,sans-serif; font-family: "Open Sans",Arial,Helvetica,sans-serif;
font-size: 16px; font-size: 16px;
height: 45px; height: 45px;
@@ -81,11 +106,14 @@ h1, h2, h3, h4, h5, h6 {
p { p {
font-size: 16px; font-size: 16px;
line-height: 1.5em; line-height: 1.5em;
margin: 0 0 20px; margin: 0 0 10px;
} }
.panel-body table{
width: 100%;
}
input.module_app_button___gray{ .button-login-cancel{
background-image: none; background-image: none;
width: 100%; width: 100%;
color: #fff; color: #fff;
@@ -97,16 +125,23 @@ input.module_app_button___gray{
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
width: 100%; width: 100%;
background-color: #1fbc99; background: none repeat scroll 0 0 #e4655f;
border-color: #1fbc99; border: 1px solid #e14333;
color: #fff; color: #fff;
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;
} }
input.module_app_buttonjs___gray{ .button-login-cancel:hover{
background-color: #e14333;
background-image:none;
color: #fff;
filter:none;
}
.button-login-success{
background-image: none; background-image: none;
width: 100%; width: 100%;
color: #fff; color: #fff;
@@ -118,21 +153,92 @@ input.module_app_buttonjs___gray{
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
width: 100%; width: 100%;
background-color: #1fbc99; background: none repeat scroll 0 0 #1fbc99;
border-color: #1fbc99; border: 1px solid #1fbc99;
color: #fff; color: #fff;
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;
} }
.module_app_button___gray:hover:hover{ .button-login-success:hover{
background-color: #1ba385; background-color: #1ba385;
background-image:none; background-image:none;
color: #fff; color: #fff;
filter:none; filter:none;
} }
.panel-body table{
width: 100%; .login-message{
border: 1px solid transparent;
border-radius: 4px;
margin-bottom: 20px;
padding: 15px;
text-align: center;
font-size: 13px;
line-height: 1.42857;
}
.login #temporalMessageWARNING{
padding: 15px;
background-color: #ffc85c;
border-color: #db9d22;
color: #4d380d;
}
.login #temporalMessageERROR{
padding: 15px;
background-color: #e87a75;
border-color: #e14333;
color: #5a1212;
}
.login #temporalMessageINFO{
padding: 15px;
background-color: #44afff;
border-color: #2481c5;
color: #0a263c;
}
.login #temporalMessageTD {
border-width: 0px;
font-size: normal 6pt !important;
height: 25px !important;
padding: 0 0px !important;
background-size: 100% 100% !important;
font-size: 11px;
}
.footer-login .content{
color: white;
font-weight: 900;
}
.footer-login{
text-align: center;
}
.login_result span{
margin-bottom: 6px;
display: block;
}
.login .module_app_inputFailed___gray{
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border-radius: 4px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset;
color: #555;
display: block;
font-size: 14px;
height: 45px;
line-height: 1.42857;
padding: 9px 12px;
transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%;
border:1px solid #e14333;
} }

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

@@ -84,7 +84,7 @@
</div> </div>
<div class="container"> <div class="container">
<div class="row vertical-offset-100"> <div class="row vertical-offset-100">
<div class="col-md-6 col-md-offset-3"> <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
<div class="row-fluid user-row"> <div class="row-fluid user-row">
<img src="/images/logopm3.png" class="img-responsive" alt="Conxole Admin"> <img src="/images/logopm3.png" class="img-responsive" alt="Conxole Admin">
</div> </div>
@@ -102,6 +102,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class ="footer-login">
<div class="content">{$footer}</div>
</div>
</body> </body>
{/if} {/if}
</html> </html>

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

@@ -698,7 +698,7 @@ 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, maintenance nor indemnity by Colosa and its Certified Partners.";
if(class_exists('pmLicenseManager')) $freeOfChargeText=""; if(class_exists('pmLicenseManager')) $freeOfChargeText="";
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html'; $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
@@ -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 .= "<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 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>";
} }
} }
} }

11
workflow/engine/templates/designer/index.html
View File

@@ -97,19 +97,12 @@
</section> </section>
<!--</div>--> <!--</div>-->
<div id="p-center-layout"/> <div id="p-center-layout"/>
<!--BODY--> <!--BODY-->
<div class="ui-layout-center tab-content" id="div-layout-canvas"> <div class="ui-layout-center tab-content" id="div-layout-canvas">
</div> </div>
<div class="bpmn_shapes"> <div class="bpmn_shapes">
</div> </div>
<section class="content" id="idContent"> <section class="content" id="idContent">
<div class="content_controls"> <div class="content_controls">
@@ -157,5 +150,5 @@
<div class="head"></div> <div class="head"></div>
</div> </div>
</section> </section>
</body>
</body>

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

@@ -22,6 +22,10 @@
window.onload= function(){ window.onload= function(){
document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER'); document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER');
document.getElementById('form[USR_EMAIL]').placeholder = _('ID_EMAIL'); 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;

30
workflow/engine/xmlform/login/licenseExpired.html Normal file
View File

@@ -0,0 +1,30 @@
<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit="return validateForm('{$form_objectRequiredFields}');"> <div class="borderForm" style="width:{$form_width}; padding-left:0; padding-right:0; border-width:{$form_border};">
<div class="boxTop"><div class="a">&nbsp;</div><div class="b">&nbsp;</div><div class="c">&nbsp;</div></div>
<div class="content" style="height:{$form_height};" >
<table width="99%">
<tr>
<td valign='top'>
<input type="hidden" class="notValidateThisFields" name="__notValidateThisFields__" id="__notValidateThisFields__" value="{$form_objectRequiredFields}" />
<input type="hidden" name="DynaformRequiredFields" id="DynaformRequiredFields" value="{$form_objectRequiredFields}" />
<input type="hidden" name="__DynaformName__" id="__DynaformName__" value="{$form_name}" />
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td class='FormTitle' colspan="2" align="">{$form.thetitle}</td>
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}"><font color="red">* </font>{$licenseFile}</td>
<td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.licenseFile}</td>
</tr>
<tr>
<td class='FormButton' colspan="2" align="">{$form.updateButton}</td>
</tr>
</table>
</td>
</tr>
</table>
<div class="FormRequiredTextMessage"><font color="red">* </font>Required Field</div> </div>
<div class="boxBottom"><div class="a">&nbsp;</div><div class="b">&nbsp;</div><div class="c">&nbsp;</div></div>
</div>
</form>

29
workflow/engine/xmlform/login/licenseExpiredpm3.html Normal file
View File

@@ -0,0 +1,29 @@
<form accept-charset="UTF-8" role="form" class="form-signin" id="{$form_id}" name="{$form_name}" action="{$form_action}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit="return validateForm('{$form_objectRequiredFields}');">
<input type="hidden" class="notValidateThisFields" name="__notValidateThisFields__" id="__notValidateThisFields__" value="{$form_objectRequiredFields}" />
<input type="hidden" name="DynaformRequiredFields" id="DynaformRequiredFields" value="{$form_objectRequiredFields}" />
<input type="hidden" name="__DynaformName__" id="__DynaformName__" value="{$form_name}" />
<fieldset>
<label class="panel-login">
<div class="login_result">{$form.thetitle}</div>
</label>
{$form.licenseFile}
</fieldset>
<fieldset>
<label class="panel-login">
<div class="login_result"></div>
</label>
<br>
{$form.updateButton}
</fieldset>
<div class="FormRequiredTextMessage"><font color="red">* </font>Required Field</div> </div>
<div class="boxBottom"><div class="a">&nbsp;</div><div class="b">&nbsp;</div><div class="c">&nbsp;</div></div>
</div>
<script type="text/javascript">
{$form.JS}
</script>
</form>

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

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm type="xmlform" name="login/licenseExpired" width="450" enabletemplate="1">
<thetitle type="title" required="0" readonly="0" optgroup="0">
<en><![CDATA[Your license has expired or the System does not have a license. To use the ProcessMaker Enterprise Edition upload a valid license]]></en>
</thetitle>
<licenseFile type="file" required="1" readonly="0" optgroup="0">
<en>License File</en>
</licenseFile>
<updateButton type="submit" required="0" readonly="0" optgroup="0">
<en>Update License</en>
</updateButton>
<JS type="javascript"><![CDATA[
window.onload= function(){
document.getElementById('form[updateButton]').classList.remove('module_app_button___gray');
document.getElementById('form[updateButton]').classList.add('button-login-success');
};
]]></JS>
</dynaForm>

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

@@ -29,6 +29,8 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
window.onload= function(){ 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.add('button-login-success');
}; };
// enable/disable forgot password link // enable/disable forgot password link

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

@@ -27,7 +27,9 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
window.onload= function(){ 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[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.add('button-login-success');
}; };
setFocus (getField ('USR_USERNAME')); setFocus (getField ('USR_USERNAME'));