cleaned up header line of xml-gui

diff --git a/web/htdocs/commands/xmlpage.pm b/web/htdocs/commands/xmlpage.pm
index 5d6e7fb8c48eebd968d699eb6b41813bffda588d..f6e08ed6d564b3bfdcd7072186d411f5abfb0985 100644 (file)
--- a/web/htdocs/commands/xmlpage.pm
+++ b/web/htdocs/commands/xmlpage.pm
@@ -56,26 +56,31 @@ print qq(</div>);
 print '<div class="head">';
 if($setup[$active]->{generic} == 1) {
   print qq|
-  <input type="text" id="target" title="Enter any valid command in the form Module-Address-Name" 
+  <div class="checkbox"><input type="text" id="target" title="Enter any valid command in the form Module-Address-Name" 
   value="$cmd" onChange="settarget()" onLoad="settarget()"
-  style="width:150px;text-align:left">
+  style="width:150px;text-align:left"></div>
   |;
   }
 
 if(!$setup[$active]->{generic}) {
-  print qq|
-  <input type="text" id="address" title="Enter any valid TrbNet address" 
+  print qq|<div class="checkbox" |;
+  if($setup[$active]->{noaddress}) {
+    print 'style="display:none"';
+    }
+  
+  print qq|><input type="text" id="address" title="Enter any valid TrbNet address" 
          value="$cmdAddr" onChange="setaddress()" onLoad="setaddress()"
-         style="text-align:left">
-  |;
+         ></div>  |;
   }  
   
 print qq|
-<input type="text" id="period" title="Refresh interval in ms. Set to -1 to disable automatic refresh" 
-       value="$period" onChange="setperiod()" onLoad="setperiod()">
-<div class="checkbox"><input type="checkbox" onChange="settarget()" value="1" id="rate" title="Convert register counter to rates where possible" $israte><label for="rate">Rates</label></div>       
-<div class="checkbox"><input type="checkbox" onChange="settarget()" value="1" id="cache" title="Use caching of data to reduce load on DAQ network" $iscache><label for="cache">Use Cache</label></div>
-<input type="button" class="stdbutton" onClick="refresh(-1);" value="Refresh">
+<div class="checkbox"><input type="text" id="period" title="Refresh interval in ms. Set to -1 to disable automatic refresh" 
+       value="$period" onChange="setperiod()" onLoad="setperiod()"></div>
+<div class="checkbox"><input type="checkbox" onChange="settarget()" value="1" id="rate" title="Convert register counter to rates where possible" $israte>
+    <label for="rate">Rates</label></div>
+<div class="checkbox"><input type="checkbox" onChange="settarget()" value="1" id="cache" title="Use caching of data to reduce load on DAQ network" $iscache>
+    <label for="cache">Use Cache</label></div>
+<div class="checkbox"><input type="button" class="stdbutton" onClick="refresh(-1);" value="Refresh"></div>
 </div>
 <div id="content"></div>|;
 

diff --git a/web/htdocs/layout/blue.css b/web/htdocs/layout/blue.css
index 2a3a6a6c2317d21b71ea0a62819954400b2b4812..4733092dbf0e0d043b656e90ce58ed2e0cbd4c1f 100644 (file)
--- a/web/htdocs/layout/blue.css
+++ b/web/htdocs/layout/blue.css
@@ -49,17 +49,22 @@ body {
 /*   overflow:auto; */
   }
 
+div#content {
+  margin-top:33px;
+  border-top:1px solid #78b;
+  padding-top:5px;
+}
   
 input[type="text"] {
     background-color:#dde;
     color:#444;
     font-size:10px;
-    height:24px;
+    height:22px;
     width:90px;
     text-align:right;
     padding-right:5px;
     padding-top:1px;
-    border:1px solid #78b;
+    border:none;
     transition:background .4s;
 }
 
@@ -75,17 +80,28 @@ select {
 }
 
 div.checkbox {
-  position:relative;
-  top:4px;
-  width: 100px;
-  display:inline;
-  padding-top:9px;
+  width: 90px;
   font-size:10px;
-  height:20px;    
+  height:22px; 
   background-color:#dde;
   color:#444;  
   border:1px solid #78b;
   transition:background .4s;  
+  float:left;
+  margin-right:5px;
+}
+
+div.checkbox input[type="checkbox"] {
+  width:20px;
+      position:relative;
+    top:-2px;
+}
+
+div.checkbox label {
+  padding-bottom:5px;
+  height:30px;
+  position:relative;
+  top:-5px;
 }
 
 input:hover, input:active, input:focus, 
@@ -95,13 +111,11 @@ background:#eed;
 }
 
 .stdbutton, input.stdbutton:active, input.stdbutton:focus {
-    width:100px;
-    height:25px;
+    width:90px;
+    height:22px;
     background:#dde;
     color:#444;
-    border:1px solid #78b;
-    margin:0 5px;
-    padding:0 0 3px 0;
+    border:none;
     transition: background .4s;
 }
 

diff --git a/web/htdocs/scripts/xmlpage.js b/web/htdocs/scripts/xmlpage.js
index e2f63ecb2ee7a4d118c992c11d43847c3b4b19fe..5031f937ce46356b995a2e2cce698525b68473b8 100644 (file)
--- a/web/htdocs/scripts/xmlpage.js
+++ b/web/htdocs/scripts/xmlpage.js
@@ -79,6 +79,7 @@
     command += opt;*/    
     
   function setaddress(e) {
+
     address=document.getElementById("address").value;
     var part = command.split('-');
     command=part[0]+"-"+address+"-"+part[2]+"-"+part[3];