+ *
+ * array(
+ * 'alias_or_column_name',
+ * 'label_to_show_in_the_filter_editor' => 'alias_or_column_name'
+ * )
+ *
+ * getOption('id') !== null ? ' id="' . $this->getOption('id') . '"' : '')
+ . 'class="spinner ' . ($this->getOption('class') ?: '') . '"'
+ . '>'
+ . $this->getView()->icon('spin6')
+ . '
';
+
+ switch ($this->getPlacement()) {
+ case self::APPEND:
+ return $content . $spinner;
+ case self::PREPEND:
+ return $spinner . $content;
+ }
+ }
+}
\ No newline at end of file
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 7992364b9..466391e4b 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -117,9 +117,19 @@ class Menu implements RecursiveIterator
foreach ($props as $key => $value) {
$method = 'set' . implode('', array_map('ucfirst', explode('_', strtolower($key))));
if ($key === 'renderer') {
+ // nested configuration is used to pass multiple arguments to the item renderer
+ if ($value instanceof ConfigObject) {
+ $args = $value;
+ $value = $value->get('0');
+ }
+
$value = '\\' . ltrim($value, '\\');
if (class_exists($value)) {
- $value = new $value;
+ if (isset($args)) {
+ $value = new $value($args);
+ } else {
+ $value = new $value;
+ }
} else {
$class = '\Icinga\Web\Menu' . $value;
if (!class_exists($class)) {
@@ -127,7 +137,11 @@ class Menu implements RecursiveIterator
sprintf('ItemRenderer with class "%s" does not exist', $class)
);
}
- $value = new $class;
+ if (isset($args)) {
+ $value = new $class($args);
+ } else {
+ $value = new $class;
+ }
}
}
if (method_exists($this, $method)) {
@@ -226,7 +240,6 @@ class Menu implements RecursiveIterator
$auth = Auth::getInstance();
if ($auth->isAuthenticated()) {
-
$this->add(t('Dashboard'), array(
'url' => 'dashboard',
'icon' => 'dashboard',
@@ -236,7 +249,10 @@ class Menu implements RecursiveIterator
$section = $this->add(t('System'), array(
'icon' => 'services',
'priority' => 700,
- 'renderer' => 'ProblemMenuItemRenderer'
+ 'renderer' => array(
+ 'SummaryMenuItemRenderer',
+ 'state' => 'critical'
+ )
));
$section->add(t('About'), array(
'url' => 'about',
@@ -255,7 +271,7 @@ class Menu implements RecursiveIterator
'priority' => 800
));
$section->add(t('Application'), array(
- 'url' => 'config',
+ 'url' => 'config/general',
'permission' => 'config/application/*',
'priority' => 810
));
@@ -297,7 +313,10 @@ class Menu implements RecursiveIterator
$section->add(t('Logout'), array(
'url' => 'authentication/logout',
'priority' => 990,
- 'renderer' => 'ForeignMenuItemRenderer'
+ 'renderer' => array(
+ 'MenuItemRenderer',
+ 'target' => '_self'
+ )
));
}
}
diff --git a/library/Icinga/Web/Menu/BadgeMenuItemRenderer.php b/library/Icinga/Web/Menu/BadgeMenuItemRenderer.php
new file mode 100644
index 000000000..ebde0b38f
--- /dev/null
+++ b/library/Icinga/Web/Menu/BadgeMenuItemRenderer.php
@@ -0,0 +1,65 @@
+renderBadge() . $this->createLink($menu);
+ }
+
+ /**
+ * Render the badge
+ *
+ * @return string
+ */
+ protected function renderBadge()
+ {
+ if ($count = $this->getCount()) {
+ return sprintf(
+ '%s
',
+ $this->getView()->escape($this->getTitle()),
+ $this->getView()->escape($this->getState()),
+ $count
+ );
+ }
+ return '';
+ }
+}
diff --git a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
deleted file mode 100644
index b898b4d08..000000000
--- a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
+++ /dev/null
@@ -1,17 +0,0 @@
- '_self'
- );
-}
diff --git a/library/Icinga/Web/Menu/MenuItemRenderer.php b/library/Icinga/Web/Menu/MenuItemRenderer.php
index d40650d91..27abcc94a 100644
--- a/library/Icinga/Web/Menu/MenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MenuItemRenderer.php
@@ -7,6 +7,7 @@ use Icinga\Application\Icinga;
use Icinga\Web\Menu;
use Icinga\Web\Url;
use Icinga\Web\View;
+use Icinga\Data\ConfigObject;
/**
* Default MenuItemRenderer class
@@ -14,38 +15,39 @@ use Icinga\Web\View;
class MenuItemRenderer
{
/**
- * Contains element specific attributes
- *
- * @var array
- */
- protected $attributes = array();
-
- /**
- * View
+ * The view this menu item is being rendered to
*
* @var View|null
*/
- protected $view;
+ protected $view = null;
/**
- * Set the view
+ * The link target
*
- * @param View $view
- *
- * @return $this
+ * @var string
*/
- public function setView(View $view)
+ protected $target = null;
+
+ /**
+ * Create a new instance of MenuItemRenderer
+ *
+ * Is is possible to configure the link target using the option 'target'
+ *
+ * @param ConfigObject|null $configuration
+ */
+ public function __construct(ConfigObject $configuration = null)
{
- $this->view = $view;
- return $this;
+ if ($configuration !== null) {
+ $this->target = $configuration->get('target', null);
+ }
}
/**
- * Get the view
+ * Get the view this menu item is being rendered to
*
* @return View
*/
- public function getView()
+ protected function getView()
{
if ($this->view === null) {
$this->view = Icinga::app()->getViewRenderer()->view;
@@ -53,6 +55,36 @@ class MenuItemRenderer
return $this->view;
}
+ /**
+ * Creates a menu item link element
+ *
+ * @param Menu $menu
+ *
+ * @return string
+ */
+ public function createLink(Menu $menu)
+ {
+ $attributes = isset($this->target) ? sprintf(' target="%s"', $this->getView()->escape($this->target)) : '';
+
+ if ($menu->getIcon() && strpos($menu->getIcon(), '.') === false) {
+ return sprintf(
+ '%s',
+ $menu->getUrl() ? : '#',
+ $attributes,
+ $menu->getIcon(),
+ $this->getView()->escape($menu->getTitle())
+ );
+ }
+
+ return sprintf(
+ '%s%s',
+ $menu->getUrl() ? : '#',
+ $attributes,
+ $menu->getIcon() ? ' ' : '',
+ $this->getView()->escape($menu->getTitle())
+ );
+ }
+
/**
* Renders the html content of a single menu item
*
@@ -64,47 +96,4 @@ class MenuItemRenderer
{
return $this->createLink($menu);
}
-
- /**
- * Creates a menu item link element
- *
- * @param Menu $menu
- *
- * @return string
- */
- public function createLink(Menu $menu)
- {
- if ($menu->getIcon() && strpos($menu->getIcon(), '.') === false) {
- return sprintf(
- '%s',
- $menu->getUrl() ? : '#',
- $this->getAttributes(),
- $menu->getIcon(),
- $this->getView()->escape($menu->getTitle())
- );
- }
-
- return sprintf(
- '%s%s',
- $menu->getUrl() ? : '#',
- $this->getAttributes(),
- $menu->getIcon() ? ' ' : '',
- $this->getView()->escape($menu->getTitle())
- );
- }
-
- /**
- * Returns element specific attributes if present
- *
- * @return string
- */
- protected function getAttributes()
- {
- $attributes = '';
- $view = $this->getView();
- foreach ($this->attributes as $attribute => $value) {
- $attributes .= ' ' . $view->escape($attribute) . '="' . $view->escape($value) . '"';
- }
- return $attributes;
- }
}
diff --git a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
deleted file mode 100644
index 010bdc034..000000000
--- a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
+++ /dev/null
@@ -1,64 +0,0 @@
-getParent() !== null && $menu->hasSubMenus()) {
- /** @var $submenu Menu */
- foreach ($menu->getSubMenus() as $submenu) {
- $renderer = $submenu->getRenderer();
- if (method_exists($renderer, 'getSummary')) {
- if ($renderer->getSummary() !== null) {
- $this->summary[] = $renderer->getSummary();
- }
- }
- }
- }
- return $this->getBadge() . $this->createLink($menu);
- }
-
- /**
- * Get the problem badge
- *
- * @return string
- */
- protected function getBadge()
- {
- if (count($this->summary) > 0) {
- $problems = 0;
- $titles = array();
-
- foreach ($this->summary as $summary) {
- $problems += $summary['problems'];
- $titles[] = $summary['title'];
- }
-
- return sprintf(
- '%s
',
- implode(', ', $titles),
- $problems
- );
- }
- return '';
- }
-}
diff --git a/library/Icinga/Web/Menu/SummaryMenuItemRenderer.php b/library/Icinga/Web/Menu/SummaryMenuItemRenderer.php
new file mode 100644
index 000000000..942ddbc09
--- /dev/null
+++ b/library/Icinga/Web/Menu/SummaryMenuItemRenderer.php
@@ -0,0 +1,94 @@
+state = $configuration->get('state', self::STATE_CRITICAL);
+ }
+
+ /**
+ * Renders the html content of a single menu item and summarized sub-menus
+ *
+ * @param Menu $menu
+ *
+ * @return string
+ */
+ public function render(Menu $menu)
+ {
+ /** @var $submenu Menu */
+ foreach ($menu->getSubMenus() as $submenu) {
+ $renderer = $submenu->getRenderer();
+ if ($renderer instanceof BadgeMenuItemRenderer) {
+ if ($renderer->getState() === $this->state) {
+ $this->titles[] = $renderer->getTitle();
+ $this->count += $renderer->getCount();
+ }
+ }
+ }
+ return $this->renderBadge() . $this->createLink($menu);
+ }
+
+ /**
+ * The amount of items to display in the badge
+ *
+ * @return int
+ */
+ public function getCount()
+ {
+ return $this->count;
+ }
+
+ /**
+ * Defines the color of the badge
+ *
+ * @return string
+ */
+ public function getState()
+ {
+ return $this->state;
+ }
+
+ /**
+ * The tooltip title
+ *
+ * @return string
+ */
+ public function getTitle()
+ {
+ return implode(', ', $this->titles);
+ }
+}
diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index b4d7e92d4..5d11798a0 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -119,6 +119,11 @@ class Request extends Zend_Controller_Request_Http
return $id . '-' . $this->uniqueId;
}
+ /**
+ * Detect whether cookies are enabled
+ *
+ * @return bool
+ */
public function hasCookieSupport()
{
$cookie = new Cookie($this);
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index af807c6e4..f22e66d33 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -12,6 +12,7 @@ class StyleSheet
protected static $lessFiles = array(
'../application/fonts/fontello-ifont/css/ifont-embedded.css',
'css/vendor/tipsy.css',
+ 'css/icinga/mixins.less',
'css/icinga/defaults.less',
'css/icinga/animation.less',
'css/icinga/layout-colors.less',
diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index 06d6851e2..eb72fb851 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -3,8 +3,6 @@
namespace Icinga\Web\Widget\Dashboard;
-use Zend_Form_Element_Button;
-use Icinga\Web\Form;
use Icinga\Web\Url;
use Icinga\Data\ConfigObject;
use Icinga\Exception\IcingaException;
@@ -43,6 +41,13 @@ class Dashlet extends UserWidget
*/
private $disabled = false;
+ /**
+ * The progress label being used
+ *
+ * @var string
+ */
+ private $progressLabel;
+
/**
* The template string used for rendering this widget
*
@@ -52,6 +57,7 @@ class Dashlet extends UserWidget
{TITLE}
+{PROGRESS_LABEL}...