diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php
index a79397e1d..8a17cc8f5 100644
--- a/workflow/engine/classes/class.applications.php
+++ b/workflow/engine/classes/class.applications.php
@@ -149,6 +149,7 @@ class Applications
$Criteria->addAlias( 'CU', 'USERS' );
$Criteria->addJoin( AppCacheViewPeer::USR_UID, 'CU.USR_UID', Criteria::LEFT_JOIN );
+ $Criteria->addAsColumn( 'USR_UID', 'CU.USR_UID' );
$Criteria->addAsColumn( 'USR_FIRSTNAME', 'CU.USR_FIRSTNAME' );
$Criteria->addAsColumn( 'USR_LASTNAME', 'CU.USR_LASTNAME' );
$Criteria->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' );
diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php
index 73026da71..ec01b0181 100755
--- a/workflow/engine/classes/class.dynaformEditor.php
+++ b/workflow/engine/classes/class.dynaformEditor.php
@@ -169,7 +169,7 @@ class dynaformEditor extends WebResource
$oHeadPublisher->addScriptCode("var TRANSLATIONS = " . G::json_encode($labesTrans) . ";");
$oHeadPublisher->setTitle(G::LoadTranslation('ID_DYNAFORM_EDITOR') . ' - ' . $Properties['DYN_TITLE']);
$G_PUBLISH->AddContent('blank');
- $this->panelConf['title'] = $this->title;
+ $this->panelConf['title'] = '';
$G_PUBLISH->AddContent('panel-init', 'mainPanel', $this->panelConf);
if ($Properties['DYN_TYPE'] == 'xmlform') {
$G_PUBLISH->AddContent('xmlform', 'toolbar', 'dynaforms/fields_Toolbar', 'display:none', $Parameters, '', '');
diff --git a/workflow/engine/classes/class.toolBar.php b/workflow/engine/classes/class.toolBar.php
index 46336aed4..0c7bbd5af 100755
--- a/workflow/engine/classes/class.toolBar.php
+++ b/workflow/engine/classes/class.toolBar.php
@@ -155,6 +155,29 @@ class XmlForm_Field_toolButton extends XmlForm_Field
case 'text/image':
$html = $this->htmlentities( $this->label, ENT_QUOTES, 'utf-8' ) . '
 . ')
style) ? ' style="' . $this->style . '"' : '') . '/>';
break;
+ case 'dropdown':
+ $html = '';
+ if (isset($this->owner->values['PRO_UID'])) {
+ G::LoadClass('processMap');
+ $criteria = processMap::getDynaformsCriteria($this->owner->values['PRO_UID']);
+ $dataset = DynaformPeer::doSelectRS($criteria);
+ if ($dataset->getRecordCount() > 0) {
+ $html .= '' . G::LoadTranslation('ID_EDITING_DYNAFORM');
+ $html .= ': ';
+ }
+ }
+ return $html;
+ break;
case 'class':
$html = '
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index f1b5b39b5..0965d570c 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -315,6 +315,8 @@ class workspaceTools
} elseif ($first) {
CLI::logging( "Updating XML form translations with $poName\n" );
Language::import( $poFile, true, false );
+ CLI::logging( "Updating database translations with $poName\n" );
+ Language::import( $poFile, false, true );
}
}
}
diff --git a/workflow/engine/skinEngine/base/extJsInitLoad.html b/workflow/engine/skinEngine/base/extJsInitLoad.html
index 13d7ba79d..c5e9b9e98 100755
--- a/workflow/engine/skinEngine/base/extJsInitLoad.html
+++ b/workflow/engine/skinEngine/base/extJsInitLoad.html
@@ -35,7 +35,7 @@
#loading-msg {
font: bold 11px arial,tahoma,sans-serif;
}
-
+
@@ -56,15 +56,9 @@
-
-
{styles}
-
+
{bodyTemplate}