From 14ba5ce845a2d0542c14a92785cd43b1833f415d Mon Sep 17 00:00:00 2001 From: jonathan Date: Wed, 15 Apr 2015 16:11:04 -0400 Subject: [PATCH] update login --- workflow/engine/methods/login/login.php | 6 +- .../skinEngine/neoclassic/css/loginStyle.css | 138 ++++++++++++++++-- .../engine/skinEngine/neoclassic/layout.html | 5 +- workflow/engine/skinEngine/skinEngine.php | 4 +- workflow/engine/templates/designer/index.html | 11 +- .../xmlform/login/forgotPasswordpm3.xml | 4 + .../engine/xmlform/login/licenseExpired.html | 30 ++++ .../xmlform/login/licenseExpiredpm3.html | 29 ++++ .../xmlform/login/licenseExpiredpm3.xml | 18 +++ workflow/engine/xmlform/login/loginpm3.xml | 2 + .../engine/xmlform/login/sysLoginNoWSpm3.xml | 4 +- 11 files changed, 221 insertions(+), 30 deletions(-) create mode 100644 workflow/engine/xmlform/login/licenseExpired.html create mode 100644 workflow/engine/xmlform/login/licenseExpiredpm3.html create mode 100755 workflow/engine/xmlform/login/licenseExpiredpm3.xml diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php index 0d6564510..a358cf1f8 100755 --- a/workflow/engine/methods/login/login.php +++ b/workflow/engine/methods/login/login.php @@ -148,7 +148,11 @@ if (!class_exists('pmLicenseManager')) { $licenseManager =& pmLicenseManager::getSingleton(); if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) { $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'); die(); } diff --git a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css index f625f57c4..bcf5c1cb2 100644 --- a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css +++ b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css @@ -3,10 +3,11 @@ */ body.login { background: url("/images/backgroundpm3.jpg") repeat scroll 0 0 / cover rgba(0, 0, 0, 0); + //background-position-y: -30px; } .vertical-offset-100 { - padding-top: 50px; + padding-top: 90px; } img.img-responsive { @@ -24,11 +25,13 @@ img.img-responsive { padding: 20px; } .panel { - background-color: rgba(255, 255, 255, 0.9); + background-color: rgba(255, 255, 255, 0.8); border: 1px solid transparent; border-radius: 4px; box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); margin-bottom: 20px; + margin-left: 50px; + margin-right: 50px; } .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 { background-color: #fff; 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; 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 { border-radius: 0; box-sizing: border-box; - color: #949494; + color: #444; font-family: "Open Sans",Arial,Helvetica,sans-serif; font-size: 16px; height: 45px; @@ -81,11 +106,14 @@ h1, h2, h3, h4, h5, h6 { p { font-size: 16px; 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; width: 100%; color: #fff; @@ -97,16 +125,23 @@ input.module_app_button___gray{ padding-left: 0; padding-right: 0; width: 100%; - background-color: #1fbc99; - border-color: #1fbc99; + background: none repeat scroll 0 0 #e4655f; + border: 1px solid #e14333; color: #fff; font-weight: 700; //transition: all 0.3s ease-in-out 0s; 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; width: 100%; color: #fff; @@ -118,21 +153,92 @@ input.module_app_buttonjs___gray{ padding-left: 0; padding-right: 0; width: 100%; - background-color: #1fbc99; - border-color: #1fbc99; + background: none repeat scroll 0 0 #1fbc99; + border: 1px solid #1fbc99; color: #fff; font-weight: 700; //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-image:none; color: #fff; 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; } \ No newline at end of file diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index 8a473c6a2..af628788d 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -84,7 +84,7 @@
-
+
Conxole Admin
@@ -102,6 +102,9 @@
+ {/if} \ No newline at end of file diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index e910c0137..fd3d6a9da 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -698,7 +698,7 @@ 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."; + $freeOfChargeText = "Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by Colosa and its Certified Partners."; if(class_exists('pmLicenseManager')) $freeOfChargeText=""; $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html'; @@ -713,7 +713,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.
" . "

"; } } } diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index 94e05ad23..f08867831 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -97,19 +97,12 @@ -
-
-
- - - -
@@ -157,5 +150,5 @@
- - + + \ No newline at end of file diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml index 6c046ca72..1c148713a 100755 --- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -22,6 +22,10 @@ window.onload= function(){ 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; diff --git a/workflow/engine/xmlform/login/licenseExpired.html b/workflow/engine/xmlform/login/licenseExpired.html new file mode 100644 index 000000000..c874614e0 --- /dev/null +++ b/workflow/engine/xmlform/login/licenseExpired.html @@ -0,0 +1,30 @@ +
+
 
 
 
+
+ + + + +
+ + + + + + + + + + + + + + +
{$form.thetitle}
* {$licenseFile}{$form.licenseFile}
{$form.updateButton}
+
+
* Required Field
+
 
 
 
+
+
+ + diff --git a/workflow/engine/xmlform/login/licenseExpiredpm3.html b/workflow/engine/xmlform/login/licenseExpiredpm3.html new file mode 100644 index 000000000..2f57e2d0f --- /dev/null +++ b/workflow/engine/xmlform/login/licenseExpiredpm3.html @@ -0,0 +1,29 @@ +
+
 
 
 
+
+ + + + + + diff --git a/workflow/engine/xmlform/login/licenseExpiredpm3.xml b/workflow/engine/xmlform/login/licenseExpiredpm3.xml new file mode 100755 index 000000000..5af1614d4 --- /dev/null +++ b/workflow/engine/xmlform/login/licenseExpiredpm3.xml @@ -0,0 +1,18 @@ + + + + + + + License File + + + 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 5a27ec84e..99ff2d1d8 100755 --- a/workflow/engine/xmlform/login/loginpm3.xml +++ b/workflow/engine/xmlform/login/loginpm3.xml @@ -29,6 +29,8 @@ SELECT LANG_ID, LANG_NAME FROM langOptions 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'); }; // enable/disable forgot password link diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml index c152669c6..30d75bcff 100755 --- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml @@ -27,7 +27,9 @@ SELECT LANG_ID, LANG_NAME FROM langOptions window.onload= function(){ 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[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'));