Index: /trunk/FACT++/www/viewer/index.html
===================================================================
--- /trunk/FACT++/www/viewer/index.html	(revision 17813)
+++ /trunk/FACT++/www/viewer/index.html	(revision 17814)
@@ -8,5 +8,5 @@
     <link rel="stylesheet" href="codemirror-4.1/lib/codemirror.css"/>
     <!--<link rel="stylesheet" href="codemirror-4.1/theme/myblackboard.css"/>-->
-    <link rel="stylesheet" href="codemirror-4.1/theme/blackboard.css">
+    <!--<link rel="stylesheet" href="codemirror-4.1/theme/blackboard.css">-->
     <!--<link rel="stylesheet" href="codemirror-4.1/theme/3024-night.css">-->
     <link rel="stylesheet" href="codemirror-4.1/addon/display/fullscreen.css"/>
@@ -167,20 +167,19 @@
    <table width="100%">
       <colgroup>
-         <col style="width:40%;">
-         <col style="width:20%;">
-         <col style="width:40%;">
+         <col style="width:38.5%;">
+         <col style="width:23%;">
+         <col style="width:38.5%;">
       </colgroup>
       <tr>
          <td>
-            <span style="white-space:nowrap">
-               Min: 
+            <span style="white-space:nowrap;margin-right:2px;">
+               Min 
                <input id="cameramin1"   style="text-align:right;width:100px;" type="number"   onchange="onCameraMinMax(1);"  value="0" disabled="true"></input>
-               <input id="cameraminon1" type="checkbox" onclick="onCameraMinMaxOn(1);" checked="true"></input>
-            </span>
-            &nbsp;
-            <span style="white-space:nowrap">
-               Max: 
+               <input id="cameraminon1" style="margin-left:0px;" type="checkbox" onclick="onCameraMinMaxOn(1);" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap">
+               Max 
                <input id="cameramax1"   style="text-align:right;width:100px;" type="number"   onchange="onCameraMinMax(1);"  value="0" disabled="true"></input>
-               <input id="cameramaxon1" type="checkbox" onclick="onCameraMinMaxOn(1);" checked="true"></input>
+               <input id="cameramaxon1" style="margin-left:0px;" type="checkbox" onclick="onCameraMinMaxOn(1);" checked="true"></input>
             </span>
          </td>
@@ -189,13 +188,12 @@
          <td style="text-align:right">
             <span style="white-space:nowrap">
-               Min: 
+               Min 
                <input id="cameramin2"   style="text-align:right;width:100px;" type="number"   onchange="onCameraMinMax(2);"  value="0" disabled="true"></input>
-               <input id="cameraminon2" type="checkbox" onclick="onCameraMinMaxOn(2);" checked="true"></input>
-            </span>
-            <span style="white-space:nowrap">
-               &nbsp;
-               Max: 
+               <input id="cameraminon2" style="margin-left:0px;" type="checkbox" onclick="onCameraMinMaxOn(2);" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap;margin-left:2px;">
+               Max 
                <input id="cameramax2"   style="text-align:right;width:100px;" type="number"   onchange="onCameraMinMax(2);"  value="0" disabled="true"></input>
-               <input id="cameramaxon2" type="checkbox" onclick="onCameraMinMaxOn(2);" checked="true"></input>
+               <input id="cameramaxon2" style="margin-left:0px;" type="checkbox" onclick="onCameraMinMaxOn(2);" checked="true"></input>
             </span>
          </td>
@@ -225,25 +223,25 @@
    <table width="100%">
       <colgroup>
-         <col style="width:40%;">
-         <col style="width:20%;">
-         <col style="width:40%;">
+         <col style="width:38.5%;">
+         <col style="width:23%;">
+         <col style="width:38.5%;">
       </colgroup>
       <tr>
          <td>
-            <span style="white-space:nowrap">
-               Min: 
+            <span style="white-space:nowrap;margin-right:2px;">
+               Min 
                <input id="cameramin3"   style="text-align:right;width:100px;" type="number"   onchange="onCameraMinMax(3);"  value="0" disabled="true"></input>
-               <input id="cameraminon3" type="checkbox" onclick="onCameraMinMaxOn(3);" checked="true"></input>
-            </span>
-            &nbsp;
-            <span style="white-space:nowrap">
-               Max: 
+               <input id="cameraminon3" style="margin-left:0px;" type="checkbox" onclick="onCameraMinMaxOn(3);" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap">
+               Max 
                <input id="cameramax3"   style="text-align:right;width:100px;" type="number"   onchange="onCameraMinMax(3);"  value="0" disabled="true"></input>
-               <input id="cameramaxon3" type="checkbox" onclick="onCameraMinMaxOn(3);" checked="true"></input>
+               <input id="cameramaxon3" style="margin-left:0px;" type="checkbox" onclick="onCameraMinMaxOn(3);" checked="true"></input>
             </span>
          </td>
          <td style="text-align:center;">
-            <input id="marker" type="checkbox" checked="true" onclick="refreshCameras();">Marker</input>&nbsp;&nbsp;
-            <input id="image" type="checkbox" onclick="refreshCameras();">Image</input>
+            <span style="white-space:nowrap;margin-left:1px;margin-right:1px;"><input id="grid"   type="checkbox" onclick="refreshCameras();" checked="true">Grid</input></span>
+            <span style="white-space:nowrap;margin-left:1px;margin-right:1px;"><input id="marker" type="checkbox" onclick="refreshCameras();" checked="true">Marker</input></span>
+            <span style="white-space:nowrap;margin-left:1px;margin-right:1px;"><input id="image"  type="checkbox" onclick="refreshCameras();">Image</input></span>
             <!--Pixel value: 
             <input id="value" type="text" readonly="true"  value="0" style="text-align:right;width:100px"></input>-->
@@ -251,13 +249,12 @@
          <td style="text-align:right">
             <span style="white-space:nowrap">
-               Min: 
+               Min 
                <input id="cameramin4"   style="text-align:right;width:100px;" type="number"   onchange="onCameraMinMax(4);"  value="0" disabled="true"></input>
-               <input id="cameraminon4" type="checkbox" onclick="onCameraMinMaxOn(4);" checked="true"></input>
-            </span>
-            <span style="white-space:nowrap">
-               &nbsp;
-               Max: 
+               <input id="cameraminon4" style="margin-left:0px;" type="checkbox" onclick="onCameraMinMaxOn(4);" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap;margin-left:2px;">
+               Max
                <input id="cameramax4"   style="text-align:right;width:100px;" type="number"   onchange="onCameraMinMax(4);"  value="0" disabled="true"></input>
-               <input id="cameramaxon4" type="checkbox" onclick="onCameraMinMaxOn(4);" checked="true"></input>
+               <input id="cameramaxon4" style="margin-left:0px;" type="checkbox" onclick="onCameraMinMaxOn(4);" checked="true"></input>
             </span>
          </td>
@@ -278,14 +275,13 @@
       <tr>
          <td>
-            <span style="white-space:nowrap">
-               Min: 
+            <span style="white-space:nowrap;margin-right:2px;">
+               Min
                <input id="histmin1"   style="text-align:right;width:100px;" type="number"   onchange="onHistMinMax(1);"  value="0" disabled="true"></input>
-               <input id="histminon1" type="checkbox" onclick="onHistMinMaxOn(1);" checked="true"></input>
-            </span>
-            &nbsp;
-            <span style="white-space:nowrap">
-               Max: 
+               <input id="histminon1" style="margin-left:0px;" type="checkbox" onclick="onHistMinMaxOn(1);" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap">
+               Max
                <input id="histmax1"   style="text-align:right;width:100px;" type="number"   onchange="onHistMinMax(1);"  value="0" disabled="true"></input>
-               <input id="histmaxon1" type="checkbox" onclick="onHistMinMaxOn(1);" checked="true"></input>
+               <input id="histmaxon1" style="margin-left:0px;" type="checkbox" onclick="onHistMinMaxOn(1);" checked="true"></input>
             </span>
          </td>
@@ -294,13 +290,12 @@
          <td style="text-align:right">
             <span style="white-space:nowrap">
-               Min: 
+               Min
                <input id="histmin2"   style="text-align:right;width:100px;" type="number"   onchange="onHistMinMax(2);"  value="0" disabled="true"></input>
-               <input id="histminon2" type="checkbox" onclick="onHistMinMaxOn(2);" checked="true"></input>
-            </span>
-            <span style="white-space:nowrap">
-               &nbsp;
-               Max: 
+               <input id="histminon2" style="margin-left:0px;" type="checkbox" onclick="onHistMinMaxOn(2);" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap;margin-left:2px;">
+               Max
                <input id="histmax2"   style="text-align:right;width:100px;" type="number"   onchange="onHistMinMax(2);"  value="0" disabled="true"></input>
-               <input id="histmaxon2" type="checkbox" onclick="onHistMinMaxOn(2);" checked="true"></input>
+               <input id="histmaxon2" style="margin-left:0px;" type="checkbox" onclick="onHistMinMaxOn(2);" checked="true"></input>
             </span>
          </td>
@@ -330,38 +325,30 @@
    <table width="100%">
       <colgroup>
-         <col style="width:40%;">
-         <col style="width:20%;">
-         <col style="width:40%;">
+         <col style="width:50%;">
+         <col style="width:50%;">
       </colgroup>
       <tr>
          <td>
-            <span style="white-space:nowrap">
-               Min: 
+            <span style="white-space:nowrap;margin-right:2px;">
+               Min 
                <input id="histmin3"   style="text-align:right;width:100px;" type="number"   onchange="onHistMinMax(3);"  value="0" disabled="true"></input>
-               <input id="histminon3" type="checkbox" onclick="onHistMinMaxOn(3);" checked="true"></input>
-            </span>
-            &nbsp;
-            <span style="white-space:nowrap">
-               Max: 
+               <input id="histminon3" style="margin-left:0px;" type="checkbox" onclick="onHistMinMaxOn(3);" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap">
+               Max 
                <input id="histmax3"   style="text-align:right;width:100px;" type="number"   onchange="onHistMinMax(3);"  value="0" disabled="true"></input>
-               <input id="histmaxon3" type="checkbox" onclick="onHistMinMaxOn(3);" checked="true"></input>
-            </span>
-         </td>
-         <td style="text-align:center;">
-	    <!--<input id="marker" type="checkbox" checked="true" onclick="onMarker();">Show pixel marker</input>-->
-            <!--Pixel value: 
-            <input id="value" type="text" readonly="true"  value="0" style="text-align:right;width:100px"></input>-->
+               <input id="histmaxon3" style="margin-left:0px;" type="checkbox" onclick="onHistMinMaxOn(3);" checked="true"></input>
+            </span>
          </td>
          <td style="text-align:right">
             <span style="white-space:nowrap">
-               Min: 
+               Min
                <input id="histmin4"   style="text-align:right;width:100px;" type="number"   onchange="onHistMinMax(4);"  value="0" disabled="true"></input>
-               <input id="histminon4" type="checkbox" onclick="onHistMinMaxOn(4);" checked="true"></input>
-            </span>
-            <span style="white-space:nowrap">
-               &nbsp;
-               Max: 
+               <input id="histminon4" style="margin-left:0px;" type="checkbox" onclick="onHistMinMaxOn(4);" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap;margin-left:2px;">
+               Max
                <input id="histmax4"   style="text-align:right;width:100px;" type="number"   onchange="onHistMinMax(4);"  value="0" disabled="true"></input>
-               <input id="histmaxon4" type="checkbox" onclick="onHistMinMaxOn(4);" checked="true"></input>
+               <input id="histmaxon4" style="margin-left:0px;" type="checkbox" onclick="onHistMinMaxOn(4);" checked="true"></input>
             </span>
          </td>
@@ -377,31 +364,30 @@
    <table style="width:100%">
       <colgroup>
-         <col style="width:50%;">
-         <col style="width:50%;">
+         <col style="width:33%;">
+         <col style="width:66%;">
       </colgroup>
       <tr>  
-         <td style="text-align:left">
+         <td style="text-align:left;margin-right:2px;">
             <span style="white-space:nowrap;float:left">
-               Xmin:
+               Xmin
                <input id="waveformxmin"   style="width:55px;text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
-               <input id="waveformxminon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
-               &nbsp;
+               <input id="waveformxminon" style="margin-left:0px;" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
       	    </span>
       	    <span style="white-space:nowrap;float:left">
-               Xmax:
+               Xmax
                <input id="waveformxmax"   style="width:55px;text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
-               <input id="waveformxmaxon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
+               <input id="waveformxmaxon" style="margin-left:0px;" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
       	    </span>
      	 </td>
          <td style="text-align:right">
             <span style="white-space:nowrap;">
-               Ymin: 
+               Ymin
                <input id="waveformmin"   style="text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
-               <input id="waveformminon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
-            </span>
-            <span style="white-space:nowrap;">
-               &nbsp;Ymax:
+               <input id="waveformminon" style="margin-left:0px;" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
+            </span>
+            <span style="white-space:nowrap;margin-left:2px;">
+               Ymax
                <input id="waveformmax"   style="text-align:right"type="number"   onchange="onWaveformMinMax();"  value="0" disabled="true"></input>
-               <input id="waveformmaxon" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
+               <input id="waveformmaxon" style="margin-left:0px;" type="checkbox" onclick="onWaveformMinMaxOn();" checked="true"></input>
            </span>
          </td>