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

Merge remote branch 'upstream/master' into BUG-9508

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2012-10-04 15:25:38 -04:00
parent e175087c82 65e75911c9
commit 1d8b2671c1
36 changed files with 1315 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gulliver/system/class.xmlform.php
View File

@@ -2264,6 +2264,7 @@ class XmlForm_Field_Link extends XmlForm_Field {
$html .= (($this->onclick) ? ' onclick="' . htmlentities ( $onclick, ENT_QUOTES, 'utf-8' ) . '"' : '') ;
$html .= (($this->target) ? ' target="' . htmlentities ( $target, ENT_QUOTES, 'utf-8' ) . '"' : '') . '>';
$html .= $this->htmlentities ( $this->value === '' ? $label : $value, ENT_QUOTES, 'utf-8' ) . '</a>';
$html .= $this->renderHint();
return $html;
}

14
phpunit.xml
View File

@@ -37,13 +37,13 @@
<var name="SYS_SYS" value="os" />
<var name="SYS_LANG" value="en" />
<var name="SYS_SKIN" value="classic" />
<var name="DB_ADAPTER" value="mysql" />
<var name="DB_HOST" value="localhost" />
<var name="DB_NAME" value="wf_os" />
<var name="DB_USER" value="root" />
<var name="DB_PASS" value="password" />
<var name="PATH_DB" value="tests/shared/" />
<var name="PATH_DATA" value="tests/shared/" />
<var name="zDB_ADAPTER" value="mysql" />
<var name="zDB_HOST" value="localhost" />
<var name="zDB_NAME" value="wf_os" />
<var name="zDB_USER" value="root" />
<var name="zDB_PASS" value="password" />
<var name="PATH_DB" value="/shared/workflow_data/sites/" />
<var name="PATH_DATA" value="/shared/workflow_data/sites/" />
</php>
<logging>

40
tests/automated/gulliver/system/classGTest.php
View File

@@ -43,7 +43,8 @@ class classGTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('G'); $this->assertTrue( count($methods) == 134);
$methods = get_class_methods('G');
$this->assertTrue( count($methods) == 139, "now there are " . count($methods) . " methods.");
}
/**
@@ -652,7 +653,7 @@ class classGTest extends PHPUnit_Framework_TestCase
/**
* @covers G::parseURI
* @todo Implement testparseURI().
* todo Implement testparseURI().
*/
public function testparseURI()
{
@@ -663,12 +664,45 @@ class classGTest extends PHPUnit_Framework_TestCase
$this->assertTrue( $params[0]->getName() == 'uri');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
$this->assertTrue( $params[1]->getName() == 'config');
$this->assertTrue( $params[1]->getName() == 'isRestRequest');
$this->assertTrue( $params[1]->isArray() == false);
$this->assertTrue( $params[1]->isOptional () == true);
$this->assertTrue( $params[1]->getDefaultValue() == array());
}
public function parseNormalUri()
{
$methods = get_class_methods($this->object);
$this->assertTrue( in_array('parseNormalUri', $methods ), 'exists method parseNormalUri' );
$r = new ReflectionMethod('G', 'parseNormalUri');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'aRequestUri');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
}
public function parseRestUri()
{
$methods = get_class_methods($this->object);
$this->assertTrue( in_array('parseRestUri', $methods ), 'exists method parseRestUri' );
$r = new ReflectionMethod('G', 'parseRestUri');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'aRequestUri');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
}
public function dispatchRestService()
{
$methods = get_class_methods($this->object);
$this->assertTrue( in_array('dispatchRestService', $methods ), 'exists method parseRestUri' );
$r = new ReflectionMethod('G', 'dispatchRestService');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'uri');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
}
/**
* @covers G::strip_slashes
* @todo Implement teststrip_slashes().

3
tests/automated/gulliver/system/classRBACTest.php
View File

@@ -43,7 +43,8 @@ class classRBACTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('RBAC'); $this->assertTrue( count($methods) == 54);
$methods = get_class_methods('RBAC');
$this->assertTrue( count($methods) == 55, "now there are " . count($methods) . " methods.");
}
/**

2
tests/automated/gulliver/system/classXmlForm_Field_GridTest.php
View File

@@ -139,7 +139,7 @@ class classXmlForm_Field_GridTest extends PHPUnit_Framework_TestCase
$this->assertTrue( in_array('flipValues', $methods ), 'exists method flipValues' );
$r = new ReflectionMethod('XmlForm_Field_Grid', 'flipValues');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'values');
$this->assertTrue( $params[0]->getName() == 'arrayData');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
}

2
tests/automated/workflow/engine/classes/classAppSolrTest.php
View File

@@ -47,7 +47,7 @@ class classAppSolrTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('AppSolr');
$this->assertTrue( count($methods) == 25);
$this->assertTrue( count($methods) == 28);
}
/**

3
tests/automated/workflow/engine/classes/classBpmnEngine_Services_SearchIndexTest.php
View File

@@ -43,7 +43,8 @@ class classBpmnEngine_Services_SearchIndexTest extends PHPUnit_Framework_TestCas
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('BpmnEngine_Services_SearchIndex'); $this->assertTrue( count($methods) == 9);
$methods = get_class_methods('BpmnEngine_Services_SearchIndex');
$this->assertTrue( count($methods) == 10);
}
/**

12
tests/automated/workflow/engine/classes/classCasesTest.php
View File

@@ -103,10 +103,10 @@ class classCasesTest extends PHPUnit_Framework_TestCase
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'sUIDUser');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
$this->assertTrue( $params[0]->isOptional () == true);
$this->assertTrue( $params[1]->getName() == 'typeView');
$this->assertTrue( $params[1]->isArray() == false);
$this->assertTrue( $params[1]->isOptional () == false);
$this->assertTrue( $params[1]->isOptional () == true);
}
/**
@@ -1448,10 +1448,10 @@ class classCasesTest extends PHPUnit_Framework_TestCase
$this->assertTrue( $params[1]->isOptional () == false);
$this->assertTrue( $params[2]->getName() == 'TAS_UID');
$this->assertTrue( $params[2]->isArray() == false);
$this->assertTrue( $params[2]->isOptional () == false);
$this->assertTrue( $params[2]->isOptional () == true);
$this->assertTrue( $params[3]->getName() == 'USR_UID');
$this->assertTrue( $params[3]->isArray() == false);
$this->assertTrue( $params[3]->isOptional () == false);
$this->assertTrue( $params[3]->isOptional () == true);
}
/**
@@ -1472,10 +1472,10 @@ class classCasesTest extends PHPUnit_Framework_TestCase
$this->assertTrue( $params[1]->isOptional () == false);
$this->assertTrue( $params[2]->getName() == 'TAS_UID');
$this->assertTrue( $params[2]->isArray() == false);
$this->assertTrue( $params[2]->isOptional () == false);
$this->assertTrue( $params[2]->isOptional () == true);
$this->assertTrue( $params[3]->getName() == 'USR_UID');
$this->assertTrue( $params[3]->isArray() == false);
$this->assertTrue( $params[3]->isOptional () == false);
$this->assertTrue( $params[3]->isOptional () == true);
$this->assertTrue( $params[4]->getName() == 'ACTION');
$this->assertTrue( $params[4]->isArray() == false);
$this->assertTrue( $params[4]->isOptional () == true);

2
tests/automated/workflow/engine/classes/classDerivationTest.php
View File

@@ -44,7 +44,7 @@ class classDerivationTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('Derivation');
$this->assertTrue(count($methods) == 13);
$this->assertTrue(count($methods) == 14, count($methods));
}
/**

3
tests/automated/workflow/engine/classes/classPMPluginRegistryTest.php
View File

@@ -43,7 +43,8 @@ class classPMPluginRegistryTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('PMPluginRegistry'); $this->assertTrue( count($methods) == 56);
$methods = get_class_methods('PMPluginRegistry');
$this->assertTrue( count($methods) == 60, count($methods));
}
/**

2
tests/automated/workflow/engine/classes/classPMPluginTest.php
View File

@@ -46,7 +46,7 @@ class classPMPluginTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('PMPlugin');
$this->assertTrue(count($methods) == 22);
$this->assertTrue(count($methods) == 24, count($methods));
}
/**

3
tests/automated/workflow/engine/classes/classprocessMapTest.php
View File

@@ -43,7 +43,8 @@ class classprocessMapTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('processMap'); $this->assertTrue( count($methods) == 149);
$methods = get_class_methods('processMap');
$this->assertTrue( count($methods) == 150, count($methods));
}
/**

2
tests/automated/workflow/engine/classes/classserverConfTest.php
View File

@@ -46,7 +46,7 @@ class classserverConfTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('serverConf');
$this->assertTrue(count($methods) == 23);
$this->assertTrue(count($methods) == 24);
}
/**

2
tests/automated/workflow/engine/classes/classworkspaceToolsTest.php
View File

@@ -45,7 +45,7 @@ class classworkspaceToolsTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('workspaceTools');
$this->assertTrue( count($methods) == 27);
$this->assertTrue( count($methods) == 28 );
}
/**

9
tests/automated/workflow/engine/classes/classwsBaseTest.php
View File

@@ -43,7 +43,8 @@ class classwsBaseTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('wsBase'); $this->assertTrue( count($methods) == 35);
$methods = get_class_methods('wsBase');
$this->assertTrue( count($methods) == 40, count($methods));
}
/**
@@ -332,13 +333,13 @@ class classwsBaseTest extends PHPUnit_Framework_TestCase
$this->assertTrue( in_array('createUser', $methods ), 'exists method createUser' );
$r = new ReflectionMethod('wsBase', 'createUser');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'userId');
$this->assertTrue( $params[0]->getName() == 'userName');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
$this->assertTrue( $params[1]->getName() == 'firstname');
$this->assertTrue( $params[1]->getName() == 'firstName');
$this->assertTrue( $params[1]->isArray() == false);
$this->assertTrue( $params[1]->isOptional () == false);
$this->assertTrue( $params[2]->getName() == 'lastname');
$this->assertTrue( $params[2]->getName() == 'lastName');
$this->assertTrue( $params[2]->isArray() == false);
$this->assertTrue( $params[2]->isOptional () == false);
$this->assertTrue( $params[3]->getName() == 'email');

55
tests/bootstrap.php
View File

@@ -15,11 +15,11 @@ define('PATH_HOME', PATH_TRUNK . 'workflow' . PATH_SEP);
define('SYS_SYS', $GLOBALS['SYS_SYS']);
define('SYS_LANG', $GLOBALS['SYS_LANG']);
define('SYS_SKIN', $GLOBALS['SYS_SKIN']);
define('DB_ADAPTER', $GLOBALS['DB_ADAPTER']);
define('DB_NAME', $GLOBALS['DB_NAME']);
define('DB_USER', $GLOBALS['DB_USER']);
define('DB_PASS', $GLOBALS['DB_PASS']);
define('DB_HOST', $GLOBALS['DB_HOST']);
//define('DB_ADAPTER', $GLOBALS['DB_ADAPTER']);
//define('DB_NAME', $GLOBALS['DB_NAME']);
//define('DB_USER', $GLOBALS['DB_USER']);
//define('DB_PASS', $GLOBALS['DB_PASS']);
//define('DB_HOST', $GLOBALS['DB_HOST']);
define('PATH_DB', $GLOBALS['PATH_DB']);
define('PATH_DATA', $GLOBALS['PATH_DATA']);
define('PATH_C', PATH_TRUNK . 'tmp/' );
@@ -27,7 +27,48 @@ define('PATH_SMARTY_C', PATH_TRUNK . 'tmp/' );
define('PATH_SMARTY_CACHE', PATH_TRUNK . 'tmp/' );
@mkdir (PATH_C);
require PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php';
//require PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php';
// Defining RBAC Paths constants
define( 'PATH_RBAC_HOME', PATH_TRUNK . 'rbac' . PATH_SEP );
// Defining Gulliver framework paths constants
define( 'PATH_GULLIVER_HOME', PATH_TRUNK . 'gulliver' . PATH_SEP );
define( 'PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP ); //gulliver system classes
define( 'PATH_GULLIVER_BIN', PATH_GULLIVER_HOME . 'bin' . PATH_SEP ); //gulliver bin classes
define( 'PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
define( 'PATH_RBAC', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP ); //to enable rbac version 2
define( 'PATH_RBAC_CORE', PATH_RBAC_HOME . 'engine' . PATH_SEP );
define( 'PATH_HTML', PATH_HOME . 'public_html' . PATH_SEP );
// Defining PMCore Path constants
define( 'PATH_CORE', PATH_HOME . 'engine' . PATH_SEP );
define( 'PATH_SKINS', PATH_CORE . 'skins' . PATH_SEP );
define( 'PATH_SKIN_ENGINE', PATH_CORE . 'skinEngine' . PATH_SEP );
define( 'PATH_METHODS', PATH_CORE . 'methods' . PATH_SEP );
define( 'PATH_XMLFORM', PATH_CORE . 'xmlform' . PATH_SEP );
define( 'PATH_CONFIG', PATH_CORE . 'config' . PATH_SEP );
define( 'PATH_PLUGINS', PATH_CORE . 'plugins' . PATH_SEP );
define( 'PATH_HTMLMAIL', PATH_CORE . 'html_templates' . PATH_SEP );
define( 'PATH_TPL', PATH_CORE . 'templates' . PATH_SEP );
define( 'PATH_TEST', PATH_CORE . 'test' . PATH_SEP );
define( 'PATH_FIXTURES', PATH_TEST . 'fixtures' . PATH_SEP );
define( 'PATH_RTFDOCS' , PATH_CORE . 'rtf_templates' . PATH_SEP );
define( 'PATH_DYNACONT', PATH_CORE . 'content' . PATH_SEP . 'dynaform' . PATH_SEP );
//define( 'PATH_LANGUAGECONT',PATH_CORE . 'content' . PATH_SEP . 'languages' . PATH_SEP );
define( 'SYS_UPLOAD_PATH', PATH_HOME . "public_html/files/" );
define( 'PATH_UPLOAD', PATH_HTML . 'files' . PATH_SEP);
define( 'PATH_WORKFLOW_MYSQL_DATA', PATH_CORE . 'data' . PATH_SEP.'mysql'.PATH_SEP);
define( 'PATH_RBAC_MYSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP.'mysql'.PATH_SEP);
define( 'FILE_PATHS_INSTALLED', PATH_CORE . 'config' . PATH_SEP . 'paths_installed.php' );
define( 'PATH_WORKFLOW_MSSQL_DATA', PATH_CORE . 'data' . PATH_SEP.'mssql'.PATH_SEP);
define( 'PATH_RBAC_MSSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP.'mssql'.PATH_SEP);
define( 'PATH_CONTROLLERS', PATH_CORE . 'controllers' . PATH_SEP );
define( 'PATH_SERVICES_REST', PATH_CORE . 'services' . PATH_SEP . 'rest' . PATH_SEP);
define("URL_KEY", 'c0l0s40pt1mu59r1m3' );
set_include_path(
PATH_CORE . PATH_SEPARATOR .
@@ -36,6 +77,8 @@ set_include_path(
PATH_RBAC_CORE . PATH_SEPARATOR .
get_include_path()
);
// include Gulliver Class
require_once( PATH_GULLIVER . PATH_SEP . 'class.g.php');
// perpare propel env.
require_once "propel/Propel.php";

3
workflow/engine/classes/class.case.php
View File

@@ -5021,6 +5021,8 @@ class Cases
*/
public function verifyCaseTracker($case, $pin)
{
//CASE INSENSITIVE pin
$pin = G::toUpper($pin);
$pin = md5($pin);
$oCriteria = new Criteria('workflow');
@@ -6109,4 +6111,3 @@ class Cases
return $response;
}
}

21
workflow/engine/controllers/home.php
View File

@@ -14,6 +14,7 @@ class Home extends Controller
private $userFullName;
private $userRolName;
private $userUxType;
private $userUxBaseTemplate;
private $appListStart = 0;
private $appListLimit = 15;
@@ -30,6 +31,7 @@ class Home extends Controller
// getting the ux type from user o group conf.
$this->userUxType = isset($_SESSION['user_experience'])? $_SESSION['user_experience']: 'SIMPLIFIED';
$this->lastSkin = isset($_SESSION['user_last_skin']) ? $_SESSION['user_last_skin'] : 'classic';
$this->userUxBaseTemplate = (is_dir(PATH_CUSTOM_SKINS . 'uxs')) ? PATH_CUSTOM_SKINS . 'simplified' . PATH_SEP . 'templates' : 'home';
if (isset($_SESSION['USER_LOGGED']) && !empty($_SESSION['USER_LOGGED'])) {
$this->userID = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : null;
@@ -59,7 +61,7 @@ class Home extends Controller
$this->setVar('pwd', $data['p']);
$this->setVar('skin', $skin);
$this->setView("home/$template");
$this->setView($this->userUxBaseTemplate . PATH_SEP . $template);
$this->render();
}
@@ -127,7 +129,7 @@ class Home extends Controller
}
}
$this->setView('home/index');
$this->setView($this->userUxBaseTemplate . PATH_SEP . 'index');
$this->setVar('usrUid', $this->userID);
$this->setVar('userName', $this->userName);
@@ -152,11 +154,10 @@ class Home extends Controller
$cases = $apps->getAll($this->userID, 0, 1, 'todo');
if (!isset($cases['data'][0])) {
//the current user has not any aplication to do
$this->setView('home/indexSingle');
$this->setVar('default_url', 'home/error?no=2');
$this->setView($this->userUxBaseTemplate . PATH_SEP .'indexSingle');
$this->setVar('default_url', $this->userUxBaseTemplate . "/" . 'error?no=2');
$this->render();
exit();
}
@@ -172,7 +173,7 @@ class Home extends Controller
$lastStep['title'] = G::LoadTranslation('ID_FINISH');
$steps[] = $lastStep;
$this->setView('home/indexSingle');
$this->setView($this->userUxBaseTemplate . PATH_SEP . 'indexSingle');
$this->setVar('usrUid', $this->userID);
$this->setVar('userName', $this->userName);
@@ -207,7 +208,7 @@ class Home extends Controller
$cases = $this->getAppsData($httpData->t);
// settings html template
$this->setView('home/appList');
$this->setView($this->userUxBaseTemplate . PATH_SEP . 'appList');
// settings vars and rendering
$this->setVar('cases', $cases['data']);
@@ -224,7 +225,7 @@ class Home extends Controller
{
$cases = $this->getAppsData($httpData->t, $httpData->start, $httpData->limit);
$this->setView('home/applications');
$this->setView($this->userUxBaseTemplate . PATH_SEP . 'applications');
$this->setVar('cases', $cases['data']);
$this->render();
}
@@ -304,8 +305,8 @@ class Home extends Controller
$httpData->no = isset($httpData->no) ? $httpData->no : 0;
switch ($httpData->no) {
case 2: $tpl = 'home/noAppsMsg'; break;
default: $tpl = 'home/error';
case 2: $tpl = $this->userUxBaseTemplate . PATH_SEP . 'noAppsMsg'; break;
default: $tpl = $this->userUxBaseTemplate . PATH_SEP . 'error';
}
$this->setView($tpl);

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

@@ -478,28 +478,26 @@ class Main extends Controller
if (($aFotoSelect = $this->memcache->get('aFotoSelect')) === false) {
G::LoadClass('replacementLogo');
$oLogoR = new replacementLogo();
$aFotoSelect = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED']))?$_SESSION['USER_LOGGED']:'');
$aFotoSelect = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED'])) ?
$_SESSION['USER_LOGGED'] : '');
$this->memcache->set('aFotoSelect', $aFotoSelect, 1*3600);
}
if (is_array ($aFotoSelect)) {
$sFotoSelect = trim($aFotoSelect['DEFAULT_LOGO_NAME']);
$sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']);
}
}
if (class_exists('PMPluginRegistry')) {
$oPluginRegistry = &PMPluginRegistry::getSingleton();
if (isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS))) {
$logoPlugin = $oPluginRegistry->getCompanyLogo($sCompanyLogo);
if ($logoPlugin != '/images/processmaker2.logo2.png') {
$sCompanyLogo = $logoPlugin;
} elseif (isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS))) {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
$sCompanyLogo = "/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/adminProxy/showLogoFile?id=".
base64_encode($sCompanyLogo);
} else {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sCompanyLogo);
}
}
return $sCompanyLogo;
}

97
workflow/engine/js/dynaformEditor/core/dynaformEditor.js
View File

@@ -3,6 +3,71 @@ var jsEditor = null;
var clientWinSize = null;
var strError = "";
var h3OK = 1;
function checkErrorXML(xmlParse)
{
strError = "";
h3OK = 1;
checkXML(xmlParse);
}
function checkXML(nodeXml)
{
var line, i, nNode;
nNode = nodeXml.nodeName;
if (nNode == "h3") {
if (h3OK == 0) {
return;
}
h3OK = 0;
}
if (nNode == "#text") {
strError = nodeXml.nodeValue + "\n";
}
line = nodeXml.childNodes.length;
for (i = 0;i < line; i++) {
checkXML(nodeXml.childNodes[i]);
}
}
function validateXML(xmlString)
{
// code for IE
if (window.ActiveXObject) {
var xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
xmlDoc.async = "false";
xmlDoc.loadXML(xmlString);
if (xmlDoc.parseError.errorCode != 0) {
xmlString = "Error Code: " + xmlDoc.parseError.errorCode + "\n";
xmlString = xmlString + "Error Reason: " + xmlDoc.parseError.reason;
xmlString = xmlString + "Error Line: " + xmlDoc.parseError.line;
alert(xmlString);
return false;
} else {
return true;
}
} else {
// code for Mozilla, Firefox, Opera, etc.
if (document.implementation.createDocument) {
var parser = new DOMParser();
var text = xmlString;
var xmlDoc = parser.parseFromString(text, "text/xml");
if (xmlDoc.getElementsByTagName("parsererror").length > 0) {
checkErrorXML(xmlDoc.getElementsByTagName("parsererror")[0]);
alert(strError);
return false;
} else {
return true;
}
} else {
alert('Your browser cannot handle XML validation');
return false;
}
}
}
if (typeof(dynaformEditor)==="undefined")
{
var dynaformEditor={
@@ -16,6 +81,7 @@ var dynaformEditor={
loadPressLoaded:true,
codePressLoaded:false,
currentJS:false,
responseAction:true,
_run:function()
{
//LOADING PARTS
@@ -36,28 +102,29 @@ var dynaformEditor={
{
},
save:function(){
save:function() {
/*this.saveProperties();*/
try {
this.saveCurrentView();
} catch (e) {
alert(e);
}
res=this.ajax.save(this.A,this.dynUid);
if(res=='noSub'){
if (this.responseAction == true) {
res = this.ajax.save(this.A,this.dynUid);
if (res == 'noSub') {
alert(G_STRINGS.ID_DONT_SAVE_XMLFORM);
return false;
}
if (res==0) {
alert(G_STRINGS.ID_SAVED);
}
else
{
if(typeof(res.innerHTML) == 'undefined')
} else {
if (typeof(res.innerHTML) == 'undefined') {
G.alert(res["*message"]);
else
} else {
alert(G_STRINGS.ID_LOST_SESSION_XMLFORM);
}
}
}
},
save_as:function(){
/*this.saveProperties();*/
@@ -148,10 +215,15 @@ var dynaformEditor={
{
//var xmlCode = getField("XML").value;
var xmlCode = this.getXMLCode();
if (validateXML(xmlCode) == true) {
var todoRefreshXmlCode = xmlCode === null;
if (todoRefreshXmlCode) return;
var res = this.ajax.set_xmlcode(this.A, encodeURIComponent(xmlCode));
if (res!=="") G.alert(res);
this.responseAction = true;
} else {
this.responseAction = false;
}
},
saveHtmlCode:function()
{
@@ -159,7 +231,12 @@ var dynaformEditor={
todoRefreshHtmlCode = htmlCode === null;
if (todoRefreshHtmlCode) return;
var response=this.ajax.set_htmlcode(this.A,htmlCode.value);
if (response) G.alert(response["*message"],"Error");
if (response) {
G.alert(response["*message"],"Error");
this.responseAction = false;
} else {
this.responseAction = true;
}
},
saveJavascript:function()
{
@@ -175,6 +252,7 @@ var dynaformEditor={
G.alert(res["*message"]);
}
}
this.responseAction = true;
},
saveProperties:function()
{
@@ -184,6 +262,7 @@ var dynaformEditor={
if (response!=0){
G.alert(response["*message"]);
}
this.responseAction = true;
},
// Change view point functions
changeToPreview:function()

9
workflow/engine/lib/Service/Rest/RestTool.php
View File

@@ -108,8 +108,9 @@ class Service_Rest_RestTool
));
}
print "\n";
self::out('Loading Xml Schema from: ', 'info', false);
echo $this->dbXmlSchemaFile . "\n";
print $this->dbXmlSchemaFile . "\n";
$doc = new Xml_DOMDocumentExtended();
$doc->load($this->dbXmlSchemaFile);
@@ -146,7 +147,8 @@ class Service_Rest_RestTool
{
$this->loadDbXmlSchema();
$configFile = empty($filename) ? $this->basePath . $this->configFile : $filename;
$configFile = empty($filename) ? $this->configFile : $filename;
$configIniStr = <<<EOT
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; -= ProcessMaker RestFul services configuration =- ;
@@ -259,9 +261,8 @@ EOT;
));
$c = 0;
//print_r ($this->config);die;
//foreach ($this->config['_tables'] as $table => $conf) {
foreach ($this->config as $table => $conf) {
foreach ($this->config['_tables'] as $table => $conf) {
$classname = self::camelize($table, 'class');
$allowedMethods = explode(' ', $conf['ALLOW_METHODS']);
$methods = '';

16
workflow/engine/methods/setup/skin_Ajax.php
View File

@@ -47,8 +47,24 @@ function skinList()
$skinList = System::getSkingList();
$wildcard = '';
if(isset($_REQUEST['activeskin']))
{
$wildcard = '@';
}
foreach ($skinList['skins'] as $key => $value) {
if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs') {
if($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']){
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation('ID_ACTIVE');
$value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
$value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION'];
$value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR'];
$value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE'];
$value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE'];
}
else{
$value['SKIN_STATUS'] = G::LoadTranslation('ID_INACTIVE');
}
$skinListArray['skins'][] = $value;
}
}

100
workflow/engine/services/rest/crud/Application.php
View File

@@ -74,105 +74,5 @@ class Services_Rest_Application
return $result;
}
/**
* Implementation for 'POST' method for Rest API
*
* @param mixed $appUid Primary key
*
* @return array $result Returns array within multiple records or a single record depending if
* a single selection was requested passing id(s) as param
*/
protected function post($appUid, $appNumber, $appParent, $appStatus, $proUid, $appProcStatus, $appProcCode, $appParallel, $appInitUser, $appCurUser, $appCreateDate, $appInitDate, $appFinishDate, $appUpdateDate, $appData, $appPin)
{
try {
$result = array();
$obj = new Application();
$obj->setAppUid($appUid);
$obj->setAppNumber($appNumber);
$obj->setAppParent($appParent);
$obj->setAppStatus($appStatus);
$obj->setProUid($proUid);
$obj->setAppProcStatus($appProcStatus);
$obj->setAppProcCode($appProcCode);
$obj->setAppParallel($appParallel);
$obj->setAppInitUser($appInitUser);
$obj->setAppCurUser($appCurUser);
$obj->setAppCreateDate($appCreateDate);
$obj->setAppInitDate($appInitDate);
$obj->setAppFinishDate($appFinishDate);
$obj->setAppUpdateDate($appUpdateDate);
$obj->setAppData($appData);
$obj->setAppPin($appPin);
$obj->save();
} catch (Exception $e) {
throw new RestException(412, $e->getMessage());
}
}
/**
* Implementation for 'PUT' method for Rest API
*
* @param mixed $appUid Primary key
*
* @return array $result Returns array within multiple records or a single record depending if
* a single selection was requested passing id(s) as param
*/
protected function put($appUid, $appNumber, $appParent, $appStatus, $proUid, $appProcStatus, $appProcCode, $appParallel, $appInitUser, $appCurUser, $appCreateDate, $appInitDate, $appFinishDate, $appUpdateDate, $appData, $appPin)
{
try {
$obj = ApplicationPeer::retrieveByPK($appUid);
$obj->setAppNumber($appNumber);
$obj->setAppParent($appParent);
$obj->setAppStatus($appStatus);
$obj->setProUid($proUid);
$obj->setAppProcStatus($appProcStatus);
$obj->setAppProcCode($appProcCode);
$obj->setAppParallel($appParallel);
$obj->setAppInitUser($appInitUser);
$obj->setAppCurUser($appCurUser);
$obj->setAppCreateDate($appCreateDate);
$obj->setAppInitDate($appInitDate);
$obj->setAppFinishDate($appFinishDate);
$obj->setAppUpdateDate($appUpdateDate);
$obj->setAppData($appData);
$obj->setAppPin($appPin);
$obj->save();
} catch (Exception $e) {
throw new RestException(412, $e->getMessage());
}
}
/**
* Implementation for 'DELETE' method for Rest API
*
* @param mixed $appUid Primary key
*
* @return array $result Returns array within multiple records or a single record depending if
* a single selection was requested passing id(s) as param
*/
protected function delete($appUid)
{
$conn = Propel::getConnection(ApplicationPeer::DATABASE_NAME);
try {
$conn->begin();
$obj = ApplicationPeer::retrieveByPK($appUid);
if (! is_object($obj)) {
throw new RestException(412, 'Record does not exist.');
}
$obj->delete();
$conn->commit();
} catch (Exception $e) {
$conn->rollback();
throw new RestException(412, $e->getMessage());
}
}
}

174
workflow/engine/skinEngine/simplified/templates/appList.html Normal file
View File

@@ -0,0 +1,174 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link rel="stylesheet" href="/css/simplified.css" media="screen" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="/js/jquery/css/smoothness/jquery-ui-1.8.17.custom.css" type="text/css">
<!--<link rel="stylesheet" href="/js/jquery/css/redmond/jquery-ui-1.7.2.custom.css" type="text/css">-->
<script type="text/javascript" src="/js/jquery/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.17.min.js"></script>
{literal}
<style>
body {
/*width: 500px;*/
margin: 10px auto;
/*color: #999;*/
font: 90%/150% Arial, Helvetica, sans-serif;
/*margin : 0px;*/
color : #808080;
/*font : normal 8pt sans-serif,Tahoma,MiscFixed;*/
background-color:#ECECEC;
}
#note_text {
width:100%;
height:52px;
}
.postitem:hover{
/*background:#EFEFEF;*/
}
</style>
<script>
function resize()
{
var h = $(document.body).height() - 52;
var w = $(document.body).width();
if (w > 600) {
w = 600;
}
$('.content-header').width(w-50);
}
function showNt(appUid)
{
var d = $('#m_'+appUid);
if (d.css('display') == 'block') {
d.hide('slow');
}
else {
d.show('slow');
}
}
function addNt(appUid)
{
$('textarea#note_text').val('');
$( "#dialog-add-note" ).dialog({
resizable: false,
height:178,
modal: true,
buttons: {
"Add Note": function() {
$(this).dialog("close");
$.post(
'../appProxy/postNote',
{appUid: appUid, noteText: $('textarea#note_text').val()},
function(responseText) {
updateNt(appUid);
}
);
//redirect('home/startCase?id='+id);
},
Cancel: function() {
$(this).dialog( "close" );
}
}
});
}
function updateNt(appUid)
{
$.post(
'../appProxy/getNotesList?appUid='+appUid,
{start:0, limit:100},
function(resp) {
data = jQuery.parseJSON(resp);
content = $('div#m_'+appUid);
content.html('');
for (i=0; i<data.notes.length; i++) {
r = data.notes[i];
s = '<div class="appMessage"><table border="0"><tr>' +
'<td width="50" valign="top">'+
'<img border="0" src="../users/users_ViewPhotoGrid?pUID='+r.USR_UID+'" width="40" height="40"/>' +
'</td><td>' +
'<h3>'+r.USR_FIRSTNAME+' '+r.USR_LASTNAME+' ('+r.USR_USERNAME+')</h3>' +
'<p><pre>'+r.NOTE_CONTENT+'</pre>' +
'<div class="appMessageDate">Posted at '+r.NOTE_DATE+'</div>' +
'</td></tr></table></div>';
content.append(s);
$('#n_'+appUid).show('slow');
}
d = $('#m_'+appUid);
d.show('slow');
}
);
return true;
}
$(document).ready(function(){
$("#loadmorebutton").click(function (){
$('#loadmorebutton').html('<img src="/images/ajax-loader.gif" />');
$.ajax({
url: "getApps?t="+listType+"&start="+appListStart+"&limit="+appListLimit,
success: function(html){
appListStart += appListLimit;
if(jQuery.trim(html) != ''){
$("#commentlist").append(html);
$('#loadmorebutton').html('Load More');
}
else {
$('#loadmorebutton').replaceWith('<center>No more applications to show.</center>');
}
}
});
return false;
});
});
{/literal}
var appListLimit = {$appListLimit};
var appListStart = {$appListStart};
var listType = '{$listType}';
</script>
</head>
<body onload="resize()" onresize="resize()" >
<center>
<div class="content-header" style="text-align:left">
<h1 style="padding: 10px">{$title} ({$cases_count})</h1>
<ul id="commentlist">
{include file='home/applications.html'}
</ul>
{if $cases_count > $appListLimit}
<center>
<a href="#" style="color:#1F98C7; font-size:12px; font-weight:bold;" id="loadmorebutton">Load More</a>
</center>
{/if}
</div>
</center>
<div id="dialog-add-note" title="Case Note" style="display:none">
<p><!-- <span class="ui-icon ui-icon-document" style="float:left; margin:0 7px 20px 0;"></span> -->
<span id="startAppTitle"/>
<textarea id="note_text" rows="2" cols="22"></textarea>
</p>
</div>
<br/>
</body>
</html>

51
workflow/engine/skinEngine/simplified/templates/applications.html Normal file
View File

@@ -0,0 +1,51 @@
{foreach from=$cases key=id item=APP}
<li class="postitem">
<span class="commentnumber">
#{$APP.APP_NUMBER}
</span>
<span id="n_{$APP.APP_UID}" class="notes-link" style="display:{if $APP.NOTES_COUNT neq 0}block{else}none{/if}">
<a href="#" onclick="showNt('{$APP.APP_UID}'); return false;"><img src="/images/simplified/messages-grey.png" height="20" width="20" border="0"></a>
</span>
<span class="notes-plus-link">
<a href="#" onclick="addNt('{$APP.APP_UID}', '{$APP.APP_UID}'); return false;"><img src="/images/simplified/messages-grey-plus.png" height="21" width="21" border="0"></a>
</span>
<p>
<cite>
<a href="../cases/cases_Open?APP_UID={$APP.APP_UID}&DEL_INDEX={$APP.DEL_INDEX}&action=todo">{$APP.APP_TITLE}</a>
</cite>
</p>
<p class="time">
{if $APP.APP_DEL_PREVIOUS_USER != ''}
From {$APP.APP_DEL_PREVIOUS_USER}, send at
{/if}
{$APP.DEL_DELEGATE_DATE}
</p>
<p>{$APP.APP_PRO_TITLE}
<br/>{$APP.APP_TAS_TITLE}</p>
<div id="m_{$APP.APP_UID}" class="appMessages">
{if $APP.NOTES_COUNT neq 0}
{foreach from=$APP.NOTES_LIST key=k item=NOTE}
<div class="appMessage">
<table border="0">
<tr>
<td width="50" valign="top">
<img border="0" src="../users/users_ViewPhotoGrid?pUID={$NOTE.USR_UID}" width="40" height="40"/>
</td>
<td>
<h3>{$NOTE.USR_FIRSTNAME} {$NOTE.USR_LASTNAME} ({$NOTE.USR_USERNAME})</h3>
<p><pre>{$NOTE.NOTE_CONTENT}</pre>
<div class="appMessageDate">Posted at {$NOTE.NOTE_DATE}</div>
</td>
</tr>
</table>
</div>
{/foreach}
{/if}
</div>
</li>
{/foreach}

205
workflow/engine/skinEngine/simplified/templates/index.html Normal file
View File

@@ -0,0 +1,205 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<!--<link rel="stylesheet" href="/js/jquery/css/redmond/jquery-ui-1.7.2.custom.css" type="text/css">-->
<link rel="stylesheet" href="/js/jquery/css/smoothness/jquery-ui-1.8.17.custom.css" type="text/css">
<link rel="stylesheet" href="/css/simplified.css" media="screen" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="/js/jquery/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.17.min.js"></script>
{if $clientBrowser neq 'msie'}
<style>
{literal}
body {
padding-top : 40px !important;
overflow : hidden;
}
</style>
{/literal}
{/if}
{literal}
<script>
var ux_env = {ver: '1.0'};
function resize()
{
var h = $(window).height() - 42;
$('iframe').height(h)
}
function redirect(url)
{
var $iframe = $('#iframex');
$iframe.attr('src', url);
return false;
}
function appStart(id, title)
{
$('#startAppTitle').html(title)
$( "#dialog-confirm" ).dialog({
resizable: false,
height:160,
modal: true,
buttons: {
"Start Case": function() {
$( this ).dialog( "close" );
redirect('home/startCase?id='+id);
},
Cancel: function() {
$( this ).dialog( "close" );
}
}
});
}
/*function setActive(o)
{
if (o.id == 'inboxOp') {
o.setAttribute('class', 'active');
}
else {
o.setAttribute('class', '');
}
}*/
//$("div.topbar ul li a").
</script>
{/literal}
</head>
<body onload="resize()" onresize="resize()" >
<div class="global-nav">
<!-- start topbar -->
<div class="topbar" id="corpBar">
<div class="topbar-bg"></div>
<div class="topbar-inner">
<div class="fixed-container clearfix">
<!-- <a href="" title="_title / Home" accesskey="1" id="logo">_title</a> -->
<ul class="nav primary-nav">
<!--
<li class="account">
<a class="menu user-actions active" href="#" onclick="redirect('home/appList?t=todo');" title="My Inbox">
<img alt="" src="/images/simplified/in-set-grey.png" id="inboxOp" />
-->
<!-- <span class="menu-label screen-name">new cases</span> -->
<!--
</a>
</li>
-->
{if count($arrayMnuOption) > 0}
{foreach from=$arrayMnuOption key=index item=option}
<li class="account">
<a class="menu user-actions" href="javascript:;" onclick="redirect('{$option.url}');" title="{$option.label}">
<img src="{$option.icon}" alt="" />
</a>
</li>
{/foreach}
{/if}
{if $canStartCase neq false && count($mnuNewCase) > 0}
<li class="account">
<a class="menu user-actions" href="javascript:;" title="{$mnuNewCase.label}" id="_new">
<img src="{$mnuNewCase.icon}" alt="" />
</a>
<ul class="menu-dropdown" style="width: 360px">
{foreach from=$processList key=id item=proc}
<li>
<a href="javascript:;" onclick="appStart('{$proc.uid}', '{$proc.value}')" accesskey="s" title="" id="settings_link">{$proc.value}</a>
</li>
{/foreach}
</ul>
</li>
{/if}
</ul>
<ul class="nav secondary-nav">
<li class="account">
<a class="menu user-photo" href="javascript:;">
<img alt="user_avatar_mini" height="24" src="users/users_ViewPhotoGrid?pUID={$usrUid}" width="24" />
<span class="menu-label screen-name">{$userName}</span>
</a>
<ul class="menu-dropdown">
<!--<li><a href="#" accesskey="s" id="settings_link">Settings</a></li>
<li><a href="#" accesskey="?" id="help_link">Help</a></li>-->
{if $userUxType eq 'SWITCHABLE'}
<li><a href="{$switchLink}" accesskey="?" id="help_link">Switch Interface</a></li>
{/if}
<li><a href="home/login" accesskey="l" id="sign_out_link">Sign out</a></li>
</ul>
</li>
</ul>
</div> <!-- /fixed-container -->
</div> <!-- /topbar-inner -->
</div>
<!-- end topbar -->
</div>
<iframe id="iframex" name="iframex" src="home/appList" width="100%" height="800" scrolling="yes" frameborder="0"></iframe>
<div id="dialog-confirm" title="Confirm" style="display:none">
<p>
Start a new case for:<br/>
<span class="ui-icon ui-icon-document" style="float:left; margin:0 7px 20px 0;"></span><span id="startAppTitle"/></p>
</div>
{literal}
<script type="text/javascript">
// Javascript to toggle the dropdowns
$(document).ready(function(){
// Dropdowns
$("body").bind("click", function(e) {
$("ul.menu-dropdown").hide();
$('a.menu').parent("li").removeClass("open").children("ul.menu-dropdown").hide();
});
$("a.menu").click(function() {
if ($(this).parent("li").hasClass("open")) {
$(this).parent("li").removeClass("open");
$(this).siblings("ul.menu-dropdown").hide();
} else {
$(this).parent("li").addClass("open");
$(this).siblings("ul.menu-dropdown").show();
}
$(this).parent("li").siblings("li").children("ul.menu-dropdown").hide();
$(this).parent("li").siblings("li").removeClass("open");
return false;
});
// To hide some actived menu clicking on inner iframe content
$('iframe').load(function(){
var iframeDoc = $('iframe').contents().get(0);
// Bind event to iframe document
$(iframeDoc).bind('click', function( event ) {
$("ul.menu-dropdown").hide();
$('a.menu').parent("li").removeClass("open").children("ul.menu-dropdown").hide();
});
})
$('ul.primary-nav').children('li').children('a').click(function(i, el){
$('ul.primary-nav').children('li').children('a').attr('class', 'menu user-actions');
$(this).attr('class', 'menu user-actions active');
});
});
</script>
{/literal}
</body>
</html>

92
workflow/engine/skinEngine/simplified/templates/indexSingle.html Normal file
View File

@@ -0,0 +1,92 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" href="/js/jquery/css/smoothness/jquery-ui-1.8.17.custom.css" type="text/css">
<link rel="stylesheet" href="/css/simplified.css" media="screen" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="/js/jquery/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.17.min.js"></script>
<script type="text/javascript" src="/js/jquery/xbreadcrumbs.js"></script>
{literal}
<style>
body {
padding-top: 40px;
overflow:hidden;
}
</style>
<!--[if IE]>
<style type="text/css">
body {
padding-top: 0px !important;
}
.global-nav-2 {
border-bottom: 1.5px solid #d5d5d5;
}
</style>
<![endif]-->
<script>
var ux_env = {ver: '1.0'};
//var simplified = {};
function resize()
{
var h = $(window).height() - 42;
$('iframe').height(h)
}
function setCurrent(id)
{
$('#' + id).trigger('click');
}
</script>
{/literal}
</head>
<body onload="resize()" onresize="resize()" >
<div style="top:40px;"/>
<div id="global-nav-2" class="global-nav-2">
<!-- start topbar -->
<ul class="xbreadcrumbs" id="breadcrumbs-1">
{if count($steps) > 0}
{foreach from=$steps key=i item=step}
<li id="{$step.id}"{if $i eq "0"} class="current"{/if}>
<a{if $i eq "0"} class="home"{/if} href="{$step.url}" target="iframex">{$i+1}. {$step.title}</a>
</li>
{/foreach}
{else}
<li></li>
{/if}
</ul>
<a id="signout-link" href="home/login" title="Sign out"><img src="/images/simplified/logout-grey.png" /></a>
<!-- end topbar -->
</div>
<iframe id="iframex" name="iframex" src="{$default_url}" width="100%" height="800" scrolling="yes" frameborder="0"></iframe>
<div id="dialog-confirm" title="Confirm" style="display:none">
<p>
Start a new case for:<br/>
<span class="ui-icon ui-icon-document" style="float:left; margin:0 7px 20px 0;"></span><span id="startAppTitle"/></p>
</div>
{literal}
<script type="text/javascript">
$(document).ready(function() {
$('#breadcrumbs-1').xBreadcrumbs({ collapsible: ($(window).width() < 500 ? true : false)});
});
</script>
{/literal}
</body>
</html>

77
workflow/engine/skinEngine/simplified/templates/login_ie.html Normal file
View File

@@ -0,0 +1,77 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<!--<script type="text/javascript" src="/js/jquery/jquery-1.7.1.min.js"></script>-->
<link rel="stylesheet" href="/css/{$skin}.css" media="screen" rel="stylesheet" type="text/css" />
{literal}
<style>
body {
background-color: #142F3C;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#142F3C',endColorstr='#1D4558');
}
div.borderForm {
position: absolute;
left: 50%;
top: 50%;
width: 300px;
height: 140px;
margin-top: -140px;
margin-left: -210px;
overflow: none;
}
</style>
{/literal}
</head>
<body onload="resize()" onresize="resize()" >
<center>
<form method="post" action="../login/authentication" class="formDefault">
<div class="borderForm" style="width:400px; padding-left:0; padding-right:0; border-width:1;">
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
<div class="content" style="height:100%;">
<table width="99%">
<tr>
<td valign='top'>
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td class='FormTitle' colspan="2" align=""><span id='form[TITLE]' name='form[TITLE]' >Login</span></td>
</tr>
<tr>
<td class='FormLabel' width="40%">User</td>
<td class='FormFieldContent' width='240' >
<input class="module_app_input___gray" name="form[USR_USERNAME]" type="text" size="30" maxlength="50" value=""/>
</td>
</tr>
<tr>
<td class='FormLabel' width="40%">Password</td>
<td class='FormFieldContent' width='240' >
<input class="module_app_input___gray" name="form[USR_PASSWORD]" type ="password" size="31" maxlength="50" value=""/>
</td>
</tr>
<!-- <tr>
<td class='FormLabel' width="40%">Language</td>
<td class='FormFieldContent' width='240' ><select class="module_app_input___gray" id="form[USER_LANG]" name="form[USER_LANG]" pm:label="Language" pm:dependent="0" ><option value="en" >English</option></select></td>
</tr> -->
<tr>
<td class='FormButton' colspan="2" align="">
<br/>
<input class='module_app_button___gray ' name="form[BSUBMIT]" type='submit' value="Login" />
</td>
</tr>
</table>
</td>
</tr>
</table>
</div>
<div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
</div>
</form>
</center>
</body>
</html>

102
workflow/engine/skinEngine/simplified/templates/login_standard.html Normal file
View File

@@ -0,0 +1,102 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<script type="text/javascript" src="/js/jquery/jquery-1.7.1.min.js"></script>
<link rel="stylesheet" href="/css/simplified.css" media="screen" rel="stylesheet" type="text/css" />
{literal}
<script>
$(document).ready(function() {
function start() {
//Fade in the Popup
$('#login').fadeIn(1000);
//Set the center alignment padding + border see css style
var popMargTop = ($('#login').height() + 24) / 2;
var popMargLeft = ($('#login').width() + 24) / 2;
if (!jQuery.browser.msie) {
$('#login').css({
'margin-top' : -popMargTop,
'margin-left' : -popMargLeft
});
// Add the mask to body
$('body').append('<div id="mask"></div>');
$('#mask').fadeIn(0);
}
else {
$('#login').css({
'margin-top' : (($(window).height()/2) - 140)
});
}
return false;
}
start();
//$('#login').fadeIn(1000);
});
function resize()
{
var h = $(document.body).height() - 52;
var w = $(document.body).width();
if (w > 400) w = 400;
$('#login').width(w-50);
var popMargTop = ($('#login').height() + 24) / 2;
var popMargLeft = ($('#login').width() + 5) / 2;
$('#login').css({
'margin-top' : -popMargTop,
'margin-left' : -popMargLeft
});
}
</script>
{/literal}
</head>
<body onload="resize()" onresize="resize()" >
<center>
<form method="post" action="../login/authentication">
<div id="login" class="login_form">
<h1>Sign In</h1>
<div class="login_message">{$msg}</div>
<table border=0 width="100%" cellspacing="0" cellpadding="0" class="formbody">
<tr>
<td><label for="login_field">Username</label></td>
</tr>
<tr>
<td>
<input id="login_field" class="text" style="width: 100%;" type="text" value="{$usr}" tabindex="1" name="form[USR_USERNAME]" autocapitalize="off" />
</td>
</tr>
<tr>
<td><label for="password">Password</label></td>
</tr>
<tr>
<td>
<input id="password" class="text" style="width: 100%;" type="password" value="{$pwd}" tabindex="2" name="form[USR_PASSWORD]" autocomplete="disabled" />
</td>
</tr>
<tr>
<td align="center">
<label class="submit_btn"><input type="submit" value="Log in" tabindex="3" name="commit" /></label>
</td>
</tr>
</table>
</div>
</form>
</center>
</body>
</html>

41
workflow/engine/skinEngine/simplified/templates/noAppsMsg.html Normal file
View File

@@ -0,0 +1,41 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link rel="stylesheet" href="/css/uxs.css" media="screen" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="/js/jquery/jquery-1.7.1.min.js"></script>
{literal}
<style>
@media only screen and (min-device-width: 768px) {
.uxs { width: 550px; }
}
</style>
<script>
$(document).ready(function() {
$('#btnRefresh').click(function(){
if (typeof parent != 'undefined') {
parent.location.href = '../home';
}
})
});
</script>
{/literal}
</head>
<body>
<center>
<div class="uxs" style="text-align:left">
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr><td class="Title">Information</td></tr>
</table>
<h2></h2>
<h3>You are now finished. Please refresh your view to see if you have any more work pending.</h3>
<center>
<button id="btnRefresh">Refresh view</button>
</center>
</div>
</center>
</body>
</html>

2
workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
View File

@@ -24,7 +24,7 @@
<table class="x-pm-headerbar">
<tr>
<td width="50%" valign="middle">
<img src="{$logo_company}" width="250" height="40"/>
<img src="{$logo_company}" height="40"/>
</td>
<td align="right" valign="top">

2
workflow/engine/templates/grid.html
View File

@@ -22,7 +22,7 @@
<tr>
<td> </td>
{foreach from=$form->fields item=field}
<td class='vFormTitle'>{if (isset($field->required)&&$field->required&&$field->mode==='edit')}<font color="red">* </font>{/if}{$field->label}</td>
<td class='vFormTitle'>{if (isset($field->required)&&$field->required&&$field->mode==='edit')}<font color="red">* </font>{/if}{$field->label}{$field->renderHint()}</td>
{/foreach}
</tr>
{literal}

2
workflow/engine/templates/grid_preview.html
View File

@@ -23,7 +23,7 @@
<td> </td>
{foreach from=$form->fields item=field}
<!--td class='vFormTitle'>{$field->label}</td-->
<td class='vFormTitle'>{if (isset($field->required)&&$field->required&&$field->mode==='edit')}<font color="red">* </font>{/if}{$field->label}</td>
<td class='vFormTitle'>{if (isset($field->required)&&$field->required&&$field->mode==='edit')}<font color="red">* </font>{/if}{$field->label}{$field->renderHint()}</td>
{/foreach}
</tr>
{literal}

50
workflow/engine/templates/setup/skinList.js
View File

@@ -165,7 +165,7 @@ Ext.onReady(function(){
store = new Ext.data.GroupingStore( {
proxy : new Ext.data.HttpProxy({
url: 'skin_Ajax?action=skinList'
url: 'skin_Ajax?action=skinList&activeskin=1'
}),
reader : new Ext.data.JsonReader( {
root: 'skins',
@@ -223,21 +223,24 @@ Ext.onReady(function(){
header: _('ID_NAME'),
dataIndex: 'SKIN_NAME',
width: 80,
align:'left'
align:'left',
renderer: selectedSkinChecked
},
{
header: _('ID_DESCRIPTION'),
dataIndex: 'SKIN_DESCRIPTION',
width: 200,
align:'left'
align:'left',
renderer: selectedSkin
},
{
header: _('ID_AUTHOR'),
dataIndex: 'SKIN_AUTHOR',
width: 80,
align:'left'
align:'left',
renderer: selectedSkin
},
{
@@ -254,6 +257,14 @@ Ext.onReady(function(){
width: 50,
align:'center',
renderer: showdate
},
{
header: _('ID_STATUS'),
dataIndex: 'SKIN_STATUS',
width: 50,
align:'center',
renderer: selectedSkin
}
]
@@ -357,12 +368,43 @@ Ext.onReady(function(){
});
});
gotWildCard = function (value){
var currentSkinWildcard = '@';
if(value.length <= 0){
return false;
}
return (value[0] == currentSkinWildcard);
}
setBoldItalic = function(value)
{
return '<b><i>' + value + '</i></b>';
}
//Function format dates
showdate = function (value){
if(gotWildCard(value)){
return setBoldItalic(_DF(value.substring(1)));
}
return _DF(value);
};
selectedSkin = function (value){
if(gotWildCard(value)){
return setBoldItalic(value.substring(1));
}
return value;
};
selectedSkinChecked = function (value){
if(value[0]=='@'){
str = value.substring(1);
return '<b><i><img src="/images/checkedsmall.gif">' + str + '</i></b>';
}
return value;
};
//Funtion Handles Context Menu Opening
onMessageContextMenu = function (grid, rowIndex, e) {
e.stopEvent();

BIN
workflow/public_html/images/checkedsmall.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 897 B