- [DEV-122] {beta} added time period to filter (Artem)

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

5 files changed, 7 insertions, 0 deletions

diff --git a/frontends/php/include/classes/ccheckbox.inc.php b/frontends/php/include/classes/ccheckbox.inc.php
index b22cb0ad..bed94b8a 100644
--- a/frontends/php/include/classes/ccheckbox.inc.php
+++ b/frontends/php/include/classes/ccheckbox.inc.php
@@ -29,6 +29,7 @@
 			$this->options['type'] = 'checkbox';
 			$this->options['value'] = $value;
 			$this->options['name'] = $name;
+			$this->options['id'] = $name;
 			$this->SetAction($action);
 			$this->SetChecked($checked);
 		}
diff --git a/frontends/php/include/classes/ctextbox.inc.php b/frontends/php/include/classes/ctextbox.inc.php
index a261f7dc..8c73648b 100644
--- a/frontends/php/include/classes/ctextbox.inc.php
+++ b/frontends/php/include/classes/ctextbox.inc.php
@@ -31,6 +31,7 @@
 			$this->tag_body_start = '';
 			$this->options['class'] = 'biginput';
 			$this->AddOption('name', $name);
+			$this->AddOption('id', $name);
 			$this->AddOption('size', $size);
 			$this->AddOption('value',$value);
 			$this->SetReadonly($readonly);
diff --git a/frontends/php/include/classes/cvar.inc.php b/frontends/php/include/classes/cvar.inc.php
index 4d267ca3..d6e39fce 100644
--- a/frontends/php/include/classes/cvar.inc.php
+++ b/frontends/php/include/classes/cvar.inc.php
@@ -27,6 +27,8 @@
 			parent::CTag('input','no');
 			$this->options['type'] = 'hidden';
 			$this->options['name'] = $name;
+			$this->options['id'] = $name;
+			
 			$this->SetValue($value);
 		}
 		function SetValue($value)
diff --git a/frontends/php/include/html.inc.php b/frontends/php/include/html.inc.php
index 37d5dfbf..a3c7ff08 100644
--- a/frontends/php/include/html.inc.php
+++ b/frontends/php/include/html.inc.php
@@ -161,6 +161,7 @@
 		$icon = new CDiv(SPACE,($state)?'filteropened':'filterclosed');
 		$icon->AddAction('onclick',new CScript("javascript: change_filter_state(this,'".$id."');"));
 		$icon->AddOption('title',S_SHOW.'/'.S_HIDE.' '.S_FILTER);
+		$icon->AddAction('id','filter_icon');
 
 		$td_icon = new CCol($icon);
 		$td_icon->AddOption('valign','bottom');
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index f618aab1..e0b57341 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -1023,6 +1023,8 @@
 	'S_PROBLEMS'=>				'Problems',
 	'S_PERCENTAGE'=>			'Percentage',
 	'S_SLA'=>				'SLA',
+	'S_HOUR'=>				'Hour',
+	'S_MINUTE'=>			'Minute',
 	'S_DAY'=>				'Day',
 	'S_MONTH'=>				'Month',
 	'S_YEAR'=>				'Year',