show ancestry as nested table

diff --git a/layout/jtageditor.css b/layout/jtageditor.css
index e329f5336c8623e1e4f332b7ad2e78e0cc7c9d1b..b19854f006f628741909350c81bcff4b528d839a 100644 (file)
--- a/layout/jtageditor.css
+++ b/layout/jtageditor.css
@@ -99,43 +99,43 @@ table.registers>tbody>tr>td:nth-child(2) {
   }
 
 
-tr.fileLevel
+.fileLevel
 {
 background:#CCFFCC;
 //background:#dea;
 }
 
-tr.fileLevel1
+.fileLevel1
 {
 background:#CCFFFF;
 }
 
-tr.fileLevel2
+.fileLevel2
 {
 background:#CCCCFF;
 }
 
-tr.fileLevel3
+.fileLevel3
 {
 background:#FFCCFF;
 }
 
-tr.fileLevel4
+.fileLevel4
 {
 background:#FFCCCC;
 }
 
-tr.fileLevel5
+.fileLevel5
 {
 background:#FFFFCC;
 }
 
-tr.fileLevel6
+.fileLevel6
 {
 background:#FFFFFF;
 }
 
-table.fields td.button_move, table.registers td.button_move {
+table.fields td.button_move, table.registers td.button_move, .button_move {
   background:orange;
   cursor:pointer;
   text-align:center;

diff --git a/xml_spielwiese/cgitest.pl b/xml_spielwiese/cgitest.pl
index 73183269131ea064da59c478580fee636508d90b..2cb4eeaf641d0d73434751fc3ba77e66207af5f4 100755 (executable)
--- a/xml_spielwiese/cgitest.pl
+++ b/xml_spielwiese/cgitest.pl
@@ -81,7 +81,6 @@ if ( $cgiHash{'print'} eq 'spectree' ) {
        parseSetAndSpec( $cgiHash{'configFile'} );
 "<div class='ancestorInfo' align='center'>specifications loaded from $specfileName</div>";
 
-
        print_registers($specfile);
 }
 
@@ -97,10 +96,10 @@ if ( $cgiHash{'print'} eq 'settree' ) {
        print "<td>";
        print_ancestorInfo();
        print "</td>";
-       print "<td style='border-right:1px solid #000000'><br></td>";   
+       print "<td style='border-right:1px solid #000000'><br></td>";
        print "<td>";
-       
-       print "<div align='center'>you are editing<br><table><tr class='fileLevel'><td>$setfileName</td></tr></table></div>";
+       print
+"<div align='center'>you are editing<br><table><tr class='fileLevel'><td>$setfileName</td></tr></table></div>";
        print "</td>";
        print "</tr></table>";
 
@@ -128,53 +127,70 @@ if ( defined $cgiHash{'action'} ) {
                copyDefaultRegister( $cgiHash{'register'} );
        }
        if ( $cgiHash{'action'} eq 'createFile' ) {
-               createFile($cgiHash{'configFile'},$cgiHash{'specFile'});
+               createFile( $cgiHash{'configFile'}, $cgiHash{'specFile'} );
        }
+       if ( $cgiHash{'action'} eq 'changeAncestor' ) {
+               parseSet( $cgiHash{'configFile'} );
+               changeAncestor( $cgiHash{'newAncestor'} );
+       }
+
 }
 
 #################### SUBLAND ######################
 
-
 sub createFile {
-       my $configFileName=$_[0];
-       
-       my $specFileName=$_[1]; #config file is based on this specification!
-       my $configFile= $confDir."/".$configFileName;
-       my $specFile=$specDir."/".$specFileName;
-       
+       my $configFileName = $_[0];
+
+       my $specFileName = $_[1];    #config file is based on this specification!
+       my $configFile = $confDir . "/" . $configFileName;
+       my $specFile   = $specDir . "/" . $specFileName;
+
        my $configTree = XML::LibXML->createDocument;
-       my $specTree = $parser->parse_file($specFile);
-       
+       my $specTree   = $parser->parse_file($specFile);
+
        my $configMaps = $configTree->createElementNS( "", "MAPS" );
-       $configTree->setDocumentElement( $configMaps );
+       $configTree->setDocumentElement($configMaps);
 
        my $specMaps = $specTree->findnodes("/MAPS")->shift();
-       
+
        my $mapsType = $specMaps->findvalue("./\@type");
-       
-       $configMaps->setAttribute("type",$mapsType);
-       $configMaps->setAttribute("specDbFile",$specFileName);
-       
-       
+
+       $configMaps->setAttribute( "type",       $mapsType );
+       $configMaps->setAttribute( "specDbFile", $specFileName );
+
        open( SCHREIBEN, "> $configFile" )
          or print "could not open file $configFile for writing: $!\n";
 
        print SCHREIBEN $configTree->toString();
        close SCHREIBEN;
-       
+
 }
 
 sub print_ancestorInfo {
        print "<div class='ancestorInfo' align='center'>";
-       if (@ancestryList) {
-               print "inherit settings from:<br>";
-               print "<table>";
+
+       print "inherit settings from:<br>";
+       if (@ancestryList)
+       {    # if ancestry is not empty, print current ancestry as a nested table
+                   # and also a button that can unlink the heritage
+
+               print "<table class='fileLevel1'><tr><td>";
+
+               my $tableNestingDepth = @ancestryList;
+               for my $ancestor ( reverse(@ancestryList) ) {
+                       print "<table class=fileLevel" . $fileLevelHash{$ancestor} . ">";
+                       print "<tr><td>";
+               }
                for my $ancestor (@ancestryList) {
-                       print "<tr class=fileLevel"
-                         . $fileLevelHash{$ancestor}
-                         . "><td>$ancestor</td></tr>";
+
+                       print "$ancestor</td></tr></table>";
                }
-               print "</table>";
+
+               print "</td><td valign='bottom'>";
+               print <<EOF;
+<table><tr><td class='button_move' onclick='changeAncestor("")'>&nbsp;X&nbsp;</td></tr></table>
+EOF
+               print "</td></tr></table>";
        }
        print "</div>";
 }
@@ -337,9 +353,9 @@ sub del {
        close SCHREIBEN;
 }
 
-sub print_fileSelector{
-       
-       my $configFile = $_[0]; 
+sub print_fileSelector {
+
+       my $configFile = $_[0];
        opendir( DIR, $confDir ) or die $!;
 
        print '<select name="fileSelectionDropdown" id="fileSelector" >';
@@ -367,9 +383,9 @@ sub print_fileSelector{
        print '</select>';
 }
 
-sub print_specSelector{
-       
-       my $configFile = $_[0]; 
+sub print_specSelector {
+
+       my $configFile = $_[0];
        opendir( DIR, $specDir ) or die $!;
 
        print '<select name="specSelectionDropdown" id="specSelector" >';
@@ -395,6 +411,7 @@ sub print_specSelector{
 
        print '</select>';
 }
+
 sub print_fileSelection {
 
        my $configFile = $_[0];
@@ -422,9 +439,9 @@ sub print_fileSelection {
        print "</table>";
 
        print "</td>";
-       
-       print "<td style='border-right:1px solid #000000'><br></td>";   
-       
+
+       print "<td style='border-right:1px solid #000000'><br></td>";
+
        print "<td>";
        print "<table>";
        print "<tr><td colspan=2>";
@@ -438,8 +455,8 @@ sub print_fileSelection {
        print "</td><td>";
        print
 "<input type='button' onclick='createFile()' value='create file' class='stdbutton'>";
-       print "</td></tr>";     
-       
+       print "</td></tr>";
+
        print "</table>";
        print "</td>";
        print "</tr></table>";
@@ -448,10 +465,17 @@ sub print_fileSelection {
 sub changeAncestor {
        my $ancestorFileName = $_[0];
        my $xmltree          = $settree;
+       my $xmlfile          = $setfile;
        my $maps             = $xmltree->findnodes("/MAPS")->shift();
 
        $maps->setAttribute( "inheritSettingsFrom", $ancestorFileName );
 
+       open( SCHREIBEN, "> $xmlfile" )
+         or print "could not open file $xmlfile for writing: $!\n";
+
+       print SCHREIBEN $xmltree->toString();
+       close SCHREIBEN;
+
 }
 
 sub getAncestor {
@@ -745,6 +769,13 @@ sub printJavaScripts {
 
 <script language="javascript">
 
+function changeAncestor(newAncestor){
+       var file_ = encodeURIComponent(selectedConfigFile());   
+       var newAncestor_ = encodeURIComponent(newAncestor);     
+       getdata('$me?action=changeAncestor&configFile='+file_+'&newAncestor='+newAncestor_,false);
+       reloadSetTree();
+}
+
 
 function selectedConfigFile(){
 if(document.getElementById("fileSelector")){