diff --git a/gulliver/js/maborak/core/stylesheet/default.css b/gulliver/js/maborak/core/stylesheet/default.css
index 60229453c..fe212f1a5 100755
--- a/gulliver/js/maborak/core/stylesheet/default.css
+++ b/gulliver/js/maborak/core/stylesheet/default.css
@@ -1631,7 +1631,7 @@ div#toolbar
font-weight:400;
text-transform: capitalize;
margin:2px 0;
- padding:3px 8px;
+ padding:2px 7px;
text-decoration:none;
line-height: 14px;
font-family: Arial,serif;
@@ -1656,12 +1656,16 @@ div#toolbar
margin:0;
}
/*DISABLED*/
-.module_app_buttonDisabled___gray{
+.pagedTableDefault .pagedTable .RowLink a.module_app_buttonDisabled___gray,
+.module_app_buttonDisabled___gray
+{
border:1px solid #bbb;
background-position:0 -3240px;
color:#9f9f9f;
cursor:default;
}
-.module_app_buttonDisabled___gray:hover{
+.pagedTableDefault .pagedTable .RowLink a.module_app_buttonDisabled___gray:hover,
+.module_app_buttonDisabled___gray:hover
+{
background:url("/skins/ext/images/gray/button/btn.gif") repeat-x scroll 0 -3240px transparent;
}
\ No newline at end of file
diff --git a/workflow/engine/classes/class.toolBar.php b/workflow/engine/classes/class.toolBar.php
index 0eb0a2335..399a89ae8 100644
--- a/workflow/engine/classes/class.toolBar.php
+++ b/workflow/engine/classes/class.toolBar.php
@@ -140,6 +140,13 @@ class XmlForm_Field_toolButton extends XmlForm_Field
case 'text':
$html=$this->htmlentities($this->label, ENT_QUOTES,'utf-8');
break;
+ case 'html':
+ $html=''.
+ $this->label.'';
+
+ //$html=$this->label;
+ break;
case 'image/text':
$html='.')
style)?' style="'.$this->style.'"':'').'/>
'.
@@ -151,10 +158,10 @@ class XmlForm_Field_toolButton extends XmlForm_Field
(($this->style)?' style="'.$this->style.'"':'').'/>';
break;
}
- return 'buttonStyle)?' style="'.$this->buttonStyle.'"':'').
(($this->onclick)?' onclick="'. htmlentities($this->onclick, ENT_QUOTES,'utf-8').'"':'').
- '>'.$html.'';
+ '>'.$html.'';
}
}
?>
\ No newline at end of file
diff --git a/workflow/engine/templates/toolbar.html b/workflow/engine/templates/toolbar.html
index f174cb04d..ed6878f4e 100644
--- a/workflow/engine/templates/toolbar.html
+++ b/workflow/engine/templates/toolbar.html
@@ -4,14 +4,18 @@
{* LEFT MENU *}
+
+
{php}$this->assign('cols', 0);{/php}
{foreach from=$form->fields item=field index=abc}
+|
{if ($field->type==='javascript')}
{elseif ($field->type==='phpvariable')}
{elseif ($field->type==='private')}
{elseif ($field->type==='')}
{else}
{* elseif ($field->type==='link') || ($field->type==='menu') *}{$field->field}{/if}
+ |
{/foreach}
{php}
@@ -19,6 +23,8 @@
$oPluginRegistry =& PMPluginRegistry::getSingleton();
$oPluginRegistry->getToolbarOptions("NORMAL");
{/php}
+
+
|
diff --git a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
index 07b15dfbc..0caca40e2 100644
--- a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
@@ -1,104 +1,106 @@
-
+
-
- save
+
+ ]]>
-
+
-
- save as
+
+ ]]>
-
+
-
- text
+
+ ]]>
-
- currency
+
+ ]]>
-
- percentage
+
+ ]]>
-
- password
+
+ ]]>
-
- Suggest
+
+ ]]>
-
-
-
- <en>title</en>
+<separator3 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
+<title type="toolButton" onclick="fieldsAdd('title')" file="images/dynamicForm/title.gif" fileAlt="images/dynamicForm/hover.gif" home="public_html" buttonType="html">
+ <en><![CDATA[<span class="ss_sprite button_toolbar ss_title" title="Title"></span>]]></en>
-
- subtitle
+
+ ]]>
-
-
\ No newline at end of file
diff --git a/workflow/public_html/images/dynamicForm/separatorTable.gif b/workflow/public_html/images/dynamicForm/separatorTable.gif
new file mode 100644
index 000000000..f5724af18
Binary files /dev/null and b/workflow/public_html/images/dynamicForm/separatorTable.gif differ
diff --git a/workflow/public_html/images/icons_silk/sprite.css b/workflow/public_html/images/icons_silk/sprite.css
index 60aa4a77b..b160a387a 100644
--- a/workflow/public_html/images/icons_silk/sprite.css
+++ b/workflow/public_html/images/icons_silk/sprite.css
@@ -4,6 +4,9 @@
/*
form.formDefault .FormTitle,form.formDefault .FormSubTitle{
background:#E0E7EF;
+}
+form.formDefault .FormSubTitle{
+
}
.pagedTableDefault .pagedTable .RowPointer
{
@@ -44,11 +47,24 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/
background-image:url( /images/icons_silk/sprites.png) !important;
background-repeat:no-repeat;
display:inline;
- height:18px !important;
+ /*height:18px !important;*/
overflow:hidden;
- padding-left:24px
+ padding-left:22px
}
-.button_menu_ext{padding-left:20px !important}
+.ss_sprite:hover,.ss_sprite:focus{
+ background-repeat:no-repeat !important;
+}
+
+
+.panel_headerBar___processmaker{
+ height:28px;
+}
+.pm_toolbar td{padding:0;margin:0}
+
+.panel_headerBar___processmaker{background:url("/skins/ext/images/gray/toolbar/bg.gif") #F0F0F0 !important}
+
+.button_menu_ext{padding-left:20px !important;height:18px !important;}
+.button_toolbar{padding-left:20px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 3px 1px 3px;}
.ss_accept{background-position:0px 0 !important}
.ss_add{background-position:0px -19px !important}
.ss_anchor{background-position:0px -37px !important}
@@ -912,4 +928,21 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/
.ss_xhtml_valid{background-position:0px -17929px !important}
.ss_zoom{background-position:0px -17947px !important}
.ss_zoom_in{background-position:0px -17965px !important}
-.ss_zoom_out{background-position:0px -17983px !important}
\ No newline at end of file
+.ss_zoom_out{background-position:0px -17983px !important}
+.ss_textfield_currency{background-position:0px -18001px !important}
+.ss_textfield_percentage{background-position:0px -18019px !important}
+.ss_js{background-position:0px -18037px !important}
+.ss_upload{background-position:0px -18055px !important}
+.ss_hidden{background-position:0px -18073px !important}
+.ss_radiogroup{background-position:0px -18091px !important}
+.ss_checkgroup{background-position:0px -18109px !important}
+.ss_check{background-position:0px -18127px !important}
+.ss_listbox{background-position:0px -18145px !important}
+.ss_yesno{background-position:0px -18163px !important}
+.ss_dropdown{background-position:0px -18181px !important}
+.ss_reset{background-position:0px -18199px !important}
+.ss_submit{background-position:0px -18217px !important}
+.ss_button{background-position:0px -18235px !important}
+.ss_textarea{background-position:0px -18253px !important}
+.ss_title{background-position:0px -18271px !important}
+.ss_subtitle{background-position:0px -18289px !important}
\ No newline at end of file
diff --git a/workflow/public_html/images/icons_silk/sprites.png b/workflow/public_html/images/icons_silk/sprites.png
index 7230058d6..7bcfd2376 100644
Binary files a/workflow/public_html/images/icons_silk/sprites.png and b/workflow/public_html/images/icons_silk/sprites.png differ
diff --git a/workflow/public_html/skins/green/style.css b/workflow/public_html/skins/green/style.css
index 4d0c1fc74..56cbccfd7 100644
--- a/workflow/public_html/skins/green/style.css
+++ b/workflow/public_html/skins/green/style.css
@@ -691,10 +691,16 @@ form.formDefault textarea.FormTextPM
{
border: 1px solid #CCC;
background: #FFFFFF url(/skins/green/images/input_back.gif) repeat-x;
- color:#333333;
+ color:#333;
font:normal 12 Courier New, monospace ;
overflow:auto;
}
+form.formDefault .FormTitle,form.formDefault .FormSubTitle{
+ color:#333;
+ text-shadow:0 1px 0px rgba(255,255,255,1);
+ padding-left:5px;
+ font-weight: 700;
+}
form.formDefault .FormTitle
{
color:#000;
@@ -706,8 +712,8 @@ form.formDefault .FormTitle
}
form.formDefault .FormSubTitle
{
- background:#E0E7EF;
- color:black;
+ background:#EFF1F3;
+ color:#666;
}
form.formDefault .FormButton
{
@@ -733,12 +739,7 @@ form.formDefault td.withoutLabel, form.formDefault td.withoutLabel table td
.FormTitle .FormTitle{
border:none;
}
-form.formDefault .FormTitle,form.formDefault .FormSubTitle{
- color:#333;
- text-shadow:0 1px 0px rgba(255,255,255,1);
- padding-left:5px;
- font-weight: 700;
-}
+
/* form END */
/* formSearch BEGIN */