Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8790)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8791)
@@ -23,4 +23,15 @@
    * datacenter/db/ganymed.php: 
      - updated tab numbers for plots Hist and FS
+
+   * datacenter/db/menu.php: 
+     - removed TestFlag from Sequence Menu, as all runs in sequences 
+       are no_test
+     - rearranged Sequence Menu (3x3 instead of 3x4)
+
+   * datacenter/db/index-header.html: 
+     - adapted links to home of db and docu (are poitingin to wiki now)
+
+   * datacenter/db/index.html: 
+     - installed redirect to wiki db website
 
 
Index: trunk/MagicSoft/Mars/datacenter/db/index-header.html
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/index-header.html	(revision 8790)
+++ trunk/MagicSoft/Mars/datacenter/db/index-header.html	(revision 8791)
@@ -28,6 +28,6 @@
 <font size='+1'><B>Magic Database</B></font><BR>
 <hr SIZE=1 NOSHADE WIDTH="80%">
-<A HREF="index.html">H</A>&nbsp;
-<A HREF="http://datacenter.astro.uni-wuerzburg.de/index.html#db">Docu</A>&nbsp;
+<A HREF="http://www.astro.uni-wuerzburg.de/wiki/Database_Websites">H</A>&nbsp;
+<A HREF="http://www.astro.uni-wuerzburg.de/wiki/Database_Tutorial">Docu</A>&nbsp;
 <A HREF="printtable.php?fTable=MarsVersion">Mars</A>&nbsp;
 <A HREF="plotdb.php">Plots</A>
Index: trunk/MagicSoft/Mars/datacenter/db/index.html
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/index.html	(revision 8790)
+++ trunk/MagicSoft/Mars/datacenter/db/index.html	(revision 8791)
@@ -1,20 +1,17 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html>
 <head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="Thomas Bretz">
-   <title>Magic Database</title>
-   <link rel="stylesheet" type="text/css" href="mars.css">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta name="Author" content="Thomas Bretz">
+<meta http-equiv="refresh" content="0; URL=http://www.astro.uni-wuerzburg.de/wiki/Database_Websites">
+<title>Magic Database</title>
+<link rel="stylesheet" type="text/css" href="mars.css">
 </head>
 
 <body background="background.gif" text="#000000" bgcolor="#000099" link="#1122FF" vlink="#8888FF" alink="#FF0000">
 &nbsp;
-
 <center>
 <table class="Main" CELLPADDING=0>
-
-<tr>
-<td class="Edge">
+<tr><td class="Edge">
 <img SRC="ecke.gif" ALT="">
 </td>
@@ -32,4 +29,10 @@
 <tr class="Block">
 <td>
+<br>
+If you are not redirected automatically, you can find the new database websites on: 
+<a href='http://www.astro.uni-wuerzburg.de/wiki/Database_Websites'>www.astro.uni-wuerzburg.de/wiki/Database_Websites</a>
+<br>
+<br>
+<hr width="100%" size="2">
 <p>
 Some useful queries:<p>
Index: trunk/MagicSoft/Mars/datacenter/db/menu.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/menu.php	(revision 8790)
+++ trunk/MagicSoft/Mars/datacenter/db/menu.php	(revision 8791)
@@ -135,23 +135,23 @@
     PrintPullDown($host, $user, $pw, $db, "Source",                      "fSourceName",                      "fSourceKEY",                      "Source Name");
     printf("  </td><td>\n");
+    PrintPullDown($host, $user, $pw, $db, "Project",                     "fProjectName",                     "fProjectKEY",                     "Project Name");
+    printf("  </td><td>\n");
     PrintPullDown($host, $user, $pw, $db, "L1TriggerTable",              "fL1TriggerTableName",              "fL1TriggerTableKEY",              "L1Trigger Table");
-    printf("  </td><td>\n");
-    PrintPullDown($host, $user, $pw, $db, "L2TriggerTable",              "fL2TriggerTableName",              "fL2TriggerTableKEY",              "L2Trigger Table");
-    printf("  </td><td>\n");
-    PrintPullDown($host, $user, $pw, $db, "TriggerDelayTable",           "fTriggerDelayTableName",           "fTriggerDelayTableKEY",           "Trigger Delay Table");
     printf("  </td></tr><tr><td>\n");
     PrintPullDown($host, $user, $pw, $db, "LightConditions",             "fLightConditionsName",             "fLightConditionsKEY",             "Light Conditions");
     printf("  </td><td>\n");
-    PrintPullDown($host, $user, $pw, $db, "Project",                     "fProjectName",                     "fProjectKEY",                     "Project Name");
-    printf("  </td><td>\n");
     PrintPullDown($host, $user, $pw, $db, "HvSettings",                  "fHvSettingsName",                  "fHvSettingsKEY",                  "HV Settings");
     printf("  </td><td>\n");
-    PrintPullDown($host, $user, $pw, $db, "DiscriminatorThresholdTable", "fDiscriminatorThresholdTableName", "fDiscriminatorThresholdTableKEY", "DT Table");
+    PrintPullDown($host, $user, $pw, $db, "L2TriggerTable",              "fL2TriggerTableName",              "fL2TriggerTableKEY",              "L2Trigger Table");
     printf("  </td></tr><tr><td>\n");
     PrintPullDown($host, $user, $pw, $db, "ObservationMode",             "fObservationModeName",             "fObservationModeKEY",             "Obs. Mode");
     printf("  </td><td>\n");
+    PrintPullDown($host, $user, $pw, $db, "DiscriminatorThresholdTable", "fDiscriminatorThresholdTableName", "fDiscriminatorThresholdTableKEY", "DT Table");
+    printf("  </td><td>\n");
+    PrintPullDown($host, $user, $pw, $db, "TriggerDelayTable",           "fTriggerDelayTableName",           "fTriggerDelayTableKEY",           "Trigger Delay Table");
+//    printf("  </td><td>\n");
 //    PrintPullDown($host, $user, $pw, $db, "ManuallyChanged",             "fManuallyChangedName",             "fManuallyChangedKEY",             "Manually changed");
 //    printf("  </td><td>\n");
-    PrintPullDown($host, $user, $pw, $db, "TestFlag",                    "fTestFlagName",                    "fTestFlagKEY",                    "Test Flag");
+//    PrintPullDown($host, $user, $pw, $db, "TestFlag",                    "fTestFlagName",                    "fTestFlagKEY",                    "Test Flag");
     printf("  </td></tr>\n");
     printf(" </table>\n");
