From: Jan Michel <j.michel@gsi.de>
Date: Wed, 6 Nov 2013 12:58:05 +0000 (+0100)
Subject: corrected register editing
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=5d8d274983e7f668853a7e9a0f7d59483d79f28d;p=daqtools.git

corrected register editing
---

diff --git a/web/htdocs/layout/blue.css b/web/htdocs/layout/blue.css
index 733b68f..83660d2 100644
--- a/web/htdocs/layout/blue.css
+++ b/web/htdocs/layout/blue.css
@@ -46,7 +46,7 @@ body {
   min-width:1000px;
   margin:50px 0 0 20px;  
   resize:horizontal;
-  overflow:auto;
+/*   overflow:auto; */
   }
 
   
@@ -301,10 +301,11 @@ hr.queryresult  {
 }
 
 
-td.editable {
+.editable {
   background-image:url("edit.png");
   background-repeat:no-repeat;
   background-position:fixed;
+  padding-left:16px;
 }
 
 table.queryresult td.slice, table.queryresult th.slice {
@@ -326,7 +327,7 @@ span.tooltip  {
   top: 2em;  
   padding:3px 5px 5px 5px;
 /*   background:#ffe; */
-  background: linear-gradient(135deg, rgba(245,245,238,1) 0%,rgba(255,255,230,1) 100%);
+  background: linear-gradient(135deg, rgba(255,255,238,1) 0%,rgba(250,250,220,1) 100%);
   border:2px solid #fff;
   color:black;
   text-align:left;
@@ -346,5 +347,4 @@ th:hover .tooltip, td:hover .tooltip {
 table.queryresult th div, table.queryresult td div {
   position:relative;
   cursor:default;
-  min-width:80px;
 }
\ No newline at end of file
diff --git a/web/htdocs/scripts/xmlpage.js b/web/htdocs/scripts/xmlpage.js
index 1d5c057..1061621 100644
--- a/web/htdocs/scripts/xmlpage.js
+++ b/web/htdocs/scripts/xmlpage.js
@@ -1,10 +1,11 @@
   function editsetting(e) {
     if(e.target.getAttribute("class") && e.target.getAttribute("class").indexOf("editable")!=-1) {
-      var text = e.target.getAttribute("cstr");
-          text += "\nCurrent Value: "+e.target.innerHTML+" ("+e.target.getAttribute("raw")+")\n ";
-      var newval = prompt(text,e.target.getAttribute("raw"));
+      var text = e.target.parentNode.getAttribute("cstr");
+      var curr = e.target.innerHTML.split('<',1);
+          text += "\nCurrent Value: "+curr+" ("+e.target.parentNode.getAttribute("raw")+")\n ";
+      var newval = prompt(text,e.target.parentNode.getAttribute("raw"));
       if (newval != null) {
-        getdataprint('../xml-db/put.pl?'+e.target.getAttribute("cstr")+'-'+newval,'returntext',false,-1,refresh);
+        getdataprint('../xml-db/put.pl?'+e.target.parentNode.getAttribute("cstr")+'-'+newval,'returntext',false,-1,refresh);
         }
       }
     }
diff --git a/xml-db/get.pl b/xml-db/get.pl
index f9497e4..c20b629 100755
--- a/xml-db/get.pl
+++ b/xml-db/get.pl
@@ -131,11 +131,11 @@ sub FormatPretty {
   my $ret, my $cl;
   if (defined $cont) {
     my $isflag = 1; $isflag = 0 if $obj->{noflag};
-    $cl = "class=\"$class ".($value?"bad":"good")."\"" if     ( $obj->{errorflag} && !$obj->{invertflag} && $isflag);
-    $cl = "class=\"$class ".($value?"good":"bad")."\"" if     ( $obj->{errorflag} &&  $obj->{invertflag} && $isflag);
-    $cl = "class=\"$class ".($value?"high":"low")."\"" if     (!$obj->{errorflag} && !$obj->{invertflag} && $isflag);
-    $cl = "class=\"$class ".($value?"low":"high")."\"" if     (!$obj->{errorflag} &&  $obj->{invertflag} && $isflag);
-    $cl .= sprintf(" cstr=\"$cstr\" raw=\"0x%x\"><div>",$rawvalue);
+    $cl = "class=\"".($value?"bad":"good")."\"" if     ( $obj->{errorflag} && !$obj->{invertflag} && $isflag);
+    $cl = "class=\"".($value?"good":"bad")."\"" if     ( $obj->{errorflag} &&  $obj->{invertflag} && $isflag);
+    $cl = "class=\"".($value?"high":"low")."\"" if     (!$obj->{errorflag} && !$obj->{invertflag} && $isflag);
+    $cl = "class=\"".($value?"low":"high")."\"" if     (!$obj->{errorflag} &&  $obj->{invertflag} && $isflag);
+    $cl .= sprintf(" cstr=\"$cstr\" raw=\"0x%x\"><div class=\"$class\">",$rawvalue);
     
     $ret = "<$cont ";
     for($obj->{format}) {