diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm index c7a18ba0a..7192f4c16 100644 --- a/lib/WebGUI/Asset/Wobject/Thingy.pm +++ b/lib/WebGUI/Asset/Wobject/Thingy.pm @@ -436,15 +436,14 @@ where asset.state = "published"'); } my $defaultValueForm = WebGUI::Form::Textarea($self->session, { name=>"defaultValue", - label=>$i18n->get('default value label'), - hoverHelp=>$i18n->get('default value description'), value=>$defaultValue, subtext=>'
'.$i18n->get('default value subtext'), width=>200, height=>60, resizable=>0, }); - $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_defaultValue_module",$defaultValueForm,$i18n->get('default value label'))); + $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_defaultValue_module",$defaultValueForm, + $i18n->get('default value label'),$i18n->get('default value description'))); $f->text( -name=>"subtext", @@ -462,52 +461,56 @@ where asset.state = "published"'); my $widthForm = WebGUI::Form::Integer($self->session, { name=>"width", - hoverHelp=>$i18n->get('width description'), value=>($field->{width} || 250), size=>10, }); - $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_width_module",$widthForm,$i18n->get('width label'))); + $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_width_module",$widthForm,$i18n->get('width label'), + $i18n->get('width description'))); my $sizeForm = WebGUI::Form::Integer($self->session, { name=>"size", - hoverHelp=>$i18n->get('size description'), value=>($field->{size} || 25), size=>10, }); - $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_size_module",$sizeForm,$i18n->get('size label'))); + $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_size_module",$sizeForm,$i18n->get('size label'), + $i18n->get('size description'),)); my $heightForm = WebGUI::Form::Integer($self->session, { name=>"height", value=>$field->{height} || 40, label=>$i18n->get('height label'), - hoverHelp=>$i18n->get('height description'), size=>10, }); - $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_height_module",$heightForm,$i18n->get('height label'))); + $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_height_module",$heightForm,$i18n->get('height label'), + $i18n->get('height description'))); my $verticalForm = WebGUI::Form::YesNo($self->session, { name=>"vertical", value=>$field->{vertical}, label=>$i18n->get('vertical label'), - hoverHelp=>$i18n->get('vertical description'), }); - $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_vertical_module",$verticalForm,$i18n->get('vertical label'))); + $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_vertical_module",$verticalForm,$i18n->get('vertical label'), + $i18n->get('vertical description'))); my $valuesForm = WebGUI::Form::Textarea($self->session, { name=>"possibleValues", - hoverHelp=>$i18n->get('possible values description'), value=>$field->{possibleValues}, width=>200, height=>60, resizable=>0, }); - $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_values_module",$valuesForm,$i18n->get('possible values label'))); + $f->raw($self->getHtmlWithModuleWrapper($dialogPrefix."_values_module",$valuesForm,$i18n->get('possible values label'), + $i18n->get('possible values description'))); $f->text( -name=>"extras", -value=>$field->{extras}, -label=>$i18n->get('extras label'), -hoverHelp=>$i18n->get('extras description'), ); + + #unless ($dialogPrefix eq "addDialog") { + # $f->raw(''); + #} return $f; } #------------------------------------------------------------------- @@ -699,13 +702,15 @@ sub getHtmlWithModuleWrapper { my $id = shift; my $formElement = shift; my $formDescription = shift; + my $hoverHelp = shift; + $hoverHelp &&= '
' . $hoverHelp . '
'; my $html = "\n\n"; $html .= "\t
\n"; $html .= "\t
\n"; $html .= "\t\n"; $html .= "\t"; + $html .= $formDescription.$hoverHelp.""; $html .= ""; $html .= "\t\n\n"; @@ -1416,7 +1421,7 @@ where thingId != ? and asset.state = 'published'",[$thingId]); $output = $tabForm->print; - my $dialog = "
\n" + my $dialog = "
\n" ."
".$i18n->get('add field label')."
\n" ."
\n"; @@ -2285,7 +2290,7 @@ sequenceNumber'); "searchResult_field_loop" => \@field_loop, ); if ($self->hasPrivileges($thingProperties{groupIdEdit})){ - $templateVars{searchResult_elete_icon} = $session->icon->delete('func=deleteThingDataConfirm;thingId=' + $templateVars{searchResult_delete_icon} = $session->icon->delete('func=deleteThingDataConfirm;thingId=' .$thingId.';thingDataId='.$thingDataId,$url,$i18n->get('delete thing data warning')); $templateVars{searchResult_edit_icon} = $session->icon->edit('func=editThingData;thingId=' .$thingId.';thingDataId='.$thingDataId,$url); diff --git a/www/extras/hoverhelp.css b/www/extras/hoverhelp.css index 943e3f853..3505b7675 100644 --- a/www/extras/hoverhelp.css +++ b/www/extras/hoverhelp.css @@ -7,7 +7,7 @@ font-weight: normal; padding: 3px; width: 300px; - z-index: 100 !important; + z-index: 12000 !important; display: none; } .wg-hoverhelp.yui-tt { diff --git a/www/extras/hoverhelp.js b/www/extras/hoverhelp.js index 4be2073d6..40c3a7af5 100644 --- a/www/extras/hoverhelp.js +++ b/www/extras/hoverhelp.js @@ -1,14 +1,20 @@ var hoverHelpLoaded; -YAHOO.util.Event.onDOMReady(function () { - if (hoverHelpLoaded) +function initHoverHelp (root) { + if (hoverHelpLoaded && !root) return; hoverHelpLoaded = true; - var tips = YAHOO.util.Dom.getElementsByClassName('wg-hoverhelp'); + var tips; + if (root == 'DOMReady') { + tips = YAHOO.util.Dom.getElementsByClassName('wg-hoverhelp'); + }else{ + tips = YAHOO.util.Dom.getElementsByClassName('wg-hoverhelp','',root); + } for (var i = tips.length; i--; ) { var myTip = new YAHOO.widget.Tooltip(tips[i], { autodismissdelay: 1000000, context: tips[i].parentNode }); } -}); +} +YAHOO.util.Event.onDOMReady(initHoverHelp,''); diff --git a/www/extras/wobject/Thingy/thingy.css b/www/extras/wobject/Thingy/thingy.css index 4fddbbe98..c38862de7 100644 --- a/www/extras/wobject/Thingy/thingy.css +++ b/www/extras/wobject/Thingy/thingy.css @@ -26,11 +26,4 @@ li.list1 { border:1px solid #7EA6B2; } -#dialog1{ - height: 400px; -} - -#dialog2{ - height: 400px; -} diff --git a/www/extras/wobject/Thingy/thingy.js b/www/extras/wobject/Thingy/thingy.js index 79e3faf47..fce3b2b09 100644 --- a/www/extras/wobject/Thingy/thingy.js +++ b/www/extras/wobject/Thingy/thingy.js @@ -150,7 +150,7 @@ function editListItem(url,fieldId) { function optionalFields() { initOptionalFields("edit_"+fieldId+"_Dialog",fieldId); } - editFieldDialog = new YAHOO.widget.Dialog("dialog2", { width:"460px", visible:false, draggable:true, close:true, fixedcenter:true, zIndex:11001, + editFieldDialog = new YAHOO.widget.Dialog("edit_"+fieldId+"_Dialog", { width:"460px", visible:false, draggable:true, close:true, fixedcenter:true, zIndex:11001, height: "400px", buttons : [ { text:"Submit", handler:handleSubmit, isDefault:true }, { text:"Cancel", handler:handleCancel } ] } ); @@ -160,8 +160,8 @@ function editListItem(url,fieldId) { editFieldDialog.render(document.body); editFieldDialog.callback = { success: handleSuccess, failure: handleFailure }; editFieldDialog.show(); - YAHOO.util.Event.onContentReady("dialog2", optionalFields); - + YAHOO.util.Event.onContentReady("edit_"+fieldId+"_Dialog", optionalFields); + initHoverHelp("edit_"+fieldId+"_Dialog"); }; @@ -270,8 +270,8 @@ function initAddFieldDialog() { this.cancel(); }; - var addFieldDialog = new YAHOO.widget.Dialog("dialog1", { width:"460px", visible:false, - draggable:true, close:true, fixedcenter:true, zIndex:11002, + var addFieldDialog = new YAHOO.widget.Dialog("addDialog", { width:"460px", visible:false, + draggable:true, close:true, fixedcenter:true, zIndex:11002, height: "400px", buttons : [ { text:"Submit", handler:handleSubmit, isDefault:true }, { text:"Cancel", handler:handleCancel } ] } );
"; - $html .= $formDescription.""; $html .= $formElement."