Commit 7b0e19f4 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Remove more vestigial references to osids and osid lists (for mere

users of course, admins still see everything).
parent b3155874
......@@ -626,8 +626,10 @@ function WRITESIDEBAR() {
NavMenuButton("List ImageIDs",
"$TBBASE/showimageid_list.php3");
NavMenuButton("List OSIDs",
"$TBBASE/showosid_list.php3");
if (ISADMIN()) {
NavMenuButton("List OSIDs",
"$TBBASE/showosid_list.php3");
}
if ($login_status & CHECKLOGIN_TRUSTED &&
$login_user->ApprovalList(0)) {
......
<?php
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -63,14 +63,14 @@ WRITESUBMENUBUTTON("Delete this Image Descriptor",
"deleteimageid.php3?imageid=$fooid");
WRITESUBMENUBUTTON("Create a New Image Descriptor",
"newimageid_ez.php3");
WRITESUBMENUBUTTON("Image Descriptor list",
"showimageid_list.php3");
if ($isadmin) {
WRITESUBMENUBUTTON("Create a new OS Descriptor",
"newosid.php3");
WRITESUBMENUBUTTON("OS Descriptor list",
"showosid_list.php3");
}
WRITESUBMENUBUTTON("Image Descriptor list",
"showimageid_list.php3");
WRITESUBMENUBUTTON("OS Descriptor list",
"showosid_list.php3");
SUBMENUEND();
#
......
......@@ -98,9 +98,9 @@ WRITESUBMENUBUTTON("Create an Image Descriptor",
if ($isadmin) {
WRITESUBMENUBUTTON("Create an OS Descriptor",
"newosid.php3");
WRITESUBMENUBUTTON("OS Descriptor list",
"showosid_list.php3");
}
WRITESUBMENUBUTTON("OS Descriptor list",
"showosid_list.php3");
SUBMENUEND();
echo "Listed below are the Images that you can load on your nodes with the
......
<?php
#
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -52,18 +52,29 @@ PAGEHEADER("OSID $osname");
SUBPAGESTART();
SUBMENUSTART("OSID Options");
WRITESUBMENUBUTTON("Delete this OS Descriptor",
CreateURL("deleteosid", $osinfo));
if ($isadmin) {
WRITESUBMENUBUTTON("Create a new OS Descriptor",
"newosid.php3");
#
# Delete from the image descriptor when its an EZ image.
#
if ($osinfo->ezid()) {
$fooid = rawurlencode($osinfo->osid());
WRITESUBMENUBUTTON("Delete this OS Descriptor",
"deleteimageid.php3?imageid=$fooid");
}
else {
WRITESUBMENUBUTTON("Delete this OS Descriptor",
CreateURL("deleteosid", $osinfo));
}
WRITESUBMENUBUTTON("Create a new Image Descriptor",
"newimageid_ez.php3");
WRITESUBMENUBUTTON("OS Descriptor list",
"showosid_list.php3");
WRITESUBMENUBUTTON("Image Descriptor list",
"showimageid_list.php3");
if ($isadmin) {
WRITESUBMENUBUTTON("OS Descriptor list",
"showosid_list.php3");
WRITESUBMENUBUTTON("Create a new OS Descriptor",
"newosid.php3");
}
SUBMENUEND();
echo "<br><br>\n";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment