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

BUG 8875 "Feature: New ExtJS based Login & Main ProcessMaker inter..." DONE

Browse Source 
- a complete refactoring on skingEngine bootstrapper, now this is a class
- the mvc templatting engine was updated to work perfectly with templates that is using extjs engine
- a new "unmodern" was added to contains the new pmos modern main interface
This commit is contained in:
Erik Amaru Ortiz
2012-04-04 18:02:32 -04:00
parent 03b6a3ba11
commit 55616696b7
36 changed files with 21657 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
workflow/engine/controllers/main.php
View File

@@ -26,12 +26,8 @@ class Main extends Controller
{
global $RBAC;
$RBAC->requirePermissions('PM_LOGIN');
$meta = new stdClass;
$this->includeExtJS('main/index');
$this->includeExtJSLib('ux/ux.menu');
$this->setView('main/index');
// setting variables for template
$this->setVar('logo_company', $this->getCompanyLogo());
$this->setVar('userfullname', $this->getUserFullName());
@@ -56,7 +52,14 @@ class Main extends Controller
$this->setJSVar('flyNotify', $flyNotify);
}
G::RenderPage('publish', 'extJs');
$this->includeExtJSLib('ux/ux.menu');
$this->includeExtJS('main/index');
//$this->setView('main/index');
$this->setLayout('pm-modern');
$this->afterLoad($httpData);
$this->render();
}
function getSystemInfo()
@@ -265,7 +268,9 @@ class Main extends Controller
$this->setVar('login_script', $loginScript);
$this->setVar('login_vars', $this->getHeadPublisher()->getExtJsVariablesScript());
G::RenderPage('publish', 'plain');
$this->setLayout('pm-modern-login');
$this->render();
}
/**
@@ -300,7 +305,6 @@ class Main extends Controller
$this->includeExtJSLib('ux/virtualkeyboard');
$this->includeExtJS('main/sysLogin');
$this->setView('main/sysLogin');
$this->setVar('logo_company', $this->getCompanyLogo());
$this->setVar('pmos_version', System::getVersion());
@@ -328,8 +332,9 @@ class Main extends Controller
$this->setVar('login_script', $loginScript);
$this->setVar('login_vars', $this->getHeadPublisher()->getExtJsVariablesScript());
G::RenderPage('publish', 'plain');
$this->setLayout('pm-modern-login');
$this->render();
}
public function sysLoginVerify()
@@ -1047,4 +1052,14 @@ class Main extends Controller
$msg .= $ntarget;
return ($msg);
}
/**
* Execute common reoutes after index() action load
*/
private function afterLoad($httpData)
{
if (isset($httpData->i18) || isset($httpData->i18n)) {
$_SESSION['DEV_FLAG'] = true;
}
}
}