diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 511eca0bd7..4ba470e8fa 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -1029,7 +1029,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."'}});"); @@ -1061,14 +1061,14 @@ abstract class cmdbAbstractObject extends CMDBObject } else { - $sHTMLValue = " {$sValidationField}"; + $sHTMLValue = " {$sValidationField}"; $aEventsList[] ='keyup'; $aEventsList[] ='change'; } break; } $sPattern = addslashes($oAttDef->GetValidationPattern()); //'^([0-9]+)$'; - if (!empty($aEventlist)) + if (!empty($aEventsList)) { $oPage->add_ready_script("$('#$iId').bind('".implode(' ', $aEventsList)."', function(evt, sFormId) { return ValidateField('$iId', '$sPattern', $bMandatory, sFormId) } );"); // Bind to a custom event: validate } diff --git a/application/templates/welcome_menu.html b/application/templates/welcome_menu.html index 5e6b8e506e..3f914b3682 100644 --- a/application/templates/welcome_menu.html +++ b/application/templates/welcome_menu.html @@ -22,34 +22,93 @@ td.dashboard li { margin-top: 5px; display: list-item; } +td div.display_block { +padding:0; +}

UI:WelcomeMenu:Title

- - - - - +
-UI:WelcomeMenu:LeftBlock - -UI:WelcomeMenu:RightBlock -
- + + +
-

UI:WelcomeMenu:MyCalls

-SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id + +

Request Management

+SELECT UserRequest +

UI:WelcomeMenu:MyCalls

+SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id 		-

UI:WelcomeMenu:MyIncidents

-SELECT Incident AS i WHERE i.caller_id = :current_contact_id + +

Incident Management

+SELECT Incident +

UI:WelcomeMenu:MyIncidents

+SELECT Incident AS i WHERE i.agent_id = :current_contact_id
+

Configuration Management

+ + + + + + + + + + + +
+ + +

Class:BusinessProcess

+SELECT BusinessProcess

+SELECT BusinessProcess + +		 + + +

Class:Contact

+SELECT Contact

+SELECT Contact + +		 + + +

Class:Location

+SELECT Location

+SELECT Location + +
+ + +

Class:Server +SELECT Server

+SELECT Server + +		 + + +

Class:DatabaseInstance

+SELECT DatabaseInstance

+SELECT DatabaseInstance + +		 + + +

Class:NetworkDevice

+SELECT NetworkDevice

+SELECT NetworkDevice + +
+
diff --git a/application/ui.passwordwidget.class.inc.php b/application/ui.passwordwidget.class.inc.php index 43f240ba46..37353b73ae 100644 --- a/application/ui.passwordwidget.class.inc.php +++ b/application/ui.passwordwidget.class.inc.php @@ -53,8 +53,8 @@ class UIPasswordWidget $sCode = $this->sAttCode.$this->sNameSuffix; $iWidgetIndex = self::$iWidgetIndex; $sHtmlValue = ''; - $sHtmlValue = ' 
'; - $sHtmlValue .= ' '.Dict::S('UI:PasswordConfirm').' '; + $sHtmlValue = ' 
'; + $sHtmlValue .= ' '.Dict::S('UI:PasswordConfirm').' '; $sHtmlValue .= ''; $oPage->add_ready_script("$('#$this->iId').bind('keyup change', function(evt) { return PasswordFieldChanged('$this->iId') } );"); // Bind to a custom event: validate