--- /usr/share/zabbix/hosts.php.orig 2013-10-15 11:25:56.000000000 +0200 +++ /usr/share/zabbix/hosts.php 2013-12-22 22:38:23.000000000 +0100 @@ -642,12 +647,31 @@ $frmGroup->addItem(array(_('Group').SPACE, $pageFilter->getGroupsCB())); $hosts_wdgt->addHeader(_('Hosts'), $frmGroup); - $hosts_wdgt->addHeaderRowNumber(); + $show_shortcuts = ($config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL || $config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_NONEALL?1:0); + $shortcuts = array(); + if ($show_shortcuts) { + $shortcut_all_id = ($config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL?0:-1); + $shortcuts = array( + _('Shortcut').': ', + new CLink(_('All groups'), 'hosts.php?groupid='.$shortcut_all_id) + ); + } + $hosts_wdgt->addHeaderRowNumber($shortcuts); $hosts_wdgt->setRootClass('host-list'); + $options = array( + 'output' => array('host'), + 'sortfield' => 'host' + ); + $proxies = API::Proxy()->get($options); + $proxies = array_combine(zbx_objectValues($proxies, 'proxyid'), zbx_objectValues($proxies, 'host')); + $proxies = array(-1 => _('none')) + $proxies; + $proxies = array(0 => _('disregarded')) + $proxies; + // filter $filter_table = new CTable('', 'filter'); $filter_table->addRow(array( + array(array(bold(_('Proxy')), ': '), new CComboBox('filter_proxy', $_REQUEST['filter_proxy'], null, $proxies, 'col3')), array(array(bold(_('Name')), SPACE._('like').': '), new CTextBox('filter_host', $_REQUEST['filter_host'], 20)), array(array(bold(_('DNS')), SPACE._('like').': '), new CTextBox('filter_dns', $_REQUEST['filter_dns'], 20)), array(array(bold(_('IP')), SPACE._('like').': '), new CTextBox('filter_ip', $_REQUEST['filter_ip'], 20)), --- /usr/share/zabbix/httpmon.php.orig 2013-10-12 15:51:53.000000000 +0200 +++ /usr/share/zabbix/httpmon.php 2013-12-13 14:10:44.000000000 +0100 @@ -121,6 +121,20 @@ $r_form->addItem(array(SPACE._('Host').SPACE,$pageFilter->getHostsCB(true))); $httpmon_wdgt->addHeader(_('Web checks'), $r_form); + + $show_shortcuts = ($config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL || $config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_NONEALL?1:0); + if ($show_shortcuts) { + $shortcut_all_id = ($config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL?0:-1); + $httpmon_wdgt->addHeader(SPACE, array( + _('Shortcuts').': ', + new CLink(_('All groups'), 'httpmon.php?groupid='.$shortcut_all_id), + ' | ', + new CLink(_('All hosts'), 'httpmon.php?groupid='.$pageFilter->groupid.'&hostid='.$shortcut_all_id), + ' | ', + new CLink(_('All hosts in all groups'), 'httpmon.php?groupid='.$shortcut_all_id.'&hostid='.$shortcut_all_id) + )); + } + $httpmon_wdgt->addItem(SPACE); // TABLE --- /usr/share/zabbix/events.php.orig 2013-10-21 10:48:13.000000000 +0200 +++ /usr/share/zabbix/events.php 2013-12-15 10:20:10.000000000 +0100 @@ -315,7 +333,23 @@ } $events_wdgt->addHeader(_('Events'), $r_form); -$events_wdgt->addHeaderRowNumber(); + +$show_shortcuts = ($source == EVENT_SOURCE_TRIGGERS && !$CSV_EXPORT && ( + $config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL || $config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_NONEALL?1:0)); +$shortcuts = array(); +if ($show_shortcuts) { + $shortcut_all_id = ($config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL?0:-1); + $shortcuts = array( + _('Shortcuts').': ', + new CLink(_('All groups'), 'events.php?groupid='.$shortcut_all_id), + ' | ', + new CLink(_('All hosts'), 'events.php?groupid='.$pageFilter->groupid.'&hostid='.$shortcut_all_id), + ' | ', + new CLink(_('All hosts in all groups'), 'events.php?groupid='.$shortcut_all_id.'&hostid='.$shortcut_all_id) + ); +} + +$events_wdgt->addHeaderRowNumber($shortcuts); // FILTER {{{ $filterForm = null; --- /usr/share/zabbix/templates.php.orig 2013-10-15 11:25:56.000000000 +0200 +++ /usr/share/zabbix/templates.php 2014-01-06 16:21:48.000000000 +0100 @@ -445,7 +457,16 @@ $frmGroup->addItem(array(_('Group').SPACE, $pageFilter->getGroupsCB())); $template_wdgt->addHeader(_('Templates'), $frmGroup); - $template_wdgt->addHeaderRowNumber(); + $show_shortcuts = ($config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL || $config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_NONEALL?1:0); + $shortcuts = array(); + if ($show_shortcuts) { + $shortcut_all_id = ($config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL?0:-1); + $shortcuts = array( + _('Shortcut').': ', + new CLink(_('All groups'), 'templates.php?groupid='.$shortcut_all_id), + ); + } + $template_wdgt->addHeaderRowNumber($shortcuts); $form = new CForm(); $form->setName('templates'); --- /usr/share/zabbix/latest.php.orig 2013-10-21 10:48:58.000000000 +0200 +++ /usr/share/zabbix/latest.php 2013-12-13 14:10:50.000000000 +0100 @@ -125,6 +129,20 @@ $r_form->addItem(array(SPACE._('Host').SPACE, $pageFilter->getHostsCB(true))); $latest_wdgt->addHeader(_('Items'), $r_form); + +$show_shortcuts = ($config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL || $config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_NONEALL?1:0); +if ($show_shortcuts) { + $shortcut_all_id = ($config['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL?0:-1); + $latest_wdgt->addHeader(SPACE, array( + _('Shortcuts').': ', + new CLink(_('All groups'), 'latest.php?groupid='.$shortcut_all_id), + ' | ', + new CLink(_('All hosts'), 'latest.php?groupid='.$pageFilter->groupid.'&hostid='.$shortcut_all_id), + ' | ', + new CLink(_('All hosts in all groups'), 'latest.php?groupid='.$shortcut_all_id.'&hostid='.$shortcut_all_id) + )); +} + //------------- /************************* FILTER **************************/ --- /usr/share/zabbix/include/views/configuration.maintenance.list.php.orig 2013-10-12 15:51:49.000000000 +0200 +++ /usr/share/zabbix/include/views/configuration.maintenance.list.php 2013-12-13 14:10:50.000000000 +0100 @@ -31,7 +31,16 @@ $filterForm = new CForm('get'); $filterForm->addItem(array(_('Group').SPACE, $this->data['pageFilter']->getGroupsCB())); $maintenanceWidget->addHeader(_('Maintenance periods'), $filterForm); -$maintenanceWidget->addHeaderRowNumber(); +$show_shortcuts = ($this->data['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL || $this->data['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_NONEALL?1:0); +$shortcuts = array(); +if ($show_shortcuts) { + $shortcut_all_id = ($this->data['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL?0:-1); + $shortcuts = array( + _('Shortcut').': ', + new CLink(_('All groups'), 'maintenance.php?groupid='.$shortcut_all_id) + ); +} +$maintenanceWidget->addHeaderRowNumber($shortcuts); // create form $maintenanceForm = new CForm(); --- /usr/share/zabbix/include/views/monitoring.charts.php.orig 2013-10-23 19:22:38.000000000 +0200 +++ /usr/share/zabbix/include/views/monitoring.charts.php 2013-12-13 14:10:50.000000000 +0100 @@ -40,6 +42,22 @@ : null, $chartForm ); + +$show_shortcuts = ($this->data['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL || $this->data['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_NONEALL?1:0); +if ($show_shortcuts) { + $shortcut_all_id = ($this->data['dropdown_first_entry'] == ZBX_DROPDOWN_FIRST_ALL?0:-1); + $chartsWidget->addHeader(SPACE, array( + _('Shortcuts').': ', + new CLink(_('All groups'), 'charts.php?groupid='.$shortcut_all_id), + ' | ', + new CLink(_('All hosts'), 'charts.php?groupid='.$this->data['pageFilter']->groupid.'&hostid='.$shortcut_all_id), + ' | ', + new CLink(_('All hosts in all groups'), 'charts.php?groupid='.$shortcut_all_id.'&hostid='.$shortcut_all_id), + ' | ', + new CLink(_('Unselect graph'), 'charts.php?groupid='.$this->data['pageFilter']->groupid.'&hostid='.$this->data['pageFilter']->hostid.'&graphid=0') + )); +} + $chartsWidget->addItem(BR()); if (!empty($this->data['graphid'])) {