- Frontend improvements (Eugene)

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

2 files changed, 13 insertions, 4 deletions

diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 6175d4ce..1194a69b 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -723,11 +723,11 @@
 		if(isset($triggerid))
 		{
 			$frmTrig->AddItemToBottomRow(SPACE);
-			$frmTrig->AddItemToBottomRow(new CButton("delete",S_DELETE,
-				"return Confirm('Delete trigger?');"));
+			$frmTrig->AddItemToBottomRow(new CButtonDelete("Delete trigger?",
+				url_param("groupid").url_param("hostid").url_param("triggerid")));
 		}
 		$frmTrig->AddItemToBottomRow(SPACE);
-		$frmTrig->AddItemToBottomRow(new CButton("cancel",S_CANCEL));
+		$frmTrig->AddItemToBottomRow(new CButtonCancel(url_param("groupid").url_param("hostid")));
 		$frmTrig->Show();
 	}
 
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php
index b2dae17b..e2b20ca1 100644
--- a/frontends/php/triggers.php
+++ b/frontends/php/triggers.php
@@ -66,6 +66,9 @@
 			$triggerid=add_trigger($_REQUEST["expression"],$_REQUEST["description"],$_REQUEST["priority"],$status,$_REQUEST["comments"],$_REQUEST["url"]);
 			add_trigger_to_linked_hosts($triggerid);
 			show_messages($triggerid, S_TRIGGER_ADDED, S_CANNOT_ADD_TRIGGER);
+			if($triggerid){
+				unset($_REQUEST["form"]);
+			}
 		}
 		else
 		{
@@ -85,6 +88,10 @@
 			$result=update_trigger($_REQUEST["triggerid"],$_REQUEST["expression"],$_REQUEST["description"],$_REQUEST["priority"],$status,$_REQUEST["comments"],$_REQUEST["url"]);
 			update_trigger_from_linked_hosts($_REQUEST["triggerid"]);
 			show_messages($result, S_TRIGGER_UPDATED, S_CANNOT_UPDATE_TRIGGER);
+			if($result)
+			{
+				unset($_REQUEST["form"]);
+			}
 		}
 		else
 		{
@@ -314,8 +321,10 @@
 		$footerButtons = array();
 		array_push($footerButtons, new CButton('register','enable selected',
 			"return Confirm('".S_ENABLE_SELECTED_TRIGGERS_Q."');"));
+		array_push($footerButtons, SPACE);
 		array_push($footerButtons, new CButton('register','disable selected',
 			"return Confirm('Disable selected triggers?');"));
+		array_push($footerButtons, SPACE);
 		array_push($footerButtons, new CButton('register','delete selected',
 			"return Confirm('".S_DISABLE_SELECTED_TRIGGERS_Q."');"));
 		$table->SetFooter(new CCol($footerButtons),'table_footer');
@@ -331,7 +340,7 @@
 		$row=DBfetch($result);
 		if($row["cnt"]>0)
 		{
-			echo "<a name=\"form\"></a>";
+			echo BR;
 			@insert_trigger_form($_REQUEST["hostid"],$_REQUEST["triggerid"]);
 		} 
 	}