diff options
| author | Reinis Detlavs <reinis.detlavs@zabbix.com> | 2022-02-18 12:16:19 +0300 |
|---|---|---|
| committer | Reinis Detlavs <reinis.detlavs@zabbix.com> | 2022-02-18 12:18:28 +0300 |
| commit | 6452e39d0f2355f048f8b1189d4187170196bd29 (patch) | |
| tree | cfe49f7c91a4aa338c0e6c5cbdc11139f6d70b6c /ui | |
| parent | 4d96612a3440e46266eefede3625f9a19f535a11 (diff) | |
..F....... [ZBX-19178] fixed trigger wizard user interface breaking because of long expressions
Merge in ZBX/zabbix from feature/ZBX-19178-5.0 to release/5.0
* commit '54a11fb88f4f17dd358d82983bcd91f9606e835f':
..F....... [ZBX-19178] fixed trigger wizard user interface breaking because of long expressions
(cherry picked from commit 535587bd9a2f74302a3e979705ac650d5ae707ed)
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/include/views/js/configuration.item.list.js.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/include/views/js/configuration.item.list.js.php b/ui/include/views/js/configuration.item.list.js.php index 4cedaba95f6..823540ed3bd 100644 --- a/ui/include/views/js/configuration.item.list.js.php +++ b/ui/include/views/js/configuration.item.list.js.php @@ -56,7 +56,10 @@ ->addStyle('top: 0px;'), (new CSpan())->addClass('ui-icon ui-icon-arrowthick-2-n-s move '.ZBX_STYLE_TD_DRAG_ICON) ]))->addClass(ZBX_STYLE_TD_DRAG_ICON), - (new CDiv('#{expression}'))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH), + (new CDiv('#{expression}')) + ->addStyle('max-width:'.ZBX_TEXTAREA_STANDARD_WIDTH.'px;') + ->addClass(ZBX_STYLE_OVERFLOW_ELLIPSIS) + ->setHint('#{expression}'), new CDiv('#{type_label}'), (new CCol([ (new CVar('expressions[][value]', '#{expression}')), @@ -71,7 +74,10 @@ <script type="text/x-jquery-tmpl" id="tmpl_expressions_part_list_row"> <?= (new CRow([ - (new CDiv('#{keyword}'))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH), + (new CDiv('#{keyword}')) + ->addStyle('max-width:'.ZBX_TEXTAREA_STANDARD_WIDTH.'px;') + ->addClass(ZBX_STYLE_OVERFLOW_ELLIPSIS) + ->setHint('#{keyword}'), new CDiv('#{type_label}'), (new CCol([ (new CVar('keys[][value]', '#{keyword}')), |