diff --git a/xCAT-UI/css/main.css b/xCAT-UI/css/main.css index ff9ccce6d..6dd14b6f5 100644 --- a/xCAT-UI/css/main.css +++ b/xCAT-UI/css/main.css @@ -332,8 +332,7 @@ padding:10px 2px; #rmc_tree { float: left; - width: auto; - min-height: 255px; + width: 21%; border-right: 1px dotted #555; min-width: 130px; /*display: none;*/ @@ -341,9 +340,9 @@ padding:10px 2px; #rmc_monshow { float: left; - width: 701px; /*need update*/ - margin: 10px; - padding: 10px; + width: 78%; /*need update*/ + margin: 0px; + padding: 0px; display: block; } @@ -406,3 +405,116 @@ padding:10px 2px; float: right; } +/* + * @the following definitions are used for cluster summary page + */ + + h5 { + font-family: "Trebuchet MS", Verdana, Helvetica, Arial,sans-serif !important; + margin: 0; + padding: 0; + letter-spacing: 0; + border-bottom: 0 !important; +} + +a { + text-decoration:none; + color: #5DB0E6; +} +a:focus { + outline: 1px dotted #eee; +} +a:active { + outline: 0px; +} +a:hover { + color: #7bc4f4; +} + +#clusternav { + float: right; + display: inline; + width: 164px; + background: #fafafa; + border: 1px solid #ccc; + padding: 5px 15px 15px; + min-height: 500px; + -moz-border-radius: .5em; /* gecko */ + -webkit-border-radius: .5em; /*webkit*/ + border-radius: .5em; /* w3 */ + color: #000; +} + +#clusternav h5 { + background: #ddd; + margin: 4px 0px 0px 24px; + outline-color: #192839; + padding: 3px 10px; + font-size: 12px; + text-align: left; +} + +#clusternav ul li { + list-style-type: none; + text-align: left; + border-bottom: 1px solid #999999; + margin-bottom: 5px; +} + +#clusterprimary { + position: relative; + float: left; + display: inline; + width: 732px; + background: #fafafa; + border: 1px solid #aaa; + padding: 5px 15px 15px; + color: #222; + min-height: 500px; + -moz-border-radius: .5em; /* gecko */ + -webkit-border-radius: .5em; /* webkit */ + border-radius: .5em; /* w3 */ + overflow: visible; +} + +.cluster_subinfo { + border-bottom: 1px solid #fafafa; + text-align: left; +} + +.cluster_subinfo h5 { + background: #ddd; + margin: 4px 0px 0px 24px; + outline-color: #192839; + padding: 3px 10px; + font-size: 12px; + text-align: left; +} + +.stat_table { + border-bottom: 1px solid #fafafa; + font-size: .8em; +} + +.spacer { + clear: both; + height: 20px; + display: block; +} + +#mgmt_network, #rpowerstat_num, #monplugin_list, #rpmtable { + border: 1px solid #AAA; + background-color: #f9f9f9; + clear: right; + color: black; + margin: 0.5em 0em 0.5em 1em; + padding: 0.2em; +} + +#rpmtable tr:odd { + background-color: #CCCCCC; +} + +#general table { + margin-left: 30px; +} \ No newline at end of file diff --git a/xCAT-UI/css/monitor.css b/xCAT-UI/css/monitor.css index f5fd54b1e..27306ea01 100644 --- a/xCAT-UI/css/monitor.css +++ b/xCAT-UI/css/monitor.css @@ -142,7 +142,7 @@ fieldset { padding: 5px; float:left; display: block; - width: 94%; + width: 95%; border: 1px solid gray; } diff --git a/xCAT-UI/js/xcat.js b/xCAT-UI/js/xcat.js index d7988087e..73fa00603 100644 --- a/xCAT-UI/js/xcat.js +++ b/xCAT-UI/js/xcat.js @@ -334,8 +334,8 @@ function init_ositree(){ //display all the nodes with OSI type nrtree = new tree_component(); //-tree begin nrtree.init($("#ositree"),{ - rules: { multiple: "Ctrl" }, - ui: { animation: 250 }, + rules: {multiple: "Ctrl"}, + ui: {animation: 250}, data : { type: "json", async: "true", @@ -358,8 +358,8 @@ function init_ositree(){ function init_rmc_ositree() { nrtree = new tree_component(); //-tree begin nrtree.init($("#rmc_tree"),{ - rules: { multiple: "Ctrl" }, - ui: { animation: 250 }, + rules: {multiple: "Ctrl"}, + ui: {animation: 250}, callback: { onchange: function(n) { $("#monshow_tip_1").hide(); @@ -482,5 +482,21 @@ function loadLLCfgEditor() window.document.location="../ll/llconfig_editor.pl"; } +/* + * loadNodeStatus() + * will show the power status of all nodes in the cluster + * with the help of "rpower all stat" + * It's used in PHP function showNodeStat(). + */ +function loadNodeStatus() +{ + $.get("rpowerstat.php", {type: "table"}, function(data) { + $("#p_stat_table").html("
"); + $("#stat_table").html(data); + $("#stat_table").dataTable({"bJQueryUI": true, "iDisplayLength": 50}); + $("#p_stat_table").show(); + }); +} + // load progress bar myBar.loaded('xcat.js'); diff --git a/xCAT-UI/lib/display.php b/xCAT-UI/lib/display.php index 66806faaa..04eb34a8c 100644 --- a/xCAT-UI/lib/display.php +++ b/xCAT-UI/lib/display.php @@ -74,6 +74,9 @@ echo <<