From 23c29745c883ce981ed72e273f6aac8ccccab503 Mon Sep 17 00:00:00 2001 From: Michael Wiebusch Date: Tue, 6 Aug 2013 14:45:35 +0200 Subject: [PATCH] style stuff --- layout/styles.css | 2 +- layout/testgui.css | 48 +++++++++++++++++++++++++-- tools/testgui.pl | 81 +++++++++++++++++++--------------------------- 3 files changed, 79 insertions(+), 52 deletions(-) diff --git a/layout/styles.css b/layout/styles.css index 91be0df..fde2de7 100644 --- 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 58104d7..4c8abb0 100644 --- 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 5fd4e73..8b518de 100755 --- 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 "
"; -# -# print ""; -# print ""; -# print ""; -# print "
IVDREF1AIVDREF1B
"; -# -# -# print "
"; - - - - -# print "
"; -# print_quickEditArea("0.xml"); -# print "
"; print_setupStructure(); print "

"; @@ -186,8 +167,6 @@ print "

[the \"console\"]
"; 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 ""; - for (@params) { - print ""; - - } - print "
"; - print escapeHTML($_); - print "="; - print escapeHTML($q->param($_)); - print "
"; - -} #### html output subs ########### @@ -282,17 +245,21 @@ sub print_sensorArea { $sensorAreaId = $sensorId; print "
"; print ""; - print ""; - print ""; - print ""; +# print ""; +# print ""; +# print "";V print ""; my $previewAreaId = "preview_".$sensorId; - print ""; + print ""; $quickEditAreaId = "quickEdit_".$sensorId; - print ""; print ""; @@ -332,6 +299,7 @@ sub print_quickEditArea { # print "print_registers();",br; parseConfigAndSpec($argumentConfigFile); integrateAncestry(); + print "
quick editor
"; print "
".getConfigFileName()."
"; print_registers(getConfigFile()); @@ -408,7 +376,7 @@ EOF #print ""; - print ''; + print ''; print ''; print '
"; - print ""; - print "
$sensorName (id=$sensorId)
description: $sensorDescription
"; - print "
"; +# # print ""; +# # print "
$sensorName (id=$sensorId)
description: $sensorDescription
"; +# print "
[not run yet!] "; + print "
$sensorName (id=$sensorId)
"; + print "
[not run yet]
"; + + print "
"; + print ""; print_quickEditArea($sensorConfig); print "
'; print_fields( $configFile, $register ); @@ -548,3 +516,20 @@ EOF print "
"; } + +sub report_param { + print br,br; + print "action ".$q->param('action')." executed with following parameters:",br; + my @params = $q->param(); + print ""; + for (@params) { + print ""; + + } + print "
"; + print escapeHTML($_); + print "="; + print escapeHTML($q->param($_)); + print "
"; + +} \ No newline at end of file -- 2.43.0