From ec8d33c3e7c1f2c3e37b8f366b87c2715da95332 Mon Sep 17 00:00:00 2001 From: mxi1 Date: Thu, 3 Sep 2009 10:06:08 +0000 Subject: [PATCH] little code update to support graphics view for RMC monitoring git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4091 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/monitor/rmc_monshow.php | 8 ++++++-- xCAT-UI/monitor/rmc_monshow_attr_source.php | 9 +++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/xCAT-UI/monitor/rmc_monshow.php b/xCAT-UI/monitor/rmc_monshow.php index 1637c7ef4..37bbea52f 100644 --- a/xCAT-UI/monitor/rmc_monshow.php +++ b/xCAT-UI/monitor/rmc_monshow.php @@ -11,7 +11,8 @@ require_once "$TOPDIR/lib/monitor_display.php"; displayMapper(array('home'=>'main.php', 'monitor' =>'')); -displayTips(array("Select the domain: the whole cluser or the compute nodes under \"lpar\",","then select the desired attributes. click the \"OK\" button")); +displayTips(array("Select the domain: the whole cluser or the compute nodes under \"lpar\",", +"then select the desired attributes. click the \"View by Text\" button or the \"View by Graphics\" button")); insertDiv("rmc_tree"); @@ -25,7 +26,10 @@ insertDiv("rmc_tree"); echo "
"; echo "
"; +//if the user clicks the "View by Text" button, the div named "monshow_data" will show +// the text data from the "monshow" command; +//and , if the "view by Graphics" button is clicked, the "monshow_data" div will display the pictures, the pictures is generated by "rrdtool" right now, but in the future, some jQuery plugin will be used to generate the graphics for the "monshow" data echo "
"; echo "
"; -?> \ No newline at end of file +?> diff --git a/xCAT-UI/monitor/rmc_monshow_attr_source.php b/xCAT-UI/monitor/rmc_monshow_attr_source.php index 5d929862a..a800c29c8 100644 --- a/xCAT-UI/monitor/rmc_monshow_attr_source.php +++ b/xCAT-UI/monitor/rmc_monshow_attr_source.php @@ -34,7 +34,8 @@ TOS0; show_rmc_monsetting(); echo "
"; //click the "OK" button, "monshow" data for the selected attributes will display -insertButtons(array('label'=>'OK', 'id'=>'monshow_ok_btn', 'onclick'=>'show_monshow_data()')); +insertButtons(array('label'=>'View by Text', 'id'=>'monshow_text_btn', 'onclick'=>'show_monshow_text()')); +insertButtons(array('label'=>'View by Graphics', 'id'=>'monshow_graph_btn', 'onclick'=>'show_monshow_graph()')); echo "
"; echo ""; } @@ -46,9 +47,9 @@ function show_rmc_monsetting() echo << -name -key -value +Name +Resources +Attributes comments