From: Jan Michel Date: Fri, 9 Aug 2013 10:59:27 +0000 (+0200) Subject: further changes on status screens, no content yet X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=dfbd7910d4f61ce51fa07bd72aee086b33992553;p=mvdsensorcontrol.git further changes on status screens, no content yet --- diff --git a/layout/jtageditor_blue.css b/layout/jtageditor_blue.css index fa46fb6..f0706af 100644 --- a/layout/jtageditor_blue.css +++ b/layout/jtageditor_blue.css @@ -5,7 +5,7 @@ body { -#roterBereich, #blauerBereich, #fileSelection, #debug, #overview { +#roterBereich, #blauerBereich, #fileSelection, #debug, #overview, #debugpane { float:left; position:relative; width:320px; @@ -34,8 +34,15 @@ body { margin:0px; } +#debugpane { + float:left; + width:1000px; + margin:50px 0 0 20px; + +} + #overview { - width:700px; + width:1000px; margin:50px 0 0 20px; } @@ -203,3 +210,43 @@ div.header { z-index:-1; } +ul { padding-left:20px;} + +div.header span{ + display:block; + float:left; + position:relative; + top:-2px; + margin:0 10px 0 0; + padding:2px 0px 0 0px; + border:0px solid transparent; + width:100px; + list-style:none; + cursor:hand; +/* text-align:center; */ + border-radius:5px; +} + +div.header span.inactive a:hover { +/* background:#78b; */ +/* box-shadow: 0 0 10px 5px #78b; */ + color:#78b; +} + +div.header span.selected a{ + color:#88a; +} + +div.header span.inactive a{ + color:#bbd; + transition:all .4s; +} + +div.header span a { + text-decoration:none; +} + +div.header span a:hover { +} + + diff --git a/tools/statusgui.pl b/tools/statusgui.pl index 825ccaf..a09ead6 100755 --- a/tools/statusgui.pl +++ b/tools/statusgui.pl @@ -16,12 +16,18 @@ my $configFile = SETUPFILE; -my ($command) = split("-",$ENV{'QUERY_STRING'}); +my ($command,$style) = split("-",$ENV{'QUERY_STRING'}); $command = "" unless defined $command; +$style = "" unless defined $style; -if($command eq "setup") {readConfig($configFile,1);} -else {initPage();} + my $isSetup = $command eq "setup"; + my $isStatus = $command eq "status"; + my $isErrors = $command eq "errors"; + + +if($isSetup && $style eq "only") {readConfig($configFile,1);} +else {initPage();} @@ -33,37 +39,37 @@ sub readConfig { my $db = $parser->parse_file($file); my $name = $db->getDocumentElement->getAttribute('name'); my $str; - print "") if $write; } sub initPage { - + print < @@ -72,20 +78,26 @@ sub initPage { EOF printJavaScripts(); - print <

JTAG Status

-
-
Debug Output
-debug text -
-
System Setup
-EOF -readConfig($configFile,1); +
+ Setup + Status + Errors +
+
+); +readConfig($configFile,($command eq "setup"?1:0)); print < +
+
+
Debug Output
+debug text +