Changeset 35238 for trunk/dvodist/www-util

Timestamp:

Mar 5, 2013, 2:34:10 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130207

Location:

trunk/dvodist/www-util

Files:

• ipp.php (modified) (3 diffs)
• ippdata.menu.dat (modified) (1 diff)

trunk/dvodist/www-util/ipp.php

@@ -147 +147 @@
 
     if (count($line) == 4) {
-      echo "count = 4<br>\n";
       $name  = trim($line[0]);
       $type  = trim($line[1]);
@@ -155 +154 @@
     }
     if (count($line) == 5) {
-      echo "count = 5<br>\n";
       $name  = trim($line[0]);
       $link  = trim($line[1]);
@@ -216 +214 @@
       break;
     case 'dir':
-      echo "<tr class=\"$style\"><td><a class=\"$style\" href=\"$name\">$name</a></td><td>$info</td></tr>\n";
+      echo "<tr class=\"$style\"><td><a class=\"$style\" href=\"$link\">$name</a></td><td>$info</td></tr>\n";
       break;
     default:
-      echo "<tr class=\"$style\"><td><a class=\"$style\" href=\"$name\">$name</a></td><td>$info</td></tr>\n";
+      echo "<tr class=\"$style\"><td><a class=\"$style\" href=\"$link\">$name</a></td><td>$info</td></tr>\n";
       break;
     } 

trunk/dvodist/www-util/ippdata.menu.dat

@@ -6 +6 @@
 menuext   | menuext      | link    | Pan-STARRS IPP Wiki          | http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki
 menuext   | menuext      | link    | PS1SC Wiki                   | http://ps1sc.ifa.hawaii.edu/PS1wiki/index.php/Main_Page
+menuext   | menuext      | link    | PS1SC Access                 | http://dvodist.ipp.ifa.hawaii.edu
+menuext   | menuext      | link    | PS1SC PSPS                   | http://psps.ifa.hawaii.edu
 
 menutop   | menutop      | plain   |                         | 
-menutop   | menuselect   | link    | DVO Releases                 | /index.php
-menutop   | menuselect   | link    | Documentation                | /docs.php
+menutop   | menuselect   | link    | PS1 Public Data              | /index.php
+menutop   | menuselect   | link    | Documentation                | /docs/index.php
 menutop   | menuselect   | link    | Help                         | /help.php