- [DEV-112] added themes option in frontend (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5341 97f52cf1-0a1b-0410-bd0e-c28be96e8082

6 files changed, 92 insertions, 54 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 5ecaa690..325a9e0a 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -712,7 +712,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 				default:
 					$p = new CTag('p','yes');
 					$p->AddOption('align','center');
-					$p->AddOption('style','color: '.((!$bool)?'#AA0000;':'#223344;'));
+					$p->AddOption('class',((!$bool)?'msgerror':'msgok'));
 					$p->AddItem(bold('['.$msg.']'));
 					$p->Show();
 					break;
@@ -1016,60 +1016,34 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 
 	# Update configuration
 
-	function	update_config($event_history,$alert_history,$refresh_unsupported,$work_period,$alert_usrgrpid,$event_ack_enable,$event_expire,$event_show_max)
+	function	update_config($configs)
 	{
 		$update = array();
-
-		if(!is_null($event_history))
-		{
-			$update[] = 'event_history='.$event_history;
-		}
-		if(!is_null($alert_history))
-		{
-			$update[] = 'alert_history='.$alert_history;
-		}
-		if(!is_null($refresh_unsupported))
-		{
-			$update[] = 'refresh_unsupported='.$refresh_unsupported;
-		}
-		if(!is_null($work_period))
-		{
-			if( !validate_period($work_period) )
-			{
+		
+		if(isset($configs['work_period']) && !is_null($configs['work_period'])){
+			if(!validate_period($configs['work_period'])){
 				error(S_ICORRECT_WORK_PERIOD);
 				return NULL;
 			}
-			$update[] = 'work_period='.zbx_dbstr($work_period);
 		}
-		if(!is_null($alert_usrgrpid))
-		{
-			if($alert_usrgrpid != 0 && !DBfetch(DBselect('select usrgrpid from usrgrp where usrgrpid='.$alert_usrgrpid)))
-			{
+		if(isset($configs['alert_usrgrpid']) && !is_null($configs['alert_usrgrpid'])){
+			if(($configs['alert_usrgrpid'] != 0) && !DBfetch(DBselect('select usrgrpid from usrgrp where usrgrpid='.$configs['alert_usrgrpid']))){
 				error(S_INCORRECT_GROUP);;
 				return NULL;
 			}
-			$update[] = 'alert_usrgrpid='.$alert_usrgrpid;
-		}
-		if(!is_null($event_ack_enable))
-		{
-			$update[] = 'event_ack_enable='.$event_ack_enable;
-		}
-		if(!is_null($event_expire))
-		{
-			$update[] = 'event_expire='.$event_expire;
 		}
-		if(!is_null($event_show_max))
-		{
-			$update[] = 'event_show_max='.$event_show_max;
+		
+		foreach($configs as $key => $value){
+			if(!is_null($value)) 
+				$update[] = $key.'='.zbx_dbstr($value);
 		}
-		if(count($update) == 0)
-		{
+
+		if(count($update) == 0){
 			error(S_NOTHING_TO_DO);
 			return NULL;
 		}
 
-		return	DBexecute('update config set '.implode(',',$update).
-			' where '.DBin_node('configid', get_current_nodeid(false)));
+	return	DBexecute('update config set '.implode(',',$update).' where '.DBin_node('configid', get_current_nodeid(false)));
 	}
 	
 /* Function: 
@@ -1149,6 +1123,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 		$table->AddRow($tr);
 		
 		$table->Show();
+		echo SBR;
 	}
 
 
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 7a7a1db7..de3710b0 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -489,6 +489,7 @@ if((ini_get('mbstring.func_overload') > 5)){
 	define('ZBX_HISTORY_COUNT',5);
 	
 	define('ZBX_GUEST_USER','guest');
+	define('ZBX_DEFAULT_CSS','default.css');
 
 /* Define if your logs are in non-standard format */
 /*	define('ZBX_LOG_ENCODING_DEFAULT', 'Shift_JIS');*/
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index d68bb578..64f2ee99 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -701,6 +701,7 @@
 			$url		= $user["url"];
 			$autologout	= $user["autologout"];
 			$lang		= $user["lang"];
+			$theme 		= $user['theme'];
 			$refresh	= $user["refresh"];
 			$user_type	= $user["type"];
 
@@ -741,6 +742,7 @@
 			$url 		= get_request("url","");
 			$autologout	= get_request("autologout",900);
 			$lang		= get_request("lang","en_gb");
+			$theme 		= get_request('theme','default.css');
 			$refresh	= get_request("refresh",30);
 			$user_type	= get_request("user_type",USER_TYPE_ZABBIX_USER);;
 			$user_groups	= get_request("user_groups",array());
@@ -876,6 +878,13 @@
 		}
 		
 		$frmUser->AddRow(S_LANGUAGE, $cmbLang);
+		
+		$cmbTheme = new CComboBox('theme',$theme);
+			$cmbTheme->AddItem(ZBX_DEFAULT_CSS,S_SYSTEM_DEFAULT);
+			$cmbTheme->AddItem('css_ob.css',S_ORIGINAL_BLUE);
+			$cmbTheme->AddItem('css_bb.css',S_BLACK_AND_BLUE);
+		
+		$frmUser->AddRow(S_THEME, $cmbTheme);
 
 		$frmUser->AddRow(S_AUTO_LOGOUT_IN_SEC,	new CNumericBox("autologout",$autologout,4));
 		$frmUser->AddRow(S_URL_AFTER_LOGIN,	new CTextBox("url",$url,50));
@@ -4090,8 +4099,24 @@ include_once 'include/discovery.inc.php';
 		$frmHouseKeep->AddItemToBottomRow(new CButton("save",S_SAVE));
 		$frmHouseKeep->Show();
 	}
+	
+	function insert_themes_form(){
+		$config=select_config();
+		
+		$frmThemes = new CFormTable(S_THEMES,"config.php");
+		$frmThemes->AddVar("config",get_request("config",9));
+			
+		$cmbTheme = new CComboBox('default_theme',$config['default_theme']);
+			$cmbTheme->AddItem('css_ob.css',S_ORIGINAL_BLUE);
+			$cmbTheme->AddItem('css_bb.css',S_BLACK_AND_BLUE);
+
+		$frmThemes->AddRow(S_DEFAULT_THEME,$cmbTheme);
+			
+		$frmThemes->AddItemToBottomRow(new CButton("save",S_SAVE));
+		$frmThemes->Show();
+	}
 
-	function	insert_event_ack_form()
+	function insert_event_ack_form()
 	{
 		$config=select_config();
 		
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 42056e0a..4191c860 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -377,6 +377,11 @@
 	'S_YELLOW'=>				'Yellow',
 
 //	config.php
+	'S_THEMES'=>					'Themes',
+	'S_SYSTEM_DEFAULT'=>			'System default',
+	'S_BLACK_AND_BLUE'=>			'Black & Blue',
+	'S_ORIGINAL_BLUE'=>				'Original blue',
+	'S_DEFAULT_THEME'=>				'Default theme',
 	'S_EVENT_ACKNOWLEDGES'=>		'Event acknowledges',
 	'S_DAYS'=>						'Days',
 	'S_SHOW_EVENTS_NOT_OLDER'=>			'Show events not older',
@@ -1395,6 +1400,7 @@
 	'S_USER_PROFILE_BIG'=>			'USER PROFILE',
 	'S_USER_PROFILE'=>			'User profile',
 	'S_LANGUAGE'=>				'Language',
+	'S_THEME'=>					'Theme',
 	'S_ENGLISH_GB'=>			'English (GB)',
 	'S_FRENCH_FR'=>				'French (FR)',
 	'S_GERMAN_DE'=>				'German (DE)',
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php
index 3802cc6d..d5805886 100644
--- a/frontends/php/include/page_header.php
+++ b/frontends/php/include/page_header.php
@@ -357,9 +357,37 @@ COpt::profiling_start("page");
 		echo '<meta http-equiv="refresh" content="'.$USER_DETAILS["refresh"].'" />';
 	}
  ?>
-    <link rel="stylesheet" href="css.css" />
-    <link rel="shortcut icon" href="images/general/zabbix.ico">
     <meta name="Author" content="ZABBIX SIA" />
+    <link rel="stylesheet" href="css.css" />
+<?php
+	global $DB;
+	if(!is_null($DB)){
+		$css = false;
+		$config=select_config();		
+		if(isset($config['default_theme']) && file_exists('styles/'.$config['default_theme'])){
+			$css = $config['default_theme'];
+		}
+		
+		if(isset($USER_DETAILS['theme']) && ($USER_DETAILS['theme']!=ZBX_DEFAULT_CSS)){
+			if(file_exists('styles/'.$USER_DETAILS['theme'])){
+				$css = $USER_DETAILS['theme'];
+			}
+		}
+		
+		if($css){
+			echo '<link rel="stylesheet" href="styles/'.$css.'" />';
+			$ico = ereg_replace('.*(\_[a-z]+).*',"\\1",$css);
+			if(file_exists('images/general/zabbix'.$ico.'.ico'))
+				echo '<link rel="shortcut icon" href="images/general/zabbix'.$ico.'.ico">';
+			else
+				echo '<link rel="shortcut icon" href="images/general/zabbix.ico">';
+		}
+		else{
+			echo '<link rel="shortcut icon" href="images/general/zabbix.ico">';
+		}
+	}
+?>
+
     <script type="text/javascript" src="js/common.js"></script>
 <?php
 	if(isset($page['scripts']) && is_array($page['scripts'])){
@@ -404,7 +432,7 @@ COpt::compare_files_with_menu($ZBX_MENU);
 		$support->SetTarget('_blank');
 		$printview = new CLink(S_PRINT, $_SERVER['REQUEST_URI'].(empty($_GET)?'?':'&').'print=1', 'small_font');
 		
-		$page_header_r_col = array($help,'|', $support,'|',$printview);
+		$page_header_r_col = array($help,'|',$support,'|',$printview);
 
 		if($USER_DETAILS["alias"]!=ZBX_GUEST_USER){
 			$page_header_r_col[] = array("|", 
@@ -414,10 +442,13 @@ COpt::compare_files_with_menu($ZBX_MENU);
 			$page_header_r_col[] = array("|", new CLink(S_LOGIN, "index.php?reconnect=1", "small_font"));
 		}
 
-		$logo = new CLink(new CImg("images/general/zabbix.png","ZABBIX"),"http://www.zabbix.com");
+		$logo = new CLink(new CDiv(SPACE,'zabbix_logo'),"http://www.zabbix.com");
 		$logo->SetTarget('_blank');
-
-		$top_page_row	= array(new CCol($logo, "page_header_l"), new CCol($page_header_r_col, "page_header_r"));
+//		$logo = new CSpan(SPACE,'zabbix_logo');
+		$td_r = new CCol($page_header_r_col, "page_header_r");
+		$td_r->AddOption('width','100%');
+//		$top_page_row	= array(new CCol($logo, "page_header_l"), new CCol($page_header_r_col, "page_header_r"));
+		$top_page_row	= array(new CCol($logo, "page_header_l"), $td_r);
 		unset($logo, $page_header_r_col, $help, $support);
 
 		$table = new CTable(NULL,"page_header");
diff --git a/frontends/php/include/users.inc.php b/frontends/php/include/users.inc.php
index 4e83a47d..50771ba8 100644
--- a/frontends/php/include/users.inc.php
+++ b/frontends/php/include/users.inc.php
@@ -33,7 +33,7 @@
 
 	# Add User definition
 
-	function	add_user($name,$surname,$alias,$passwd,$url,$autologout,$lang,$refresh,$user_type,$user_groups,$user_medias)
+	function	add_user($name,$surname,$alias,$passwd,$url,$autologout,$lang,$theme,$refresh,$user_type,$user_groups,$user_medias)
 	{
 		global $USER_DETAILS;
 
@@ -50,9 +50,9 @@
 
 		$userid = get_dbid("users","userid");
 
-		$result =  DBexecute('insert into users (userid,name,surname,alias,passwd,url,autologout,lang,refresh,type)'.
+		$result =  DBexecute('insert into users (userid,name,surname,alias,passwd,url,autologout,lang,theme,refresh,type)'.
 			' values ('.$userid.','.zbx_dbstr($name).','.zbx_dbstr($surname).','.zbx_dbstr($alias).','.
-			zbx_dbstr(md5($passwd)).','.zbx_dbstr($url).','.$autologout.','.zbx_dbstr($lang).','.$refresh.','.$user_type.')');
+			zbx_dbstr(md5($passwd)).','.zbx_dbstr($url).','.$autologout.','.zbx_dbstr($lang).','.zbx_dbstr($theme).','.$refresh.','.$user_type.')');
 		
 		if($result)
 		{
@@ -86,7 +86,7 @@
 
 	# Update User definition
 
-	function	update_user($userid,$name,$surname,$alias,$passwd, $url,$autologout,$lang,$refresh,$user_type,$user_groups,$user_medias)
+	function	update_user($userid,$name,$surname,$alias,$passwd, $url,$autologout,$lang,$theme,$refresh,$user_type,$user_groups,$user_medias)
 	{
 		if(DBfetch(DBselect("select * from users where alias=".zbx_dbstr($alias).
 			" and userid<>$userid and ".DBin_node('userid', get_current_nodeid(false)))))
@@ -97,7 +97,7 @@
 
 		$result = DBexecute("update users set name=".zbx_dbstr($name).",surname=".zbx_dbstr($surname).","."alias=".zbx_dbstr($alias).
 				(isset($passwd) ? (',passwd='.zbx_dbstr(md5($passwd))) : '').
-				",url=".zbx_dbstr($url).","."autologout=$autologout,lang=".zbx_dbstr($lang).",refresh=$refresh,".
+				",url=".zbx_dbstr($url).","."autologout=$autologout,lang=".zbx_dbstr($lang).",theme=".zbx_dbstr($theme).",refresh=$refresh,".
 				"type=$user_type".
 			" where userid=$userid");
 
@@ -134,7 +134,7 @@
 
 	# Update User definition
 
-	function	update_user_profile($userid,$passwd, $url,$autologout,$lang,$refresh)
+	function	update_user_profile($userid,$passwd, $url,$autologout,$lang,$theme,$refresh)
 	{
 		global $USER_DETAILS;
 
@@ -143,7 +143,7 @@
 			access_deny();
 		}
 
-		return DBexecute("update users set url=".zbx_dbstr($url).",autologout=$autologout,lang=".zbx_dbstr($lang).
+		return DBexecute("update users set url=".zbx_dbstr($url).",autologout=$autologout,lang=".zbx_dbstr($lang).",theme=".zbx_dbstr($theme).
 				(isset($passwd) ? (',passwd='.zbx_dbstr(md5($passwd))) : '').
 				",refresh=$refresh where userid=$userid");
 	}