diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 8870a8d22..43674138f 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -878,19 +878,19 @@ abstract class cmdbAbstractObject extends CMDBObject case 'DateTime': $aEventsList[] ='keyup'; $aEventsList[] ='change'; - $sHTMLValue = ""; + $sHTMLValue = " {$sValidationField}"; break; case 'Password': $aEventsList[] ='keyup'; $aEventsList[] ='change'; - $sHTMLValue = ""; + $sHTMLValue = " {$sValidationField}"; break; case 'Text': $aEventsList[] ='keypress'; $aEventsList[] ='change'; - $sHTMLValue = ""; + $sHTMLValue = " {$sValidationField}"; break; case 'List': @@ -911,7 +911,7 @@ abstract class cmdbAbstractObject extends CMDBObject $sHTMLValue = "\n"; $sHTMLValue .= "\n"; $sHTMLValue .= "$sFileName
\n"; - $sHTMLValue .= "\n"; + $sHTMLValue .= " {$sValidationField}\n"; break; case 'String': @@ -930,7 +930,7 @@ abstract class cmdbAbstractObject extends CMDBObject { // too many choices, use an autocomplete // The input for the auto complete - $sHTMLValue = "$sValidationField"; + $sHTMLValue = " {$sValidationField}"; // another hidden input to store & pass the object's Id $sHTMLValue .= "\n"; $oPage->add_ready_script("\$('#label_$iId').autocomplete('./ajax.render.php', { scroll:true, minChars:3, onItemSelect:selectItem, onFindValue:findValue, formatItem:formatItem, autoFill:true, keyHolder:'#$iId', extraParams:{operation:'autocomplete', sclass:'$sClass',attCode:'".$sAttCode."'}});"); @@ -953,13 +953,13 @@ abstract class cmdbAbstractObject extends CMDBObject $sSelected = ($value == $key) ? ' selected' : ''; $sHTMLValue .= "\n"; } - $sHTMLValue .= "$sValidationField\n"; + $sHTMLValue .= " {$sValidationField}\n"; $aEventsList[] ='change'; } } else { - $sHTMLValue = ""; + $sHTMLValue = " {$sValidationField}"; $aEventsList[] ='keyup'; $aEventsList[] ='change'; } @@ -973,7 +973,7 @@ abstract class cmdbAbstractObject extends CMDBObject $oPage->add_ready_script("$('#$iId').bind('change', function(evt, sFormId) { return UpdateDependentFields(['".implode("','", $aDependencies)."']) } );"); // Bind to a custom event: validate } } - return "
{$sHTMLValue}{$sValidationField}
"; + return "
{$sHTMLValue}
"; } public function DisplayModifyForm(WebPage $oPage, $aExtraParams = array()) diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php index 3e1b22a18..6da294fcd 100644 --- a/application/ui.linkswidget.class.inc.php +++ b/application/ui.linkswidget.class.inc.php @@ -108,7 +108,7 @@ class UILinksWidget $oPage->add_at_the_end($this->GetLinkObjectDialog($oPage, $this->m_iInputId)); // Forms should not be inside forms $sHTMLValue .= "m_iInputId}\" size=\"35\" value=\"\" title=\"".Dict::S('UI:LinksWidget:Autocomplete+')."\"/>"; $sHTMLValue .= "m_iInputId}\" value=\"".Dict::S('UI:Button:AddObject')."\" class=\"action\" onClick=\"oLinkWidget{$this->m_iInputId}.AddObject();\"/>"; - $sHTMLValue .= " m_iInputId', '$sExtKeyToRemote');\"/>"; + $sHTMLValue .= " m_iInputId', '$sExtKeyToRemote');\"/> m_iInputId}\">\n"; // another hidden input to store & pass the object's Id $sHTMLValue .= "m_iInputId}\" onChange=\"EnableAddButton('{$this->m_iInputId}');\"/>\n"; $sHTMLValue .= "m_iInputId}\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\"/>\n"; diff --git a/css/light-grey.css b/css/light-grey.css index 77ea1a54d..5b59ee914 100644 --- a/css/light-grey.css +++ b/css/light-grey.css @@ -34,6 +34,7 @@ table.listResults { border-bottom: 3px solid #e6e6e1; border-right: 3px solid #e6e6e1; width: 100%; + background-color: #fff; } table.listResults td {