diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php index 2a08ffe8a..12448210d 100644 --- a/gulliver/system/class.headPublisher.php +++ b/gulliver/system/class.headPublisher.php @@ -184,9 +184,20 @@ class headPublisher { } if ($this->disableHeaderScripts) return ''; - $this->addScriptFile ( "/js/widgets/js-calendar/unicode-letter.js" ); - $this->addScriptFile ( "/js/widgets/js-calendar/lang/" . SYS_LANG . ".js" ); + // available js-calendar languages array + $availableJsCalendarLang = array('ca', 'cn', 'cz', 'de', 'en', 'es', 'fr', 'it', 'jp', 'nl', 'pl', 'pt', 'ro', 'ru', 'sv'); + + // get the system language without locale + $sysLang = explode('-', SYS_LANG); + $sysLang = $sysLang[0]; + + // verify if the requested lang by the system is supported by js-calendar library, if not set english by default + $sysLang = in_array($sysLang, $availableJsCalendarLang) ? $sysLang : 'en'; + + $this->addScriptFile ( "/js/widgets/js-calendar/unicode-letter.js" ); + $this->addScriptFile ( "/js/widgets/js-calendar/lang/".$sysLang.".js" ); + $this->addScriptFile ( "/js/widgets/js-calendar/lang/en.js" ); $head = ''; $head .= '' . $this->title . "\n"; diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index acc997e76..aebc419ea 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -260,7 +260,7 @@ function executePlugins(){ $oPlugin = new $className(); if (method_exists($oPlugin, 'executeCron')) { $oPlugin->executeCron(); - setExecutionMessage("Executing Pentaho Reports Plugin"); + setExecutionMessage("Executing Plugins"); setExecutionResultMessage('DONE'); } } diff --git a/workflow/engine/classes/class.toolBar.php b/workflow/engine/classes/class.toolBar.php index c95487a85..1e1bc7e53 100644 --- a/workflow/engine/classes/class.toolBar.php +++ b/workflow/engine/classes/class.toolBar.php @@ -99,6 +99,7 @@ class XmlForm_Field_toolButton extends XmlForm_Field var $buttonStyle = ''; /*$hoverMethod : back | switch*/ var $hoverMethod='back'; + var $class; /** * Prints the components of the toolBar @@ -157,6 +158,10 @@ class XmlForm_Field_toolButton extends XmlForm_Field '
style)?' style="'.$this->style.'"':'').'/>'; break; + case 'class': + $html='
+
+
'; } return 'buttonStyle)?' style="'.$this->buttonStyle.'"':''). diff --git a/workflow/engine/templates/dynaforms/fieldsHandler.php b/workflow/engine/templates/dynaforms/fieldsHandler.php index 3986c4d06..2475f54ff 100755 --- a/workflow/engine/templates/dynaforms/fieldsHandler.php +++ b/workflow/engine/templates/dynaforms/fieldsHandler.php @@ -71,18 +71,18 @@ - -
+
+
- +
 
 
 
 
 
@@ -99,16 +99,16 @@ } ?>
  • - +
    - - - - + +
    + />   + - + - - - + + + +   -   - -   - +   +

    30 ){ @@ -143,18 +142,18 @@ ?>

    		 - +
    - -
    - - + +
    + +
    diff --git a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml index 50815904d..6a1ed0076 100644 --- a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml +++ b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml @@ -1,106 +1,95 @@ - - - - -
    • ]]> - - - - - -
    ]]> - - - - - - - - ]]> - - - ]]> - - - ]]> - - - ]]> - - - ]]> - - - - - - <en><![CDATA[<div class="ss_sprite button_toolbar ss_title" title="Title"></div>]]></en> - - - ]]> - - - - - - ]]> - - - ]]> - - - - - ]]> - - - ]]> - - - ]]> - - - - - ]]> - - - ]]> - - - ]]> - - - - - ]]> - - - ]]> - - - ]]> - - - ]]> - - - - - ]]> - - - - - ]]> - - + + + Save + + + Save as + + + + + Text field + + + Currency + + + Percentage + + + Password + + + Suggest + + + + + + <en>Title</en> + + + Subtitle + + + + + + Submit + + + Reset + + + + + Dropdown + + + Yes/No + + + Listbox + + + + + Checkbox + + + CheckGroup + + + RadioGroup + + + + + Date + + + Hidden + + + Link + + + File + + + + + Javascript + + + + + Grid + \ No newline at end of file diff --git a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml index 24c6a9b4f..e6d251710 100644 --- a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml +++ b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml @@ -1,60 +1,51 @@ - - - - - ]]> - - - - - - ]]> - - - - - - ]]> - - - ]]> - - - ]]> - - - - - - - - ]]> - - - ]]> - - - - - - - ]]> - - - ]]> - - - ]]> - + + + Save + + + Save as + + + + + Text field + + + Currency + + + Percentage + + + + + + + Dropdown + + + Yes/No + + + + + + + Date + + + Hidden + + + Link + \ No newline at end of file