fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hugo Loza
2013-04-22 18:08:25 -04:00
parent 34e0798b00 1dd4ce6b42
commit 23331ad004
34 changed files with 434 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gulliver/js/codemirror/lib/codemirror.css vendored
View File

@@ -3,7 +3,7 @@
.CodeMirror {
/* Set height, width, borders, and global font properties here */
font-family: monospace;
height: 300px;
height: '95%';
}
.CodeMirror-scroll {
/* Set scrolling behaviour here */
@@ -76,6 +76,7 @@
.cm-s-default .cm-error {color: #f00;}
.cm-s-default .cm-qualifier {color: #555;}
.cm-s-default .cm-builtin {color: #30a;}
.cm-s-default .cm-PMbuiltin {color: white; background: #38A;}
.cm-s-default .cm-bracket {color: #997;}
.cm-s-default .cm-tag {color: #170;}
.cm-s-default .cm-attribute {color: #00c;}

187
gulliver/js/codemirror/mode/php/php.js vendored
View File

File diff suppressed because one or more lines are too long

6
gulliver/methods/genericAjax.php
View File

@@ -222,11 +222,11 @@ function sortByChar($aRows, $charSel)
*/
function queryModified($sqlParsed, $inputSel = "")
{
if(!empty($sqlParsed['SELECT'])) {
$sqlSelectOptions = (isset($sqlParsed["OPTIONS"]) && count($sqlParsed["OPTIONS"]) > 0)? implode(" ", $sqlParsed["OPTIONS"]) : null;
$sqlSelect = "SELECT ";
$aSelect = $sqlParsed['SELECT'];
$sqlSelect = "SELECT $sqlSelectOptions ";
$aSelect = $sqlParsed["SELECT"];
$sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr'];
foreach($aSelect as $key => $value ) {

4
gulliver/system/class.form.php
View File

@@ -509,6 +509,10 @@ class Form extends XmlForm
$values[$k] = $this->fields[$k]->maskValue( $newValues[$k], $this );
}
}
} else {
if ($v->type == 'checkgroup') {
$values[$k] = null;
}
}
} else {
if (isset( $_FILES["form"]["name"][$k] )) {

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

@@ -4520,9 +4520,9 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
$isRequired = '0';
}
if ($this->editable != "0") {
$html = '<input pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:5px;" >' . ' <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position:relative;left:-22px;top:0px;" >' . ' <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
$html = '<input pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . ' <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position:relative;left:-17px;top:2px;" >' . ' <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
} else {
$html = '<input pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" readonly="readonly" />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:5px;" >' . ' <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position:relative;left:-22px;top:0px;" >' . ' <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
$html = '<input pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" readonly="readonly" />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . ' <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position:relative;left:-17px;top:2px;" >' . ' <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
}
} else {
$html = "<span style='border:1;border-color:#000;width:100px;' name='" . $pID . "'>$value</span>" . '<input type="hidden" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '"' . 'pm:end="' . $endDate . '" ' . $onchange . ' class="module_app_input___gray" value="' . $value . '"/>';

5
gulliver/templates/controller.exception.tpl
View File

@@ -3,13 +3,11 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Server Error :: </title>
<link href="style.css" rel="stylesheet" type="text/css">
</head>
<style>
.box {
-moz-border-radius:6px; /* Rounded edges in Firefox */
background-image: url(/images/classic/info.gif);
color :#000;
border-style:solid;
border-width:1px;
@@ -54,5 +52,4 @@
</div>
</body>
</html>
</html>

35
workflow/engine/classes/class.configuration.php
View File

@@ -479,6 +479,8 @@ class Configurations // extends Configuration
$arrayFormat[] = array("id" => "m.d.y", "name" => G::LoadTranslation("ID_DATE_FORMAT_7")); //"m.d.y" i.e: "11.17.10"
$arrayFormat[] = array("id" => "j, n, Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_8")); //"j, n, Y" i.e: "17,11,2010"
$arrayFormat[] = array("id" => "D M j G:i:s T Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_9")); //"D M j G:i:s T Y" i.e: "Thu Nov 17 10:48:18 BOT 2010"
$arrayFormat[] = array("id" => "M d, Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_15")); //"M d, Y" i.e: "November 15, 2010"
$arrayFormat[] = array("id" => "m D, Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_16")); //"D M, Y" i.e: "Thu 01, 2010"
$arrayFormat[] = array("id" => "D d M, Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_10")); //"D d M, Y" i.e: "Thu 17 Nov, 2010"
$arrayFormat[] = array("id" => "D M, Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_11")); //"D M, Y" i.e: "Thu Nov, 2010"
$arrayFormat[] = array("id" => "d M, Y", "name" => G::LoadTranslation("ID_DATE_FORMAT_12")); //"d M, Y" i.e: "17 Nov, 2010"
@@ -506,8 +508,10 @@ class Configurations // extends Configuration
public function getSystemDate($dateTime)
{
$oConf = new Configurations();
$dateFormat = 'M d, Y';
$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
$creationDateMask = isset($oConf->aConfig['dateFormat']) ? $oConf->aConfig['dateFormat'] : '';
$creationDateMask = ($creationDateMask == '') ? $dateFormat : $creationDateMask;
if ($creationDateMask != '') {
if (strpos($dateTime, ' ') !== false) {
list ($date, $time) = explode(' ', $dateTime);
@@ -517,7 +521,7 @@ class Configurations // extends Configuration
} else {
list ($y, $m, $d) = explode('-', $dateTime);
$newCreation = '';
$maskTime = array('d' => '%d', 'D' => '%a', 'j' => '%e', 'l' => '%A', 'N' => '%u', 'S' => '%d', 'w' => '%w', 'z' => '%j', 'W' => '%W', 'F' => '%B', 'm' => '%m', 'M' => '%h', 'n' => '%m', 'o' => '%Y', 'Y' => '%Y', 'y' => '%g', 'a' => '%P', 'A' => '%p', 'g' => '%l', 'G' => '%k', 'h' => '%I', 'H' => '%H', 'i' => '%M', 's' => '%S');
$maskTime = array('d' => '%d', 'D' => '%A', 'j' => '%e', 'l' => '%A', 'N' => '%u', 'S' => '%d', 'w' => '%w', 'z' => '%j', 'W' => '%W', 'F' => '%B', 'm' => '%m', 'M' => '%B', 'n' => '%m', 'o' => '%Y', 'Y' => '%Y', 'y' => '%g', 'a' => '%P', 'A' => '%p', 'g' => '%l', 'G' => '%k', 'h' => '%I', 'H' => '%H', 'i' => '%M', 's' => '%S');
$creationDateMask = trim($creationDateMask);
for ($i = 0; $i < strlen($creationDateMask); $i++) {
if ($creationDateMask[$i] != ' ' && isset($maskTime[$creationDateMask[$i]])) {
@@ -528,19 +532,36 @@ class Configurations // extends Configuration
}
$langLocate = SYS_LANG;
if (SYS_LANG == 'es') {
$langLocate = 'es_ES';
} else if (strlen(SYS_LANG) > 2) {
$langLocate = str_replace('-', '_', SYS_LANG);
if (G::toLower(PHP_OS) == 'linux' || G::toLower(PHP_OS) == 'darwin') {
if (SYS_LANG == 'es') {
$langLocate = 'es_ES';
} else if (strlen(SYS_LANG) > 2) {
$langLocate = str_replace('-', '_', SYS_LANG);
} else {
$langLocate = 'en_US';
}
} else {
$langLocate = 'en_US';
switch (SYS_LANG) {
case 'es':
case 'es_ES':
$langLocate = 'ESN';
break;
case 'pt':
case 'pt-BR':
$langLocate = 'PTB';
break;
case 'en':
case 'en-US':
default:
$langLocate = 'EST';
break;
}
}
setlocale(LC_TIME, $langLocate);
$dateTime = utf8_encode(strftime($newCreation, mktime(0, 0, 0, $m, $d, $y)));
}
}
return $dateTime;
}

7
workflow/engine/classes/class.pmScript.php
View File

@@ -335,9 +335,12 @@ class PMScript
for ($i = 0; $i < $iOcurrences; $i ++) {
// if the variables for that condition has not been previously defined then $variableIsDefined
// is set to false
if (! isset( $this->aFields[$aMatch[2][$i][0]] )) {
// $variableIsDefined = false;
if (!isset($this->aFields[$aMatch[2][$i][0]]) && !isset($aMatch[5][$i][0])) {
$this->aFields[$aMatch[2][$i][0]] = '';
} else {
if (!isset($this->aFields[$aMatch[2][$i][0]])) {
eval("\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';");
}
}
$sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux );
if (! $bEqual) {

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

@@ -337,7 +337,9 @@ class Installer extends Controller
if (substr( $pathShared, - 1 ) != '/') {
$pathShared .= '/';
}
$logFile = $pathShared . 'log/install.log';
$pathSharedLog = $pathShared . 'log/';
G::verifyPath($pathSharedLog, true);
$logFile = $pathSharedLog . 'install.log';
if (! is_file( $logFile )) {
G::mk_dir( dirname( $pathShared ) );
@@ -839,6 +841,7 @@ class Installer extends Controller
$updatedConf['default_skin'] = $skinUri;
$info->uri = PATH_SEP . 'sys' . $_REQUEST['workspace'] . PATH_SEP . $langUri . PATH_SEP . $skinUri . PATH_SEP . 'login' . PATH_SEP . 'login';
$indexFileUpdated = true;
if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
$this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], SYS_LANG);
} else {
@@ -1335,8 +1338,14 @@ EOL;
ini_set('max_execution_time', '0');
ini_set('memory_limit', '256M');
$serv = 'http://'.$_SERVER['SERVER_NAME'];
$serv = 'http://';
if (isset($_SERVER['HTTPS']) && trim($_SERVER['HTTPS']) != '') {
$serv = 'https://';
}
$serv .= $_SERVER['SERVER_NAME'];
if (isset($_SERVER['SERVER_PORT']) && trim($_SERVER['SERVER_PORT']) != '') {
$serv .= ':' . $_SERVER['SERVER_PORT'];
}
// create session
$cookiefile = sys_get_temp_dir() . PATH_SEP . 'curl-session';

14
workflow/engine/methods/services/login_getStarted.php
View File

@@ -22,7 +22,19 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
$G_PUBLISH = new Publisher();
$oTemplatePower = new TemplatePower( PATH_TPL . 'services/login_getStarted.html' );
$fileGetStart = PATH_SKINS . SYS_SKIN . PATH_SEP . 'login_getStarted.html';
if (!file_exists($fileGetStart)) {
$fileGetStart = PATH_SKIN_ENGINE . SYS_SKIN . PATH_SEP . 'login_getStarted.html';
if (!file_exists($fileGetStart)) {
$fileGetStart = PATH_CUSTOM_SKINS . SYS_SKIN . PATH_SEP . 'login_getStarted.html';
if (!file_exists($fileGetStart)) {
$fileGetStart = PATH_TPL . 'services/login_getStarted.html';
}
}
}
$oTemplatePower = new TemplatePower( $fileGetStart );
$oTemplatePower->prepare();
/*
$oTemplatePower->newBlock('users');

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

@@ -45,25 +45,33 @@ function skinList ()
G::loadClass( 'system' );
$skinList = System::getSkingList();
$wildcard = '';
if (isset( $_REQUEST['activeskin'] )) {
$wildcard = '@';
}
$classicSkin = '';
if (defined('PARTNER_FLAG')) {
$classicSkin = '00000000000000000000000000000001';
}
foreach ($skinList['skins'] as $key => $value) {
if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
$value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
$value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE'];
$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' );
if ($value['SKIN_ID'] != $classicSkin) {
if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
$value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
$value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE'];
$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;
}
$skinListArray['skins'][] = $value;
}
}
$skinListArray['currentSkin'] = $skinList['currentSkin'];

8
workflow/engine/skinEngine/base/config.xml
View File

@@ -15,8 +15,6 @@
<cssFile file="form.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="codemirror.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="show-hint.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</skin>
<blank>
@@ -25,8 +23,6 @@
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="codemirror.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="show-hint.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</blank>
<raw>
</raw>
@@ -36,8 +32,6 @@
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="codemirror.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="show-hint.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</submenu>
<tracker>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
@@ -51,8 +45,6 @@
<cssFile file="pmos-xtheme-gray.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="codemirror.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="show-hint.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</extjs>
</cssFiles>

246
workflow/engine/skinEngine/base/css/codemirror.css
View File

@@ -1,246 +0,0 @@
/* BASICS */
.CodeMirror {
/* Set height, width, borders, and global font properties here */
font-family: monospace;
height: 300px;
}
.CodeMirror-scroll {
/* Set scrolling behaviour here */
overflow: auto;
}
/* PADDING */
.CodeMirror-lines {
padding: 4px 0; /* Vertical padding around content */
}
.CodeMirror pre {
padding: 0 4px; /* Horizontal padding of content */
}
.CodeMirror-scrollbar-filler {
background-color: white; /* The little square between H and V scrollbars */
}
/* GUTTER */
.CodeMirror-gutters {
border-right: 1px solid #ddd;
background-color: #f7f7f7;
}
.CodeMirror-linenumbers {}
.CodeMirror-linenumber {
padding: 0 3px 0 5px;
min-width: 20px;
text-align: right;
color: #999;
}
/* CURSOR */
.CodeMirror div.CodeMirror-cursor {
border-left: 1px solid black;
z-index: 3;
}
/* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor {
border-left: 1px solid silver;
}
.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
width: auto;
border: 0;
background: #7e7;
z-index: 1;
}
/* Can style cursor different in overwrite (non-insert) mode */
.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {}
.cm-tab { display: inline-block; }
/* DEFAULT THEME */
.cm-s-default .cm-keyword {color: #708;}
.cm-s-default .cm-atom {color: #219;}
.cm-s-default .cm-number {color: #164;}
.cm-s-default .cm-def {color: #00f;}
.cm-s-default .cm-variable {color: black;}
.cm-s-default .cm-variable-2 {color: #05a;}
.cm-s-default .cm-variable-3 {color: #085;}
.cm-s-default .cm-property {color: black;}
.cm-s-default .cm-operator {color: black;}
.cm-s-default .cm-comment {color: #a50;}
.cm-s-default .cm-string {color: #a11;}
.cm-s-default .cm-string-2 {color: #f50;}
.cm-s-default .cm-meta {color: #555;}
.cm-s-default .cm-error {color: #f00;}
.cm-s-default .cm-qualifier {color: #555;}
.cm-s-default .cm-builtin {color: #30a;}
.cm-s-default .cm-bracket {color: #997;}
.cm-s-default .cm-tag {color: #170;}
.cm-s-default .cm-attribute {color: #00c;}
.cm-s-default .cm-header {color: blue;}
.cm-s-default .cm-quote {color: #090;}
.cm-s-default .cm-hr {color: #999;}
.cm-s-default .cm-link {color: #00c;}
.cm-negative {color: #d44;}
.cm-positive {color: #292;}
.cm-header, .cm-strong {font-weight: bold;}
.cm-em {font-style: italic;}
.cm-link {text-decoration: underline;}
.cm-invalidchar {color: #f00;}
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
/* STOP */
/* The rest of this file contains styles related to the mechanics of
the editor. You probably shouldn't touch them. */
.CodeMirror {
line-height: 1;
position: relative;
overflow: hidden;
background: white;
color: black;
}
.CodeMirror-scroll {
/* 30px is the magic margin used to hide the element's real scrollbars */
/* See overflow: hidden in .CodeMirror, and the paddings in .CodeMirror-sizer */
margin-bottom: -30px; margin-right: -30px;
padding-bottom: 30px; padding-right: 30px;
height: 100%;
outline: none; /* Prevent dragging from highlighting the element */
position: relative;
}
.CodeMirror-sizer {
position: relative;
}
/* The fake, visible scrollbars. Used to force redraw during scrolling
before actuall scrolling happens, thus preventing shaking and
flickering artifacts. */
.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler {
position: absolute;
z-index: 6;
display: none;
}
.CodeMirror-vscrollbar {
right: 0; top: 0;
overflow-x: hidden;
overflow-y: scroll;
}
.CodeMirror-hscrollbar {
bottom: 0; left: 0;
overflow-y: hidden;
overflow-x: scroll;
}
.CodeMirror-scrollbar-filler {
right: 0; bottom: 0;
z-index: 6;
}
.CodeMirror-gutters {
position: absolute; left: 0; top: 0;
height: 100%;
padding-bottom: 30px;
z-index: 3;
}
.CodeMirror-gutter {
height: 100%;
padding-bottom: 30px;
margin-bottom: -32px;
display: inline-block;
/* Hack to make IE7 behave */
*zoom:1;
*display:inline;
}
.CodeMirror-gutter-elt {
position: absolute;
cursor: default;
z-index: 4;
}
.CodeMirror-lines {
cursor: text;
}
.CodeMirror pre {
/* Reset some styles that the rest of the page might have set */
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
border-width: 0;
background: transparent;
font-family: inherit;
font-size: inherit;
margin: 0;
white-space: pre;
word-wrap: normal;
line-height: inherit;
color: inherit;
z-index: 2;
position: relative;
overflow: visible;
}
.CodeMirror-wrap pre {
word-wrap: break-word;
white-space: pre-wrap;
word-break: normal;
}
.CodeMirror-linebackground {
position: absolute;
left: 0; right: 0; top: 0; bottom: 0;
z-index: 0;
}
.CodeMirror-linewidget {
position: relative;
z-index: 2;
overflow: auto;
}
.CodeMirror-widget {
display: inline-block;
}
.CodeMirror-wrap .CodeMirror-scroll {
overflow-x: hidden;
}
.CodeMirror-measure {
position: absolute;
width: 100%; height: 0px;
overflow: hidden;
visibility: hidden;
}
.CodeMirror-measure pre { position: static; }
.CodeMirror div.CodeMirror-cursor {
position: absolute;
visibility: hidden;
border-right: none;
width: 0;
}
.CodeMirror-focused div.CodeMirror-cursor {
visibility: visible;
}
.CodeMirror-selected { background: #d9d9d9; }
.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
.cm-searching {
background: #ffa;
background: rgba(255, 255, 0, .4);
}
/* IE7 hack to prevent it from returning funny offsetTops on the spans */
.CodeMirror span { *vertical-align: text-bottom; }
@media print {
/* Hide the cursor when printing */
.CodeMirror div.CodeMirror-cursor {
visibility: hidden;
}
}

38
workflow/engine/skinEngine/base/css/show-hint.css
View File

@@ -1,38 +0,0 @@
.CodeMirror-hints {
position: absolute;
z-index: 10;
overflow: hidden;
list-style: none;
margin: 0;
padding: 2px;
-webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
box-shadow: 2px 3px 5px rgba(0,0,0,.2);
border-radius: 3px;
border: 1px solid silver;
background: white;
font-size: 90%;
font-family: monospace;
max-height: 20em;
overflow-y: auto;
}
.CodeMirror-hint {
margin: 0;
padding: 0 4px;
border-radius: 2px;
max-width: 150em;
overflow: hidden;
white-space: pre;
color: black;
cursor: pointer;
}
.CodeMirror-hint-active {
background: #08f;
color: white;
}

60
workflow/engine/skinEngine/skinEngine.php
View File

@@ -263,7 +263,7 @@ class SkinEngine
$meta = null;
$dirBody = null;
if (preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
$ie = intval($arrayMatch[1]);
$swTrident = (preg_match("/^.*Trident.*$/", $_SERVER["HTTP_USER_AGENT"]))? 1 : 0; //Trident only in IE8+
@@ -363,10 +363,26 @@ 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, <br>maintenance nor indemnity by Colosa and its Certified Partners.";
if (! defined('SKIP_FREE_OF_CHARGE_TEXT'))
$freeOfChargeText = "Supplied free of charge with no support, certification, warranty, <br>maintenance nor indemnity by Colosa and its Certified Partners.";
if(class_exists('pmLicenseManager')) $freeOfChargeText="";
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$fileFooter = PATH_SKIN_ENGINE . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$fileFooter = PATH_CUSTOM_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$footer .= "<br />Copyright &copy; 2003-" . date('Y') . " <a href=\"http://www.colosa.com\" alt=\"Colosa, Inc.\" target=\"_blank\">Colosa, Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"><img src=\"/images/PowerdbyProcessMaker.png\" border=\"0\" /></a>";
}
}
}
$footer .= "<br />Copyright &copy; 2003-" . date('Y') . " <a href=\"http://www.colosa.com\" alt=\"Colosa, Inc.\" target=\"_blank\">Colosa, Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"><img src=\"/images/PowerdbyProcessMaker.png\" border=\"0\" /></a>";
}
$oMenu = new Menu();
@@ -463,7 +479,22 @@ class SkinEngine
$footer = '';
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
$footer .= "<br />Copyright &copy; 2003-" . date('Y') . " Colosa, Inc. All rights reserved.";
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$fileFooter = PATH_SKIN_ENGINE . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$fileFooter = PATH_CUSTOM_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$footer .= "<br />Copyright &copy; 2003-" . date('Y') . " <a href=\"http://www.colosa.com\" alt=\"Colosa, Inc.\" target=\"_blank\">Colosa, Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"><img src=\"/images/PowerdbyProcessMaker.png\" border=\"0\" /></a>";
}
}
}
}
//menu
@@ -635,12 +666,27 @@ class SkinEngine
$footer = '';
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, <br>maintenance nor indemnity by Colosa and its Certified Partners.";
if(class_exists('pmLicenseManager')) $freeOfChargeText="";
$footer .= "<br />Copyright &copy; 2003-" . date('Y') . " <a href=\"http://www.colosa.com\" alt=\"Colosa, Inc.\" target=\"_blank\">Colosa, Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"><img src=\"/images/PowerdbyProcessMaker.png\" border=\"0\" /></a>";
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$fileFooter = PATH_SKIN_ENGINE . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$fileFooter = PATH_CUSTOM_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$footer .= "<br />Copyright &copy; 2003-" . date('Y') . " <a href=\"http://www.colosa.com\" alt=\"Colosa, Inc.\" target=\"_blank\">Colosa, Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"><img src=\"/images/PowerdbyProcessMaker.png\" border=\"0\" /></a>";
}
}
}
}
$oMenu = new Menu();

246
workflow/engine/skinEngine/uxs/css/codemirror.css
View File

@@ -1,246 +0,0 @@
/* BASICS */
.CodeMirror {
/* Set height, width, borders, and global font properties here */
font-family: monospace;
height: 300px;
}
.CodeMirror-scroll {
/* Set scrolling behaviour here */
overflow: auto;
}
/* PADDING */
.CodeMirror-lines {
padding: 4px 0; /* Vertical padding around content */
}
.CodeMirror pre {
padding: 0 4px; /* Horizontal padding of content */
}
.CodeMirror-scrollbar-filler {
background-color: white; /* The little square between H and V scrollbars */
}
/* GUTTER */
.CodeMirror-gutters {
border-right: 1px solid #ddd;
background-color: #f7f7f7;
}
.CodeMirror-linenumbers {}
.CodeMirror-linenumber {
padding: 0 3px 0 5px;
min-width: 20px;
text-align: right;
color: #999;
}
/* CURSOR */
.CodeMirror div.CodeMirror-cursor {
border-left: 1px solid black;
z-index: 3;
}
/* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor {
border-left: 1px solid silver;
}
.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
width: auto;
border: 0;
background: #7e7;
z-index: 1;
}
/* Can style cursor different in overwrite (non-insert) mode */
.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {}
.cm-tab { display: inline-block; }
/* DEFAULT THEME */
.cm-s-default .cm-keyword {color: #708;}
.cm-s-default .cm-atom {color: #219;}
.cm-s-default .cm-number {color: #164;}
.cm-s-default .cm-def {color: #00f;}
.cm-s-default .cm-variable {color: black;}
.cm-s-default .cm-variable-2 {color: #05a;}
.cm-s-default .cm-variable-3 {color: #085;}
.cm-s-default .cm-property {color: black;}
.cm-s-default .cm-operator {color: black;}
.cm-s-default .cm-comment {color: #a50;}
.cm-s-default .cm-string {color: #a11;}
.cm-s-default .cm-string-2 {color: #f50;}
.cm-s-default .cm-meta {color: #555;}
.cm-s-default .cm-error {color: #f00;}
.cm-s-default .cm-qualifier {color: #555;}
.cm-s-default .cm-builtin {color: #30a;}
.cm-s-default .cm-bracket {color: #997;}
.cm-s-default .cm-tag {color: #170;}
.cm-s-default .cm-attribute {color: #00c;}
.cm-s-default .cm-header {color: blue;}
.cm-s-default .cm-quote {color: #090;}
.cm-s-default .cm-hr {color: #999;}
.cm-s-default .cm-link {color: #00c;}
.cm-negative {color: #d44;}
.cm-positive {color: #292;}
.cm-header, .cm-strong {font-weight: bold;}
.cm-em {font-style: italic;}
.cm-link {text-decoration: underline;}
.cm-invalidchar {color: #f00;}
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
/* STOP */
/* The rest of this file contains styles related to the mechanics of
the editor. You probably shouldn't touch them. */
.CodeMirror {
line-height: 1;
position: relative;
overflow: hidden;
background: white;
color: black;
}
.CodeMirror-scroll {
/* 30px is the magic margin used to hide the element's real scrollbars */
/* See overflow: hidden in .CodeMirror, and the paddings in .CodeMirror-sizer */
margin-bottom: -30px; margin-right: -30px;
padding-bottom: 30px; padding-right: 30px;
height: 100%;
outline: none; /* Prevent dragging from highlighting the element */
position: relative;
}
.CodeMirror-sizer {
position: relative;
}
/* The fake, visible scrollbars. Used to force redraw during scrolling
before actuall scrolling happens, thus preventing shaking and
flickering artifacts. */
.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler {
position: absolute;
z-index: 6;
display: none;
}
.CodeMirror-vscrollbar {
right: 0; top: 0;
overflow-x: hidden;
overflow-y: scroll;
}
.CodeMirror-hscrollbar {
bottom: 0; left: 0;
overflow-y: hidden;
overflow-x: scroll;
}
.CodeMirror-scrollbar-filler {
right: 0; bottom: 0;
z-index: 6;
}
.CodeMirror-gutters {
position: absolute; left: 0; top: 0;
height: 100%;
padding-bottom: 30px;
z-index: 3;
}
.CodeMirror-gutter {
height: 100%;
padding-bottom: 30px;
margin-bottom: -32px;
display: inline-block;
/* Hack to make IE7 behave */
*zoom:1;
*display:inline;
}
.CodeMirror-gutter-elt {
position: absolute;
cursor: default;
z-index: 4;
}
.CodeMirror-lines {
cursor: text;
}
.CodeMirror pre {
/* Reset some styles that the rest of the page might have set */
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
border-width: 0;
background: transparent;
font-family: inherit;
font-size: inherit;
margin: 0;
white-space: pre;
word-wrap: normal;
line-height: inherit;
color: inherit;
z-index: 2;
position: relative;
overflow: visible;
}
.CodeMirror-wrap pre {
word-wrap: break-word;
white-space: pre-wrap;
word-break: normal;
}
.CodeMirror-linebackground {
position: absolute;
left: 0; right: 0; top: 0; bottom: 0;
z-index: 0;
}
.CodeMirror-linewidget {
position: relative;
z-index: 2;
overflow: auto;
}
.CodeMirror-widget {
display: inline-block;
}
.CodeMirror-wrap .CodeMirror-scroll {
overflow-x: hidden;
}
.CodeMirror-measure {
position: absolute;
width: 100%; height: 0px;
overflow: hidden;
visibility: hidden;
}
.CodeMirror-measure pre { position: static; }
.CodeMirror div.CodeMirror-cursor {
position: absolute;
visibility: hidden;
border-right: none;
width: 0;
}
.CodeMirror-focused div.CodeMirror-cursor {
visibility: visible;
}
.CodeMirror-selected { background: #d9d9d9; }
.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
.cm-searching {
background: #ffa;
background: rgba(255, 255, 0, .4);
}
/* IE7 hack to prevent it from returning funny offsetTops on the spans */
.CodeMirror span { *vertical-align: text-bottom; }
@media print {
/* Hide the cursor when printing */
.CodeMirror div.CodeMirror-cursor {
visibility: hidden;
}
}

38
workflow/engine/skinEngine/uxs/css/show-hint.css
View File

@@ -1,38 +0,0 @@
.CodeMirror-hints {
position: absolute;
z-index: 10;
overflow: hidden;
list-style: none;
margin: 0;
padding: 2px;
-webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
box-shadow: 2px 3px 5px rgba(0,0,0,.2);
border-radius: 3px;
border: 1px solid silver;
background: white;
font-size: 90%;
font-family: monospace;
max-height: 20em;
overflow-y: auto;
}
.CodeMirror-hint {
margin: 0;
padding: 0 4px;
border-radius: 2px;
max-width: 150em;
overflow: hidden;
white-space: pre;
color: black;
cursor: pointer;
}
.CodeMirror-hint-active {
background: #08f;
color: white;
}

7
workflow/engine/templates/admin/pmLogo.html
View File

@@ -72,7 +72,7 @@
display : inline;
margin : 4px;
margin-right : 0;
padding : 5px;
padding : 22px;
border : 1px solid white;
}
#images-view .thumb-wrap span {
@@ -84,7 +84,7 @@
border : 1px solid #99bbe8;
opacity : 0.5;
background : #efefef url(/images/ext/row-over.gif) repeat-x left top;
padding : 5px;
padding : 22px;
}
@@ -92,7 +92,8 @@
border : 1px solid #99bbe8;
background : #eff5fb url(/images/select-icon.png) no-repeat right bottom;
opacity : 0.5;
padding : 5px;
padding : 22px;
text-align : center;
}
#images-view .x-view-selected .thumb {
background : transparent;

1
workflow/engine/templates/admin/pmLogo.js
View File

@@ -182,6 +182,7 @@ Ext.onReady(function() {
autoHeight : false,
height : 800,
multiSelect : true,
autoScroll: true,
overClass : 'x-view-over',
itemSelector: 'div.thumb-wrap',
emptyText : _('ID_NO_IMAGES_TO_DISPLAY'),

3
workflow/engine/templates/cases/open.js
View File

@@ -121,7 +121,7 @@ Ext.onReady(function(){
var actionMenu = Ext.getCmp('actionMenu');
actionMenu.menu.removeAll();
for(j=0; j<data[i].options.length; j++) {
if(!data[i].options[j].hide){
if(!data[i].options[j].hide){
actionMenu.menu.add({
text: data[i].options[j].text,
handler: data[i].options[j].fn != '' ? Actions[data[i].options[j].fn] : function(){}
@@ -759,6 +759,7 @@ Ext.onReady(function(){
autoScroll:true,
modal: true,
maximizable: false,
resizable: false,
items: [frm]
});
win.show();

11
workflow/engine/templates/installer/main.js
View File

@@ -42,10 +42,19 @@ Ext.onReady(function(){
function finishInstallation()
{
Ext.MessageBox.show({
msg: _('ID_INSTALLING_WORKSPACE'),
progressText: 'Saving...',
width:300,
wait:true,
waitConfig: {interval:200},
animEl: 'mb7'
});
wizard.showLoadMask(true, _('ID_FINISH'));
Ext.Ajax.request({
url: 'createWorkspace',
success: function(response){
Ext.MessageBox.hide();
var response = Ext.util.JSON.decode(response.responseText);
Ext.getCmp('finish_message').setValue(getFieldOutput(response.message, response.result));
wizard.showLoadMask(false);
@@ -76,7 +85,7 @@ function finishInstallation()
})
}
},
failure: function(){wizard.showLoadMask(false);},
failure: function(){Ext.MessageBox.hide(); wizard.showLoadMask(false);},
params: {
'db_engine' : Ext.getCmp('db_engine' ).getValue(),
'db_hostname' : Ext.getCmp('db_hostname' ).getValue(),

6
workflow/engine/templates/pmTables/data.js
View File

@@ -158,6 +158,12 @@ Ext.onReady(function(){
}
}
if (navigator.userAgent.toLowerCase().indexOf("chrome") != -1){
if (_columns.length > 7) {
_columns.push({header:"", dataIndex:"", width: 30, menuDisabled: true, hideable: false});
}
}
smodel = new Ext.grid.CheckboxSelectionModel({
listeners:{
selectionchange : function(sm){

11
workflow/engine/templates/pmTables/editReport.js
View File

@@ -910,7 +910,7 @@ function createReportTable()
{
var tableName = Ext.getCmp('REP_TAB_NAME').getValue().trim();
var tableDescription = Ext.getCmp('REP_TAB_DSC').getValue().trim();
//validate table name
if(Ext.getCmp('REP_TAB_NAME').getValue().trim() == '') {
Ext.getCmp('REP_TAB_NAME').focus();
@@ -919,6 +919,15 @@ function createReportTable()
});
return false;
}
//validate process
if(Ext.getCmp('PROCESS').getValue().trim() == '') {
Ext.getCmp('PROCESS').focus();
PMExt.error(_('ID_ERROR'), _('ID_PROCESS_IS_REQUIRED'), function(){
Ext.getCmp('PROCESS').focus();
});
return false;
}
// validate table name length
if(tableName.length < 4) {

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

@@ -132,7 +132,13 @@ Ext.onReady(function(){
rowSelected = infoGrid.getSelectionModel().getSelected();
if((rowSelected.data.SKIN_FOLDER_ID)&&((rowSelected.data.SKIN_FOLDER_ID!="classic"))){
exportButton.enable();
deleteButton.enable();
if (rowSelected.data.SKIN_STATUS!='Inactive') {
deleteButton.disable();
} else {
deleteButton.enable();
}
}else{
exportButton.disable();
deleteButton.disable();
@@ -363,6 +369,7 @@ showdate = function (value){
selectedSkin = function (value){
if(gotWildCard(value)){
deleteButton.disable();
return setBoldItalic(value.substring(1));
}
return value;

3
workflow/engine/templates/setup/systemInfo.js
View File

@@ -76,8 +76,7 @@ systemInfo.application = {
bodyStyle: "padding: 10px; font: 0.80em arial;",
width: 250,
height: 300,
html: _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION") + _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2")
html: _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION") +'<br><br>'+ _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2") +'<br><br>'+ _("ID_PROCESSMAKER_REQUIREMENTS_OPENSSL_OPTIONAL") +'<br><br>'+ _("ID_PROCESSMAKER_REQUIREMENTS_LDAP_OPTIONAL")
});
var frmfsCenter = new Ext.form.FieldSet({

13
workflow/engine/xmlform/dynaforms/dynaforms_Editor.xml
View File

@@ -33,6 +33,19 @@ function loadEditor()
dynaformEditor.A="@#URL";
dynaformEditor.dynUid="@#DYN_UID";
dynaformEditor._run();
//Add css Codemirror
var head = document.getElementsByTagName('head')[0];
var s = document.createElement('link');
s.setAttribute('href', '/js/codemirror/lib/codemirror.css');
s.setAttribute('type', 'text/css');
s.setAttribute('rel', 'stylesheet');
head.appendChild(s);
var s = document.createElement('link');
s.setAttribute('href', '/js/codemirror/addon/hint/show-hint.css');
s.setAttribute('type', 'text/css');
s.setAttribute('rel', 'stylesheet');
head.appendChild(s);
mainPanel.events.remove = function()
{
var canClose=dynaformEditor.close();

1
workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html
View File

@@ -20,6 +20,7 @@
<td class='FormLabel' width="{$form_labelWidth}">{$HTML2}</td>
<td class='FormFieldContent' >{$form.HTML2}</td>
</tr -->
</table>
</td>
</tr>
</table>

63
workflow/engine/xmlform/dynaforms/fields/currency.xml
View File

@@ -105,6 +105,9 @@ var fieldSeparator=getField("PME_COMMA_SEPARATOR",fieldForm);
var fieldMask=getField("PME_MASK",fieldForm);
var savedFieldName=fieldName.value;
var pme_validating;
var separatorOld;
var separatorNew;
fieldName.focus();
fieldName.select();
leimnud.event.add(fieldName, 'change', {method:dynaformVerifyFieldName, instance:fieldName, event:true});
@@ -135,9 +138,7 @@ function replaceAll( text, search, change ) {
return text;
}
function checkSeparator() {
var separatorOld;
var separatorNew;
function selectSeparator() {
switch (fieldSeparator.value) {
case '.':
separatorOld = ',';
@@ -152,42 +153,34 @@ function checkSeparator() {
separatorNew = '.';
break;
}
var mask = fieldMask.value;
if (fieldVal.value !== 'Int'){
var amount = fieldMask.value.length;
var separator = mask.substring(amount-3, amount-2);
mask = mask.substring(0, amount-3);
}
function changeVal (positionSeparator) {
var maskDecimal = '';
var maskInteger = fieldMask.value;
if (positionSeparator > 0) {
maskDecimal = fieldMask.value.substring(positionSeparator + 1, fieldMask.value.length);
maskInteger = fieldMask.value.substring(0, positionSeparator);
}
mask = replaceAll(mask , separatorNew, separatorOld);
if (fieldVal.value !== 'Int'){
mask = mask.concat(separatorNew, '##');
maskInteger = replaceAll(maskInteger , separatorNew, separatorOld);
if (fieldVal.value === 'Int'){
fieldMask.value = maskInteger;
}
fieldMask.value = mask;
if (fieldVal.value === 'Real'){
if (maskDecimal == '' || (maskDecimal.length > 6)) {
maskDecimal = '######';
}
fieldMask.value = maskInteger + separatorNew + maskDecimal;
}
}
function checkSeparator() {
selectSeparator();
changeVal (fieldMask.value.indexOf(separatorOld));
}
function checkVal(){
if (fieldVal.value === 'Int'){
aux = fieldMask.value;
aux = aux.replace('.000','');
var amount = fieldMask.value.length;
var sw = 0;
var i = 0;
while (sw == 0) {
if(aux.charAt(amount - i - 1) == ',' || aux.charAt(amount - i - 1) == '.') {
sw = 1;
} else {
i++;
}
}
if (i <= 2) {
aux = aux.substring(0, amount - i - 1);
}
fieldMask.value = aux;
}
if (fieldVal.value === 'Real'){
fieldMask.value = fieldMask.value+'.##';
}
checkSeparator();
function checkVal() {
selectSeparator();
changeVal (fieldMask.value.indexOf(separatorNew));
}
]]></PME_JS>

2
workflow/engine/xmlform/triggers/triggerCopy.xml
View File

@@ -93,7 +93,7 @@
indentWithTabs: false,
readOnly: true
});
triggerEditor.setSize(350,200);
triggerEditor.setSize(400,200);
function cancel()
{

2
workflow/engine/xmlform/triggers/triggersCustom.xml
View File

@@ -52,7 +52,7 @@ var triggerEditor = CodeMirror.fromTextArea(document.getElementById("form[TRI_WE
indentWithTabs: false,
extraKeys: {"Ctrl-Space": "autocomplete"}
});
triggerEditor.setSize(400,250);
triggerEditor.setSize(450,245);
getField('TRI_TITLE').form.onsubmit = function() {return false;};
var _oVarsPanel_;

Some files were not shown because too many files have changed in this diff Show More