From 46f4daf879cb71b022874fc3b6551d97d400fe1b Mon Sep 17 00:00:00 2001 From: osmiy Date: Fri, 3 Feb 2006 17:03:31 +0000 Subject: - Frontend improvements (Eugene) + Configuration -> General (finished) + Configuration -> Users (finished) + Configuration -> Hosts (finished) + Configuration -> Items (finished) git-svn-id: svn://svn.zabbix.com/trunk@2603 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/items.php | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'frontends/php/items.php') diff --git a/frontends/php/items.php b/frontends/php/items.php index ff7579d8..f8b99238 100644 --- a/frontends/php/items.php +++ b/frontends/php/items.php @@ -353,13 +353,13 @@ array( new CCheckBox("all_items",NULL,NULL, "CheckAll('".$form->GetName()."','all_items');"), S_ID), - S_KEY, S_DESCRIPTION,nbsp(S_UPDATE_INTERVAL), + S_DESCRIPTION,S_KEY,nbsp(S_UPDATE_INTERVAL), S_HISTORY,S_TRENDS,S_TYPE,S_STATUS,S_ERROR)); $result=DBselect("select h.host,i.key_,i.itemid,i.description,i.delay,". "i.history,i.lastvalue,i.lastclock,i.status,i.nextcheck,h.hostid,i.type,". "i.trends,i.error from hosts h,items i where h.hostid=i.hostid and". - " h.hostid=".$_REQUEST["hostid"]." order by h.host,i.key_,i.description"); + " h.hostid=".$_REQUEST["hostid"]." order by i.description, i.key_"); while($row=DBfetch($result)) { if(!check_right("Item","R",$row["itemid"])) @@ -367,17 +367,6 @@ continue; } - $input= array( - new CCheckBox("group_itemid[]",NULL,NULL,NULL,$row["itemid"]), - new CLink($row["itemid"],"items.php?form=update&itemid=". - $row["itemid"]. url_param("hostid").url_param("groupid")) - ); - - $key = new CLink($row["key_"],"items.php?form=update&itemid=". - $row["itemid"]. url_param("hostid").url_param("groupid")); - - $description = new CLink($row["description"],"items.php?form=update&itemid=". - $row["itemid"].url_param("hostid").url_param("groupid")); switch($row["type"]){ case 0: $type = S_ZABBIX_AGENT; break; @@ -418,9 +407,14 @@ $error=new CCol($row["error"],"on"); } $table->AddRow(array( - $input, - $key, - $description, + array( + new CCheckBox("group_itemid[]",NULL,NULL,NULL,$row["itemid"]), + $row["itemid"] + ), + new CLink($row["description"],"items.php?form=update&itemid=". + $row["itemid"].url_param("hostid").url_param("groupid"), + 'action'), + $row["key_"], $row["delay"], $row["history"], $row["trends"], -- cgit