// keep css separate for now
drupal_set_html_head('
<link href="/planetlab/css/my_slice.css" rel="stylesheet" type="text/css" />
-<script src="/planetlab/slices/leases.js" type="text/javascript" charset="utf-8"></script>
');
// -------------------- admins potentially need to get full list of users
-ini_set('memory_limit','32M');
//error_reporting(0);
$profiling=false;
//////////////////////////////////////////////////////////// tab:details
-// default for opening the details section or not ?
-if ($local_peer) {
- $default_show_details = true;
- } else {
- $default_show_details = ! $renew_visible;
- }
-
$toggle =
new PlekitToggle ('my-slice-details',"Details",
array('bubble'=>
'Display and modify details for that slice',
- 'visible'=>get_arg('show_details',$default_show_details)));
+ 'visible'=>get_arg('show_details')));
$toggle->start();
$details=new PlekitDetails($privileges);
new PlekitToggle ('my-slice-persons',"$count users",
array('bubble'=>
'Manage accounts attached to this slice',
- 'visible'=>get_arg('show_persons',false)));
+ 'visible'=>get_arg('show_persons')));
$toggle->start();
////////// people currently in
// show otherwise
$toggle_persons = new PlekitToggle ('my-slice-persons-current',
"$count people currently in $name",
- array('visible'=>get_arg('show_persons_current',!$privileges)));
+ array('visible'=>get_arg('show_persons_current')));
$toggle_persons->start();
$headers=array();
$count=count($potential_persons);
$toggle_persons = new PlekitToggle ('my-slice-persons-add',
"$count people may be added to $name",
- array('visible'=>get_arg('show_persons_add',false)));
+ array('visible'=>get_arg('show_persons_add')));
$toggle_persons->start();
if ( ! $potential_persons ) {
// xxx improve style
$toggle=new PlekitToggle ('my-slice-nodes',$nodes_message,
array('bubble'=>
'Manage nodes attached to this slice',
- 'visible'=>get_arg('show_nodes',false)));
+ 'visible'=>get_arg('show_nodes')));
$toggle->start();
";
$count=count($reservable_nodes);
if ($count && $privileges) {
+ // include leases.js only if needed
+ drupal_set_html_head('<script src="/planetlab/slices/leases.js" type="text/javascript" charset="utf-8"></script>');
+
// having reservable nodes in white lists looks a bit off scope for now...
$toggle_nodes=new PlekitToggle('my-slice-nodes-reserve',
"Leases - " . count($reservable_nodes) . " reservable node(s)",
- array('visible'=>get_arg('show_nodes_resa',false),
+ array('visible'=>get_arg('show_nodes_resa'),
'info-text'=>$leases_info,
'info-visible'=>$show_reservable_info));
$toggle_nodes->start();
if ( ! $leases_offset ) $leases_offset=0;
// how many timeslots to show
$leases_slots=$_GET['leases_slots'];
- if ( ! $leases_slots ) $leases_slots = 48;
+ if ( ! $leases_slots ) $leases_slots = 36;
// offset in hours (in the future) from now
$leases_w = $_GET['leases_w'];
- if ( ! $leases_w) $leases_w=14;
+ if ( ! $leases_w) $leases_w=18;
// number of timeslots to display
$granularity=$api->GetLeaseGranularity();
<div id='leases_area'></div>
<div id='leases_buttons'>
- <button id='leases_refresh' type='submit'>Refresh</button>
- <button id='leases_submit' type='submit'>Submit</button>
+ <button id='leases_refresh' type='submit'>Refresh (Pull)</button>
+ <button id='leases_submit' type='submit'>Submit (Push)</button>
</div>
EOF;
';
$toggle_nodes=new PlekitToggle('my-slice-nodes-configuration',
"Node table layout",
- array('visible'=>$column_conf_visible,
- 'info-text'=>$layout_info,
+ array('info-text'=>$layout_info,
'info-visible'=>$show_layout_info));
$toggle_nodes->start();
//////////////////// nodes currently in
$toggle_nodes=new PlekitToggle('my-slice-nodes-current',
count_english($slice_nodes,"node") . " currently in $name",
- array('visible'=>get_arg('show_nodes_current',!$privileges)));
+ array('visible'=>get_arg('show_nodes_current')));
$toggle_nodes->start();
$headers=array();
$count=count($potential_nodes);
$toggle_nodes=new PlekitToggle('my-slice-nodes-add',
count_english($potential_nodes,"more node") . " available",
- array('visible'=>get_arg('show_nodes_add',false)));
+ array('visible'=>get_arg('show_nodes_add')));
$toggle_nodes->start();
if ( $potential_nodes ) {
$toggle = new PlekitToggle('slice-initscripts',$label,
array('bubble'=>'Manage initscript on that slice',
- 'visible'=>get_arg('show_initscripts',false),
+ 'visible'=>get_arg('show_initscripts'),
'info-text'=>$initscript_info
// not messing with persontags to guess whether this should be displayed or not
// hopefully some day toggle will know how to handle that using web storage
$toggle = new PlekitToggle ('slice-tags',count_english_warning($tags,'tag'),
array('bubble'=>'Inspect and set tags on that slice',
- 'visible'=>get_arg('show_tags',false)));
+ 'visible'=>get_arg('show_tags')));
$toggle->start();
$headers=array(
function tag_selector ($tag) {
return array("display"=>$tag['tagname'],"value"=>$tag['tag_type_id']);
}
- $all_tags= $api->GetTagTypes( array ("category"=>"slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id"));
+ $all_tags= $api->GetTagTypes( array ("category"=>"*slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id"));
if ($profiling) plc_debug_prof('9 tagtypes',count($all_tags));
$selector_tag=array_map("tag_selector",$all_tags);
//////////////////////////////////////////////////////////// tab:renew
if ($local_peer ) {
- if ( ! $renew_visible) renew_area ($slice,$site,false);
+ if ( ! $renew_visible) renew_area ($slice,$site,NULL);
}
$peers->block_end($peer_id);