From 0112b0d5d422807aa655b9036d555612a0c13af3 Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Fri, 11 Apr 2003 14:02:52 +0000
Subject: [PATCH] Remove "Create and OS Descriptor" link for non-admins. Mere
 users do not ever need to create a OSID directly, so do not give them the
 link. Will need a mechanism to allow this later for Eric and others with a
 clue. Also add pointer to customos section of the tutorial at the top of the
 page.

---
 www/showimageid_list.php3 | 21 +++++++++++++++++++--
 www/showosid_list.php3    | 15 ++++++++++-----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/www/showimageid_list.php3 b/www/showimageid_list.php3
index ea3900465..259c837e0 100644
--- a/www/showimageid_list.php3
+++ b/www/showimageid_list.php3
@@ -62,11 +62,28 @@ SUBPAGESTART();
 SUBMENUSTART("More Options");
 WRITESUBMENUBUTTON("Create an Image Descriptor",
 		   "newimageid_ez.php3");
-WRITESUBMENUBUTTON("Create an OS Descriptor",
-		   "newosid_form.php3");
+if ($isadmin) {
+    WRITESUBMENUBUTTON("Create an OS Descriptor",
+		       "newosid_form.php3");
+}
 WRITESUBMENUBUTTON("OS Descriptor list",
 		   "showosid_list.php3");
 SUBMENUEND();
+
+echo "Listed below are the Images that you can load on your nodes with the
+      <a href='tutorial/docwrapper.php3?docname=nscommands.html#OS'>
+      <tt>tb-set-node-os</tt></a> directive. If the OS you have selected for
+      a node is not loaded on that node when the experiment is swapped in,
+      the Testbed system will automatically reload that node's disk with the
+      appropriate image. You might notice that it takes a few minutes longer
+      to start start your experiment when selecting an OS that is not
+      already resident. Please be patient.
+      <br>
+      More information on how to create your own Images is in the
+      <a href='tutorial/tutorial.php3#CustomOS'>Custom OS</a> section of
+      the <a href='tutorial/tutorial.php3'>Emulab Tutorial.</a>
+      <br>\n";
+
 SUBPAGEEND();
 
 if (mysql_num_rows($query_result)) {
diff --git a/www/showosid_list.php3 b/www/showosid_list.php3
index ab34ae484..03768137c 100644
--- a/www/showosid_list.php3
+++ b/www/showosid_list.php3
@@ -56,14 +56,15 @@ SUBPAGESTART();
 SUBMENUSTART("More Options");
 WRITESUBMENUBUTTON("Create an Image Descriptor",
 		   "newimageid_ez.php3");
-WRITESUBMENUBUTTON("Create an OS Descriptor",
-		   "newosid_form.php3");
+if ($isadmin) {
+    WRITESUBMENUBUTTON("Create an OS Descriptor",
+		       "newosid_form.php3");
+}
 WRITESUBMENUBUTTON("Image Descriptor list",
 		   "showimageid_list.php3");
 SUBMENUEND();
 
-echo "<p>
-      Listed below are the OS Descriptors that you may use in your NS file
+echo "Listed below are the OS Descriptors that you may use in your NS file
       with the <a href='tutorial/docwrapper.php3?docname=nscommands.html#OS'>
       <tt>tb-set-node-os</tt></a> directive. If the OS you have selected for
       a node is not loaded on that node when the experiment is swapped in,
@@ -71,7 +72,11 @@ echo "<p>
       appropriate image. You might notice that it takes a few minutes longer
       to start start your experiment when selecting an OS that is not
       already resident. Please be patient.
-      </p><br />\n";
+      <br>
+      More information on how to create your own Images is in the
+      <a href='tutorial/tutorial.php3#CustomOS'>Custom OS</a> section of
+      the <a href='tutorial/tutorial.php3'>Emulab Tutorial.</a>
+      <br>\n";
 
 SUBPAGEEND();
 
-- 
GitLab