From 11b237674d340613cf022d53fcd2d7b3ba494ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrejs=20Gri=C5=A1=C4=8Denko?= Date: Tue, 29 Mar 2022 15:25:07 +0300 Subject: ..F....... [ZBX-18652] fixed data overview discrepancy between host location top and left --- ui/include/classes/helpers/CArrayHelper.php | 10 ++++++++ ui/include/items.inc.php | 38 ++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 11 deletions(-) (limited to 'ui') diff --git a/ui/include/classes/helpers/CArrayHelper.php b/ui/include/classes/helpers/CArrayHelper.php index 0815349e6ae..6d0c440eb1f 100644 --- a/ui/include/classes/helpers/CArrayHelper.php +++ b/ui/include/classes/helpers/CArrayHelper.php @@ -207,6 +207,16 @@ class CArrayHelper { return 0; } + /** + * Sort array by keys in ascending order. + * Performs case-insensitive string comparisons using a "natural order" algorithm. + * + * @param array $array + */ + public static function ksort(array &$array): void { + uksort($array, 'strnatcasecmp'); + } + /** * Unset values that are contained in $a2 from $a1. Skip arrays and keys given in $skipKeys. * diff --git a/ui/include/items.inc.php b/ui/include/items.inc.php index 30c74c2ddee..1e34bd3fd74 100644 --- a/ui/include/items.inc.php +++ b/ui/include/items.inc.php @@ -1135,7 +1135,6 @@ function getDataOverviewCellData(array $db_items, array $data, int $show_suppres * @return array */ function getDataOverviewItems(?array $groupids, ?array $hostids, ?array $tags, int $evaltype): array { - if ($hostids === null) { $limit = (int) CSettingsHelper::get(CSettingsHelper::MAX_OVERVIEW_TABLE_SIZE) + 1; $db_hosts = API::Host()->get([ @@ -1143,8 +1142,9 @@ function getDataOverviewItems(?array $groupids, ?array $hostids, ?array $tags, i 'groupids' => $groupids, 'monitored_hosts' => true, 'with_monitored_items' => true, - 'preservekeys' => true, - 'limit' => $limit + 'sortfield' => ['name'], + 'limit' => $limit, + 'preservekeys' => true ]); $hostids = array_keys($db_hosts); } @@ -1167,7 +1167,7 @@ function getDataOverviewItems(?array $groupids, ?array $hostids, ?array $tags, i ['field' => 'itemid', 'order' => ZBX_SORT_UP] ]); - return [$db_items, $hostids]; + return $db_items; } /** @@ -1184,7 +1184,7 @@ function getDataOverview(?array $groupids, ?array $hostids, array $filter): arra $tags = (array_key_exists('tags', $filter) && $filter['tags']) ? $filter['tags'] : null; $evaltype = array_key_exists('evaltype', $filter) ? $filter['evaltype'] : TAG_EVAL_TYPE_AND_OR; - [$db_items, $hostids] = getDataOverviewItems($groupids, $hostids, $tags, $evaltype); + $db_items = getDataOverviewItems($groupids, $hostids, $tags, $evaltype); $data = []; $item_counter = []; @@ -1239,25 +1239,41 @@ function getDataOverview(?array $groupids, ?array $hostids, array $filter): arra $data_display_limit = (int) CSettingsHelper::get(CSettingsHelper::MAX_OVERVIEW_TABLE_SIZE); $has_hidden_hosts = (count($db_hosts) > $data_display_limit); $db_hosts = array_slice($db_hosts, 0, $data_display_limit, true); + $host_names = array_column($db_hosts, 'name', 'name'); $data = array_slice($data, 0, $data_display_limit, true); $items_left = $data_display_limit; $itemids = []; - array_walk($data, function (array &$item_columns) use ($data_display_limit, &$itemids, &$items_left) { + + foreach ($data as &$item_columns) { if ($items_left != 0) { $item_columns = array_slice($item_columns, 0, min($data_display_limit, $items_left)); $items_left -= count($item_columns); } else { $item_columns = null; - return; + break; } - array_walk($item_columns, function (array &$item_column) use ($data_display_limit, &$itemids) { + foreach ($item_columns as &$item_column) { + CArrayHelper::ksort($item_column); $item_column = array_slice($item_column, 0, $data_display_limit, true); - $itemids += array_column($item_column, 'itemid', 'itemid'); - }); - }); + + foreach ($item_column as $host_name => $item) { + if (array_key_exists($host_name, $host_names)) { + $itemids[$item['itemid']] = true; + } + else { + unset($item_column[$host_name]); + } + } + } + unset($item_column); + + $item_columns = array_filter($item_columns); + } + unset($item_columns); + $data = array_filter($data); $has_hidden_items = (count($db_items) != count($itemids)); -- cgit v1.2.3 From 0fb4ddad47558200423d08276dc1fd9d61133c7c Mon Sep 17 00:00:00 2001 From: Roberts Lataria Date: Mon, 4 Apr 2022 13:24:24 +0300 Subject: ..F....... [ZBX-20534] fixed popup layout for importing when horizontal scroll was not visible --- ui/app/views/popup.import.compare.php | 10 +++++----- ui/assets/styles/blue-theme.css | 2 +- ui/assets/styles/dark-theme.css | 2 +- ui/assets/styles/hc-dark.css | 2 +- ui/assets/styles/hc-light.css | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'ui') diff --git a/ui/app/views/popup.import.compare.php b/ui/app/views/popup.import.compare.php index fc6af676071..26a9323b376 100644 --- a/ui/app/views/popup.import.compare.php +++ b/ui/app/views/popup.import.compare.php @@ -170,13 +170,13 @@ else { 'script_inline' => trim($this->readJsFile('popup.import.compare.js.php')), 'body' => !$data['diff'] ? (new CTableInfo()) - ->setNoDataMessage(_('No changes.')) - ->toString() + ->setNoDataMessage(_('No changes.')) + ->toString() : (new CForm()) - ->addClass('import-compare') ->addVar('import_overlayid', $data['import_overlayid']) - ->addItem(drawToc($data['diff_toc'])) - ->addItem(drawDiff($data['diff'])) + ->addItem( + (new CDiv([drawToc($data['diff_toc']), drawDiff($data['diff'])]))->addClass('import-compare') + ) ->toString(), 'buttons' => $buttons, 'no_changes' => !$data['diff'] diff --git a/ui/assets/styles/blue-theme.css b/ui/assets/styles/blue-theme.css index 913043c8e32..2d41673d5ea 100644 --- a/ui/assets/styles/blue-theme.css +++ b/ui/assets/styles/blue-theme.css @@ -6878,7 +6878,7 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty), .import-compare { display: flex; - max-height: calc(100vh - 190px); } + max-height: calc(100vh - 220px); } .import-compare .toc { flex: 20%; overflow-y: auto; diff --git a/ui/assets/styles/dark-theme.css b/ui/assets/styles/dark-theme.css index 814a3b29248..58e96afd334 100644 --- a/ui/assets/styles/dark-theme.css +++ b/ui/assets/styles/dark-theme.css @@ -6889,7 +6889,7 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty), .import-compare { display: flex; - max-height: calc(100vh - 190px); } + max-height: calc(100vh - 220px); } .import-compare .toc { flex: 20%; overflow-y: auto; diff --git a/ui/assets/styles/hc-dark.css b/ui/assets/styles/hc-dark.css index 109097b67c0..678e8d52bbb 100644 --- a/ui/assets/styles/hc-dark.css +++ b/ui/assets/styles/hc-dark.css @@ -6835,7 +6835,7 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty), .import-compare { display: flex; - max-height: calc(100vh - 190px); } + max-height: calc(100vh - 220px); } .import-compare .toc { flex: 20%; overflow-y: auto; diff --git a/ui/assets/styles/hc-light.css b/ui/assets/styles/hc-light.css index 91277e414ed..b40fa30e49e 100644 --- a/ui/assets/styles/hc-light.css +++ b/ui/assets/styles/hc-light.css @@ -6835,7 +6835,7 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty), .import-compare { display: flex; - max-height: calc(100vh - 190px); } + max-height: calc(100vh - 220px); } .import-compare .toc { flex: 20%; overflow-y: auto; -- cgit v1.2.3 From f98af527a52b4380306702765385a696ed0402ca Mon Sep 17 00:00:00 2001 From: Katerina Kuzmina Date: Thu, 28 Apr 2022 13:12:55 +0300 Subject: ..F....... [ZBX-20565] fixed visibility of placeholder text in host prototype edit form --- ui/include/views/configuration.host.prototype.edit.php | 4 ++-- ui/include/views/js/common.template.edit.js.php | 2 +- ui/include/views/js/configuration.triggers.edit.js.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ui') diff --git a/ui/include/views/configuration.host.prototype.edit.php b/ui/include/views/configuration.host.prototype.edit.php index 85982678374..bdd54033592 100644 --- a/ui/include/views/configuration.host.prototype.edit.php +++ b/ui/include/views/configuration.host.prototype.edit.php @@ -75,8 +75,8 @@ $host_tab->addRow( $name = ($host_prototype['name'] != $host_prototype['host']) ? $host_prototype['name'] : ''; $host_tab->addRow( - _('Visible name'), - (new CTextBox('name', $name, (bool) $host_prototype['templateid'])) + (new CLabel(_('Visible name'), 'visiblename')), + (new CTextBox('visiblename', $name, (bool) $host_prototype['templateid'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('maxlength', 128) ); diff --git a/ui/include/views/js/common.template.edit.js.php b/ui/include/views/js/common.template.edit.js.php index f8269196a9b..c973c0c5e65 100644 --- a/ui/include/views/js/common.template.edit.js.php +++ b/ui/include/views/js/common.template.edit.js.php @@ -124,7 +124,7 @@ var $show_inherited_macros = $('input[name="show_inherited_macros"]'), linked_templateids = ; - $('#template_name') + $('#host') .on('input keydown paste', function() { $('#visiblename').attr('placeholder', $(this).val()); }) diff --git a/ui/include/views/js/configuration.triggers.edit.js.php b/ui/include/views/js/configuration.triggers.edit.js.php index ef9b29cf228..f1274ffc5f2 100644 --- a/ui/include/views/js/configuration.triggers.edit.js.php +++ b/ui/include/views/js/configuration.triggers.edit.js.php @@ -87,7 +87,7 @@ $('#correlation_tag_row') .toggle((recovery_mode == || recovery_mode == ) - && correlation_mode == + && correlation_mode == ); }, -- cgit v1.2.3 From 10d433c9d5176efccdb38b2ddc9e41b0c787864d Mon Sep 17 00:00:00 2001 From: Katerina Kuzmina Date: Thu, 28 Apr 2022 13:25:41 +0300 Subject: ..F....... [ZBX-20565] fixed visibility of placeholder text in host prototype edit form --- ui/include/views/configuration.host.prototype.edit.php | 2 +- ui/include/views/js/configuration.triggers.edit.js.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/include/views/configuration.host.prototype.edit.php b/ui/include/views/configuration.host.prototype.edit.php index bdd54033592..f09d91f6e1b 100644 --- a/ui/include/views/configuration.host.prototype.edit.php +++ b/ui/include/views/configuration.host.prototype.edit.php @@ -75,7 +75,7 @@ $host_tab->addRow( $name = ($host_prototype['name'] != $host_prototype['host']) ? $host_prototype['name'] : ''; $host_tab->addRow( - (new CLabel(_('Visible name'), 'visiblename')), + (new CLabel(_('Visible name'), 'visiblename')), (new CTextBox('visiblename', $name, (bool) $host_prototype['templateid'])) ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH) ->setAttribute('maxlength', 128) diff --git a/ui/include/views/js/configuration.triggers.edit.js.php b/ui/include/views/js/configuration.triggers.edit.js.php index f1274ffc5f2..ef9b29cf228 100644 --- a/ui/include/views/js/configuration.triggers.edit.js.php +++ b/ui/include/views/js/configuration.triggers.edit.js.php @@ -87,7 +87,7 @@ $('#correlation_tag_row') .toggle((recovery_mode == || recovery_mode == ) - && correlation_mode == + && correlation_mode == ); }, -- cgit v1.2.3 From 6c01ce10e4eadbd5b644dc04b1f3e575aece33e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrejs=20Gri=C5=A1=C4=8Denko?= Date: Mon, 2 May 2022 18:02:08 +0300 Subject: ..F....... [ZBX-18652] fixed some items being excluded from the results despite the maximum limit --- ui/include/items.inc.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'ui') diff --git a/ui/include/items.inc.php b/ui/include/items.inc.php index 1e34bd3fd74..931e804a279 100644 --- a/ui/include/items.inc.php +++ b/ui/include/items.inc.php @@ -1241,20 +1241,9 @@ function getDataOverview(?array $groupids, ?array $hostids, array $filter): arra $db_hosts = array_slice($db_hosts, 0, $data_display_limit, true); $host_names = array_column($db_hosts, 'name', 'name'); - $data = array_slice($data, 0, $data_display_limit, true); - $items_left = $data_display_limit; $itemids = []; foreach ($data as &$item_columns) { - if ($items_left != 0) { - $item_columns = array_slice($item_columns, 0, min($data_display_limit, $items_left)); - $items_left -= count($item_columns); - } - else { - $item_columns = null; - break; - } - foreach ($item_columns as &$item_column) { CArrayHelper::ksort($item_column); $item_column = array_slice($item_column, 0, $data_display_limit, true); @@ -1275,6 +1264,7 @@ function getDataOverview(?array $groupids, ?array $hostids, array $filter): arra unset($item_columns); $data = array_filter($data); + $data = array_slice($data, 0, $data_display_limit, true); $has_hidden_items = (count($db_items) != count($itemids)); -- cgit v1.2.3 From 5f57d65fb68eab8a7fdb09e70b548b6da3ab7dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrejs=20Gri=C5=A1=C4=8Denko?= Date: Mon, 9 May 2022 09:51:10 +0300 Subject: ..F....... [ZBX-18652] fixed message about more results not being displayed if there are items over the maximum limit --- ui/include/items.inc.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/include/items.inc.php b/ui/include/items.inc.php index 931e804a279..292d2cca19d 100644 --- a/ui/include/items.inc.php +++ b/ui/include/items.inc.php @@ -1237,13 +1237,23 @@ function getDataOverview(?array $groupids, ?array $hostids, array $filter): arra ]); $data_display_limit = (int) CSettingsHelper::get(CSettingsHelper::MAX_OVERVIEW_TABLE_SIZE); - $has_hidden_hosts = (count($db_hosts) > $data_display_limit); + $has_hidden_data = count($data) > $data_display_limit || count($db_hosts) > $data_display_limit; $db_hosts = array_slice($db_hosts, 0, $data_display_limit, true); $host_names = array_column($db_hosts, 'name', 'name'); $itemids = []; + $items_left = $data_display_limit; foreach ($data as &$item_columns) { + if ($items_left != 0) { + $item_columns = array_slice($item_columns, 0, min($data_display_limit, $items_left)); + $items_left -= count($item_columns); + } + else { + $item_columns = null; + break; + } + foreach ($item_columns as &$item_column) { CArrayHelper::ksort($item_column); $item_column = array_slice($item_column, 0, $data_display_limit, true); @@ -1266,12 +1276,12 @@ function getDataOverview(?array $groupids, ?array $hostids, array $filter): arra $data = array_filter($data); $data = array_slice($data, 0, $data_display_limit, true); - $has_hidden_items = (count($db_items) != count($itemids)); + $has_hidden_data = $has_hidden_data || count($db_items) != count($itemids); $db_items = array_intersect_key($db_items, $itemids); $data = getDataOverviewCellData($db_items, $data, $filter['show_suppressed']); - return [$data, $db_hosts, ($has_hidden_items || $has_hidden_hosts)]; + return [$data, $db_hosts, $has_hidden_data]; } /** -- cgit v1.2.3 From 5a78ddd14cd18257c80dbfd4cf6b9f46e53d1467 Mon Sep 17 00:00:00 2001 From: Eliza Sekace Date: Wed, 11 May 2022 14:43:31 +0300 Subject: ..F....... [ZBX-20669] fixed focus on fields when clicking on labels --- ui/app/partials/configuration.filter.items.php | 6 ++-- ui/app/partials/configuration.host.edit.html.php | 5 ++-- ui/app/partials/monitoring.latest.filter.php | 9 +++--- ui/app/partials/scheduledreport.formgrid.html.php | 2 +- ui/app/views/administration.token.edit.php | 2 +- ui/app/views/administration.user.edit.php | 2 +- ui/app/views/popup.condition.common.php | 34 +++++++++++------------ ui/app/views/popup.media.php | 2 +- ui/app/views/slareport.list.php | 4 +-- ui/include/views/configuration.graph.edit.php | 17 ++++++------ ui/include/views/configuration.graph.list.php | 4 +-- ui/include/views/configuration.template.edit.php | 2 +- ui/include/views/configuration.triggers.list.php | 4 +-- ui/report2.php | 2 +- 14 files changed, 47 insertions(+), 48 deletions(-) (limited to 'ui') diff --git a/ui/app/partials/configuration.filter.items.php b/ui/app/partials/configuration.filter.items.php index f3ce4cbd54c..848abcece3e 100644 --- a/ui/app/partials/configuration.filter.items.php +++ b/ui/app/partials/configuration.filter.items.php @@ -52,7 +52,7 @@ zbx_add_post_js("var filterTypeSwitcher". // First column. $filter_column_1 - ->addRow((new CLabel(_('Host groups'), 'filter_groupid_ms')), + ->addRow((new CLabel(_('Host groups'), 'filter_groupids__ms')), (new CMultiSelect([ 'name' => 'filter_groupids[]', 'object_name' => 'hostGroup', @@ -69,7 +69,7 @@ $filter_column_1 ] ]))->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH) ) - ->addRow((new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostid_ms')), + ->addRow((new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostids__ms')), (new CMultiSelect([ 'name' => 'filter_hostids[]', 'object_name' => ($data['context'] === 'host') ? 'hosts' : 'templates', @@ -96,7 +96,7 @@ $filter_column_1 ); if ($data['filter_data']['hosts']) { - $filter_column_1->addRow(_('Value mapping'), + $filter_column_1->addRow(new CLabel(_('Value mapping'), 'filter_valuemapids__ms'), (new CMultiSelect([ 'name' => 'filter_valuemapids[]', 'object_name' => 'valuemap_names', diff --git a/ui/app/partials/configuration.host.edit.html.php b/ui/app/partials/configuration.host.edit.html.php index e5b4c511ce6..a303200ff3a 100644 --- a/ui/app/partials/configuration.host.edit.html.php +++ b/ui/app/partials/configuration.host.edit.html.php @@ -207,7 +207,7 @@ else { $host_tab ->addItem([ - new CLabel(_('Templates')), + new CLabel(_('Templates'), 'add_templates__ms'), (new CFormField( (count($templates_field_items) > 1) ? (new CDiv($templates_field_items))->addClass('linked-templates') @@ -375,6 +375,7 @@ foreach ($data['inventory_fields'] as $inventory_no => $inventory_field) { $input_field = (new CTextArea('host_inventory['.$field_name.']', $data['host']['inventory'][$field_name])) ->setWidth(ZBX_TEXTAREA_BIG_WIDTH); } + else { $input_field = (new CTextBox('host_inventory['.$field_name.']', $data['host']['inventory'][$field_name])) ->setWidth(ZBX_TEXTAREA_BIG_WIDTH) @@ -414,7 +415,7 @@ foreach ($data['inventory_fields'] as $inventory_no => $inventory_field) { } $inventory_tab->addItem([ - new CLabel($inventory_field['title']), + new CLabel($inventory_field['title'], 'host_inventory['.$field_name.']'), new CFormField([$input_field, $inventory_item]) ]); } diff --git a/ui/app/partials/monitoring.latest.filter.php b/ui/app/partials/monitoring.latest.filter.php index 2afa2fda165..3ecfb6399fd 100644 --- a/ui/app/partials/monitoring.latest.filter.php +++ b/ui/app/partials/monitoring.latest.filter.php @@ -29,7 +29,7 @@ $filter_view_data = array_key_exists('filter_view_data', $data) ? $data['filter_ $left_column = (new CFormGrid()) ->addClass(CFormGrid::ZBX_STYLE_FORM_GRID_LABEL_WIDTH_TRUE) ->addItem([ - new CLabel(_('Host groups'), 'groupids__ms'), + new CLabel(_('Host groups'), 'groupids_#{uniqid}_ms'), new CFormField( (new CMultiSelect([ 'name' => 'groupids[]', @@ -53,7 +53,7 @@ $left_column = (new CFormGrid()) ) ]) ->addItem([ - new CLabel(_('Hosts'), 'hostids__ms'), + new CLabel(_('Hosts'), 'hostids_#{uniqid}_ms'), new CFormField( (new CMultiSelect([ 'name' => 'hostids[]', @@ -169,7 +169,7 @@ $right_column = (new CFormGrid()) new CFormField($tag_format_line) ]) ->addItem([ - new CLabel(_('Tag display priority')), + new CLabel(_('Tag display priority'), 'tag_priority_#{uniqid}'), new CFormField( (new CTextBox('tag_priority', $data['tag_priority'])) ->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH) @@ -179,12 +179,11 @@ $right_column = (new CFormGrid()) ) ]) ->addItem([ - new CLabel(_('Show details')), + new CLabel(_('Show details'), 'show_details'), new CFormField([ (new CCheckBox('show_details')) ->setChecked($data['show_details'] == 1) ->setUncheckedValue(0) - ->removeId() ]) ]); diff --git a/ui/app/partials/scheduledreport.formgrid.html.php b/ui/app/partials/scheduledreport.formgrid.html.php index b4f1576085f..04bb1e18606 100644 --- a/ui/app/partials/scheduledreport.formgrid.html.php +++ b/ui/app/partials/scheduledreport.formgrid.html.php @@ -104,7 +104,7 @@ $form_grid ) ]) ->addItem([ - new CLabel(_('Start time')), + new CLabel(_('Start time'), 'hours'), new CFormField( (new CDiv([ (new CNumericBox('hours', $data['hours'], 2)) diff --git a/ui/app/views/administration.token.edit.php b/ui/app/views/administration.token.edit.php index 5a7605268a9..e083f4c1c2b 100644 --- a/ui/app/views/administration.token.edit.php +++ b/ui/app/views/administration.token.edit.php @@ -78,7 +78,7 @@ $token_from_list = (new CFormList()) ->setChecked($data['expires_state']) ->setUncheckedValue('0') ) - ->addRow((new CLabel(_('Expires at')))->setAsteriskMark(), + ->addRow((new CLabel(_('Expires at'),'expires_at'))->setAsteriskMark(), (new CDateSelector('expires_at', $data['expires_at'])) ->setDateFormat(ZBX_FULL_DATE_TIME) ->setPlaceholder(_('YYYY-MM-DD hh:mm:ss')) diff --git a/ui/app/views/administration.user.edit.php b/ui/app/views/administration.user.edit.php index 8ffffe7203d..1e466b8b4e2 100644 --- a/ui/app/views/administration.user.edit.php +++ b/ui/app/views/administration.user.edit.php @@ -409,7 +409,7 @@ if ($data['action'] === 'user.edit') { ); } else { - $permissions_form_list->addRow((new CLabel(_('Role')))->setAsteriskMark(), $role_multiselect); + $permissions_form_list->addRow((new CLabel(_('Role'), 'roleid_ms'))->setAsteriskMark(), $role_multiselect); } if ($data['roleid']) { diff --git a/ui/app/views/popup.condition.common.php b/ui/app/views/popup.condition.common.php index 1415ca943af..6b6c64c608c 100644 --- a/ui/app/views/popup.condition.common.php +++ b/ui/app/views/popup.condition.common.php @@ -69,7 +69,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), [$operator, new CVar('operator', CONDITION_OPERATOR_EQUAL)]) - ->addRow(_('Tag'), $new_condition_tag); + ->addRow(new CLabel(_('Tag'), 'tag'), $new_condition_tag); break; // New event host group form elements. @@ -98,7 +98,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow(_('Host groups'), $hostgroup_multiselect); + ->addRow(new CLabel(_('Host groups'), 'groupids__ms'), $hostgroup_multiselect); break; // Event tag pair form elements. @@ -115,9 +115,9 @@ switch ($data['type']) { $inline_js .= $new_condition_newtag->getPostJS(); $form_list - ->addRow(_('Old tag name'), $new_condition_oldtag) + ->addRow(new CLabel(_('Old tag name'), 'oldtag'), $new_condition_oldtag) ->addRow(_('Operator'), [$operator, new CVar('operator', CONDITION_OPERATOR_EQUAL)]) - ->addRow(_('New tag name'), $new_condition_newtag); + ->addRow(new CLabel(_('New tag name'), 'newtag'), $new_condition_newtag); break; // Old|New event tag value form elements. @@ -135,9 +135,9 @@ switch ($data['type']) { $inline_js .= $new_condition_value->getPostJS(); $form_list - ->addRow(_('Tag'), $new_condition_tag) + ->addRow(new CLabel(_('Tag'), 'tag'), $new_condition_tag) ->addRow(_('Operator'), $operator) - ->addRow(_('Value'), $new_condition_value); + ->addRow(new CLabel(_('Value'), 'value'), $new_condition_value); break; } break; @@ -205,7 +205,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow(_('Triggers'), $trigger_multiselect); + ->addRow( new CLabel(_('Triggers'), 'trigger_new_condition_ms'), $trigger_multiselect); break; // Trigger severity form elements. @@ -248,7 +248,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow(_('Hosts'), $host_multiselect); + ->addRow(new CLabel(_('Hosts'), 'host_new_condition_ms'), $host_multiselect); break; // Host group form elements. @@ -279,7 +279,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow(_('Host groups'), $hostgroup_multiselect); + ->addRow(new CLabel(_('Host groups'), 'hostgroup_new_condition_ms'), $hostgroup_multiselect); break; // Problem is suppressed form elements. @@ -304,7 +304,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow((new CLabel(_('Tag')))->setAsteriskMark(), $new_condition_value); + ->addRow((new CLabel(_('Tag'), 'value'))->setAsteriskMark(), $new_condition_value); break; // Tag value form elements. @@ -320,9 +320,9 @@ switch ($data['type']) { $inline_js .= $new_condition_value->getPostJS(); $form_list - ->addRow((new CLabel(_('Tag')))->setAsteriskMark(), $new_condition_value2) + ->addRow((new CLabel(_('Tag'), 'value2'))->setAsteriskMark(), $new_condition_value2) ->addRow(_('Operator'), $operator) - ->addRow(_('Value'), $new_condition_value); + ->addRow(new CLabel(_('Value'), 'value'), $new_condition_value); break; // Template form elements. @@ -354,7 +354,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow(_('Templates'), $template_multiselect); + ->addRow(new CLabel(_('Templates'), 'template_new_condition_ms'), $template_multiselect); break; // Time period form elements. @@ -465,7 +465,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow(_('Discovery rules'), $drule_multiselect); + ->addRow(new CLabel(_('Discovery rules'), 'drule_new_condition_ms'), $drule_multiselect); break; // Discovery status form elements. @@ -517,7 +517,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow(_('Proxy'), $proxy_multiselect); + ->addRow(new CLabel(_('Proxy'), 'proxy_new_condition_ms'), $proxy_multiselect); break; // Received value form elements. @@ -532,7 +532,7 @@ switch ($data['type']) { ->setFocusableElementId('label-operator') ->addOptions(CSelect::createOptionsFromArray($operators_by_condition[CONDITION_TYPE_DVALUE])) ) - ->addRow(_('Value'), $new_condition_value); + ->addRow(new CLabel(_('Value'), 'value'), $new_condition_value); break; // Service port form elements. @@ -598,7 +598,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow((new CLabel(_('Value')))->setAsteriskMark(), $new_condition_value); + ->addRow((new CLabel(_('Value'), 'value'))->setAsteriskMark(), $new_condition_value); break; // Event type form elements. diff --git a/ui/app/views/popup.media.php b/ui/app/views/popup.media.php index 081d5d8480b..9b1718ec71b 100644 --- a/ui/app/views/popup.media.php +++ b/ui/app/views/popup.media.php @@ -76,7 +76,7 @@ $media_form = (new CFormList(_('Media'))) 'mediatype_send_to' ) ->addRow( - (new CLabel(_('Send to'), 'mediatype_email_send_to'))->setAsteriskMark(), + (new CLabel(_('Send to'), 'sendto_emails[0]'))->setAsteriskMark(), $email_send_to_table, 'mediatype_email_send_to' ) diff --git a/ui/app/views/slareport.list.php b/ui/app/views/slareport.list.php index 48562cba159..0dc67498e31 100644 --- a/ui/app/views/slareport.list.php +++ b/ui/app/views/slareport.list.php @@ -37,7 +37,7 @@ $filter = (new CFilter()) (new CFormGrid()) ->addClass(CFormGrid::ZBX_STYLE_FORM_GRID_LABEL_WIDTH_TRUE) ->addItem([ - new CLabel(_('SLA'), 'filter_slaid'), + new CLabel(_('SLA'), 'filter_slaid_ms'), new CFormField( (new CMultiSelect([ 'name' => 'filter_slaid', @@ -57,7 +57,7 @@ $filter = (new CFilter()) ] ]))->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH) ), - new CLabel(_('Service'), 'filter_serviceid'), + new CLabel(_('Service'), 'filter_serviceid_ms'), new CFormField( (new CMultiSelect([ 'name' => 'filter_serviceid', diff --git a/ui/include/views/configuration.graph.edit.php b/ui/include/views/configuration.graph.edit.php index 744a56c41af..57778d87e74 100644 --- a/ui/include/views/configuration.graph.edit.php +++ b/ui/include/views/configuration.graph.edit.php @@ -178,7 +178,8 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_YAXIS_TYPE_FIXED => _('Fixed'), GRAPH_YAXIS_TYPE_ITEM_VALUE => _('Item') ])) - ->setDisabled($readonly); + ->setDisabled($readonly) + ->setFocusableElementId('ymin_type_label'); if ($this->data['ymin_type'] == GRAPH_YAXIS_TYPE_FIXED) { $yaxisMinData[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN); @@ -235,11 +236,9 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == $graphForm->addVar('yaxismin', $this->data['yaxismin']); } - $yaxismin_label = new CLabel(_('Y axis MIN value')); + $yaxismin_label = new CLabel(_('Y axis MIN value'),'ymin_type_label'); if ($this->data['ymin_type'] == GRAPH_YAXIS_TYPE_ITEM_VALUE) { - $yaxismin_label - ->setAsteriskMark() - ->setAttribute('for', 'ymin_name'); + $yaxismin_label->setAsteriskMark(); } $graphFormList->addRow($yaxismin_label, $yaxisMinData); @@ -253,7 +252,8 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_YAXIS_TYPE_FIXED => _('Fixed'), GRAPH_YAXIS_TYPE_ITEM_VALUE => _('Item') ])) - ->setDisabled($readonly); + ->setDisabled($readonly) + ->setFocusableElementId('ymax_type_label'); if ($this->data['ymax_type'] == GRAPH_YAXIS_TYPE_FIXED) { $yaxisMaxData[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN); @@ -310,11 +310,10 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == $graphForm->addVar('yaxismax', $this->data['yaxismax']); } - $yaxismax_label = new CLabel(_('Y axis MAX value')); + $yaxismax_label = new CLabel(_('Y axis MAX value'), 'ymax_type_label'); if ($this->data['ymax_type'] == GRAPH_YAXIS_TYPE_ITEM_VALUE) { $yaxismax_label - ->setAsteriskMark() - ->setAttribute('for', 'ymax_name'); + ->setAsteriskMark(); } $graphFormList->addRow($yaxismax_label, $yaxisMaxData); diff --git a/ui/include/views/configuration.graph.list.php b/ui/include/views/configuration.graph.list.php index 961da213066..f656e7eb2da 100644 --- a/ui/include/views/configuration.graph.list.php +++ b/ui/include/views/configuration.graph.list.php @@ -77,7 +77,7 @@ else { ->addFilterTab(_('Filter'), [ (new CFormList()) ->addRow( - (new CLabel(_('Host groups'), 'filter_groups__ms')), + (new CLabel(_('Host groups'), 'filter_groupids__ms')), (new CMultiSelect([ 'name' => 'filter_groupids[]', 'object_name' => 'hostGroup', @@ -96,7 +96,7 @@ else { ]))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) ) ->addRow( - (new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hosts__ms')), + (new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostids__ms')), (new CMultiSelect([ 'name' => 'filter_hostids[]', 'object_name' => ($data['context'] === 'host') ? 'hosts' : 'templates', diff --git a/ui/include/views/configuration.template.edit.php b/ui/include/views/configuration.template.edit.php index 02e065882c4..0178db086f4 100644 --- a/ui/include/views/configuration.template.edit.php +++ b/ui/include/views/configuration.template.edit.php @@ -142,7 +142,7 @@ $templates_field_items[] = (new CMultiSelect([ $template_tab ->addRow( - new CLabel(_('Templates')), + new CLabel(_('Templates'), 'add_templates__ms'), (count($templates_field_items) > 1) ? (new CDiv($templates_field_items))->addClass('linked-templates') : $templates_field_items diff --git a/ui/include/views/configuration.triggers.list.php b/ui/include/views/configuration.triggers.list.php index 012418bd45a..f5050e58c85 100644 --- a/ui/include/views/configuration.triggers.list.php +++ b/ui/include/views/configuration.triggers.list.php @@ -28,7 +28,7 @@ require_once dirname(__FILE__).'/js/configuration.triggers.list.js.php'; $hg_ms_params = ($data['context'] === 'host') ? ['real_hosts' => 1] : ['templated_hosts' => 1]; $filter_column1 = (new CFormList()) - ->addRow((new CLabel(_('Host groups'), 'filter_groupids')), + ->addRow((new CLabel(_('Host groups'), 'filter_groupids__ms')), (new CMultiSelect([ 'name' => 'filter_groupids[]', 'object_name' => 'hostGroup', @@ -45,7 +45,7 @@ $filter_column1 = (new CFormList()) ] ]))->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH) ) - ->addRow((new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostids')), + ->addRow((new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostids__ms')), (new CMultiSelect([ 'name' => 'filter_hostids[]', 'object_name' => ($data['context'] === 'host') ? 'hosts' : 'templates', diff --git a/ui/report2.php b/ui/report2.php index ce1be9a9fbb..9833b989745 100644 --- a/ui/report2.php +++ b/ui/report2.php @@ -462,7 +462,7 @@ else { ]))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) ) ->addRow( - (new CLabel(_('Hosts'), 'filter_hostid__ms')), + (new CLabel(_('Hosts'), 'filter_hostids__ms')), (new CMultiSelect([ 'name' => 'filter_hostids[]', 'object_name' => 'hosts', -- cgit v1.2.3 From eca402a8a2810500d65fe2e0f0dd5ca321902787 Mon Sep 17 00:00:00 2001 From: Eliza Sekace Date: Wed, 11 May 2022 16:56:14 +0300 Subject: ..F....... [ZBX-20669] fixed focus on fields when clicking label => Administration->Users and Configuration->Hosts->Web --- ui/app/views/administration.user.list.php | 2 +- ui/include/views/configuration.httpconf.list.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/app/views/administration.user.list.php b/ui/app/views/administration.user.list.php index 4920b58891d..76255e3d866 100644 --- a/ui/app/views/administration.user.list.php +++ b/ui/app/views/administration.user.list.php @@ -70,7 +70,7 @@ $widget = (new CWidget()) (new CFormList())->addRow(_('Last name'), (new CTextBox('filter_surname', $data['filter']['surname']))->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH) ), - (new CFormList())->addRow((new CLabel(_('User roles'), 'filter_roles')), + (new CFormList())->addRow((new CLabel(_('User roles'), 'filter_roles__ms')), (new CMultiSelect([ 'name' => 'filter_roles[]', 'object_name' => 'roles', diff --git a/ui/include/views/configuration.httpconf.list.php b/ui/include/views/configuration.httpconf.list.php index 7c0031979c9..5a62c994300 100644 --- a/ui/include/views/configuration.httpconf.list.php +++ b/ui/include/views/configuration.httpconf.list.php @@ -28,7 +28,7 @@ $hg_ms_params = ($data['context'] === 'host') ? ['real_hosts' => 1] : ['template $filter_column_left = (new CFormList()) ->addRow( - (new CLabel(_('Host groups'), 'filter_groups__ms')), + (new CLabel(_('Host groups'), 'filter_groupids__ms')), (new CMultiSelect([ 'name' => 'filter_groupids[]', 'object_name' => 'hostGroup', @@ -47,7 +47,7 @@ $filter_column_left = (new CFormList()) ]))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH) ) ->addRow( - (new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hosts__ms')), + (new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostids__ms')), (new CMultiSelect([ 'name' => 'filter_hostids[]', 'object_name' => ($data['context'] === 'host') ? 'hosts' : 'templates', -- cgit v1.2.3 From bc9df199662682d789f5ba2b6eba8d9f2a8dd4da Mon Sep 17 00:00:00 2001 From: Miks Kronkalns Date: Thu, 12 May 2022 12:52:28 +0300 Subject: ..F....... [ZBX-20669] fixed coding style --- ui/app/partials/configuration.host.edit.html.php | 1 - ui/app/views/administration.token.edit.php | 2 +- ui/app/views/popup.condition.common.php | 2 +- ui/include/views/configuration.graph.edit.php | 5 ++--- 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'ui') diff --git a/ui/app/partials/configuration.host.edit.html.php b/ui/app/partials/configuration.host.edit.html.php index a303200ff3a..4f6ee2a1a30 100644 --- a/ui/app/partials/configuration.host.edit.html.php +++ b/ui/app/partials/configuration.host.edit.html.php @@ -375,7 +375,6 @@ foreach ($data['inventory_fields'] as $inventory_no => $inventory_field) { $input_field = (new CTextArea('host_inventory['.$field_name.']', $data['host']['inventory'][$field_name])) ->setWidth(ZBX_TEXTAREA_BIG_WIDTH); } - else { $input_field = (new CTextBox('host_inventory['.$field_name.']', $data['host']['inventory'][$field_name])) ->setWidth(ZBX_TEXTAREA_BIG_WIDTH) diff --git a/ui/app/views/administration.token.edit.php b/ui/app/views/administration.token.edit.php index e083f4c1c2b..b7762bd64b9 100644 --- a/ui/app/views/administration.token.edit.php +++ b/ui/app/views/administration.token.edit.php @@ -78,7 +78,7 @@ $token_from_list = (new CFormList()) ->setChecked($data['expires_state']) ->setUncheckedValue('0') ) - ->addRow((new CLabel(_('Expires at'),'expires_at'))->setAsteriskMark(), + ->addRow((new CLabel(_('Expires at'), 'expires_at'))->setAsteriskMark(), (new CDateSelector('expires_at', $data['expires_at'])) ->setDateFormat(ZBX_FULL_DATE_TIME) ->setPlaceholder(_('YYYY-MM-DD hh:mm:ss')) diff --git a/ui/app/views/popup.condition.common.php b/ui/app/views/popup.condition.common.php index 6b6c64c608c..1366017d2cf 100644 --- a/ui/app/views/popup.condition.common.php +++ b/ui/app/views/popup.condition.common.php @@ -205,7 +205,7 @@ switch ($data['type']) { $form_list ->addRow(_('Operator'), $operator) - ->addRow( new CLabel(_('Triggers'), 'trigger_new_condition_ms'), $trigger_multiselect); + ->addRow(new CLabel(_('Triggers'), 'trigger_new_condition_ms'), $trigger_multiselect); break; // Trigger severity form elements. diff --git a/ui/include/views/configuration.graph.edit.php b/ui/include/views/configuration.graph.edit.php index 57778d87e74..a241086e79a 100644 --- a/ui/include/views/configuration.graph.edit.php +++ b/ui/include/views/configuration.graph.edit.php @@ -236,7 +236,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == $graphForm->addVar('yaxismin', $this->data['yaxismin']); } - $yaxismin_label = new CLabel(_('Y axis MIN value'),'ymin_type_label'); + $yaxismin_label = new CLabel(_('Y axis MIN value'), 'ymin_type_label'); if ($this->data['ymin_type'] == GRAPH_YAXIS_TYPE_ITEM_VALUE) { $yaxismin_label->setAsteriskMark(); } @@ -312,8 +312,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == $yaxismax_label = new CLabel(_('Y axis MAX value'), 'ymax_type_label'); if ($this->data['ymax_type'] == GRAPH_YAXIS_TYPE_ITEM_VALUE) { - $yaxismax_label - ->setAsteriskMark(); + $yaxismax_label->setAsteriskMark(); } $graphFormList->addRow($yaxismax_label, $yaxisMaxData); -- cgit v1.2.3 From 3638b67cfe565b59c4da1477a7603836ccab8e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrejs=20Gri=C5=A1=C4=8Denko?= Date: Thu, 12 May 2022 13:59:15 +0300 Subject: ..F....... [ZBX-18652] increased host search limit to mitigate disrepancy between order by name and sorting by name with natural sorting --- ui/include/items.inc.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/include/items.inc.php b/ui/include/items.inc.php index 292d2cca19d..1657080a4e4 100644 --- a/ui/include/items.inc.php +++ b/ui/include/items.inc.php @@ -1136,9 +1136,9 @@ function getDataOverviewCellData(array $db_items, array $data, int $show_suppres */ function getDataOverviewItems(?array $groupids, ?array $hostids, ?array $tags, int $evaltype): array { if ($hostids === null) { - $limit = (int) CSettingsHelper::get(CSettingsHelper::MAX_OVERVIEW_TABLE_SIZE) + 1; + $limit = CSettingsHelper::get(CSettingsHelper::SEARCH_LIMIT); $db_hosts = API::Host()->get([ - 'output' => [], + 'output' => ['name'], 'groupids' => $groupids, 'monitored_hosts' => true, 'with_monitored_items' => true, @@ -1146,6 +1146,10 @@ function getDataOverviewItems(?array $groupids, ?array $hostids, ?array $tags, i 'limit' => $limit, 'preservekeys' => true ]); + + CArrayHelper::sort($db_hosts, ['name']); + $db_hosts = array_slice($db_hosts, 0, CSettingsHelper::get(CSettingsHelper::MAX_OVERVIEW_TABLE_SIZE) + 1, true); + $hostids = array_keys($db_hosts); } -- cgit v1.2.3 From b026108b8e2d628633602f1fa892ff26cbb1f332 Mon Sep 17 00:00:00 2001 From: Eliza Sekace Date: Thu, 12 May 2022 14:44:26 +0300 Subject: ..F....... [ZBX-20669] fixed focus on additional fields when clicking label --- ui/app/views/administration.user.token.edit.php | 5 +++-- ui/include/views/configuration.host.prototype.edit.php | 4 ++-- ui/include/views/js/configuration.host.prototype.edit.js.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'ui') diff --git a/ui/app/views/administration.user.token.edit.php b/ui/app/views/administration.user.token.edit.php index 85ef8584a9a..2768b815f71 100644 --- a/ui/app/views/administration.user.token.edit.php +++ b/ui/app/views/administration.user.token.edit.php @@ -60,11 +60,12 @@ $token_from_list = (new CFormList()) ->setChecked($data['expires_state']) ->setUncheckedValue('0') ) - ->addRow((new CLabel(_('Expires at')))->setAsteriskMark(), + ->addRow((new CLabel(_('Expires at'), 'expires_at'))->setAsteriskMark(), (new CDateSelector('expires_at', $data['expires_at'])) ->setDateFormat(ZBX_FULL_DATE_TIME) ->setPlaceholder(_('YYYY-MM-DD hh:mm:ss')) - ->setAriaRequired(), + ->setAriaRequired() + ->setId('expires-at-row'), 'expires-at-row' ) ->addRow(_('Enabled'), diff --git a/ui/include/views/configuration.host.prototype.edit.php b/ui/include/views/configuration.host.prototype.edit.php index 85982678374..20f241ddcd5 100644 --- a/ui/include/views/configuration.host.prototype.edit.php +++ b/ui/include/views/configuration.host.prototype.edit.php @@ -174,7 +174,7 @@ else { } $host_tab - ->addRow(_('Templates'), + ->addRow(new CLabel(_('Templates'), 'add_templates__ms'), (count($templates_field_items) > 1) ? (new CDiv($templates_field_items))->addClass('linked-templates') : $templates_field_items @@ -206,7 +206,7 @@ $host_tab->addRow( // New group prototypes. $host_tab->addRow( - _('Group prototypes'), + new CLabel(_('Group prototypes'), 'group_prototypes'), (new CDiv( (new CTable()) ->setId('tbl_group_prototypes') diff --git a/ui/include/views/js/configuration.host.prototype.edit.js.php b/ui/include/views/js/configuration.host.prototype.edit.js.php index 98e40f66b96..1fd393c7581 100644 --- a/ui/include/views/js/configuration.host.prototype.edit.js.php +++ b/ui/include/views/js/configuration.host.prototype.edit.js.php @@ -28,7 +28,7 @@ + placeholder="{#MACRO}" maxlength="255" id='group_prototypes'/>