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

6
workflow/engine/controllers/adminProxy.php
View File

@@ -74,13 +74,11 @@ class adminProxy extends HttpProxyController
if ($updateRedirector) {
if (!file_exists(PATH_HTML . 'index.html')) {
if (!is_writable(PATH_HTML)) {
throw new Exception('The public directory is not writable. <br/>Please give write permission to file: /workflow/public_html');
}
throw new Exception('The index.html file is not writable on workflow/public_html directory.');
}
else {
if (!is_writable(PATH_HTML . 'index.html')) {
throw new Exception('The public index file is not writable. <br/>Please give write permission to file: /workflow/public_html/index.html');
throw new Exception(G::LoadTranslation('ID_INDEX_NOT_WRITEABLE') . ' /workflow/public_html/index.html');
}
}

10
workflow/engine/controllers/installer.php
View File

@@ -20,7 +20,7 @@ class Installer extends Controller {
$this->path_languages = PATH_CORE.'content/languages/';
$this->path_plugins = PATH_CORE.'plugins/';
$this->path_xmlforms = PATH_CORE.'xmlform/';
$this->path_public = PATH_HOME.'public_html/';
$this->path_public = PATH_HOME.'public_html/index.html';
$this->path_shared = PATH_TRUNK.'shared/';
$this->path_sep = PATH_SEP;
}
@@ -34,8 +34,8 @@ class Installer extends Controller {
$step2_txt = 'These settings are recommended for PHP in order to ensure full compatibility with ProcessMaker. <> ' .
'However, ProcessMaker still operate if your settings do not quite match the recommended';
$step3_txt = 'In order for ProcessMaker to function correctly it needs to be able to access or write to certain files or directories.<br>' .
'If you see <font color="red">"unwriteable"</font> you need to change the permissions on the file or directory to allow ProcessMaker to write to it.';
$step3_txt = 'In order for ProcessMaker works correctly it needs to be able to access or write to certain files or directories.<br>' .
'Please make sure to change the permissions on the files or directories listed below.';
$step4_txt = 'ProcessMaker stores all of its data in a database. This screen gives the installation program the information needed to create this database.<br><br>' .
'If you are installing ProcessMaker on a remote web server, you will need to get this information from your Database Server.<br>';
$step5_txt = 'ProcessMaker uses a workspaces to store data. Please select a valid workspace name and credentials to log in it. ';
@@ -210,6 +210,7 @@ class Installer extends Controller {
public function getPermissionInfo() {
$this->setResponseType('json');
$info->notify = '';
// pathConfig
$info->pathConfig->message = 'unwriteable';
@@ -229,8 +230,7 @@ class Installer extends Controller {
if ( $info->pathXmlforms->result ) $info->pathXmlforms->message = 'writeable';
$info->pathPublic->message = 'unwriteable';
$info->pathPublic->result = $this->is_dir_writable($_REQUEST['pathPublic']);
if ( $info->pathPublic->result ) $info->pathPublic->message = 'writeable';
$info->pathPublic->result = is_writable($_REQUEST['pathPublic']);
$info->pathShared->message = 'unwriteable';
$info->pathShared->result = $this->is_dir_writable($_REQUEST['pathShared']);

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;
}
}
}