X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fsites%2Fsites.php;h=d4ab6b9eac254522e1c67f85417a435e284ab314;hb=589a8865c3cc774f2456d460008a45b09cc60cf9;hp=dfabe5ce49bf15d1d78e79a810a402f29a91cefc;hpb=88cbcd06d4406e038e933de6a8cc724be655196d;p=plewww.git diff --git a/planetlab/sites/sites.php b/planetlab/sites/sites.php index dfabe5c..d4ab6b9 100644 --- a/planetlab/sites/sites.php +++ b/planetlab/sites/sites.php @@ -28,8 +28,9 @@ $pattern=$_GET['pattern']; // --- decoration $title="Sites"; $tabs=array(); -$tabs []= tab_mysite(); +$tabs []= tab_sites(); $tabs []= tab_sites_local(); +$tabs []= tab_mysite(); // -------------------- $site_filter=array(); @@ -49,6 +50,9 @@ function site_status ($site) { // check that site is enabled if ( ! $site['enabled']) $messages [] = "Not enabled"; + global $PENDING_CONSORTIUM_ID; + if ( $site['ext_consortium_id'] === $PENDING_CONSORTIUM_ID ) + $messages [] = "Pending registration"; // check that site has at least a PI and a tech global $api; @@ -94,8 +98,9 @@ if (! plc_is_admin()) { $site_columns = array("site_id", "name", "abbreviated_name", "login_base" , "peer_id" ); $site_filter = array_merge ($site_filter, array ("enabled" => TRUE)); } else { - $site_columns = array("site_id", "name", "abbreviated_name", "login_base" , "peer_id" , "is_public", - "enabled", "person_ids", "max_slices", "slice_ids", "node_ids"); + $site_columns = array("site_id", "name", "abbreviated_name", "login_base" , "peer_id" , + "is_public", "enabled", "ext_consortium_id", + "person_ids", "max_slices", "slice_ids", "node_ids"); } if (plc_is_admin()) @@ -112,6 +117,8 @@ $peers=new Peers($api); $nifty=new PlekitNifty ('','objects-list','big'); $nifty->start(); + +$headers=array(); if (plc_is_admin()) { $headers['I']='int'; } @@ -142,7 +149,7 @@ if ($sites) foreach ($sites as $site) { $table->cell(l_site_t($site_id,$site_id)); } $peers->cell($table,$peer_id); - $table->cell (l_site_t($site_id,htmlentities($site['name']))); + $table->cell (l_site_t($site_id,htmlentities(utf8_decode($site['name'])))); $table->cell (l_site_t($site_id,$login_base)); $table->cell (htmlentities($site['abbreviated_name'])); if (plc_is_admin()) { @@ -155,7 +162,7 @@ if ($sites) foreach ($sites as $site) { } $notes=array(); if (plc_is_admin()) { - $notes []= "N = number of sites"; + $notes []= "N = number of nodes"; $notes []= "U = number of users"; $notes []= "S = number of slices"; $notes []= "I = site_id";