Index: trunk/ippMonitor/Makefile
===================================================================
--- trunk/ippMonitor/Makefile	(revision 8982)
+++ trunk/ippMonitor/Makefile	(revision 8984)
@@ -8,11 +8,21 @@
 DESTBIN =       /var/www/kiawe/phpipp
 
-INSTALL = \
+RAWSRC = \
 $(DESTBIN)/ipp.css \
 $(DESTBIN)/ipp.php \
 $(DESTBIN)/ipp.menu.dat \
+$(DESTBIN)/ipp.copy.dat \
+$(DESTBIN)/ipp.science.dat \
+$(DESTBIN)/ipp.detrend.dat \
+$(DESTBIN)/ipp.imfiles.dat \
 $(DESTBIN)/Login.php \
 $(DESTBIN)/SelectProject.php \
-$(DESTBIN)/phptest.php \
+$(DESTBIN)/LoadSetup.php \
+$(DESTBIN)/ScienceSteps.php \
+$(DESTBIN)/DetrendSteps.php \
+$(DESTBIN)/ImfileTables.php \
+$(DESTBIN)/phptest.php
+
+DEFSRC = \
 $(DESTBIN)/detInputExp.php \
 $(DESTBIN)/detMasterFrame.php \
@@ -44,5 +54,5 @@
 $(DESTBIN)/PScolorlogo2.jpg
 
-php: $(INSTALL) $(PICTURES)
+php: $(RAWSRC) $(DEFSRC) $(PICTURES)
 
 # dependancy rules for binary code #########################
Index: trunk/ippMonitor/def/autocode.php
===================================================================
--- trunk/ippMonitor/def/autocode.php	(revision 8982)
+++ trunk/ippMonitor/def/autocode.php	(revision 8984)
@@ -5,5 +5,5 @@
 $ID = checkID ();
 
-menu('Login', 'ipp.css', $ID['link']);
+menu('$MENU', '$TITLE', '$STYLE', $ID['link']);
 
 echo "<p> $TITLE </p>";
Index: trunk/ippMonitor/def/detInputExp.d
===================================================================
--- trunk/ippMonitor/def/detInputExp.d	(revision 8982)
+++ trunk/ippMonitor/def/detInputExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detInputExp
 FILE  detInputExp.php
+MENU  ipp.detrend.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/detMasterFrame.d
===================================================================
--- trunk/ippMonitor/def/detMasterFrame.d	(revision 8982)
+++ trunk/ippMonitor/def/detMasterFrame.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detMasterFrame
 FILE  detMasterFrame.php
+MENU  ipp.detrend.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/detMasterImfile.d
===================================================================
--- trunk/ippMonitor/def/detMasterImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/detMasterImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detMasterImfile
 FILE  detMasterImfile.php
+MENU  ipp.imfiles.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/detNormalizedImfile.d
===================================================================
--- trunk/ippMonitor/def/detNormalizedImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/detNormalizedImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detNormalizedImfile
 FILE  detNormalizedImfile.php
+MENU  ipp.imfiles.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/detNormalizedStatImfile.d
===================================================================
--- trunk/ippMonitor/def/detNormalizedStatImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/detNormalizedStatImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detNormalizedStatImfile
 FILE  detNormalizedStatImfile.php
+MENU  ipp.imfiles.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/detProcessedImfile.d
===================================================================
--- trunk/ippMonitor/def/detProcessedImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/detProcessedImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detProcessedImfile
 FILE  detProcessedImfile.php
+MENU  ipp.imfiles.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/detResidExp.d
===================================================================
--- trunk/ippMonitor/def/detResidExp.d	(revision 8982)
+++ trunk/ippMonitor/def/detResidExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detResidExp
 FILE  detResidExp.php
+MENU  ipp.detrend.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/detResidImfile.d
===================================================================
--- trunk/ippMonitor/def/detResidImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/detResidImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detResidImfile
 FILE  detResidImfile.php
+MENU  ipp.imfiles.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/detRun.d
===================================================================
--- trunk/ippMonitor/def/detRun.d	(revision 8982)
+++ trunk/ippMonitor/def/detRun.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detRun
 FILE  detRun.php
+MENU  ipp.detrend.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/detRunSummary.d
===================================================================
--- trunk/ippMonitor/def/detRunSummary.d	(revision 8982)
+++ trunk/ippMonitor/def/detRunSummary.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detRunSummary
 FILE  detRunSummary.php
+MENU  ipp.detrend.dat
 
 #     field    name    link to     extras
Index: trunk/ippMonitor/def/detStackedImfile.d
===================================================================
--- trunk/ippMonitor/def/detStackedImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/detStackedImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE detStackedImfile
 FILE  detStackedImfile.php
+MENU  ipp.imfiles.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/newExp.d
===================================================================
--- trunk/ippMonitor/def/newExp.d	(revision 8982)
+++ trunk/ippMonitor/def/newExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE Raw Science Exposures
 FILE  newExp.php
+MENU  ipp.copy.dat
 
 #        field          name           link to         extras
Index: trunk/ippMonitor/def/newImfile.d
===================================================================
--- trunk/ippMonitor/def/newImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/newImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE Raw Science Exposures
 FILE  newImfile.php
+MENU  ipp.imfiles.dat
 
 #        field          name           link to         extras
Index: trunk/ippMonitor/def/p1PendingExp.d
===================================================================
--- trunk/ippMonitor/def/p1PendingExp.d	(revision 8982)
+++ trunk/ippMonitor/def/p1PendingExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE p1PendingExp
 FILE  p1PendingExp.php
+MENU  ipp.science.dat
 
 #     field       name         link to         extras
Index: trunk/ippMonitor/def/p2PendingExp.d
===================================================================
--- trunk/ippMonitor/def/p2PendingExp.d	(revision 8982)
+++ trunk/ippMonitor/def/p2PendingExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE p2PendingExp
 FILE  p2PendingExp.php
+MENU  ipp.science.dat
 
 #     field       name         link to         extras
Index: trunk/ippMonitor/def/p2PendingImfile.d
===================================================================
--- trunk/ippMonitor/def/p2PendingImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/p2PendingImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE p2PendingImfile
 FILE  p2PendingImfile.php
+MENU  ipp.imfiles.dat
 
 #     field     name     link to     extras
Index: trunk/ippMonitor/def/p2ProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/p2ProcessedExp.d	(revision 8982)
+++ trunk/ippMonitor/def/p2ProcessedExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE p2ProcessedExp
 FILE  p2ProcessedExp.php
+MENU  ipp.science.dat
 
 #     field       name         link to                 extras
Index: trunk/ippMonitor/def/p2ProcessedImfile.d
===================================================================
--- trunk/ippMonitor/def/p2ProcessedImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/p2ProcessedImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE p2ProcessedImfile
 FILE  p2ProcessedImfile.php
+MENU  ipp.imfiles.dat
 
 #     field          name         link to     extras
Index: trunk/ippMonitor/def/p3PendingExp.d
===================================================================
--- trunk/ippMonitor/def/p3PendingExp.d	(revision 8982)
+++ trunk/ippMonitor/def/p3PendingExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE p3PendingExp
 FILE  p3PendingExp.php
+MENU  ipp.science.dat
 
 #     field       name          link to                extras
Index: trunk/ippMonitor/def/pzPendingExp.d
===================================================================
--- trunk/ippMonitor/def/pzPendingExp.d	(revision 8982)
+++ trunk/ippMonitor/def/pzPendingExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE pending exposures
 FILE  pzPendingExp.php
+MENU  ipp.copy.dat
 
 #        field        name           link to         extras
Index: trunk/ippMonitor/def/pzPendingImfile.d
===================================================================
--- trunk/ippMonitor/def/pzPendingImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/pzPendingImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE Pending Image Files
 FILE  pzPendingImfile.php
+MENU  ipp.imfiles.dat
 
 #        field        name           link to         extras
Index: trunk/ippMonitor/def/rawDetrendExp.d
===================================================================
--- trunk/ippMonitor/def/rawDetrendExp.d	(revision 8982)
+++ trunk/ippMonitor/def/rawDetrendExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE Raw Detrend Exposures
 FILE  rawDetrendExp.php
+MENU  ipp.copy.dat
 
 #        field        name           link to         extras
Index: trunk/ippMonitor/def/rawImfile.d
===================================================================
--- trunk/ippMonitor/def/rawImfile.d	(revision 8982)
+++ trunk/ippMonitor/def/rawImfile.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE Raw Image File
 FILE  rawImfile.php
+MENU  ipp.imfiles.dat
 
 RESTRICT exp_id
Index: trunk/ippMonitor/def/rawScienceExp.d
===================================================================
--- trunk/ippMonitor/def/rawScienceExp.d	(revision 8982)
+++ trunk/ippMonitor/def/rawScienceExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE Raw Science Exposures
 FILE  rawScienceExp.php
+MENU  ipp.copy.dat
 
 #        field        name           link to         extras
Index: trunk/ippMonitor/def/summitExp.d
===================================================================
--- trunk/ippMonitor/def/summitExp.d	(revision 8982)
+++ trunk/ippMonitor/def/summitExp.d	(revision 8984)
@@ -2,4 +2,5 @@
 TITLE Summit Exposures
 FILE  summitExp.php
+MENU  ipp.copy.dat
 
 #        field        name           link to         extras
Index: trunk/ippMonitor/generate
===================================================================
--- trunk/ippMonitor/generate	(revision 8982)
+++ trunk/ippMonitor/generate	(revision 8984)
@@ -2,4 +2,5 @@
 
 $VERBOSE = 0;
+
 if ($ARGV[0] eq "-v") { $VERBOSE = 1; shift @ARGV; }
 if (@ARGV != 3) { die "generate (schema) (template) (output)\n"; }
@@ -18,7 +19,10 @@
     close (FILE);
 
+    &init_key ("MENU");
+    &init_key ("STYLE");
     &init_key ("TABLE");
     &init_key ("TITLE");
     &init_key ("FILE");
+
     &init_key ("FIELDS");
 
@@ -54,4 +58,12 @@
 	}
     }
+
+    # check on keys
+    &check_key ("MENU", "ipp.menu.dat");
+    &check_key ("STYLE", "ipp.css");
+    &check_key ("TABLE", "");
+    &check_key ("TITLE", "");
+    &check_key ("FILE", "");
+
     # define query string, add to keypairs
     &define_query_fields;
@@ -192,7 +204,24 @@
 	    if ($value[$i] ne "") { die "key is multiply defined\n"; }
 	    $value[$i] = $value;
+	    if ($VERBOSE) { print STDERR "setting $key = $value\n"; }
 	    return;
 	}
     }
+}
+
+sub check_key {
+    my ($i);
+    my ($key)     = $_[0];
+    my ($default) = $_[1];
+
+    for ($i = 0; $i < @key; $i++) {
+	if ($key eq $key[$i]) {
+	    if ($VERBOSE) { print "found $key: $key[$i]  -- $value[$i] (def: $default)\n"; }
+	    if (($default eq "") && ($value[$i] eq "")) { die "missing value for required key $key[$i]\n"; }
+	    if ($value[$i] eq "") { $value[$i] = $default; }
+	    return;
+	}
+    }
+    die "unknown key $key\n";
 }
 
@@ -200,5 +229,5 @@
     my ($i);
     for ($i = 0; $i < @key; $i++) {
-	# if ($VERBOSE) { print "$key[$i]  -- $value[$i]\n"; }
+	if ($VERBOSE) { print "$key[$i]  -- $value[$i]\n"; }
 	if ($line =~ m|\$$key[$i]|) {
 	    if ($value[$i] eq "") { die "missing value for required key $key[$i]\n"; }
Index: trunk/ippMonitor/raw/DetrendSteps.php
===================================================================
--- trunk/ippMonitor/raw/DetrendSteps.php	(revision 8984)
+++ trunk/ippMonitor/raw/DetrendSteps.php	(revision 8984)
@@ -0,0 +1,14 @@
+<?php 
+
+include 'ipp.php';
+
+$ID = checkID ();
+
+menu('ipp.detrend.dat', 'Detrend Steps', 'ipp.css', $ID['link']);
+
+// document body
+echo "Detrend Image Creation Steps<br>\n";
+
+menu_end();
+
+?>
Index: trunk/ippMonitor/raw/ImfileTables.php
===================================================================
--- trunk/ippMonitor/raw/ImfileTables.php	(revision 8984)
+++ trunk/ippMonitor/raw/ImfileTables.php	(revision 8984)
@@ -0,0 +1,14 @@
+<?php 
+
+include 'ipp.php';
+
+$ID = checkID ();
+
+menu('ipp.imfiles.dat', 'Imfile Tables', 'ipp.css', $ID['link']);
+
+// document body
+echo "browse the imfile tables<br>\n";
+
+menu_end();
+
+?>
Index: trunk/ippMonitor/raw/LoadSetup.php
===================================================================
--- trunk/ippMonitor/raw/LoadSetup.php	(revision 8984)
+++ trunk/ippMonitor/raw/LoadSetup.php	(revision 8984)
@@ -0,0 +1,14 @@
+<?php 
+
+include 'ipp.php';
+
+$ID = checkID ();
+
+menu('ipp.copy.dat', 'Load and Setup', 'ipp.css', $ID['link']);
+
+// document body
+echo "load and setup page<br>\n";
+
+menu_end();
+
+?>
Index: trunk/ippMonitor/raw/Login.php
===================================================================
--- trunk/ippMonitor/raw/Login.php	(revision 8982)
+++ trunk/ippMonitor/raw/Login.php	(revision 8984)
@@ -4,5 +4,5 @@
 
 if (($_SERVER[REQUEST_METHOD] != 'POST') && ($_SERVER[REQUEST_METHOD] != 'GET')) {
-  menu ('Login', 'ipp.css', '');
+  menu ('ipp.menu.dat', 'Login', 'ipp.css', '');
   echo "Invalid Client Request<br>\n";
   menu_end ();
@@ -14,5 +14,5 @@
   $ID = checkID ();
 
-  menu ('Login', 'ipp.css', $ID['link']);
+  menu ('ipp.menu.dat', 'Login', 'ipp.css', $ID['link']);
 
   $pass = $ID['pass'];
@@ -34,5 +34,5 @@
     $ID = checkLogin ();
 
-    menu ('Login', 'ipp.css', $ID['link']);
+    menu ('ipp.menu.dat', 'Login', 'ipp.css', $ID['link']);
     echo "Login Accepted\n";
     menu_end();
@@ -41,5 +41,5 @@
 
   if (key_exists (logout, $_POST)) {
-    menu ('Login', 'ipp.css', '');
+    menu ('ipp.menu.dat', 'Login', 'ipp.css', '');
     echo "You are now logged out<br>\n";
     logintext ();
@@ -50,5 +50,5 @@
 
   // missing a valid POST state (login or logout)
-  menu ('Login', 'ipp.css', '');
+  menu ('ipp.menu.dat', 'Login', 'ipp.css', '');
   echo "Invalid Client Post Request<br>\n";
   foreach ($_POST as $key => $value) {
Index: trunk/ippMonitor/raw/ScienceSteps.php
===================================================================
--- trunk/ippMonitor/raw/ScienceSteps.php	(revision 8984)
+++ trunk/ippMonitor/raw/ScienceSteps.php	(revision 8984)
@@ -0,0 +1,14 @@
+<?php 
+
+include 'ipp.php';
+
+$ID = checkID ();
+
+menu('ipp.science.dat', 'Science Steps', 'ipp.css', $ID['link']);
+
+// document body
+echo "science image steps<br>\n";
+
+menu_end();
+
+?>
Index: trunk/ippMonitor/raw/SelectProject.php
===================================================================
--- trunk/ippMonitor/raw/SelectProject.php	(revision 8982)
+++ trunk/ippMonitor/raw/SelectProject.php	(revision 8984)
@@ -1,27 +1,21 @@
-
-<? function projectform () { ?>
-  <p>
-  Select the project of interest
-  </p>
-  <form action="<? $myPage ?>" method="POST">
-  Project: <input type="text" name="proj"><br>
-  <input type="submit" name="project">
-  </form>
-<? } ?>
-
 <?php 
 
-include 'menu.php';
+include 'ipp.php';
 
 checkID ();
 
 if ($_SERVER[REQUEST_METHOD] == 'GET') { 
-    menu ('Project', 'ipp.css');
-    projectform ();
+    menu ('ipp.menu.dat', 'Project', 'ipp.css', '');
+    echo "<p> Select the project of interest </p>\n";
+    echo "<form action=\"$myPage\" method=\"POST\">\n";
+    echo "Project: <input type=\"text\" name=\"proj\"><br>\n";
+    echo "<input type=\"submit\" name=\"project\">\n";
+    echo "</form>\n";
+
     menu_end ();
 }
 
 if ($_SERVER[REQUEST_METHOD] != 'POST') { 
-  menu ('Project', 'ipp.css');
+  menu ('ipp.menu.dat', 'Project', 'ipp.css', '');
   echo "Invalid Client Request<br>\n";
   menu_end ();
@@ -32,10 +26,10 @@
   # validate the existence of the project
   $_GET[proj] = $myProj;
-  menu ('Project', 'ipp.css');
+  menu ('ipp.menu.dat', 'Project', 'ipp.css', '');
   echo "New project is : $myProj\n";
   menu_end();
 }
   
-menu ('Project', 'ipp.css');
+menu ('ipp.menu.dat', 'Project', 'ipp.css', '');
 echo "Invalid Client Post Request<br>\n";
 foreach ($_POST as $key => $value) {
Index: trunk/ippMonitor/raw/ipp.copy.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.copy.dat	(revision 8984)
+++ trunk/ippMonitor/raw/ipp.copy.dat	(revision 8984)
@@ -0,0 +1,33 @@
+# style   | select-style | type    | menu line                    | link page       
+
+# we have four valid menu types: picture, piclink, link, plain
+# picture   | picture    | picture | PScolorlogo2.jpg             | none
+# piclink   | piclink    | piclink | PScolorlogo2.jpg             | http://panstarrs.ifa.hawaii.edu
+# menulink  | menuselect | link    | other page                   | notest.php     
+# menutop   | menutop    | plain   | foo bar                      | none            
+
+piclink   | piclink      | piclink | PScolorlogo2.jpg             | http://panstarrs.ifa.hawaii.edu
+menuext   | menuext      | link    | Pan-STARRS public            | http://panstarrs.ifa.hawaii.edu
+menuext   | menuext      | link    | Pan-STARRS project           | http://panstarrs.ifa.hawaii.edu/project
+menuext   | menuext      | link    | Pan-STARRS IPP               | http://panstarrs.ifa.hawaii.edu/project/IPP
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect   | link    | Login                        | Login.php     
+menulink  | menuselect   | link    | Select Project               | SelectProject.php     
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menutop   | menutop      | link    | Load and Setup               | LoadSetup.php
+menutop   | menutop      | link    | Science Steps                | ScienceSteps.php
+menutop   | menutop      | link    | Detrend Steps                | DetrendSteps.php
+menutop   | menutop      | link    | Imfile Tables                | ImfileTables.php
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect 	 | link    | Summit Exp                   | summitExp.php                         
+menulink  | menuselect 	 | link    | New Exp                      | newExp.php                    
+menulink  | menuselect 	 | link    | Copy Pending Exp             | pzPendingExp.php              
+menulink  | menuselect 	 | link    | Raw Detrend Exp              | rawDetrendExp.php             
+menulink  | menuselect 	 | link    | Raw Science Exp              | rawScienceExp.php             
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menutop   | menutop      | plain   | External Links               | none
+menutop   | menutop      | link    | test page                    | phptest.php     
Index: trunk/ippMonitor/raw/ipp.detrend.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.detrend.dat	(revision 8984)
+++ trunk/ippMonitor/raw/ipp.detrend.dat	(revision 8984)
@@ -0,0 +1,33 @@
+# style   | select-style | type    | menu line                    | link page       
+
+# we have four valid menu types: picture, piclink, link, plain
+# picture   | picture    | picture | PScolorlogo2.jpg             | none
+# piclink   | piclink    | piclink | PScolorlogo2.jpg             | http://panstarrs.ifa.hawaii.edu
+# menulink  | menuselect | link    | other page                   | notest.php     
+# menutop   | menutop    | plain   | foo bar                      | none            
+
+piclink   | piclink      | piclink | PScolorlogo2.jpg             | http://panstarrs.ifa.hawaii.edu
+menuext   | menuext      | link    | Pan-STARRS public            | http://panstarrs.ifa.hawaii.edu
+menuext   | menuext      | link    | Pan-STARRS project           | http://panstarrs.ifa.hawaii.edu/project
+menuext   | menuext      | link    | Pan-STARRS IPP               | http://panstarrs.ifa.hawaii.edu/project/IPP
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect   | link    | Login                        | Login.php     
+menulink  | menuselect   | link    | Select Project               | SelectProject.php     
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menutop   | menutop      | link    | Load and Setup               | LoadSetup.php
+menutop   | menutop      | link    | Science Steps                | ScienceSteps.php
+menutop   | menutop      | link    | Detrend Steps                | DetrendSteps.php
+menutop   | menutop      | link    | Imfile Tables                | ImfileTables.php
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect 	 | link    | Det Run                      | detRun.php                    
+menulink  | menuselect 	 | link    | Det Run Summary              | detRunSummary.php             
+menulink  | menuselect 	 | link    | Det Master Frame             | detMasterFrame.php            
+menulink  | menuselect 	 | link    | Det Input Exp                | detInputExp.php                    
+menulink  | menuselect 	 | link    | Det Resid Exp                | detResidExp.php                       
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menutop   | menutop      | plain   | External Links               | none            
+menutop   | menutop      | link    | test page                    | phptest.php     
Index: trunk/ippMonitor/raw/ipp.imfiles.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.imfiles.dat	(revision 8984)
+++ trunk/ippMonitor/raw/ipp.imfiles.dat	(revision 8984)
@@ -0,0 +1,39 @@
+# style   | select-style | type    | menu line                    | link page       
+
+# we have four valid menu types: picture, piclink, link, plain
+# picture   | picture    | picture | PScolorlogo2.jpg             | none
+# piclink   | piclink    | piclink | PScolorlogo2.jpg             | http://panstarrs.ifa.hawaii.edu
+# menulink  | menuselect | link    | other page                   | notest.php     
+# menutop   | menutop    | plain   | foo bar                      | none            
+
+piclink   | piclink      | piclink | PScolorlogo2.jpg             | http://panstarrs.ifa.hawaii.edu
+menuext   | menuext      | link    | Pan-STARRS public            | http://panstarrs.ifa.hawaii.edu
+menuext   | menuext      | link    | Pan-STARRS project           | http://panstarrs.ifa.hawaii.edu/project
+menuext   | menuext      | link    | Pan-STARRS IPP               | http://panstarrs.ifa.hawaii.edu/project/IPP
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect   | link    | Login                        | Login.php     
+menulink  | menuselect   | link    | Select Project               | SelectProject.php     
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menutop   | menutop      | link    | Load and Setup               | LoadSetup.php
+menutop   | menutop      | link    | Science Steps                | ScienceSteps.php
+menutop   | menutop      | link    | Detrend Steps                | DetrendSteps.php
+menutop   | menutop      | link    | Imfile Tables                | ImfileTables.php
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect 	 | link    | detMasterImfile          	  | detMasterImfile.php                   
+menulink  | menuselect 	 | link    | detNormalizedImfile      	  | detNormalizedImfile.php               
+menulink  | menuselect 	 | link    | detNormalizedStatImfile  	  | detNormalizedStatImfile.php           
+menulink  | menuselect 	 | link    | detProcessedImfile       	  | detProcessedImfile.php                
+menulink  | menuselect 	 | link    | detResidImfile           	  | detResidImfile.php            
+menulink  | menuselect 	 | link    | detStackedImfile         	  | detStackedImfile.php                  
+menulink  | menuselect 	 | link    | newImfile                	  | newImfile.php                         
+menulink  | menuselect 	 | link    | p2PendingImfile          	  | p2PendingImfile.php                   
+menulink  | menuselect 	 | link    | p2ProcessedImfile        	  | p2ProcessedImfile.php                 
+menulink  | menuselect 	 | link    | pzPendingImfile          	  | pzPendingImfile.php                   
+menulink  | menuselect 	 | link    | rawImfile                	  | rawImfile.php                         
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menutop   | menutop      | plain   | External Links               | none            
+menutop   | menutop      | link    | test page                    | phptest.php     
Index: trunk/ippMonitor/raw/ipp.menu.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.menu.dat	(revision 8982)
+++ trunk/ippMonitor/raw/ipp.menu.dat	(revision 8984)
@@ -17,41 +17,11 @@
 
 menutop   | menutop      | plain   | &nbsp;                       | 
-menutop   | menutop      | plain   | Load and Setup               | 
-menulink  | menuselect 	 | link    | Summit Exp                   | summitExp.php                         
-menulink  | menuselect 	 | link    | New Exp                      | newExp.php                    
-menulink  | menuselect 	 | link    | Copy Pending Exp             | pzPendingExp.php              
-menulink  | menuselect 	 | link    | Raw Detrend Exp              | rawDetrendExp.php             
-menulink  | menuselect 	 | link    | Raw Science Exp              | rawScienceExp.php             
+menutop   | menutop      | link    | Load and Setup               | LoadSetup.php
+menutop   | menutop      | link    | Science Steps                | ScienceSteps.php
+menutop   | menutop      | link    | Detrend Steps                | DetrendSteps.php
+menutop   | menutop      | link    | Imfile Tables                | ImfileTables.php
 
 menutop   | menutop      | plain   | &nbsp;                       | 
-menutop   | menutop      | plain   | Science Steps                | 
-menulink  | menuselect 	 | link    | P1 Pending Exp               | p1PendingExp.php              
-menulink  | menuselect 	 | link    | P2 Pending Exp               | p2PendingExp.php              
-menulink  | menuselect 	 | link    | P2 Processed Exp             | p2ProcessedExp.php            
-menulink  | menuselect 	 | link    | P3 Pending Exp               | p3PendingExp.php              
 
-menutop   | menutop      | plain   | &nbsp;                       | 
-menutop   | menutop      | plain   | Detrend Steps                | 
-menulink  | menuselect 	 | link    | Det Run                      | detRun.php                    
-menulink  | menuselect 	 | link    | Det Run Summary              | detRunSummary.php             
-menulink  | menuselect 	 | link    | Det Master Frame             | detMasterFrame.php            
-menulink  | menuselect 	 | link    | Det Input Exp                | detInputExp.php                    
-menulink  | menuselect 	 | link    | Det Resid Exp                | detResidExp.php                       
-
-menutop   | menutop      | plain   | &nbsp;                       | 
-menutop   | menutop      | plain   | Imfile Tables                | none            
-menulink  | menuselect 	 | link    | detMasterImfile          	  | detMasterImfile.php                   
-menulink  | menuselect 	 | link    | detNormalizedImfile      	  | detNormalizedImfile.php               
-menulink  | menuselect 	 | link    | detNormalizedStatImfile  	  | detNormalizedStatImfile.php           
-menulink  | menuselect 	 | link    | detProcessedImfile       	  | detProcessedImfile.php                
-menulink  | menuselect 	 | link    | detResidImfile           	  | detResidImfile.php            
-menulink  | menuselect 	 | link    | detStackedImfile         	  | detStackedImfile.php                  
-menulink  | menuselect 	 | link    | newImfile                	  | newImfile.php                         
-menulink  | menuselect 	 | link    | p2PendingImfile          	  | p2PendingImfile.php                   
-menulink  | menuselect 	 | link    | p2ProcessedImfile        	  | p2ProcessedImfile.php                 
-menulink  | menuselect 	 | link    | pzPendingImfile          	  | pzPendingImfile.php                   
-menulink  | menuselect 	 | link    | rawImfile                	  | rawImfile.php                         
-
-menutop   | menutop      | plain   | &nbsp;                       | 
 menutop   | menutop      | plain   | External Links               | none            
 menutop   | menutop      | link    | test page                    | phptest.php     
Index: trunk/ippMonitor/raw/ipp.php
===================================================================
--- trunk/ippMonitor/raw/ipp.php	(revision 8982)
+++ trunk/ippMonitor/raw/ipp.php	(revision 8984)
@@ -33,4 +33,5 @@
 // - pass (NOT the same as the user password: randomly generated for the session and given a timeout) 
 
+// have this function take the current menu and style?
 function checkLogin () {
 
@@ -42,5 +43,5 @@
 
   if (!$success) {  
-    menu ('Login', 'ipp.css', '');
+    menu ('ipp.menu.dat', 'Login', 'ipp.css', '');
     echo "Login Failed, please try again<br>\n";
     loginform ();
@@ -67,5 +68,5 @@
   // check for valid server method
   if (($_SERVER[REQUEST_METHOD] != 'POST') && ($_SERVER[REQUEST_METHOD] != 'GET')) {
-    menu ('Login', 'ipp.css', '');
+    menu ('ipp.menu.dat', 'Login', 'ipp.css', '');
     echo "Invalid Client Request<br>\n";
     menu_end ();
@@ -77,15 +78,15 @@
     $ID['pass'] = $_GET[pass];
     $ID['proj'] = $_GET[proj];
-    echo "using GET: ", $ID['pass'], $ID['proj'];
+    // echo "using GET: ", $ID['pass'], $ID['proj'];
   }
   if ($_SERVER[REQUEST_METHOD] == 'POST') { 
     $ID['pass'] = $_POST[pass];
     $ID['proj'] = $_POST[proj];
-    echo "using POST: ", $ID['pass'], $ID['proj'];
+    // echo "using POST: ", $ID['pass'], $ID['proj'];
   }
 
   // user is not logged in at all
   if ($ID['pass'] == "") {
-    menu('Login', 'ipp.css', '');
+    menu('ipp.menu.dat', 'Login', 'ipp.css', '');
     logintext ();    
     loginform ();
@@ -95,5 +96,5 @@
   // user supplied an invalid pass
   if ($ID['pass'] != "foobar") {
-    menu('Login', 'ipp.css', '');
+    menu('ipp.menu.dat', 'Login', 'ipp.css', '');
     echo "unknown user, please login again<br>\n";
     loginform ();
@@ -113,5 +114,5 @@
 }
 
-function menu ($title, $sheet, $append) {
+function menu ($source, $title, $sheet, $append) {
 
   echo "<html><head><title> $title </title></head>\n\n";
@@ -121,5 +122,5 @@
   $root = "/phpipp";
 
-  $file = fopen ("ipp.menu.dat", "r");
+  $file = fopen ($source, "r");
 
   echo "<table class=page cellspacing=10px><tr><td valign=top>\n";
Index: trunk/ippMonitor/raw/ipp.science.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.science.dat	(revision 8984)
+++ trunk/ippMonitor/raw/ipp.science.dat	(revision 8984)
@@ -0,0 +1,32 @@
+# style   | select-style | type    | menu line                    | link page       
+
+# we have four valid menu types: picture, piclink, link, plain
+# picture   | picture    | picture | PScolorlogo2.jpg             | none
+# piclink   | piclink    | piclink | PScolorlogo2.jpg             | http://panstarrs.ifa.hawaii.edu
+# menulink  | menuselect | link    | other page                   | notest.php     
+# menutop   | menutop    | plain   | foo bar                      | none            
+
+piclink   | piclink      | piclink | PScolorlogo2.jpg             | http://panstarrs.ifa.hawaii.edu
+menuext   | menuext      | link    | Pan-STARRS public            | http://panstarrs.ifa.hawaii.edu
+menuext   | menuext      | link    | Pan-STARRS project           | http://panstarrs.ifa.hawaii.edu/project
+menuext   | menuext      | link    | Pan-STARRS IPP               | http://panstarrs.ifa.hawaii.edu/project/IPP
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect   | link    | Login                        | Login.php     
+menulink  | menuselect   | link    | Select Project               | SelectProject.php     
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menutop   | menutop      | link    | Load and Setup               | LoadSetup.php
+menutop   | menutop      | link    | Science Steps                | ScienceSteps.php
+menutop   | menutop      | link    | Detrend Steps                | DetrendSteps.php
+menutop   | menutop      | link    | Imfile Tables                | ImfileTables.php
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect 	 | link    | P1 Pending Exp               | p1PendingExp.php              
+menulink  | menuselect 	 | link    | P2 Pending Exp               | p2PendingExp.php              
+menulink  | menuselect 	 | link    | P2 Processed Exp             | p2ProcessedExp.php            
+menulink  | menuselect 	 | link    | P3 Pending Exp               | p3PendingExp.php              
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menutop   | menutop      | plain   | External Links               | none            
+menutop   | menutop      | link    | test page                    | phptest.php     
Index: trunk/ippMonitor/raw/phptest.php
===================================================================
--- trunk/ippMonitor/raw/phptest.php	(revision 8982)
+++ trunk/ippMonitor/raw/phptest.php	(revision 8984)
@@ -1,7 +1,7 @@
-<?php include 'ipp.php'; ?>
+<?php 
 
-<?php menu('test.page', 'ipp.css', ''); ?>
+include 'ipp.php';
 
-<?
+menu('ipp.menu.dat', 'test.page', 'ipp.css', '');
 
 $varlist = array ('SERVER_NAME', 'GATEWAY_INTERFACE', 'SERVER_PROTOCOL',
@@ -19,8 +19,4 @@
 }
 
+menu_end();
 ?>
-
-<?php menu_end(); ?>
-
-</body>
-</html>
