1 files changed, 13 insertions, 10 deletions

diff --git a/frontends/php/dashboard.php b/frontends/php/dashboard.php
index 83e8cd52fd7..528fb32db94 100644
--- a/frontends/php/dashboard.php
+++ b/frontends/php/dashboard.php
@@ -40,7 +40,7 @@ $fields = array(
 	'fullscreen' =>		array(T_ZBX_INT, O_OPT, P_SYS,	IN('0,1'),	null),
 	// ajax
 	'widgetName' =>		array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
-	'widgetRefresh' =>	array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
+	'widgetRefresh' =>	array(T_ZBX_STR, O_OPT, null,	null,		null),
 	'widgetRefreshRate' => array(T_ZBX_STR, O_OPT, P_ACT, null,		null),
 	'widgetSort' =>		array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
 	'widgetState' =>	array(T_ZBX_STR, O_OPT, P_ACT,	null,		null),
@@ -311,7 +311,7 @@ $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setAttribute('id', 'favouriteGraphs');
 $icon->setMenuPopup(CMenuPopupHelper::getFavouriteGraphs());
 
-$favouriteGraphs = new CUIWidget(WIDGET_FAVOURITE_GRAPHS, getFavouriteGraphs());
+$favouriteGraphs = new CCollapsibleUiWidget(WIDGET_FAVOURITE_GRAPHS, getFavouriteGraphs());
 $favouriteGraphs->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_FAVOURITE_GRAPHS.'.state', true);
 $favouriteGraphs->setHeader(_('Favourite graphs'), $icon);
 $favouriteGraphs->setFooter(new CLink(_('Graphs').' »', 'charts.php', 'highlight'), true);
@@ -325,7 +325,7 @@ $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setAttribute('id', 'favouriteMaps');
 $icon->setMenuPopup(CMenuPopupHelper::getFavouriteMaps());
 
-$favouriteMaps = new CUIWidget(WIDGET_FAVOURITE_MAPS, getFavouriteMaps());
+$favouriteMaps = new CCollapsibleUiWidget(WIDGET_FAVOURITE_MAPS, getFavouriteMaps());
 $favouriteMaps->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_FAVOURITE_MAPS.'.state', true);
 $favouriteMaps->setHeader(_('Favourite maps'), $icon);
 $favouriteMaps->setFooter(new CLink(_('Maps').' »', 'maps.php', 'highlight'), true);
@@ -339,7 +339,7 @@ $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setAttribute('id', 'favouriteScreens');
 $icon->setMenuPopup(CMenuPopupHelper::getFavouriteScreens());
 
-$favouriteScreens = new CUIWidget(WIDGET_FAVOURITE_SCREENS, getFavouriteScreens());
+$favouriteScreens = new CCollapsibleUiWidget(WIDGET_FAVOURITE_SCREENS, getFavouriteScreens());
 $favouriteScreens->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_FAVOURITE_SCREENS.'.state', true);
 $favouriteScreens->setHeader(_('Favourite screens'), $icon);
 $favouriteScreens->setFooter(
@@ -364,7 +364,7 @@ if (CWebUser::$data['type'] == USER_TYPE_SUPER_ADMIN) {
 	$icon = new CIcon(_('Menu'), 'iconmenu');
 	$icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_ZABBIX_STATUS, $rate));
 
-	$zabbixStatus = new CUIWidget(WIDGET_ZABBIX_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
+	$zabbixStatus = new CCollapsibleUiWidget(WIDGET_ZABBIX_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
 	$zabbixStatus->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_ZABBIX_STATUS.'.state', true);
 	$zabbixStatus->setHeader(_('Status of Zabbix'), $icon);
 	$zabbixStatus->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_ZABBIX_STATUS.'_footer'));
@@ -388,7 +388,7 @@ $rate = CProfile::get('web.dashboard.widget.'.WIDGET_SYSTEM_STATUS.'.rf_rate', 6
 $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_SYSTEM_STATUS, $rate));
 
-$systemStatus = new CUIWidget(WIDGET_SYSTEM_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
+$systemStatus = new CCollapsibleUiWidget(WIDGET_SYSTEM_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
 $systemStatus->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_SYSTEM_STATUS.'.state', true);
 $systemStatus->setHeader(_('System status'), $icon);
 $systemStatus->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_SYSTEM_STATUS.'_footer'));
@@ -411,7 +411,7 @@ $rate = CProfile::get('web.dashboard.widget.'.WIDGET_HOST_STATUS.'.rf_rate', 60)
 $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_HOST_STATUS, $rate));
 
-$hostStatus = new CUIWidget(WIDGET_HOST_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
+$hostStatus = new CCollapsibleUiWidget(WIDGET_HOST_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
 $hostStatus->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_HOST_STATUS.'.state', true);
 $hostStatus->setHeader(_('Host status'), $icon);
 $hostStatus->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_HOST_STATUS.'_footer'));
@@ -434,7 +434,7 @@ $rate = CProfile::get('web.dashboard.widget.'.WIDGET_LAST_ISSUES.'.rf_rate', 60)
 $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_LAST_ISSUES, $rate));
 
-$lastIssues = new CUIWidget(WIDGET_LAST_ISSUES, new CSpan(_('Loading...'), 'textcolorstyles'));
+$lastIssues = new CCollapsibleUiWidget(WIDGET_LAST_ISSUES, new CSpan(_('Loading...'), 'textcolorstyles'));
 $lastIssues->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_LAST_ISSUES.'.state', true);
 $lastIssues->setHeader(_n('Last %1$d issue', 'Last %1$d issues', DEFAULT_LATEST_ISSUES_CNT), $icon);
 $lastIssues->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_LAST_ISSUES.'_footer'));
@@ -457,7 +457,7 @@ $rate = CProfile::get('web.dashboard.widget.'.WIDGET_WEB_OVERVIEW.'.rf_rate', 60
 $icon = new CIcon(_('Menu'), 'iconmenu');
 $icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_WEB_OVERVIEW, $rate));
 
-$webMonitoring = new CUIWidget(WIDGET_WEB_OVERVIEW, new CSpan(_('Loading...'), 'textcolorstyles'));
+$webMonitoring = new CCollapsibleUiWidget(WIDGET_WEB_OVERVIEW, new CSpan(_('Loading...'), 'textcolorstyles'));
 $webMonitoring->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_WEB_OVERVIEW.'.state', true);
 $webMonitoring->setHeader(_('Web monitoring'), $icon);
 $webMonitoring->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_WEB_OVERVIEW.'_footer'));
@@ -487,7 +487,7 @@ if ($dbDiscoveryRules['cnt'] > 0 && check_right_on_discovery()) {
 	$icon = new CIcon(_('Menu'), 'iconmenu');
 	$icon->setMenuPopup(CMenuPopupHelper::getRefresh(WIDGET_DISCOVERY_STATUS, $rate));
 
-	$discoveryStatus = new CUIWidget(WIDGET_DISCOVERY_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
+	$discoveryStatus = new CCollapsibleUiWidget(WIDGET_DISCOVERY_STATUS, new CSpan(_('Loading...'), 'textcolorstyles'));
 	$discoveryStatus->open = (bool) CProfile::get('web.dashboard.widget.'.WIDGET_DISCOVERY_STATUS.'.state', true);
 	$discoveryStatus->setHeader(_('Discovery status'), $icon);
 	$discoveryStatus->setFooter(new CDiv(SPACE, 'textwhite', WIDGET_DISCOVERY_STATUS.'_footer'));
@@ -534,6 +534,9 @@ zbx_add_post_js('jqBlink.blink();');
 
 ?>
 <script type="text/javascript">
+	/**
+	 * @see init.js add.popup event
+	 */
 	function addPopupValues(list) {
 		var favourites = {graphid: 1, itemid: 1, screenid: 1, slideshowid: 1, sysmapid: 1};