diff --git a/workflow/engine/methods/login/forgotPassword.php b/workflow/engine/methods/login/forgotPassword.php index 755fab2db..52340ab35 100755 --- a/workflow/engine/methods/login/forgotPassword.php +++ b/workflow/engine/methods/login/forgotPassword.php @@ -23,6 +23,10 @@ * */ $G_PUBLISH = new Publisher (); -$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php'); +if(SYS_SKIN == 'neoclassic'){ + $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPasswordpm3', '', array(), 'retrivePassword.php'); +}else{ + $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php'); +} G::RenderPage ( "publish" ); diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php index 2241a195e..0d6564510 100755 --- a/workflow/engine/methods/login/login.php +++ b/workflow/engine/methods/login/login.php @@ -192,7 +192,12 @@ if (isset($myUrl) && $myUrl != "") { } $G_PUBLISH = new Publisher(); -$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php'); +if(SYS_SKIN == 'neoclassic'){ + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/loginpm3', '', $aFields, SYS_URI . 'login/authentication.php'); +}else{ + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php'); +} + G::LoadClass('serverConfiguration'); //Bootstrap::LoadClass('serverConfiguration'); //get the serverconf singleton, and check if we can send the heartbeat diff --git a/workflow/engine/methods/login/sysLogin.php b/workflow/engine/methods/login/sysLogin.php index 207c2e755..b4b744ddf 100755 --- a/workflow/engine/methods/login/sysLogin.php +++ b/workflow/engine/methods/login/sysLogin.php @@ -23,12 +23,12 @@ * */ /*----------------------------------********---------------------------------*/ -//Browser Compatibility -$browserSupported = G::checkBrowserCompatibility(); -if ($browserSupported==false){ - if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){ - G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning'); - } +//Browser Compatibility +$browserSupported = G::checkBrowserCompatibility(); +if ($browserSupported==false){ + if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){ + G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning'); + } } /*----------------------------------********---------------------------------*/ if (isset ($_POST['form']['USER_ENV'])) { @@ -160,13 +160,21 @@ switch (WS_IN_LOGIN) { //Get Server Configuration $oServerConf = & serverConf::getSingleton (); if ($oServerConf->getProperty ('LOGIN_NO_WS')) { - $fileLogin = 'login/sysLoginNoWS'; + if(SYS_SKIN == 'neoclassic'){ + $fileLogin = 'login/sysLoginNoWSpm3'; + }else{ + $fileLogin = 'login/sysLoginNoWS'; + } } else { $fileLogin = 'login/sysLogin'; } break; case 'no': - $fileLogin = 'login/sysLoginNoWS'; + if(SYS_SKIN == 'neoclassic'){ + $fileLogin = 'login/sysLoginNoWSpm3'; + }else{ + $fileLogin = 'login/sysLoginNoWS'; + } break; case 'yes': $fileLogin = 'login/sysLogin'; diff --git a/workflow/engine/skinEngine/neoclassic/config.xml b/workflow/engine/skinEngine/neoclassic/config.xml index 1620a8711..5303272e1 100644 --- a/workflow/engine/skinEngine/neoclassic/config.xml +++ b/workflow/engine/skinEngine/neoclassic/config.xml @@ -16,6 +16,7 @@ + diff --git a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css new file mode 100644 index 000000000..c3ef7668d --- /dev/null +++ b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css @@ -0,0 +1,117 @@ +/* +* LOGIN PM3 STYLES +*/ +body.login { + background: url("/images/backgroundpm3.jpg") repeat scroll 0 0 / cover rgba(0, 0, 0, 0); +} + +.vertical-offset-100 { + padding-top: 50px; +} + +img.img-responsive { + margin-bottom: 20px; +} +.img-responsive { + display: block; + height: auto; + margin: auto; + max-width: 100%; +} + +.login .panel { + border-radius: 0; + padding: 20px; +} +.panel { + background-color: rgba(255, 255, 255, 0.9); + border: 1px solid transparent; + border-radius: 4px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); + margin-bottom: 20px; +} + +.login .panel-default > .panel-heading { + background: none repeat scroll 0 0 transparent; +} + + +.module_app_input___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: 34px; + line-height: 1.42857; + padding: 6px 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; + font-family: "Open Sans",Arial,Helvetica,sans-serif; + font-size: 16px; + height: 45px; + padding: 10px; + position: relative; + margin-bottom: 6px; +} + +.module_app_input___gray::-moz-placeholder { + color: #999; + opacity: 1; +} + +.login .panel h3 { + margin-bottom: 8px; +} +h1, h2, h3, h4, h5, h6 { + color: #444; + font-family: "Montserrat",sans-serif; + font-weight: 400; + margin: 0 0 30px; +} +p { + font-size: 16px; + line-height: 1.5em; + margin: 0 0 20px; +} + + +input.module_app_button___gray{ + background-image: none; + width: 100%; + color: #fff; + border-radius: 6px; + font-size: 18px; + line-height: 1.33; + padding: 10px 16px; + display: block; + padding-left: 0; + padding-right: 0; + width: 100%; + background-color: #1fbc99; + border-color: #1fbc99; + color: #fff; + font-weight: 700; + //transition: all 0.3s ease-in-out 0s; + max-width: 400px; + +} + +.module_app_button___gray:hover:hover{ + background-color: #1ba385; + background-image:none; + color: #fff; +} + +.panel-body table{ + width: 100%; +} \ No newline at end of file diff --git a/workflow/engine/skinEngine/neoclassic/css/style.css b/workflow/engine/skinEngine/neoclassic/css/style.css index 54e56e44f..29ef93429 100644 --- a/workflow/engine/skinEngine/neoclassic/css/style.css +++ b/workflow/engine/skinEngine/neoclassic/css/style.css @@ -3268,7 +3268,7 @@ ul#pm_menu li { } ul#pm_menu a { color: #7b7c80; - font-size: 15px; + font-size: 14px; text-decoration: none; display: block; text-transform: capitalize; diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index f429b65e1..44a590123 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -1,76 +1,149 @@ + {$meta} {$header} - - - - + + + + + + + +
- - - {if $user_logged neq '' or $tracker neq ''} - - - +
- {include file="$tpl_menu"} - {if (count($subMenus)>0) } - {include file= "$tpl_submenu"} - {/if} - -
- - {if $user_logged neq ''} - {$msgVer} - {if $switch_interface} - + {if $user_logged neq '' or $tracker neq ''} + + + + - - - - - - - -
+ + + {if $user_logged neq '' or $tracker neq ''} + + + + {else} + + {/if} + + + - {else} - - {/if} - - - - -
+ {include file="$tpl_menu"} + {if (count($subMenus)>0) } + {include file= "$tpl_submenu"} {/if} - {$logout}  
-     - {else} - {if $tracker eq 1} - {$logout}   + 		+
+ + {if $user_logged neq ''} + {$msgVer} + {if $switch_interface} + {/if} - {/if} - -
+ {$logout}  
+     + {else} + {if $tracker eq 1} + {$logout}   + {/if} + {/if} + + + 		+ +
+
-
-
-
- - - - -
- {php} - global $G_TEMPLATE; - if ($G_TEMPLATE != '') G::LoadTemplate($G_TEMPLATE); - {/php} -
-
-
-
{$footer}
-
-
- - \ No newline at end of file +
+
+ + + + +
+ {php} + global $G_TEMPLATE; + if ($G_TEMPLATE != '') G::LoadTemplate($G_TEMPLATE); + {/php} +
+
+
+
{$footer}
+
+
+ + {else} + + + + + + + +
+ +
+
+
+ Conxole Admin +
+
+
+ +

Please enter your credentials below

+
+
+ + {php} + global $G_TEMPLATE; + if ($G_TEMPLATE != '') G::LoadTemplate($G_TEMPLATE); + {/php} + +
+
+
+
+
+ + + + + {/if} + + + + + + + + + + + diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.html b/workflow/engine/xmlform/login/forgotPasswordpm3.html new file mode 100755 index 000000000..079fc986d --- /dev/null +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.html @@ -0,0 +1,71 @@ + + +
+ + + +
+ + {$form.USR_USERNAME} + {$form.USR_EMAIL} + {$form.URL} + +
+
+ + {$form.BSUBMIT} +
+ {$form.BCANCEL} +
+ +
+ + + diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml new file mode 100755 index 000000000..5cd64dd19 --- /dev/null +++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml @@ -0,0 +1,48 @@ + + + + <en><![CDATA[I forgot my password]]></en> + + + + + + + + + + + + + + + + + diff --git a/workflow/engine/xmlform/login/loginpm3.html b/workflow/engine/xmlform/login/loginpm3.html new file mode 100755 index 000000000..6a38dc9b3 --- /dev/null +++ b/workflow/engine/xmlform/login/loginpm3.html @@ -0,0 +1,75 @@ + +
+ + + +
+ + {$form.USR_USERNAME} + {$form.USR_PASSWORD} + {$form.USER_LANG} + {$form.URL} + +
+
+ +
+ {$form.BSUBMIT} + {$form.FORGOT_PASWORD_LINK} + +
+ +
+ diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml new file mode 100755 index 000000000..a12b154d4 --- /dev/null +++ b/workflow/engine/xmlform/login/loginpm3.xml @@ -0,0 +1,104 @@ + + + + <en><![CDATA[Login]]></en> + + + + + + + + +SELECT LANG_ID, LANG_NAME FROM langOptions + + + + + + + + + + + + diff --git a/workflow/engine/xmlform/login/sysLoginNoWS.html b/workflow/engine/xmlform/login/sysLoginNoWS.html new file mode 100644 index 000000000..fc386508c --- /dev/null +++ b/workflow/engine/xmlform/login/sysLoginNoWS.html @@ -0,0 +1,69 @@ + + +
+ + + +
+ + {$form.USR_USERNAME} + {$form.USR_PASSWORD} + +
+
+ + {$form.USER_LANG} + {$form.USER_ENV} +
+ {$form.BSUBMIT} +
+ +
diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.html b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html new file mode 100644 index 000000000..bd8dda6f6 --- /dev/null +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html @@ -0,0 +1,70 @@ + + +
+ + + +
+ + {$form.USR_USERNAME} + {$form.USR_PASSWORD} + +
+
+ + {$form.USER_ENV} + {$form.USER_LANG} + +
+ {$form.BSUBMIT} +
+ +
\ No newline at end of file diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml new file mode 100755 index 000000000..93b382609 --- /dev/null +++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml @@ -0,0 +1,51 @@ + + + + <en><![CDATA[Login]]></en> + + + + + + + + + + + +SELECT LANG_ID, LANG_NAME FROM langOptions + + + + + + + diff --git a/workflow/public_html/images/backgroundpm3.jpg b/workflow/public_html/images/backgroundpm3.jpg new file mode 100644 index 000000000..85fd281c8 Binary files /dev/null and b/workflow/public_html/images/backgroundpm3.jpg differ diff --git a/workflow/public_html/images/logopm3.png b/workflow/public_html/images/logopm3.png new file mode 100644 index 000000000..df5f03fe0 Binary files /dev/null and b/workflow/public_html/images/logopm3.png differ