diff --git a/.gitignore b/.gitignore index 7c9bc964d..22b7d3ef1 100755 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ upgrade.log workflow/engine/gulliver workflow/public_html/index.html .DS_Store +.idea diff --git a/gulliver/js/codemirror/lib/codemirror.css b/gulliver/js/codemirror/lib/codemirror.css index 4e126154f..a17e0bf4e 100644 --- a/gulliver/js/codemirror/lib/codemirror.css +++ b/gulliver/js/codemirror/lib/codemirror.css @@ -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 */ diff --git a/gulliver/js/codemirror/mode/php/php.js b/gulliver/js/codemirror/mode/php/php.js index f65307d1b..41c170b76 100644 --- a/gulliver/js/codemirror/mode/php/php.js +++ b/gulliver/js/codemirror/mode/php/php.js @@ -81,7 +81,6 @@ state.pending = null; var cur = stream.current(), openPHP = cur.search(/<\?/); if (openPHP != -1) { - alert("openPHP"); if (style == "string" && /\"$/.test(cur) && !/\?>/.test(cur)) state.pending = '"'; else state.pending = {end: stream.pos, style: style}; stream.backUp(cur.length - openPHP); diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php index a11e56610..d11e493fc 100755 --- a/gulliver/system/class.form.php +++ b/gulliver/system/class.form.php @@ -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] )) { diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 3539c79ad..f0e152e85 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -4520,9 +4520,9 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText $isRequired = '0'; } if ($this->editable != "0") { - $html = '' . '' . ' ' . '' . '' . ' ' . '' . ''; + $html = '' . '' . ' ' . '' . '' . ' ' . '' . ''; } else { - $html = '' . '' . ' ' . '' . '' . ' ' . '' . ''; + $html = '' . '' . ' ' . '' . '' . ' ' . '' . ''; } } else { $html = "$value" . ''; diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index a07e9ae76..11edc3bc8 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -1323,9 +1323,10 @@ class Installer extends Controller public function setConfiguration() { - $query = 'INSERT INTO CONFIGURATION (CFG_UID, CFG_VALUE) VALUES'; - $query .= "('ENVIRONMENT_SETTINGS', " - . '\'"a:9:{s:6:"format";s:32:"@userName (@firstName @lastName)";s:10:"dateFormat";s:6:"D M, Y";s:23:"startCaseHideProcessInf";b:0;s:19:"casesListDateFormat";s:13:"F j, Y, g:i a";s:18:"casesListRowNumber";i:20;s:20:"casesListRefreshTime";i:120;s:26:"login_enableForgotPassword";b:0;s:27:"login_enableVirtualKeyboard";b:0;s:21:"login_defaultLanguage";s:5:"pt-BR";}\')'; + $query = <<mysqlQuery($query); } diff --git a/workflow/engine/methods/services/login_getStarted.php b/workflow/engine/methods/services/login_getStarted.php index dc7853572..7b453ef85 100755 --- a/workflow/engine/methods/services/login_getStarted.php +++ b/workflow/engine/methods/services/login_getStarted.php @@ -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'); diff --git a/workflow/engine/skinEngine/base/config.xml b/workflow/engine/skinEngine/base/config.xml index 14b1b1dc7..34760575f 100755 --- a/workflow/engine/skinEngine/base/config.xml +++ b/workflow/engine/skinEngine/base/config.xml @@ -15,8 +15,6 @@ - - @@ -25,8 +23,6 @@ - - @@ -36,8 +32,6 @@ - - @@ -51,8 +45,6 @@ - - diff --git a/workflow/engine/skinEngine/base/css/codemirror.css b/workflow/engine/skinEngine/base/css/codemirror.css deleted file mode 100755 index 4e126154f..000000000 --- a/workflow/engine/skinEngine/base/css/codemirror.css +++ /dev/null @@ -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; - } -} diff --git a/workflow/engine/skinEngine/base/css/show-hint.css b/workflow/engine/skinEngine/base/css/show-hint.css deleted file mode 100755 index 47fb7921f..000000000 --- a/workflow/engine/skinEngine/base/css/show-hint.css +++ /dev/null @@ -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; -} diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index f99d9127d..7d74c3888 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -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,
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,
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 .= "
Copyright © 2003-" . date('Y') . " Colosa, Inc. All rights reserved.
$freeOfChargeText " . "

"; + } + } } - $footer .= "
Copyright © 2003-" . date('Y') . " Colosa, Inc. All rights reserved.
$freeOfChargeText " . "

"; } $oMenu = new Menu(); @@ -463,7 +479,22 @@ class SkinEngine $footer = ''; if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { - $footer .= "
Copyright © 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 .= "
Copyright © 2003-" . date('Y') . " Colosa, Inc. All rights reserved.
$freeOfChargeText " . "

"; + } + } + } } //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,
maintenance nor indemnity by Colosa and its Certified Partners."; if(class_exists('pmLicenseManager')) $freeOfChargeText=""; - $footer .= "
Copyright © 2003-" . date('Y') . " Colosa, Inc. All rights reserved.
$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 .= "
Copyright © 2003-" . date('Y') . " Colosa, Inc. All rights reserved.
$freeOfChargeText " . "

"; + } + } + } } $oMenu = new Menu(); diff --git a/workflow/engine/skinEngine/uxs/css/codemirror.css b/workflow/engine/skinEngine/uxs/css/codemirror.css deleted file mode 100644 index 4e126154f..000000000 --- a/workflow/engine/skinEngine/uxs/css/codemirror.css +++ /dev/null @@ -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; - } -} diff --git a/workflow/engine/skinEngine/uxs/css/show-hint.css b/workflow/engine/skinEngine/uxs/css/show-hint.css deleted file mode 100644 index 47fb7921f..000000000 --- a/workflow/engine/skinEngine/uxs/css/show-hint.css +++ /dev/null @@ -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; -} diff --git a/workflow/engine/templates/installer/main.js b/workflow/engine/templates/installer/main.js index f5b9dd210..25c442147 100644 --- a/workflow/engine/templates/installer/main.js +++ b/workflow/engine/templates/installer/main.js @@ -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(), diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_Editor.xml b/workflow/engine/xmlform/dynaforms/dynaforms_Editor.xml index 864486d86..68f76adcb 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_Editor.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_Editor.xml @@ -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(); diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html index 7713ed9c3..d631a2894 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html +++ b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html @@ -20,6 +20,7 @@ {$HTML2} {$form.HTML2} + diff --git a/workflow/engine/xmlform/dynaforms/fields/currency.xml b/workflow/engine/xmlform/dynaforms/fields/currency.xml index 28b8e6983..b36640c95 100755 --- a/workflow/engine/xmlform/dynaforms/fields/currency.xml +++ b/workflow/engine/xmlform/dynaforms/fields/currency.xml @@ -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)); } ]]> diff --git a/workflow/engine/xmlform/triggers/triggerCopy.xml b/workflow/engine/xmlform/triggers/triggerCopy.xml index bf43a92b6..f6fadb92e 100644 --- a/workflow/engine/xmlform/triggers/triggerCopy.xml +++ b/workflow/engine/xmlform/triggers/triggerCopy.xml @@ -93,7 +93,7 @@ indentWithTabs: false, readOnly: true }); - triggerEditor.setSize(350,200); + triggerEditor.setSize(400,200); function cancel() { diff --git a/workflow/engine/xmlform/triggers/triggersCustom.xml b/workflow/engine/xmlform/triggers/triggersCustom.xml index 8147c9d69..f167a239a 100755 --- a/workflow/engine/xmlform/triggers/triggersCustom.xml +++ b/workflow/engine/xmlform/triggers/triggersCustom.xml @@ -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_; diff --git a/workflow/engine/xmlform/triggers/triggers_Edit.xml b/workflow/engine/xmlform/triggers/triggers_Edit.xml index 330aeffe7..788e7c0fd 100755 --- a/workflow/engine/xmlform/triggers/triggers_Edit.xml +++ b/workflow/engine/xmlform/triggers/triggers_Edit.xml @@ -43,7 +43,7 @@ var triggerEditor = CodeMirror.fromTextArea(document.getElementById("form[TRI_WE indentWithTabs: false, extraKeys: {"Ctrl-Space": "autocomplete"} }); -triggerEditor.setSize(800,400); +triggerEditor.setSize(890, 440); var _oVarsPanel_; var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) { diff --git a/workflow/engine/xmlform/triggers/triggers_Options.xml b/workflow/engine/xmlform/triggers/triggers_Options.xml index 461afce84..f77f0daf4 100755 --- a/workflow/engine/xmlform/triggers/triggers_Options.xml +++ b/workflow/engine/xmlform/triggers/triggers_Options.xml @@ -46,6 +46,20 @@ } } */ + //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); + var windowWidth = 600; var windowHeight = 460; diff --git a/workflow/public_html/images/icons_silk/calendar_x_button.png b/workflow/public_html/images/icons_silk/calendar_x_button.png index 3caa59e02..6b338b90d 100755 Binary files a/workflow/public_html/images/icons_silk/calendar_x_button.png and b/workflow/public_html/images/icons_silk/calendar_x_button.png differ