From 7839d500997675faa09fd45eae83323c43635b0f Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 13 Feb 2015 09:40:24 +0100 Subject: [PATCH 01/38] Header: Add header to preferences refs #7976 --- application/views/scripts/preference/index.phtml | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/scripts/preference/index.phtml b/application/views/scripts/preference/index.phtml index 163381531..9da6d2db3 100644 --- a/application/views/scripts/preference/index.phtml +++ b/application/views/scripts/preference/index.phtml @@ -3,5 +3,6 @@
+

\ No newline at end of file From ce3a564de7dc3170fda0eb219109d3a69263f6c7 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 13 Feb 2015 11:26:09 +0100 Subject: [PATCH 02/38] Header: Add header to tabs extension refs #7976 --- application/controllers/ConfigController.php | 1 + library/Icinga/Web/Widget/Tabs.php | 61 ++++++++++++++++++-- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index bc82b6015..9318520e8 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -66,6 +66,7 @@ class ConfigController extends ActionController $allowedActions[] = 'roles'; } $this->firstAllowedAction = array_shift($allowedActions); + $this->getTabs()->setTitle($this->translate('Config Navigation')); } public function devtoolsAction() diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php index 9df556f65..54274eda4 100644 --- a/library/Icinga/Web/Widget/Tabs.php +++ b/library/Icinga/Web/Widget/Tabs.php @@ -19,6 +19,7 @@ class Tabs extends AbstractWidget implements Countable * @var string */ private $baseTpl = <<< 'EOT' +{HEADER} EOT; + /** + * Template used for the header + * + * @type string + */ + private $headerTpl = '

{TITLE}

'; + /** * Template used for the tabs dropdown * @@ -87,6 +95,13 @@ EOT; */ private $closeTab = true; + /** + * Title of the tab navigation + * + * @type string + */ + private $title; + /** * Set whether the current tab is closable */ @@ -309,11 +324,21 @@ EOT; } $close = $this->closeTab ? $this->renderCloseTab() : ''; - $html = $this->baseTpl; - $html = str_replace('{TABS}', $tabs, $html); - $html = str_replace('{DROPDOWN}', $drop, $html); - $html = str_replace('{CLOSE}', $close, $html); - return $html; + return str_replace( + array( + '{TABS}', + '{DROPDOWN}', + '{CLOSE}', + '{HEADER}' + ), + array( + $tabs, + $drop, + $close, + $this->renderHeader() + ), + $this->baseTpl + ); } public function __toString() @@ -372,4 +397,30 @@ EOT; $tabextension->apply($this); return $this; } + + /** + * Set the title of the tab navigation + * + * @param string $title + * @return self + */ + public function setTitle($title) + { + $this->title = $title; + return $this; + } + + /** + * Render the title into the header template + * + * @return string + */ + public function renderHeader() + { + if (! $this->title) { + return ''; + } + + return str_replace('{TITLE}', $this->title, $this->headerTpl); + } } From bcc03f8160c2c849a7cd399070dc0396ab5eeaa6 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 13 Feb 2015 11:39:28 +0100 Subject: [PATCH 03/38] Focus: Set the focus to the next usable element Fix copy and paste error and find h1 first. refs #7976 --- public/js/icinga/events.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 57c365649..49c23437d 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -337,21 +337,19 @@ handleAnchor: function(query) { var $element = $(query); if ($element.length > 0) { - // Try to find the first header. It is more pleasant to users - // to select the header instead a container - var $header = $element.find(':header:first'); - if ($header.length > 0) { - $element = $header; - } else { - var $input = $element.find(':header:first'); - if ($input.length > 0) { - $element = $input + var focusQueries = ['h1:first', ':header:first', ':input:first']; + $.each(focusQueries, function(index,q) { + var $item = $element.find(q); + if ($item.length > 0) { + $element = $item; + return false; } - } + }); + // If we want to focus an element which has no tabindex // add one that we can focus is if ($element.prop('tabindex') < 0) { - $element.prop('tabindex', 0); + $element.prop('tabindex', '-1'); } $element.focus(); } From 7ca2e1d282a8f7a2ee5ecd8bc86507ee3aefe1fa Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 13 Feb 2015 11:45:20 +0100 Subject: [PATCH 04/38] Fix close button: Test the anchor if it belongs to us --- public/js/icinga/events.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 49c23437d..1ec7c82be 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -413,7 +413,8 @@ event.preventDefault(); // This is an anchor only - if (href.substr(0, 1) === '#' && href.substr(1, 1) !== '!') { + if (href.substr(0, 1) === '#' && href.length > 1 + && href.substr(1, 1) !== '!') { self.handleAnchor(href); return; } From a0e4e4d1faae3a2b677cdb8d58b24e01152a83c5 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 13 Feb 2015 14:48:28 +0100 Subject: [PATCH 05/38] Skip Links: Remove nav element --- application/layouts/scripts/body.phtml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml index 9f0b78ce9..49b097c6c 100644 --- a/application/layouts/scripts/body.phtml +++ b/application/layouts/scripts/body.phtml @@ -8,20 +8,18 @@ use Icinga\Authentication\Manager as Auth; if (Auth::getInstance()->isAuthenticated()): ?>
-

+

translate('Create New Authentication Backend'); ?>

diff --git a/application/views/scripts/config/authentication/modify.phtml b/application/views/scripts/config/authentication/modify.phtml index 5aeee7d12..ebc1937a7 100644 --- a/application/views/scripts/config/authentication/modify.phtml +++ b/application/views/scripts/config/authentication/modify.phtml @@ -2,7 +2,7 @@ tabs->showOnlyCloseButton() ?>

-

+

translate('Edit Backend'); ?>

diff --git a/application/views/scripts/config/authentication/remove.phtml b/application/views/scripts/config/authentication/remove.phtml index cdd615ac7..0a53af30c 100644 --- a/application/views/scripts/config/authentication/remove.phtml +++ b/application/views/scripts/config/authentication/remove.phtml @@ -2,7 +2,7 @@ tabs->showOnlyCloseButton() ?>
-

+

translate('Remove Backend'); ?>

diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml index a31062025..e2491c1fc 100644 --- a/application/views/scripts/config/authentication/reorder.phtml +++ b/application/views/scripts/config/authentication/reorder.phtml @@ -2,21 +2,20 @@
-

- +

+ translate('Authentication Configuration'); ?>

- +

translate('Skip Links'); ?>

+
-

+

@@ -24,7 +23,7 @@ icon('plus', null, array('aria-hidden' => 'true')); ?>translate('Create A New Authentication Backend'); ?>

-

+

From ef7fcb10232d20de522775b3cf2143d593d7a15b Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 13 Feb 2015 15:35:24 +0100 Subject: [PATCH 07/38] Header: Adapt application configuration dialog --- application/views/scripts/config/application.phtml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/views/scripts/config/application.phtml b/application/views/scripts/config/application.phtml index c34aa8349..edb15d31a 100644 --- a/application/views/scripts/config/application.phtml +++ b/application/views/scripts/config/application.phtml @@ -1,10 +1,9 @@
tabs->render($this); ?>
-
-

- +

+ translate('Generic Configuration'); ?>

messageBox)): ?> messageBox->render() ?> From 04fde79a9ff8324b80bdfb5d7cbcb9b7aa7ac69c Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 13 Feb 2015 16:10:51 +0100 Subject: [PATCH 08/38] Header: Adapt resource configuration --- .../config/authentication/reorder.phtml | 2 +- .../views/scripts/config/resource.phtml | 23 +++++++++---------- .../scripts/config/resource/create.phtml | 2 +- .../scripts/config/resource/modify.phtml | 2 +- .../scripts/config/resource/remove.phtml | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml index e2491c1fc..daa8a959f 100644 --- a/application/views/scripts/config/authentication/reorder.phtml +++ b/application/views/scripts/config/authentication/reorder.phtml @@ -6,7 +6,7 @@ translate('Authentication Configuration'); ?>
-

translate('Skip Links'); ?>

+

translate('Skip Links'); ?>

-

+

- +

translate('Skip Links'); ?>

+
-

+

@@ -24,7 +23,7 @@ icon('plus', null, array('aria-hidden' => 'true')); ?> translate('Create A New Resource'); ?>

-

+

diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml index c70bd4779..71d8c946e 100644 --- a/application/views/scripts/config/resource/create.phtml +++ b/application/views/scripts/config/resource/create.phtml @@ -2,7 +2,7 @@ tabs->showOnlyCloseButton() ?>
-

+

translate('Create A New Resource'); ?>

translate('Resources are entities that provide data to Icinga Web 2.'); ?>

diff --git a/application/views/scripts/config/resource/modify.phtml b/application/views/scripts/config/resource/modify.phtml index 48255261b..b7bd0a2f7 100644 --- a/application/views/scripts/config/resource/modify.phtml +++ b/application/views/scripts/config/resource/modify.phtml @@ -2,7 +2,7 @@ tabs->showOnlyCloseButton() ?>
-

+

translate('Edit Existing Resource'); ?>

diff --git a/application/views/scripts/config/resource/remove.phtml b/application/views/scripts/config/resource/remove.phtml index ad5ed59cb..010f2d5d2 100644 --- a/application/views/scripts/config/resource/remove.phtml +++ b/application/views/scripts/config/resource/remove.phtml @@ -2,7 +2,7 @@ tabs->showOnlyCloseButton() ?>
-

+

translate('Remove Existing Resource'); ?>

From 586fa3120b5e760f1da70885de887ddfc0120425 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 13 Feb 2015 16:12:34 +0100 Subject: [PATCH 09/38] Header: Adapt preference dialog refs #7976 --- application/views/scripts/preference/index.phtml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/views/scripts/preference/index.phtml b/application/views/scripts/preference/index.phtml index 9da6d2db3..fc19a1e10 100644 --- a/application/views/scripts/preference/index.phtml +++ b/application/views/scripts/preference/index.phtml @@ -1,8 +1,7 @@
-
-

+

translate('Preferences'); ?>

\ No newline at end of file From 7644888f25f0301945862d15f29d401aaacb96a5 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 13 Feb 2015 16:19:28 +0100 Subject: [PATCH 10/38] Header: Add header semantic to roles configuration refs #7976 --- application/controllers/RolesController.php | 1 + application/views/scripts/roles/index.phtml | 17 ++++++++++++++++- application/views/scripts/roles/new.phtml | 4 +++- application/views/scripts/roles/remove.phtml | 4 +++- application/views/scripts/roles/update.phtml | 4 +++- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php index 7b66b1fa8..097c79e29 100644 --- a/application/controllers/RolesController.php +++ b/application/controllers/RolesController.php @@ -45,6 +45,7 @@ class RolesController extends ActionController 'title' => $this->translate('Roles'), 'url' => 'roles' )); + $this->getTabs()->setTitle($this->translate('Role Configuration')); } /** diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml index c08a0b6a4..4ff2da81e 100644 --- a/application/views/scripts/roles/index.phtml +++ b/application/views/scripts/roles/index.phtml @@ -1,8 +1,20 @@
-

translate('Roles') ?>

+

+ translate('Roles') ?> +

+
+

translate('Skip Links'); ?>

+ +
isEmpty()): ?> translate('No roles found.') ?> @@ -64,6 +76,9 @@
+

+ translate('Create New Role'); ?> +

translate('New Role') ?> diff --git a/application/views/scripts/roles/new.phtml b/application/views/scripts/roles/new.phtml index 4c21c6f6b..d18ada1a5 100644 --- a/application/views/scripts/roles/new.phtml +++ b/application/views/scripts/roles/new.phtml @@ -1,7 +1,9 @@
showOnlyCloseButton() ?> -

translate('New Role') ?>

+

+ translate('New Role') ?> +

diff --git a/application/views/scripts/roles/remove.phtml b/application/views/scripts/roles/remove.phtml index 4abff566a..432c3602d 100644 --- a/application/views/scripts/roles/remove.phtml +++ b/application/views/scripts/roles/remove.phtml @@ -1,7 +1,9 @@
showOnlyCloseButton() ?> -

translate('Remove Role %s'), $name) ?>

+

+ translate('Remove Role %s'), $name) ?> +

diff --git a/application/views/scripts/roles/update.phtml b/application/views/scripts/roles/update.phtml index f48f1ca69..32ab7d018 100644 --- a/application/views/scripts/roles/update.phtml +++ b/application/views/scripts/roles/update.phtml @@ -1,7 +1,9 @@
showOnlyCloseButton() ?> -

translate('Update Role %s'), $name) ?>

+

+ translate('Update Role %s'), $name) ?> +

From 32226418af767cb4caf98badb934083cdea1c87c Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Tue, 17 Feb 2015 16:12:41 +0100 Subject: [PATCH 11/38] Header: Add header to process/info refs #7976 --- .../controllers/ProcessController.php | 2 +- .../views/scripts/process/info.phtml | 67 +++++++++++++++++-- public/css/icinga/menu.less | 5 +- 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php index 875f4094c..2209a8e0b 100644 --- a/modules/monitoring/application/controllers/ProcessController.php +++ b/modules/monitoring/application/controllers/ProcessController.php @@ -25,7 +25,7 @@ class Monitoring_ProcessController extends Controller 'title' => $this->translate('Monitoring Health'), 'url' =>'monitoring/process/info' ) - ); + )->setTitle($this->translate('Process Information')); } /** diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml index 92bb6cb63..12cb01fbc 100644 --- a/modules/monitoring/application/views/scripts/process/info.phtml +++ b/modules/monitoring/application/views/scripts/process/info.phtml @@ -9,15 +9,42 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
+

+ translate('Monitoring Health'); ?> +

+
+

translate('Skip Links'); ?>

+ +
-

translate('Feature Commands') ?>

+

+ translate('Feature Commands') ?> +

toggleFeaturesForm ?>
-

translate('Process Info') ?>

+

+ translate('Process Info') ?> +

@@ -68,9 +95,33 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
-

translate('Performance Info') ?>

+

+ translate('Performance Info') ?> +

+
+

translate('Skip Links'); ?>

+ +
-

translate('Object summaries') ?>

+

+ translate('Object summaries') ?> +

@@ -118,7 +169,9 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
-

translate('Active checks') ?>

+

+ translate('Active checks') ?> +

@@ -148,7 +201,9 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
-

translate('Passive checks') ?>

+

+ translate('Passive checks') ?> +

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less index c33c6670c..6e31e8d8f 100644 --- a/public/css/icinga/menu.less +++ b/public/css/icinga/menu.less @@ -301,5 +301,8 @@ a:focus { } } .skip-links-inline { - margin-top: -3.5em; + margin-top: -2em; + ul > li > a { + width: 14em !important; + } } From fe0bcdbbafbd7aa619023bf47152a94371905034 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Tue, 17 Feb 2015 16:19:03 +0100 Subject: [PATCH 12/38] Header: Add header to module configuration refs #7976 --- application/views/scripts/config/module.phtml | 136 +++++++++--------- .../views/scripts/config/modules.phtml | 56 ++++---- 2 files changed, 98 insertions(+), 94 deletions(-) diff --git a/application/views/scripts/config/module.phtml b/application/views/scripts/config/module.phtml index cd6ad5af8..c41fdbf3a 100644 --- a/application/views/scripts/config/module.phtml +++ b/application/views/scripts/config/module.phtml @@ -1,70 +1,74 @@
-tabs ?> -

escape($module->getTitle()) ?>

+ tabs ?>
- -translate('There is no such module installed.') ?> - -getDependencies(); -$restrictions = $module->getProvidedRestrictions(); -$permissions = $module->getProvidedPermissions(); -$state = $moduleData->enabled ? ($moduleData->loaded ? 'enabled' : 'failed') : 'disabled' - -?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
escape($this->translate('Name')) ?>escape($module->getName()) ?>
translate('State') ?> - qlink($this->translate('disable'), 'config/moduledisable', array( - 'name' => $module->getName() - )) ?> - - - qlink($this->translate('enable'), 'config/moduleenable', array( - 'name' => $module->getName() - )) ?> - -
escape($this->translate('Version')) ?>escape($module->getVersion()) ?>
escape($this->translate('Description')) ?>escape($module->getDescription())) ?>
escape($this->translate('Dependencies')) ?>translate('This module has no dependencies'); - -else: foreach ($dependencies as $name => $versionString): ?> -escape($name) ?>: escape($versionString) ?>
-
escape($this->translate('Permissions')) ?> -escape($permission->name) ?>: escape($permission->description) ?>
-
escape($this->translate('Restrictions')) ?> -escape($restriction->name) ?>: escape($restriction->description) ?>
-
- +

+ escape($module->getTitle()) ?> +

+ + translate('There is no such module installed.') ?> + + getDependencies(); + $restrictions = $module->getProvidedRestrictions(); + $permissions = $module->getProvidedPermissions(); + $state = $moduleData->enabled ? ($moduleData->loaded ? 'enabled' : 'failed') : 'disabled' + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
escape($this->translate('Name')) ?>escape($module->getName()) ?>
translate('State') ?> + qlink($this->translate('disable'), 'config/moduledisable', array( + 'name' => $module->getName() + )) ?> + + + qlink($this->translate('enable'), 'config/moduleenable', array( + 'name' => $module->getName() + )) ?> + +
escape($this->translate('Version')) ?>escape($module->getVersion()) ?>
escape($this->translate('Description')) ?>escape($module->getDescription())) ?>
escape($this->translate('Dependencies')) ?> + translate('This module has no dependencies'); + else: foreach ($dependencies as $name => $versionString): ?> + escape($name) ?>: escape($versionString) ?>
+ +
escape($this->translate('Permissions')) ?> + + escape($permission->name) ?>: escape($permission->description) ?>
+ +
escape($this->translate('Restrictions')) ?> + + escape($restriction->name) ?>: escape($restriction->description) ?>
+ +
diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml index 01fc1c48d..25b57533d 100644 --- a/application/views/scripts/config/modules.phtml +++ b/application/views/scripts/config/modules.phtml @@ -1,36 +1,36 @@
tabs ?> -

translate('Installed Modules') ?>

paginationControl($modules) ?>
- - - - - + + + +
- enabled && $module->loaded) { - $icon = $this->icon('thumbs-up'); - $title = sprintf($this->translate('Module %s is enabled'), $module->name); - } elseif (! $module->enabled) { - $icon = $this->icon('thumbs-down'); - $title = sprintf($this->translate('Module %s is disabled'), $module->name); - } else { // ! $module->loaded - $icon = $this->icon('thumbs-down'); - $title = sprintf($this->translate('Module %s has failed to load'), $module->name); - } +

translate('Installed Modules') ?>

+ + + + + - - - -
+ enabled && $module->loaded) { + $icon = $this->icon('thumbs-up'); + $title = sprintf($this->translate('Module %s is enabled'), $module->name); + } elseif (! $module->enabled) { + $icon = $this->icon('thumbs-down'); + $title = sprintf($this->translate('Module %s is disabled'), $module->name); + } else { // ! $module->loaded + $icon = $this->icon('thumbs-down'); + $title = sprintf($this->translate('Module %s has failed to load'), $module->name); + } - echo $this->qlink( - $icon . $this->escape($module->name), - 'config/module/', - array('name' => $module->name), - array('title' => $title), - false - ); ?> -
+ echo $this->qlink( + $icon . $this->escape($module->name), + 'config/module/', + array('name' => $module->name), + array('title' => $title), + false + ); ?> +
From 28dfbe7e55e246c77bc8bdfdeda42fa4fbb4e4c9 Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Tue, 17 Feb 2015 16:34:36 +0100 Subject: [PATCH 13/38] Support aria markup in SVG charts Add "aria-labelled-by", "title" and "desc" to describe the svg charts in screen readers. --- library/Icinga/Chart/Chart.php | 22 ++++- library/Icinga/Chart/GridChart.php | 7 ++ library/Icinga/Chart/PieChart.php | 7 ++ library/Icinga/Chart/Primitive/Canvas.php | 24 +++++ library/Icinga/Chart/SVGRenderer.php | 95 +++++++++++++++++++ .../controllers/AlertsummaryController.php | 4 + .../controllers/ChartController.php | 6 ++ 7 files changed, 163 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Chart/Chart.php b/library/Icinga/Chart/Chart.php index 13b0114e6..842bb56e8 100644 --- a/library/Icinga/Chart/Chart.php +++ b/library/Icinga/Chart/Chart.php @@ -38,11 +38,25 @@ abstract class Chart implements Drawable */ protected $palette; + /** + * The title of this chart, used for providing accessibility features + * + * @var string + */ + public $title; + + /** + * The description for this chart, mandatory for providing accessibility features + * + * @var string + */ + public $description; + /** * Create a new chart object and create internal objects * * If you want to extend this class use the init() method as an extension point, - * as this will be called at the end o fthe construct call + * as this will be called at the end of the construct call */ public function __construct() { @@ -86,7 +100,6 @@ abstract class Chart implements Drawable } /** - * * Render this graph and return the created SVG * * @return string The SVG created by the SvgRenderer @@ -105,6 +118,11 @@ abstract class Chart implements Drawable $this->renderer->setXAspectRatioAlignment(SVGRenderer::X_ASPECT_RATIO_MIN); $this->renderer->setYAspectRatioAlignment(SVGRenderer::Y_ASPECT_RATIO_MIN); } + + $this->renderer->setAriaDescription($this->description); + $this->renderer->setAriaTitle($this->title); + $this->renderer->getCanvas()->setAriaRole('presentation'); + $this->renderer->getCanvas()->addElement($this); return $this->renderer->render(); } diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php index 7f2794282..20ebb969e 100644 --- a/library/Icinga/Chart/GridChart.php +++ b/library/Icinga/Chart/GridChart.php @@ -84,6 +84,13 @@ class GridChart extends Chart */ private $tooltips = array(); + public function __construct() + { + $this->title = t('Grid Chart'); + $this->description = t('Contains data in a bar or line chart.'); + parent::__construct(); + } + /** * Check if the current dataset has the proper structure for this chart. * diff --git a/library/Icinga/Chart/PieChart.php b/library/Icinga/Chart/PieChart.php index 33ce32927..6b19969c8 100644 --- a/library/Icinga/Chart/PieChart.php +++ b/library/Icinga/Chart/PieChart.php @@ -50,6 +50,13 @@ class PieChart extends Chart */ private $noCaption = false; + public function __construct() + { + $this->title = t('Pie Chart'); + $this->description = t('Contains data in a pie chart.'); + parent::__construct(); + } + /** * Test if the given pies have the correct format * diff --git a/library/Icinga/Chart/Primitive/Canvas.php b/library/Icinga/Chart/Primitive/Canvas.php index c5617fa35..88e247f02 100644 --- a/library/Icinga/Chart/Primitive/Canvas.php +++ b/library/Icinga/Chart/Primitive/Canvas.php @@ -43,6 +43,13 @@ class Canvas implements Drawable */ private $rect; + /** + * The aria role used to describe this canvas' purpose in the accessibility tree + * + * @var string + */ + private $ariaRole; + /** * Create this canvas * @@ -111,6 +118,23 @@ class Canvas implements Drawable $innerContainer->appendChild($child->toSvg($ctx)); } + if (isset($this->ariaRole)) { + $outer->setAttribute('role', $this->ariaRole); + } return $outer; } + + /** + * Set the aria role used to determine the meaning of this canvas in the accessibility tree + * + * The role 'presentation' will indicate that the purpose of this canvas is entirely decorative, while the role + * 'img' will indicate that the canvas contains an image, with a possible title or a description. For other + * possible roles, see http://www.w3.org/TR/wai-aria/roles + * + * @param $role string The aria role to set + */ + public function setAriaRole($role) + { + $this->ariaRole = $role; + } } diff --git a/library/Icinga/Chart/SVGRenderer.php b/library/Icinga/Chart/SVGRenderer.php index 5cc223388..98eaa86d6 100644 --- a/library/Icinga/Chart/SVGRenderer.php +++ b/library/Icinga/Chart/SVGRenderer.php @@ -48,6 +48,27 @@ class SVGRenderer */ private $svg; + /** + * The description of this SVG, useful for screen readers + * + * @var string + */ + private $ariaDescription; + + /** + * The title of this SVG, useful for screen readers + * + * @var string + */ + private $ariaTitle; + + /** + * The aria role used by this svg element + * + * @var string + */ + private $ariaRole = 'img'; + /** * The root layer for all elements * @@ -126,6 +147,7 @@ class SVGRenderer $svg = $this->document->createElement('svg'); $svg->setAttribute('xmlns', 'http://www.w3.org/2000/svg'); $svg->setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $svg->setAttribute('role', $this->ariaRole); $svg->setAttribute('width', '100%'); $svg->setAttribute('height', '100%'); $svg->setAttribute( @@ -150,6 +172,42 @@ class SVGRenderer return $svg; } + /** + * Add aria title and description + * + * Adds an aria title and desc element to the given SVG node, which are used to describe this SVG by accessibility + * tools such as screen readers. + * + * @param DOMNode $svg The SVG DOMNode to which the aria attributes should be attached + * @param $title The title text + * @param $description The description text + */ + private function addAriaDescription (DOMNode $svg, $titleText, $descriptionText) + { + $doc = $svg->ownerDocument; + + $titleId = $descId = ''; + if (isset ($this->ariaTitle)) { + $titleId = 'aria-title-' . $this->stripNonAlphanumeric($titleText); + $title = $doc->createElement('title'); + $title->setAttribute('id', $titleId); + + $title->appendChild($doc->createTextNode($titleText)); + $svg->appendChild($title); + } + + if (isset ($this->ariaDescription)) { + $descId = 'aria-desc-' . $this->stripNonAlphanumeric($descriptionText); + $desc = $doc->createElement('desc'); + $desc->setAttribute('id', $descId); + + $desc->appendChild($doc->createTextNode($descriptionText)); + $svg->appendChild($desc); + } + + $svg->setAttribute('aria-labelledby', join(' ', array($titleId, $descId))); + } + /** * Initialises the XML-document, SVG-element and this figure's root canvas * @@ -172,6 +230,7 @@ class SVGRenderer { $this->createRootDocument(); $ctx = $this->createRenderContext(); + $this->addAriaDescription($this->svg, $this->ariaTitle, $this->ariaDescription); $this->svg->appendChild($this->rootCanvas->toSvg($ctx)); $this->document->formatOutput = true; return $this->document->saveXML(); @@ -232,4 +291,40 @@ class SVGRenderer { $this->yAspectRatio = $alignment; } + + /** + * Set the aria description, that is used as a title for this SVG in screen readers + * + * @param $text + */ + public function setAriaTitle($text) + { + $this->ariaTitle = $text; + } + + /** + * Set the aria description, that is used to describe this SVG in screen readers + * + * @param $text + */ + public function setAriaDescription($text) + { + $this->ariaDescription = $text; + } + + /** + * Set the aria role, that is used to describe the purpose of this SVG in screen readers + * + * @param $text + */ + public function setAriaRole($text) + { + $this->ariaRole = $text; + } + + + private function stripNonAlphanumeric($str) + { + return preg_replace('/[^A-Za-z]+/', '', $str); + } } diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php index 1b3db8093..252a67091 100644 --- a/modules/monitoring/application/controllers/AlertsummaryController.php +++ b/modules/monitoring/application/controllers/AlertsummaryController.php @@ -341,6 +341,8 @@ class Monitoring_AlertsummaryController extends Controller public function createHealingChart() { $gridChart = new GridChart(); + $gridChart->title = t('Healing Chart'); + $gridChart->description = t('Notifications and average reaction time per hour.'); $gridChart->alignTopLeft(); $gridChart->setAxisLabel($this->createPeriodDescription(), mt('monitoring', 'Notifications')) @@ -477,6 +479,8 @@ class Monitoring_AlertsummaryController extends Controller public function createDefectImage() { $gridChart = new GridChart(); + $gridChart->title = t('Defect Chart'); + $gridChart->description = t('Notifications and defects per hour'); $gridChart->alignTopLeft(); $gridChart->setAxisLabel($this->createPeriodDescription(), mt('monitoring', 'Notifications')) diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php index b01702c04..f19d3f458 100644 --- a/modules/monitoring/application/controllers/ChartController.php +++ b/modules/monitoring/application/controllers/ChartController.php @@ -236,6 +236,9 @@ class Monitoring_ChartController extends Controller $unknownBars[] = array($servicegroup->servicegroup, $servicegroup->services_unknown_unhandled); } $this->view->chart = new GridChart(); + $this->view->chart->title = t('Service Group Chart'); + $this->view->chart->description = t('Contains service states for each service group.'); + $this->view->chart->alignTopLeft(); $this->view->chart->setAxisLabel('', mt('monitoring', 'Services')) ->setXAxis(new StaticAxis()) @@ -292,6 +295,9 @@ class Monitoring_ChartController extends Controller } $tooltip = mt('monitoring', '{title}:
{value} of {sum} hosts are {label}'); $this->view->chart = new GridChart(); + $this->view->chart->title = t('Host Group Chart'); + $this->view->chart->description = t('Contains host states of each service group.'); + $this->view->chart->alignTopLeft(); $this->view->chart->setAxisLabel('', mt('monitoring', 'Hosts')) ->setXAxis(new StaticAxis()) From a61e3094025bb8bf68b7cf2e102e7715c523d1d3 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Wed, 18 Feb 2015 10:56:21 +0100 Subject: [PATCH 14/38] Header: Scrolling Position fix for skiplinks refs #7976 --- public/css/icinga/menu.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less index 6e31e8d8f..3c733db6e 100644 --- a/public/css/icinga/menu.less +++ b/public/css/icinga/menu.less @@ -270,7 +270,7 @@ a:focus { /* Accessibility Skip Links */ .skip-links { - position: absolute; + position: relative; opacity: 1; ul { list-style-type: none; @@ -286,7 +286,6 @@ a:focus { left: -999em; box-sizing: content-box; width: 10.4em !important; - top: 0em; text-align: left !important; padding: 0.8em; background-color: white; @@ -301,8 +300,8 @@ a:focus { } } .skip-links-inline { - margin-top: -2em; ul > li > a { width: 14em !important; + top: -3em; } } From 02777c58acd0770d06f0267f8702fffb672165e1 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Wed, 18 Feb 2015 12:45:08 +0100 Subject: [PATCH 15/38] Header: Add one to Alertsummary report refs #7976 --- .../controllers/AlertsummaryController.php | 2 + .../views/scripts/alertsummary/index.phtml | 54 ++++++++++++++++--- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php index 1b3db8093..b36f7ac3e 100644 --- a/modules/monitoring/application/controllers/AlertsummaryController.php +++ b/modules/monitoring/application/controllers/AlertsummaryController.php @@ -39,6 +39,8 @@ class Monitoring_AlertsummaryController extends Controller $this->notificationData = $this->createNotificationData(); $this->problemData = $this->createProblemData(); + + $tabs->setTitle($this->translate('Alertsummary Navigation')); } /** diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml index dbfff6433..7db60791a 100644 --- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml +++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml @@ -8,25 +8,63 @@
- +

+ translate('Alert summary'); ?> +

+
+

translate('Skip Links'); ?>

+ +
-

translate('Notifications and Problems'); ?>

+

+ translate('Notifications and Problems'); ?> +

render(); ?>
-

translate('Time to Reaction (Ack, Recover)'); ?>

+

+ translate('Time to Reaction (Ack, Recover)'); ?> +

render(); ?>
-

translate('Trend'); ?>

+

+ translate('Trend'); ?> +

@@ -53,7 +91,9 @@
recentAlerts): ?> -

translate('Top 5 Recent Alerts'); ?>

+

+ translate('Top 5 Recent Alerts'); ?> +

@@ -66,7 +106,9 @@
-

translate('History'); ?>

+

+ translate('History'); ?> +

partial('list/notifications.phtml', array( From 2992bf3445a817f8ddf2b2f61b3e64fa614a4764 Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Wed, 18 Feb 2015 12:55:33 +0100 Subject: [PATCH 16/38] Always display tooltips in all charts Make information about data types available to colorblind, when hovering over the displayed data set fixes #8364 --- library/Icinga/Chart/Graph/BarGraph.php | 6 ++ library/Icinga/Chart/Graph/LineGraph.php | 62 ++++++++++++++++--- library/Icinga/Chart/Graph/Tooltip.php | 2 +- library/Icinga/Chart/GridChart.php | 7 ++- library/Icinga/Web/Widget/Chart/InlinePie.php | 1 - .../controllers/AlertsummaryController.php | 15 +++-- public/js/icinga/behavior/tooltip.js | 2 +- 7 files changed, 78 insertions(+), 17 deletions(-) diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php index 2d20f8f22..dacc12878 100644 --- a/library/Icinga/Chart/Graph/BarGraph.php +++ b/library/Icinga/Chart/Graph/BarGraph.php @@ -65,7 +65,13 @@ class BarGraph extends Styleable implements Drawable ) { $this->order = $order; $this->dataSet = $dataSet; + $this->tooltips = $tooltips; + foreach ($this->tooltips as $value) { + $ts[] = $value; + } + $this->tooltips = $ts; + $this->graphs = $graphs; } diff --git a/library/Icinga/Chart/Graph/LineGraph.php b/library/Icinga/Chart/Graph/LineGraph.php index 630223968..7b831d625 100644 --- a/library/Icinga/Chart/Graph/LineGraph.php +++ b/library/Icinga/Chart/Graph/LineGraph.php @@ -38,6 +38,13 @@ class LineGraph extends Styleable implements Drawable */ private $isDiscrete = false; + /** + * The tooltips + * + * @var + */ + private $tooltips; + /** * The default stroke width * @var int @@ -56,10 +63,22 @@ class LineGraph extends Styleable implements Drawable * * @param array $dataset An array of [x, y] arrays to display */ - public function __construct(array $dataset) - { + public function __construct( + array $dataset, + array &$graphs, + $order, + array $tooltips = null + ) { usort($dataset, array($this, 'sortByX')); $this->dataset = $dataset; + $this->graphs = $graphs; + + $this->tooltips = $tooltips; + foreach ($this->tooltips as $value) { + $ts[] = $value; + } + $this->tooltips = $ts; + $this->order = $order; } /** @@ -142,14 +161,41 @@ class LineGraph extends Styleable implements Drawable $path->setAdditionalStyle('clip-path: url(#clip);'); $path->setId($this->id); $group = $path->toSvg($ctx); - if ($this->showDataPoints === true) { - foreach ($this->dataset as $point) { - $dot = new Circle($point[0], $point[1], $this->dotWith); - $dot->setFill($this->strokeColor); - $group->appendChild($dot->toSvg($ctx)); + foreach ($this->dataset as $x => $point) { + + if ($this->showDataPoints === true) { + $dot = new Circle($point[0], $point[1], $this->dotWith); + $dot->setFill($this->strokeColor); + $group->appendChild($dot->toSvg($ctx)); + } + + // Draw invisible circle for tooltip hovering + $invisible = new Circle($point[0], $point[1], 20); + $invisible->setFill($this->strokeColor); + $invisible->setAdditionalStyle('opacity: 0.0;'); + $invisible->setAttribute('class', 'chart-data'); + if (isset($this->tooltips[$x])) { + $data = array( + 'label' => isset($this->graphs[$this->order]['label']) ? + strtolower($this->graphs[$this->order]['label']) : '', + 'color' => isset($this->graphs[$this->order]['color']) ? + strtolower($this->graphs[$this->order]['color']) : '#fff' + ); + $format = isset($this->graphs[$this->order]['tooltip']) + ? $this->graphs[$this->order]['tooltip'] : null; + $invisible->setAttribute( + 'title', + $this->tooltips[$x]->renderNoHtml($this->order, $data, $format) + ); + $invisible->setAttribute( + 'data-title-rich', + $this->tooltips[$x]->render($this->order, $data, $format) + ); + } + $group->appendChild($invisible->toSvg($ctx)); } - } + return $group; } } diff --git a/library/Icinga/Chart/Graph/Tooltip.php b/library/Icinga/Chart/Graph/Tooltip.php index 5fa5c3608..8b2efa613 100644 --- a/library/Icinga/Chart/Graph/Tooltip.php +++ b/library/Icinga/Chart/Graph/Tooltip.php @@ -66,7 +66,7 @@ class Tooltip */ public function __construct ( $data = array(), - $format = '{title}
{value} of {sum} {label}' + $format = '{title}: {value} {label}' ) { $this->data = array_merge($this->data, $data); $this->defaultFormat = $format; diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php index 20ebb969e..9f867ac66 100644 --- a/library/Icinga/Chart/GridChart.php +++ b/library/Icinga/Chart/GridChart.php @@ -402,7 +402,12 @@ class GridChart extends Chart ); break; case self::TYPE_LINE: - $graphObj = new LineGraph($axis->transform($graph['data'])); + $graphObj = new LineGraph( + $axis->transform($graph['data']), + $graphs, + $dataset, + $this->tooltips + ); break; default: continue; diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php index 341322714..0bddc906d 100644 --- a/library/Icinga/Web/Widget/Chart/InlinePie.php +++ b/library/Icinga/Web/Widget/Chart/InlinePie.php @@ -44,7 +44,6 @@ EOD; EOD; - /** * @var Url */ diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php index 252a67091..cd2626472 100644 --- a/modules/monitoring/application/controllers/AlertsummaryController.php +++ b/modules/monitoring/application/controllers/AlertsummaryController.php @@ -446,7 +446,8 @@ class Monitoring_AlertsummaryController extends Controller 'label' => $this->translate('Notifications'), 'color' => '#07C0D9', 'data' => $notifications, - 'showPoints' => true + 'showPoints' => true, + 'tooltip' => '{title}: {value} {label}' ) ); @@ -455,7 +456,8 @@ class Monitoring_AlertsummaryController extends Controller 'label' => $this->translate('Avg (min)'), 'color' => '#ffaa44', 'data' => $dAvg, - 'showPoints' => true + 'showPoints' => true, + 'tooltip' => t('{title}: {value}m min. reaction time') ) ); @@ -464,7 +466,8 @@ class Monitoring_AlertsummaryController extends Controller 'label' => $this->translate('Max (min)'), 'color' => '#ff5566', 'data' => $dMax, - 'showPoints' => true + 'showPoints' => true, + 'tooltip' => t('{title}: {value}m max. reaction time') ) ); @@ -493,7 +496,8 @@ class Monitoring_AlertsummaryController extends Controller 'label' => $this->translate('Notifications'), 'color' => '#07C0D9', 'data' => $this->notificationData, - 'showPoints' => true + 'showPoints' => true, + 'tooltip' => '{title}: {value} {label}' ) ); @@ -502,7 +506,8 @@ class Monitoring_AlertsummaryController extends Controller 'label' => $this->translate('Defects'), 'color' => '#ff5566', 'data' => $this->problemData, - 'showPoints' => true + 'showPoints' => true, + 'tooltip' => '{title}: {value} {label}' ) ); diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js index b08b1f3c1..c9a64257f 100644 --- a/public/js/icinga/behavior/tooltip.js +++ b/public/js/icinga/behavior/tooltip.js @@ -27,7 +27,7 @@ var $el = $(this); $el.attr('title', $el.data('title-rich') || $el.attr('title')); }); - $('svg rect.chart-data[title]', el).tipsy({ gravity: 'se', html: true }); + $('svg .chart-data', el).tipsy({ gravity: 'se', html: true }); $('.historycolorgrid a[title]', el).tipsy({ gravity: 's', offset: 2 }); $('img.icon[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, offset: 2 }); $('[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, delayIn: 500 }); From e72de8dfe1456cbb50852d8b7910e0013cab3aaa Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 20 Feb 2015 11:23:31 +0100 Subject: [PATCH 17/38] Disable Livestatus as backend Livestatus is not feature complete yet. This commit has to be reverted once we've fully implemented Livestatus support. refs #8254 --- .../forms/Config/BackendConfigForm.php | 19 ++++++++++++++----- .../application/forms/Setup/BackendPage.php | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php index e0f8e3e0d..265ab33bc 100644 --- a/modules/monitoring/application/forms/Config/BackendConfigForm.php +++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php @@ -43,8 +43,11 @@ class BackendConfigForm extends ConfigForm { $resources = array(); foreach ($resourceConfig as $name => $resource) { - if ($resource->type === 'db' || $resource->type === 'livestatus') { - $resources[$resource->type === 'db' ? 'ido' : 'livestatus'][$name] = $name; +// if ($resource->type === 'db' || $resource->type === 'livestatus') { +// $resources[$resource->type === 'db' ? 'ido' : 'livestatus'][$name] = $name; +// } + if ($resource->type === 'db') { + $resources['ido'][$name] = $name; } } @@ -183,13 +186,19 @@ class BackendConfigForm extends ConfigForm { $resourceType = isset($formData['type']) ? $formData['type'] : key($this->resources); + if ($resourceType === 'livestatus') { + throw new ConfigurationError( + 'We\'ve disabled livestatus support for now because it\'s not feature complete yet' + ); + } + $resourceTypes = array(); if ($resourceType === 'ido' || array_key_exists('ido', $this->resources)) { $resourceTypes['ido'] = 'IDO Backend'; } - if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) { - $resourceTypes['livestatus'] = 'Livestatus'; - } +// if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) { +// $resourceTypes['livestatus'] = 'Livestatus'; +// } $this->addElement( 'checkbox', diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php index d8d4c7fd0..f2df42a1f 100644 --- a/modules/monitoring/application/forms/Setup/BackendPage.php +++ b/modules/monitoring/application/forms/Setup/BackendPage.php @@ -51,7 +51,7 @@ class BackendPage extends Form if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) { $resourceTypes['ido'] = 'IDO'; } - $resourceTypes['livestatus'] = 'Livestatus'; + // $resourceTypes['livestatus'] = 'Livestatus'; $this->addElement( 'select', From b6124d7371baec960776356bf8ee2cd7d8b00801 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 11:18:58 +0100 Subject: [PATCH 18/38] Header: Remove skiplinks Skiplinks are to much and confusing for other users. Better is to use header navigation in screen readers. refs #7076 --- .../config/authentication/reorder.phtml | 10 ----- .../views/scripts/config/resource.phtml | 10 ----- application/views/scripts/roles/index.phtml | 10 ----- .../views/scripts/alertsummary/index.phtml | 30 -------------- .../views/scripts/process/info.phtml | 41 +------------------ 5 files changed, 1 insertion(+), 100 deletions(-) diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml index f26eba82e..4583a23b3 100644 --- a/application/views/scripts/config/authentication/reorder.phtml +++ b/application/views/scripts/config/authentication/reorder.phtml @@ -5,16 +5,6 @@

translate('Authentication Configuration'); ?>

-
-

translate('Skip Links'); ?>

- -

diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml index 6964c48cc..c4eb9360f 100644 --- a/application/views/scripts/config/resource.phtml +++ b/application/views/scripts/config/resource.phtml @@ -5,16 +5,6 @@

-
-

translate('Skip Links'); ?>

- -

diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml index 61cbe3310..d4f5ad2aa 100644 --- a/application/views/scripts/roles/index.phtml +++ b/application/views/scripts/roles/index.phtml @@ -5,16 +5,6 @@

translate('Roles') ?>

-
-

translate('Skip Links'); ?>

- -
isEmpty()): ?> translate('No roles found.') ?> diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml index 7db60791a..d3e7028c0 100644 --- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml +++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml @@ -11,36 +11,6 @@

translate('Alert summary'); ?>

-
-

translate('Skip Links'); ?>

- -
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml index 12cb01fbc..639b5ebc0 100644 --- a/modules/monitoring/application/views/scripts/process/info.phtml +++ b/modules/monitoring/application/views/scripts/process/info.phtml @@ -12,26 +12,7 @@ $cp = $this->checkPerformance()->create($this->checkperformance);

translate('Monitoring Health'); ?>

-
-

translate('Skip Links'); ?>

- -
+
@@ -98,26 +79,6 @@ $cp = $this->checkPerformance()->create($this->checkperformance);

translate('Performance Info') ?>

-
-

translate('Skip Links'); ?>

- -

translate('Object summaries') ?> From 84d1e6b3a322bb33f25fcfc2f953792865723076 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 12:20:45 +0100 Subject: [PATCH 19/38] Header: Add to alert summary refs #7076 --- .../application/views/scripts/alertsummary/index.phtml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml index d3e7028c0..3281f3ec8 100644 --- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml +++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml @@ -1,6 +1,9 @@
tabs ?>
+

+ translate('Filters'); ?> +

widget('limiter') ?> From 6f2d42825450a2592f4ee54f454fd68638a3c71b Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 12:24:24 +0100 Subject: [PATCH 20/38] Event Grid: Add header refs #7976 --- .../monitoring/application/controllers/ListController.php | 1 + .../application/views/scripts/list/eventgrid.phtml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index d7fbe177f..9504917a3 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -717,6 +717,7 @@ class Monitoring_ListController extends Controller private function createTabs() { $tabs = $this->getTabs(); + $tabs->setTitle($this->translate('Monitoring Navigation')); if (in_array($this->_request->getActionName(), array( 'hosts', 'services', diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml index 53056daac..efabac28b 100644 --- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml +++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml @@ -2,18 +2,20 @@ use Icinga\Data\Filter\Filter; use Icinga\Web\Widget\Chart\HistoryColorGrid; ?> - -
tabs->render($this); ?>
+

+ translate('Filters'); ?> +

+

translate('Event Grid') ?>

Date: Mon, 23 Feb 2015 14:23:56 +0100 Subject: [PATCH 21/38] Header: Add header to event history Add header to the following widgets: - FilterEditor - SortBox refs #7976 --- library/Icinga/Web/Widget/FilterEditor.php | 34 ++++++++++++------- library/Icinga/Web/Widget/SortBox.php | 9 ++++- .../views/scripts/list/eventhistory.phtml | 9 ++--- modules/monitoring/public/css/module.less | 4 +++ 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php index 999a825ac..eefc2d739 100644 --- a/library/Icinga/Web/Widget/FilterEditor.php +++ b/library/Icinga/Web/Widget/FilterEditor.php @@ -676,20 +676,28 @@ class FilterEditor extends AbstractWidget public function render() { if (! $this->preservedUrl()->getParam('modifyFilter')) { - return $this->renderSearch() . $this->shorten($this->filter, 50); + $filterEditor = $this->renderSearch() . $this->shorten($this->filter, 50); + } else { + $filterEditor = $this->renderSearch() + . '
' + . '
  • ' + . $this->renderFilter($this->filter) + . '
' + . '
' + . '' + . '' + . '
' + . '
'; } - return $this->renderSearch() - . '
' - . '
  • ' - . $this->renderFilter($this->filter) - . '
' - . '
' - . '' - . '' - . '
' - . '
'; + + return sprintf( + '
' + . '

%s

%s
', + t('Filters'), + $filterEditor + ); } protected function shorten($string, $length) diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php index 18ed95b86..a1728db4f 100644 --- a/library/Icinga/Web/Widget/SortBox.php +++ b/library/Icinga/Web/Widget/SortBox.php @@ -133,6 +133,13 @@ class SortBox extends AbstractWidget if ($this->request) { $form->populate($this->request->getParams()); } - return $form; + + return sprintf( + '
' + . '

%s

%s%s
', + t('Sort Criteria'), + t('Sort by'), + (string) $form + ); } } diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml index 0b6b9bcec..8a75a74cf 100644 --- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml +++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml @@ -4,16 +4,10 @@ use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; ?> - compact): ?>
tabs ?> -
-
- translate('Sort by') ?> sortControl ?> -
-
- + sortControl ?> widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?> paginationControl($history, null, null, array('preserve' => $this->preserve)); ?> @@ -22,6 +16,7 @@ use Icinga\Module\Monitoring\Object\Service;
filterEditor ?> +

translate('Event History') ?>

translate('No history events matching the filter') ?>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less index 387df892b..58014dae8 100644 --- a/modules/monitoring/public/css/module.less +++ b/modules/monitoring/public/css/module.less @@ -198,3 +198,7 @@ hr.command-separator { border: none; border-bottom: 2px solid @colorPetrol; } + +.sort-box { + float: right; +} From 4d4c8b08366f9c602cc14d189fe7b0fdf8e3e693 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 14:28:22 +0100 Subject: [PATCH 22/38] Header: Add header to timeline refs #7976 --- .../monitoring/application/controllers/TimelineController.php | 3 ++- .../monitoring/application/views/scripts/timeline/index.phtml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php index a13973e1d..b4b4eafbb 100644 --- a/modules/monitoring/application/controllers/TimelineController.php +++ b/modules/monitoring/application/controllers/TimelineController.php @@ -19,7 +19,8 @@ class Monitoring_TimelineController extends Controller $this->getTabs()->add($action, array( 'title' => $title, 'url' => Url::fromRequest() - ))->activate($action); + ))->activate($action) + ->setTitle($this->translate('Timeline Navigation')); $this->view->title = $title; } diff --git a/modules/monitoring/application/views/scripts/timeline/index.phtml b/modules/monitoring/application/views/scripts/timeline/index.phtml index a6e32ac08..11a228566 100644 --- a/modules/monitoring/application/views/scripts/timeline/index.phtml +++ b/modules/monitoring/application/views/scripts/timeline/index.phtml @@ -10,6 +10,9 @@ $firstRow = !$beingExtended;
tabs ?>
+

+ translate('Filters') ?> +

@@ -22,6 +25,7 @@ $firstRow = !$beingExtended;
+

translate('Timeline'); ?>

From 918ac21d6d9d1310e2385e16dc8d2cd78d548a42 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 14:30:09 +0100 Subject: [PATCH 23/38] Header: Add h1 to notifications refs #7976 --- .../application/views/scripts/list/notifications.phtml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml index 9cc5f724b..bd2af8184 100644 --- a/modules/monitoring/application/views/scripts/list/notifications.phtml +++ b/modules/monitoring/application/views/scripts/list/notifications.phtml @@ -4,19 +4,17 @@ use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; ?> - compact): ?>
tabs ?> -
- translate('Sort by') ?> sortControl->render($this) ?> -
+ sortControl->render($this) ?> widget('limiter') ?> paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
+

translate('Notifications'); ?>

translate('No notifications matching the filter') ?> From b45897de221477b44419822ae00c1d405d4adc1b Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 14:35:29 +0100 Subject: [PATCH 24/38] Header: Add h1 to downtimes refs #7976 --- .../views/scripts/list/downtimes.phtml | 20 +++++++------------ .../views/scripts/list/eventhistory.phtml | 1 - 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml index 1fbaa713f..5ad554f99 100644 --- a/modules/monitoring/application/views/scripts/list/downtimes.phtml +++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml @@ -4,23 +4,17 @@ use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; ?> - compact): ?> -
- tabs->render($this); ?> -
- translate('Sort by'); ?> sortControl->render($this); ?> - filterEditor): ?> - filterPreview ?> - -
- widget('limiter', array('url' => $this->url, 'max' => $downtimes->count())); ?> - paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?> -
+
+ tabs ?> + sortControl ?> + widget('limiter', array('url' => $this->url, 'max' => $downtimes->count())); ?> + paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?> +
-
filterEditor ?> +

translate('Downtimes'); ?>

translate('No active downtimes'); ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml index 8a75a74cf..84baabb86 100644 --- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml +++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml @@ -10,7 +10,6 @@ use Icinga\Module\Monitoring\Object\Service; sortControl ?> widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?> paginationControl($history, null, null, array('preserve' => $this->preserve)); ?> -
From cef20022b9aea7360ee3a67cf1dbbeb09b97492b Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 14:39:26 +0100 Subject: [PATCH 25/38] Commends: Add h1 to comments refs #7976 --- .../application/views/scripts/list/comments.phtml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml index 6f49bf4a8..d41399984 100644 --- a/modules/monitoring/application/views/scripts/list/comments.phtml +++ b/modules/monitoring/application/views/scripts/list/comments.phtml @@ -1,15 +1,14 @@ compact): ?> -
- tabs->render($this); ?> -
- translate('Sort by'); ?> sortControl->render($this); ?> -
- widget('limiter', array('url' => $this->url, 'max' => $comments->count())); ?> - paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?> -
+
+ tabs ?> + sortControl ?> + widget('limiter', array('url' => $this->url, 'max' => $comments->count())); ?> + paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?> +
+

translate('Comments') ?>

translate('No comments matching the filter'); ?>
From 37568a78321413510bc33d8eb8897666a9cb66ab Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 14:41:51 +0100 Subject: [PATCH 26/38] Header: Add h1 to contacts refs #7976 --- .../application/views/scripts/list/contacts.phtml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml index 4623a5027..e9f47efce 100644 --- a/modules/monitoring/application/views/scripts/list/contacts.phtml +++ b/modules/monitoring/application/views/scripts/list/contacts.phtml @@ -1,12 +1,14 @@ -
- tabs ?> -
- sortControl->render($this); ?> +compact): ?> +
+ tabs ?> + sortControl ?> + widget('limiter', array('url' => $this->url, 'max' => $contacts->count())); ?> + paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
- paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?> -
+
+

translate('Contacts') ?>

Date: Mon, 23 Feb 2015 14:42:55 +0100 Subject: [PATCH 27/38] Header: Add h1 to contact groups refs #7076 --- .../application/views/scripts/list/contactgroups.phtml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml index f32a22815..797e0b299 100644 --- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml @@ -4,6 +4,9 @@
+

+ translate('Contact Groups'); ?> +

Date: Mon, 23 Feb 2015 14:54:02 +0100 Subject: [PATCH 28/38] Header: Add h1 to service groups refs #7976 --- .../application/views/scripts/list/servicegroups.phtml | 5 ++--- modules/monitoring/public/css/module.less | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml index 04e6975e1..3c35d8cce 100644 --- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml @@ -3,15 +3,14 @@
tabs ?> -
- translate('Sort by'); ?> sortControl->render($this); ?> -
+ sortControl->render($this); ?> widget('limiter')->setMaxLimit(count($servicegroups)); ?> paginationControl($servicegroups, null, null, array('preserve' => $this->preserve)); ?>
filterEditor; ?> +

translate('Service Groups') ?>

translate('No service groups matching the filter'); diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less index 58014dae8..26cd5bc38 100644 --- a/modules/monitoring/public/css/module.less +++ b/modules/monitoring/public/css/module.less @@ -201,4 +201,5 @@ hr.command-separator { .sort-box { float: right; -} + margin-right: 1em; +} \ No newline at end of file From b8dbf9c8098ec0c29fb8b2b0beffc1015183ae84 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 14:57:26 +0100 Subject: [PATCH 29/38] Header: Add h1 to hostgroups refs #7976 --- .../application/views/scripts/list/hostgroups.phtml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml index 0c5989bff..ee5973a77 100644 --- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml @@ -3,15 +3,14 @@
tabs ?> -
- translate('Sort by'); ?> sortControl->render($this); ?> -
+ sortControl->render($this); ?> widget('limiter')->setMaxLimit(count($hostgroups)); ?> paginationControl($hostgroups, null, null, array('preserve' => $this->preserve)); ?>
filterEditor; ?> +

translate('Host Groups') ?>

translate('No host groups matching the filter'); From 3cc33417980b575049646992e12b7bf449fc254b Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 15:00:28 +0100 Subject: [PATCH 30/38] Header: Add h1 to service list refs #7976 --- .../monitoring/application/views/scripts/list/services.phtml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index e8d39c7c3..5b8edcaa3 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -10,10 +10,8 @@ if (!$this->compact): ?>
render('list/components/selectioninfo.phtml') ?> render('list/components/servicesummary.phtml') ?> -
-translate('Sort by') ?> sortControl ?> -
+sortControl ?> limit === 0): ?> widget('limiter') ?> @@ -28,6 +26,7 @@ if (!$this->compact): ?>
+

translate('Services') ?>

" From 26ec8bb9ba12a97f3fcb1e8772736c85dd2db85a Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 15:01:42 +0100 Subject: [PATCH 31/38] Header: Add h1 to host list refs #7976 --- .../monitoring/application/views/scripts/list/hosts.phtml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index b9fa25975..509cf5797 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -9,9 +9,8 @@ if ($this->compact): ?>
render('list/components/selectioninfo.phtml') ?> render('list/components/hostssummary.phtml') ?> - translate('Sort by') ?> sortControl->render($this) ?>
- +sortControl->render($this) ?> widget('limiter')->setMaxLimit($this->hosts->count()) ?> paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?> selectionToolbar('multi', $this->href('monitoring/hosts/show?' . $this->filter->toQueryString())) ?> @@ -31,7 +30,7 @@ if ($hosts->count() === 0) { return; } ?> - +

translate('Hosts') ?>

Date: Mon, 23 Feb 2015 15:03:11 +0100 Subject: [PATCH 32/38] Header: Add h1 to tactical overview refs #7976 --- .../monitoring/application/views/scripts/tactical/index.phtml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/monitoring/application/views/scripts/tactical/index.phtml b/modules/monitoring/application/views/scripts/tactical/index.phtml index 3882b27b3..897ef9776 100644 --- a/modules/monitoring/application/views/scripts/tactical/index.phtml +++ b/modules/monitoring/application/views/scripts/tactical/index.phtml @@ -4,6 +4,7 @@
+

translate('Tactical Overview') ?>

statusSummary->hosts_down || $this->statusSummary->hosts_unreachable): ?> render('tactical/components/problem_hosts.phtml'); ?> From a037e5c4db33f3d5215a9482b7585bb8c64e3e93 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 15:12:19 +0100 Subject: [PATCH 33/38] Header: Add h1 to objects header refs #7076 --- .../views/scripts/partials/host/objects-header.phtml | 4 +++- .../views/scripts/partials/service/objects-header.phtml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml index f5edd0213..f892df6f4 100644 --- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml +++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml @@ -3,7 +3,9 @@ 0): ?>
- translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?> +

+ translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?> +

  diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml index 1ac27b934..6389d992f 100644 --- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml +++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml @@ -4,7 +4,9 @@ 0): ?>
- translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount); ?> +

+ translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount); ?> +

  From 060d1093e31b4b00ec6a83f12cb4ad0377a8caba Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 15:13:18 +0100 Subject: [PATCH 34/38] Header: Add h1 to host/show component refs #7976 --- modules/monitoring/application/views/scripts/host/show.phtml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml index 867692301..f490c25f9 100644 --- a/modules/monitoring/application/views/scripts/host/show.phtml +++ b/modules/monitoring/application/views/scripts/host/show.phtml @@ -3,6 +3,7 @@ render('partials/host/servicesummary.phtml') ?>
+

translate('Host Detail Information') ?>

render('show/components/output.phtml') ?> render('show/components/grapher.phtml') ?> From 62866e5fb165d955484e7b3724262fe7f530a405 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 15:13:47 +0100 Subject: [PATCH 35/38] Header: Add h1 to service grid refs #7976 --- .../application/views/scripts/list/servicegrid.phtml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml index dd9be0394..8af02c3a9 100644 --- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml @@ -6,12 +6,11 @@ use Icinga\Module\Monitoring\Object\Service; compact): ?>
tabs; ?> -
- translate('Sort by'); ?> sortControl; ?> -
+ sortControl; ?>
+

translate('Service Grid') ?>

Date: Mon, 23 Feb 2015 15:35:56 +0100 Subject: [PATCH 36/38] Header: Change position because of dashboard rendering refs #7976 --- .../application/views/scripts/list/eventgrid.phtml | 11 ++++++----- .../application/views/scripts/list/eventhistory.phtml | 11 +++++++---- .../application/views/scripts/list/hostgroups.phtml | 2 +- .../application/views/scripts/list/hosts.phtml | 2 +- .../views/scripts/list/notifications.phtml | 5 +++-- .../views/scripts/list/servicegroups.phtml | 2 +- .../application/views/scripts/list/services.phtml | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml index efabac28b..168bac9d1 100644 --- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml +++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml @@ -2,7 +2,7 @@ use Icinga\Data\Filter\Filter; use Icinga\Web\Widget\Chart\HistoryColorGrid; ?> - +
tabs->render($this); ?>
@@ -12,10 +12,11 @@ use Icinga\Web\Widget\Chart\HistoryColorGrid;
- - -
-

translate('Event Grid') ?>

+
+

translate('Event Grid'); ?>

+ +
+ widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?> paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
- -
-filterEditor ?> -

translate('Event History') ?>

+ filterEditor ?> +

translate('Event History') ?>

+ +
+ + + translate('No history events matching the filter') ?>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml index ee5973a77..671ccb467 100644 --- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml @@ -9,8 +9,8 @@
filterEditor; ?> -

translate('Host Groups') ?>

+ translate('No host groups matching the filter'); diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 509cf5797..0af16c296 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -18,6 +18,7 @@ if ($this->compact): ?>
filterEditor ?> +

translate('Hosts') ?>

count() === 0) { return; } ?> -

translate('Hosts') ?>

widget('limiter') ?> paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?> - -

translate('Notifications'); ?>

+ +
+ translate('No notifications matching the filter') ?> diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml index 3c35d8cce..87baf3278 100644 --- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml @@ -9,8 +9,8 @@
filterEditor; ?> -

translate('Service Groups') ?>

+ translate('No service groups matching the filter'); diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index 5b8edcaa3..0f4933f82 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -22,11 +22,11 @@ if (!$this->compact): ?>
filterEditor ?> +

translate('Services') ?>

-

translate('Services') ?>

" From 44019f4e67e720df3eb2ea717a1af3499aab835e Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 16:06:21 +0100 Subject: [PATCH 37/38] Events: Quick fix for access the focusable element refs #7976 --- public/js/icinga/events.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 649557011..39a2a3de4 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -337,6 +337,15 @@ handleAnchor: function(query) { var $element = $(query); if ($element.length > 0) { + // TODO(mh): Some elements are missing to place the right focus + // This is a fixed workarround until all header took place + + var $item = $element.find(':header:first').nextUntil(':header:first').next(); + if ($item.length > 0) { + $element = $item; + } + + /* var focusQueries = ['h1:first', ':header:first', ':input:first']; $.each(focusQueries, function(index,q) { var $item = $element.find(q); @@ -345,6 +354,7 @@ return false; } }); + */ // If we want to focus an element which has no tabindex // add one that we can focus is From 4cdc1313cfd27638600733f6a234465e4c5a1c94 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 23 Feb 2015 16:20:08 +0100 Subject: [PATCH 38/38] Dashlet: Add titles to iframe title attribute resolves #8459 --- library/Icinga/Web/Widget/Dashboard/Dashlet.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php index ae7bb5558..0a3443771 100644 --- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php +++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php @@ -6,7 +6,6 @@ namespace Icinga\Web\Widget\Dashboard; use Zend_Form_Element_Button; use Icinga\Web\Form; use Icinga\Web\Url; -use Icinga\Web\Widget\AbstractWidget; use Icinga\Data\ConfigObject; use Icinga\Exception\IcingaException; @@ -54,7 +53,12 @@ class Dashlet extends UserWidget

{TITLE}

EOD; @@ -184,7 +188,8 @@ EOD; '{IFRAME_URL}', '{FULL_URL}', '{TITLE}', - '{REMOVE}' + '{REMOVE}', + '{TITLE_PREFIX}' ); $replaceTokens = array( @@ -192,7 +197,9 @@ EOD; $iframeUrl, $url->getUrlWithout(array('view', 'limit')), $view->escape($this->getTitle()), - $this->getRemoveLink() + $this->getRemoveLink(), + t('Dashlet') . ': ' + ); return str_replace($searchTokens, $replaceTokens, $this->template);