- developed simple trigger expression editor (Eugene)

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

5 files changed, 40 insertions, 6 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index f4cdbec5..665329be 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1493,6 +1493,24 @@ else if (document.getElementById)
 			frmForm.elements[i].checked = value;
 		}
 	}
+
+	function GetSelectedText(obj)
+	{
+		if (navigator.appName == "Microsoft Internet Explorer")
+		{
+			obj.focus();
+			return document.selection.createRange().text;
+		}
+		else (obj.selectionStart)
+		{
+			if(obj.selectionStart != obj.selectionEnd) {
+				var s = obj.selectionStart;
+				var e = obj.selectionEnd;
+				return obj.value.substring(s, e);
+			}
+		}
+		return obj.value;
+	}
 //-->
 </script>
 <?php
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 6e907512..08712ad4 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -285,6 +285,9 @@
 	define("RESOURCE_TYPE_NODE",		0);
 	define("RESOURCE_TYPE_GROUP",		1);
 
+	define('PARAM_TYPE_SECONDS',	0);
+	define('PARAM_TYPE_COUNTS',	1);
+
 	define("ZBX_NODE_REMOTE",	0);
 	define("ZBX_NODE_LOCAL",	1);
 	define("ZBX_NODE_MASTER",	2);
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index dc9a00e0..82955f50 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1281,8 +1281,14 @@
 			}
 		}
 
-		$frmTrig->AddRow(S_NAME, new CTextBox("description",$description,70, $limited));
-		$frmTrig->AddRow(S_EXPRESSION, new CTextBox("expression",$expression,70, $limited));
+		$frmTrig->AddRow(S_NAME, new CTextBox("description",$description,90, $limited));
+		$frmTrig->AddRow(S_EXPRESSION, array(
+				new CTextBox("expression",$expression,75, $limited),
+				new CButton('insert',S_INSERT,
+					"return PopUp('popup_trexpr.php?dstfrm=".$frmTrig->GetName().
+					"&dstfld1=expression&srctbl=expression".
+					"&srcfld1=expression&expression=' + escape(GetSelectedText(this.form.elements['expression'])),700,200);")
+			));
 
 	/* dependences */
 		foreach($dependences as $val){
@@ -1306,7 +1312,7 @@
 	/* new dependence */
 		$frmTrig->AddVar('new_dependence','0');
 
-		$txtCondVal = new CTextBox('trigger','',50);
+		$txtCondVal = new CTextBox('trigger','',75);
 		$txtCondVal->SetReadonly('yes');
 
 		$btnSelect = new CButton('btn1',S_SELECT,
@@ -1329,8 +1335,8 @@
 		}
 		$frmTrig->AddRow(S_SEVERITY,$cmbPrior);
 
-		$frmTrig->AddRow(S_COMMENTS,new CTextArea("comments",$comments,70,7));
-		$frmTrig->AddRow(S_URL,new CTextBox("url",$url,70));
+		$frmTrig->AddRow(S_COMMENTS,new CTextArea("comments",$comments,90,7));
+		$frmTrig->AddRow(S_URL,new CTextBox("url",$url,90));
 		$frmTrig->AddRow(S_DISABLED,new CCheckBox("status",$status));
  
 		$frmTrig->AddItemToBottomRow(new CButton("save",S_SAVE));
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index daca74a4..8c012bcc 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -958,6 +958,11 @@
 	"S_URL"=>				"URL",
 	"S_INVALID_URL"=>			"Invalid URL",
 	"S_CREATE_TRIGGER"=>			"Create Trigger",
+	"S_INSERT"=>				"Insert",
+	"S_TIMES"=>				"Times",
+	"S_SECONDS"=>				"Seconds",
+	"S_COUNTS"=>				"Counts",
+	"S_LAST_OF"=>				"Last of",
 
 //	tr_comments.php
 	"S_TRIGGER_COMMENTS"=>			"Trigger comments",
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php
index 9433ee8a..e7213cdd 100644
--- a/frontends/php/include/page_header.php
+++ b/frontends/php/include/page_header.php
@@ -191,7 +191,9 @@ COpt::profiling_start("page");
 						),
 					array("url"=>"hosts.php"	,"label"=>S_HOSTS		),
 					array("url"=>"items.php"	,"label"=>S_ITEMS		),
-					array("url"=>"triggers.php"	,"label"=>S_TRIGGERS		),
+					array("url"=>"triggers.php"	,"label"=>S_TRIGGERS		,
+						"sub_pages"=>array("popup_trexpr.php")
+						),
 					array("url"=>"actionconf.php"	,"label"=>S_ACTIONS		),
 					array("url"=>"sysmaps.php"	,"label"=>S_MAPS		,
 						"sub_pages"=>array("sysmap.php")