diff --git a/events.php b/events.php index 957083e..33964b1 100644 --- a/events.php +++ b/events.php @@ -780,7 +780,8 @@ else { 'ns' => $event['ns'] ))); - $triggerDescription = new CSpan($description, 'pointer link_menu'); + $triggerDescription = new CCol($description, 'pointer link_menu'); + $triggerDescription->addClass('wraptext column_desc'); $triggerDescription->setMenuPopup(getMenuPopupTrigger($trigger, $triggerItems, null, $event['clock'])); // acknowledge diff --git a/include/blocks.inc.php b/include/blocks.inc.php index 3cb8d69..52a96d9 100644 --- a/include/blocks.inc.php +++ b/include/blocks.inc.php @@ -1017,6 +1017,7 @@ function make_latest_issues(array $filter = array()) { $description = new CSpan($description, 'pointer'); } $description = new CCol($description, getSeverityStyle($trigger['priority'])); + $description->addClass('wraptext column_desc'); if ($trigger['lastEvent']) { $description->setHint( make_popup_eventlist($trigger['triggerid'], $trigger['lastEvent']['eventid']), diff --git a/include/classes/macros/CMacrosResolver.php b/include/classes/macros/CMacrosResolver.php index 1123b54..416442e 100644 --- a/include/classes/macros/CMacrosResolver.php +++ b/include/classes/macros/CMacrosResolver.php @@ -665,7 +665,7 @@ class CMacrosResolver extends CMacrosResolverGeneral { // macro function is "last" if ($function == 'last') { $value = ($item['lastclock'] > 0) - ? formatHistoryValue($item['lastvalue'], $item) + ? formatHistoryValue($item['lastvalue'], $item, false) : UNRESOLVED_MACRO_STRING; } // macro function is "max", "min" or "avg" diff --git a/include/classes/macros/CMacrosResolverGeneral.php b/include/classes/macros/CMacrosResolverGeneral.php index 71bd665..41eb560 100644 --- a/include/classes/macros/CMacrosResolverGeneral.php +++ b/include/classes/macros/CMacrosResolverGeneral.php @@ -175,7 +175,7 @@ class CMacrosResolverGeneral { * @return string */ protected function getItemLastValueMacro($lastValue, array $item) { - return ($lastValue === null) ? UNRESOLVED_MACRO_STRING : formatHistoryValue($lastValue, $item); + return ($lastValue === null) ? UNRESOLVED_MACRO_STRING : formatHistoryValue($lastValue, $item, false); } /** @@ -205,7 +205,7 @@ class CMacrosResolverGeneral { if ($this->config == 'eventDescription') { $value = item_get_history($item, $trigger['clock'], $trigger['ns']); - return ($value === null) ? UNRESOLVED_MACRO_STRING : formatHistoryValue($value, $item); + return ($value === null) ? UNRESOLVED_MACRO_STRING : formatHistoryValue($value, $item, false); } else { return $this->getItemLastValueMacro($lastValue, $item); diff --git a/styles/default.css b/styles/default.css index 7bca1bb..5a4a7f4 100644 --- a/styles/default.css +++ b/styles/default.css @@ -249,6 +249,7 @@ ul.messages li.error { /* column */ .column { margin: 5px 0 5px 5px; min-width: 240px; padding-bottom: 100px; } .column .widget, #search_wdgt .widget { padding: 2px; margin-bottom: 5px; overflow: hidden; } +.column_desc { min-width: 340px; max-width: 600px } /* drag & drop */ .draggable { cursor: move; } diff --git a/tr_status.php b/tr_status.php index 9db9ff2..dbec9b1 100644 --- a/tr_status.php +++ b/tr_status.php @@ -628,7 +628,8 @@ foreach ($triggers as $trigger) { } unset($img, $dependenciesTable, $dependency); - $triggerDescription = new CSpan($description, 'pointer'); + $triggerDescription = new CCol($description, 'pointer'); + $triggerDescription->addClass('wraptext column_desc'); // host js menu $hostList = array();