diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php index 599404250..75751684d 100755 --- a/gulliver/system/class.form.php +++ b/gulliver/system/class.form.php @@ -47,7 +47,7 @@ class Form extends XmlForm var $objectRequiredFields = null; var $nextstepsave = ''; var $printdynaform = ''; - var $adjustgridswith = '0'; + var $adjustgridswidth = '0'; public $visual_frontend; diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 1ac8c1953..29b68d7e7 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -3297,7 +3297,7 @@ class XmlForm_Field_Grid extends XmlForm_Field $emptyRow [$key] = array ($emptyValue); } - if (isset($owner->adjustgridswith) && $owner->adjustgridswith == '1') { + if (isset($owner->adjustgridswidth) && $owner->adjustgridswidth == '1') { // 400w -> 34s to Firefox // 400w -> 43s to Chrome diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php index fd8017a5b..6ed8a6389 100755 --- a/workflow/engine/classes/class.dynaformEditor.php +++ b/workflow/engine/classes/class.dynaformEditor.php @@ -716,7 +716,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax //'ENABLETEMPLATE'=> $form->enableTemplate, 'MODE' => $form->mode, 'PRINTDYNAFORM' => $form->printdynaform, - 'ADJUSTGRIDSWITH'=> $form->adjustgridswith, + 'ADJUSTGRIDSWIDTH' => $form->adjustgridswith, 'NEXTSTEPSAVE' => $form->nextstepsave ); $tmp['Properties']=$Properties; @@ -777,8 +777,8 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax if (isset($Fields['PRINTDYNAFORM'])) { $ses2->execute(G::replaceDataField("UPDATE . SET PRINTDYNAFORM = @@PRINTDYNAFORM WHERE XMLNODE_NAME = 'dynaForm' ", $Fields)); } - if (isset($Fields['ADJUSTGRIDSWITH'])) { - $ses2->execute(G::replaceDataField("UPDATE . SET ADJUSTGRIDSWITH = @@ADJUSTGRIDSWITH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields)); + if (isset($Fields['ADJUSTGRIDSWIDTH'])) { + $ses2->execute(G::replaceDataField("UPDATE . SET ADJUSTGRIDSWIDTH = @@ADJUSTGRIDSWIDTH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields)); } return 0; } diff --git a/workflow/engine/templates/grid.html b/workflow/engine/templates/grid.html index 375a894a2..1d47cc8ab 100755 --- a/workflow/engine/templates/grid.html +++ b/workflow/engine/templates/grid.html @@ -8,13 +8,12 @@ {$form->label} -
{if ($form->addRow) } - +
 {$form->NewLabel} {$form->NewLabel}
{/if} @@ -67,7 +66,6 @@
-
diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml b/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml index 955c200c2..69a3f5b68 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml @@ -58,10 +58,9 @@ Show print dynaform button - + Adjust the grid width to the width of the main form - - + @@ -87,7 +86,7 @@ if(document.getElementById("form[DYN_TYPE]").value=="grid"){ hideRowById('WIDTH'); hideRowById('NEXTSTEPSAVE'); hideRowById('PRINTDYNAFORM'); - hideRowById('ADJUSTGRIDSWITH'); + hideRowById('ADJUSTGRIDSWIDTH'); } function getElementsByClassNameCrossBrowser(searchClass,node,tag) { @@ -124,6 +123,7 @@ leimnud.event.add(getField('DYN_TYPE'), 'change', function() { showRowById('WIDTH'); showRowById('NEXTSTEPSAVE'); showRowById('PRINTDYNAFORM'); + showRowById('ADJUSTGRIDSWIDTH'); } }); @@ -150,7 +150,7 @@ function validateGridConversion(proUid,dynUid){ hideRowById('WIDTH'); hideRowById('NEXTSTEPSAVE'); hideRowById('PRINTDYNAFORM'); - hideRowById('ADJUSTGRIDSWITH'); + hideRowById('ADJUSTGRIDSWIDTH'); } else { setDropdownSelection("form[DYN_TYPE]" , "xmlform"); msgBox("Grid forms can not contain the following fields:
" + response,"alert");