Index: trunk/www/db_po/view_po.php
===================================================================
--- trunk/www/db_po/view_po.php	(revision 11504)
+++ trunk/www/db_po/view_po.php	(revision 11599)
@@ -12,6 +12,10 @@
 
     include("db.php");
-    printf("This page is to <u>view</u> the DB <b>%s</b>.\n", $db);
+    printf("This page is to <u>view and compare</u> entries from the DB <b>%s</b>.\n", $db);
+    printf("<button onClick='show_viewinfo()' id='showinfo' style='display:inline'>More Info</button>\n");
     printf("For edit, please go <a href='edit_po.php'>here</a>.<br><br>\n");
+    printf("<div id='viewinfo' style='display:none'>\n");
+    echo (file_get_contents("view-info.html"));
+    printf("</div>\n");
 
     $db_id = mysql_pconnect($host, $user, $pw);
@@ -23,30 +27,17 @@
     mysql_select_db($db);
 
-    printf("<table><tbody>\n");
-
-    printf("<tr>\n");
-    printf("<td valign='top' id='progfield'></td>\n");
-    printf("<td valign='top' id='keyfield'></td>\n");
-    printf("</tr>\n");
-
-    printf("<tr><td colspan='2'>\n");
-    //printf("<button onClick='get_values(2,\"all\",\"all\");get_values(3,\"all\",\"all\");alert(\"wait\");CompareValues();' id='showpo' style='display:inline'>Show Status</button></div>\n");
-    printf("<button onClick='get_values(2,\"all\",\"all\");get_values(3,\"all\",\"all\");CompareValues();' id='showpo' style='display:inline'>Show Status</button></div>\n");
-    printf("<button onClick='reset_dates(\"year\", \"empty\", \"empty\", 2);reset_dates(\"year\", \"empty\", \"empty\", 3)' id='resetdates' style='display:inline'>Reset Dates</button></div>\n");
-    printf("</td></tr>\n");
-
-    printf("<tr>\n");
-    for ($i=2; $i<4; $i++)
-    {
-        printf("<td>\n");
-        printf("<input name='dateformat%d' type='radio' onclick='ShowDatePulldown(%d)' value='pulldown' checked>pulldown \n", $i, $i);
-        printf("<input name='dateformat%d' type='radio' onclick='ShowDateInput(%d)' value='textinput'>text input \n", $i, $i);
-        printf("</td>\n");
-    }
-    printf("</tr>\n");
-
     $query0="SELECT DATE_FORMAT(fValidFrom, '%Y') AS valid FROM History WHERE NOT fValidFrom='0000-00-00 00:00:00' group by valid";
     $result0=mysql_query($query0, $db_id);
 
+
+    printf("<table border='0' cellspacing='2px'><tbody>\n");
+
+    printf("<tr>\n");
+    printf("<th bgcolor='#DCFFDC'>Configuration 1</th>\n");
+    printf("<td colspan='2' align='center'>\n");
+    printf("<button onClick='get_values(2,\"all\",\"all\");get_values(3,\"all\",\"all\");CompareValues();' id='showpo' style='display:inline'>Show /<br>Compare</button>\n");
+    printf("</td>\n");
+    printf("<th bgcolor='#DCDCFF'>Configuration 2</th>\n");
+    printf("</tr>\n");
 
     //date fields
@@ -55,13 +46,19 @@
     for ($i=2; $i<4; $i++)
     {
-        printf("<td>\n");
+        if ($i==2)
+            printf("<td bgcolor='#DCFFDC'>Date: &nbsp;\n");
+        else
+            printf("<td bgcolor='#DCDCFF'>Date: &nbsp;\n");
+        //buttons to show next/prev timestamp
+        printf("<button onClick='get_timestamp(%s, \"next\");get_values(2,\"all\",\"all\");get_values(3,\"all\",\"all\");CompareValues();' id='nexttimestamp%s' style='display:inline'>Next Time Stamp</button>\n", $i, $i);
+        printf("<button onClick='get_timestamp(%s, \"prev\");get_values(2,\"all\",\"all\");get_values(3,\"all\",\"all\");CompareValues();' id='prevtimestamp%s' style='display:inline'>Prev Time Stamp</button>\n", $i, $i);
         //input field
-        printf("<div id='dateinput%d' style='display:none'>Date (YYYY-MM-DD hh:mm:ss) \n", $i);
-        printf("<input id=\"statusdate%d\" type=\"text\" size=\"19\" maxlength=\"19\">\n", $i);
-        printf("<button onClick='get_timestamp(%s, \"next\");' id='nextimestamp%s' style='display:inline'>Next Time Stamp</button>\n", $i, $i);
-        printf("<button onClick='get_timestamp(%s, \"prev\");' id='nextimestamp%s' style='display:inline'>Prev Time Stamp</button>\n", $i, $i);
+        printf("<br>\n", $i);
+        printf("<div id='dateinput%d' style='display:none'>(YYYY-MM-DD hh:mm:ss) \n", $i);
+        printf("<input id=\"statusdate%d\" type=\"text\" size=\"19\" maxlength=\"19\"><br>\n", $i);
         printf("</div>\n");
+
         //pull down menus
-        printf("<div id='datepulldown%d' style='display:inline'>Date:\n", $i);
+        printf("<div id='datepulldown%d' style='display:inline'>\n", $i);
         //select for years
         printf("<div id='yearselect%d' style='display:inline'>\n", $i);
@@ -77,40 +74,82 @@
         printf("<div id='monthselect%d' style='display:inline'>\n", $i);
         printf("<select id='month%d' onchange=\"get_dates('day', this.value, 'empty', %d, 'yes')\">\n", $i, $i);
-        printf("<option value='empty'>-</option>\n");
-        printf("</select></div>\n");
+        printf("<option value='empty'>month</option>\n");
+        printf("</select>\n");
+        printf("</div>\n");
         //select for days
         printf("<div id='dayselect%d' style='display:inline'>\n", $i);
         printf("<select id='day%d' onchange=\"get_dates('hour', this.value, 'empty', %d, 'yes')\">\n", $i, $i);
-        printf("<option value='empty'>-</option>\n");
-        printf("</select></div>\n");
+        printf("<option value='empty'>day</option>\n");
+        printf("</select>\n");
+        printf("</div>\n");
         //select for hours
         printf("<div id='hourselect%d' style='display:inline'>\n", $i);
         printf("<select id='hour%d' onchange=\"get_dates('min', this.value, 'empty', %d, 'yes')\">\n", $i, $i);
-        printf("<option value='empty'>-</option>\n");
-        printf("</select></div>\n");
+        printf("<option value='empty'>hour</option>\n");
+        printf("</select>\n");
+        printf("</div>\n");
         //select for minutes
         printf("<div id='minselect%d' style='display:inline'>\n", $i);
         printf("<select id='min%d' onchange=\"get_dates('sec', this.value, 'empty', %d, 'yes')\">\n", $i, $i);
-        printf("<option value='empty'>-</option>\n");
-        printf("</select></div>\n");
+        printf("<option value='empty'>min</option>\n");
+        printf("</select>\n");
+        printf("</div>\n");
         //select for seconds
-        printf("<div id='secselect%d' style='display:inline'><select id='sec%d'>\n", $i, $i);
-        printf("<option value='empty'>-</option>\n");
-        printf("</select></div>\n");
+        printf("<div id='secselect%d' style='display:inline'>\n", $i);
+        printf("<select id='sec%d'>\n", $i, $i);
+        printf("<option value='empty'>sec</option>\n");
+        printf("</select>\n");
+        printf("</div>\n");
         //buttton to show next timestamp
-        //printf("<button onClick='get_next_timestamp(%s);' id='nextimestamp%s' style='display:inline'>Next Time Stamp</button>\n", $i, $i);
-        printf("<button onClick='get_timestamp(%s, \"next\");' id='nextimestamp%s' style='display:inline'>Next Time Stamp</button>\n", $i, $i);
-        printf("<button onClick='get_timestamp(%s, \"prev\");' id='nextimestamp%s' style='display:inline'>Prev Time Stamp</button>\n", $i, $i);
+        //printf("<button onClick='get_timestamp(%s, \"next\");get_values(2,\"all\",\"all\");get_values(3,\"all\",\"all\");CompareValues();' id='nexttimestamp%s' style='display:inline'>Next Time Stamp</button>\n", $i, $i);
+        //printf("<button onClick='get_timestamp(%s, \"prev\");get_values(2,\"all\",\"all\");get_values(3,\"all\",\"all\");CompareValues();' id='prevtimestamp%s' style='display:inline'>Prev Time Stamp</button>\n", $i, $i);
+        printf("</div>\n");
+        printf("<br>\n");
+
+        //radio button to select input-format for date
+        printf("<input name='dateformat%d' type='radio' onclick='ShowDatePulldown(%d)' value='pulldown' checked>pulldown \n", $i, $i);
+        printf("<input name='dateformat%d' type='radio' onclick='ShowDateInput(%d)' value='textinput'>text input \n", $i, $i);
         printf("</td>\n");
+
+        //reset mysql result to loop again over it
         if ($i==2 && $rowcount > 0)
             mysql_data_seek($result0, 0);
+
+        if ($i==2)
+            printf("<td colspan='2' align='center'><button onClick='reset_dates(\"year\", \"empty\", \"empty\", 2);reset_dates(\"year\", \"empty\", \"empty\", 3);get_values(2,\"all\",\"all\");get_values(3,\"all\",\"all\");CompareValues();' id='resetdates' style='display:inline'>Reset Dates</button></td>\n");
     }
     printf("</tr>\n");
     mysql_free_result($result0);
 
+    //print pulldown for programs/key and buttons
+    printf("<tr><td colspan='4'>\n");
+    printf("<br>Select a subset of program options:\n");
+    printf("<div id='progfield' style='display:inline'></div>\n");
+    printf("<div id='keyfield' style='display:inline'></div>\n");
+    //printf("<button onClick='get_values(2,\"all\",\"all\");get_values(3,\"all\",\"all\");alert(\"wait\");CompareValues();' id='showpo' style='display:inline'>Show Status</button></div>\n");
+    printf("</td></tr>\n");
+
+    //checkboxes to show/hide part of the table
+    printf("<tr>\n");
+    for ($i=2; $i<4; $i++)
+    {
+        if ($i==2)
+            printf("<td bgcolor='#DCFFDC' colspan='2'>\n");
+        else
+            printf("<td bgcolor='#DCDCFF' colspan='2'>\n");
+        printf("Show:\n");
+        printf("<input type='checkbox' id='sh_indices%d' onclick='ShowHide(\"indices\", \"sh_indices\", %d);'>indices\n", $i, $i);
+        printf("<input type='checkbox' id='sh_validsince%d' onclick='ShowHide(\"validsince\", \"sh_validsince\", %d);'>validsince\n", $i, $i);
+        printf("<input type='checkbox' id='sh_descr%d' onclick='ShowHide(\"description\", \"sh_descr\", %d);'>description\n", $i, $i);
+        printf("<input type='checkbox' id='sh_min%d' onclick='ShowHide(\"minimum\", \"sh_min\", %d);'>min\n", $i, $i);
+        printf("<input type='checkbox' id='sh_max%d' onclick='ShowHide(\"maximum\", \"sh_max\", %d);'>max\n", $i, $i);
+        printf("</td>\n");
+    }
+    printf("</tr>\n");
+
     //list of POs
     printf("<tr>\n");
-    printf("<td><div id='valuefield2'></div></td>\n");
-    printf("<td><div id='valuefield3'></div></td>\n");
+    printf("<td bgcolor='#BEFFBE' colspan='2'><div id='valuefield2'></div></td>\n");
+    printf("<td bgcolor='#BEBEFF' colspan='2'><div id='valuefield3'></div></td>\n");
     printf("</tr>\n");