style stuff

diff --git a/layout/styles.css b/layout/styles.css
index 91be0df578f9e44d0a27c1539c530fa496e2bf34..fde2de7dd0659026f50c923f761db58feb28da83 100644 (file)
--- a/layout/styles.css
+++ b/layout/styles.css
@@ -1,5 +1,5 @@
 body {
-    background:#f5f5f5;
+/*     background:#f5f5f5; */
     font-size:10pt;
     margin:0px 0 0 25px;
     padding:0;

diff --git a/layout/testgui.css b/layout/testgui.css
index 58104d7051b204e1a1c1abcb98fbdb968aba1d95..4c8abb0d14c408e41aa9fd59b325da16a3cb1500 100644 (file)
--- a/layout/testgui.css
+++ b/layout/testgui.css
@@ -1,5 +1,12 @@
 
 
+
+
+.bitfield {
+  background:#dea;
+  visibility:visible;
+}
+
 #theConsole {
   visibility:collapse;
 }
@@ -12,14 +19,49 @@
 
 .sensorAreaTable {
   
-  border-style: dashed;
-  padding:10px;
+/*   border-style: dashed; */
+/*   padding:10px; */
+}
+
+.prevImgContainer {
+  vertical-align:middle;
 }
 
 .previewArea {
   width:800px;
   height:400px;
-  text-align:center;  
+  text-align:center;
+  vertical-align:middle;
+  float:left;
+   position:relative;
+/*    width:320px; */
+/*    padding:10px; */
+/*    margin:50px 10px 0 30px; */
+   border-radius:5px;
+   background:#eef;
+   box-shadow: 0 0 10px 5px #fff,  0 0 4px 1px #78b inset;
 }
 
 
+.quickEditArea {
+   float:left;
+   position:relative;
+   width:320px;
+   padding:10px;
+   margin:50px 10px 0 30px;
+   border-radius:5px;
+   background:#eef;
+   box-shadow: 0 0 10px 5px #fff,  0 0 4px 1px #78b inset;
+   }
+   
+.sensorHeader{
+/*    float:left; */
+/*    position:relative; */
+/*    width:700px; */
+/*    min-height:50px; */
+/*    padding:10px; */
+   margin:50px 0 0 20px;
+   border-radius:5px;
+   background:#eef;
+   box-shadow: 0 0 10px 5px #fff,  0 0 4px 1px #78b inset;
+}
\ No newline at end of file

diff --git a/tools/testgui.pl b/tools/testgui.pl
index 5fd4e73722a835f6b617a34548115093140787e0..8b518de08ff77b0614296dcc9ca5739e7a8c11b1 100755 (executable)
--- a/tools/testgui.pl
+++ b/tools/testgui.pl
@@ -121,8 +121,8 @@ print header;
 print start_html(
 -title=>'testgui',
 -style=>[{'src'=>'../layout/styles.css'},
-{'src'=>'../layout/testgui.css'},
-{'src'=>'../layout/jtageditor_blue.css'}
+{'src'=>'../layout/jtageditor_blue.css'},
+{'src'=>'../layout/testgui.css'}
 ],
 -script=>[
 { -type => 'text/javascript', -src => './testgui.js'},
@@ -131,25 +131,6 @@ print start_html(
 ]
 );
 
-# print h2("testgui");
-
-
-# print "<div>";
-# 
-# print "<table>";
-# print "<tr><td>IVDREF1A</td><td>IVDREF1B</td></tr>";
-# print "<tr><td><input type='text' id='IVDREF1A'></td></tr>";
-# print "</table>";
-# 
-# 
-# print "</div>";
-
-
-
-
-# print "<div id='quickEditArea'>";
-# print_quickEditArea("0.xml");
-# print "</div>";
 print_setupStructure();
 
 print "<p>";
@@ -186,8 +167,6 @@ print "<div id='theConsole'>[the \"console\"]</div>";
 
 print end_html;
 
-
-
 }
 
 
@@ -245,22 +224,6 @@ sub print_setupStructure {
 }
 
 
-sub report_param {
-  print br,br;
-  print "action ".$q->param('action')." executed with following parameters:",br;
-  my @params = $q->param();
-  print "<table>";
-  for (@params) {
-    print "<tr><td>";
-    print escapeHTML($_);
-    print "</td><td>=</td><td>";
-    print escapeHTML($q->param($_));
-    print "</td>";
-  
-  }
-  print "</table>";
-
-}
 
 
 #### html output subs ###########
@@ -282,17 +245,21 @@ sub print_sensorArea {
   $sensorAreaId = $sensorId;
   print "<div class='sensorAreaDiv' id='".$sensorAreaId."'>";
   print "<table class='sensorAreaTable'>";
-  print "<tr>";
-  print "<td colspan=2 align='center' class='td_solid'>";
-  print "<table><tr><td>$sensorName (id=$sensorId)</td></tr>";
-  print "<tr><td>description: $sensorDescription</td></tr></table>";
-  print "</td>";
-  print "</tr>";
+#   print "<tr>";
+#   print "<td colspan=2 align='center' class='td_solid'>";
+# #   print "<table><tr><td>$sensorName (id=$sensorId)</td></tr>";
+# #   print "<tr><td>description: $sensorDescription</td></tr></table>";
+#   print "</td>";
+#   print "</tr>";V
   print "<tr>";
   my $previewAreaId = "preview_".$sensorId;
-  print "<td id='".$previewAreaId."' class='previewArea'> [not run yet!] </td>";
+  print "<td class='previewArea'>";
+  print "<div class='header' title='$sensorDescription'>$sensorName (id=$sensorId)</div>";
+  print "<div id='".$previewAreaId."' class='prevImgContainer'>[not run yet]</div>";
+  
+  print "</td>";
   $quickEditAreaId = "quickEdit_".$sensorId;
-  print "<td id='".$quickEditAreaId."' class='quickEditArea td_solid'>";
+  print "<td id='".$quickEditAreaId."' class='quickEditArea'>";
   print_quickEditArea($sensorConfig);
   print "</td>";
   print "</tr>";
@@ -332,6 +299,7 @@ sub print_quickEditArea {
 #   print "print_registers();",br;
   parseConfigAndSpec($argumentConfigFile);
   integrateAncestry();
+  print "<div class='header'>quick editor</div>";
   print "<div align=center>".getConfigFileName()."</div>";
   print_registers(getConfigFile());
 
@@ -408,7 +376,7 @@ EOF
 
     #print "<tr>";
 
-    print '<tr id="' . $flistid . '" class="">';
+    print '<tr id="' . $flistid . '" class="bitfield">';
     print '<td></td>';
     print '<td  class="fieldcontainer">';
     print_fields( $configFile, $register );
@@ -548,3 +516,20 @@ EOF
   print "</table>";
 
 }
+
+sub report_param {
+  print br,br;
+  print "action ".$q->param('action')." executed with following parameters:",br;
+  my @params = $q->param();
+  print "<table>";
+  for (@params) {
+    print "<tr><td>";
+    print escapeHTML($_);
+    print "</td><td>=</td><td>";
+    print escapeHTML($q->param($_));
+    print "</td>";
+  
+  }
+  print "</table>";
+
+}
\ No newline at end of file