Merge branch 'master' of /home/vorner/pciids

diff --git a/PciIds/Html/Admin.pm b/PciIds/Html/Admin.pm
index 04d8a659a4363b9bf3b8531529e9f4f62ec981ab..7b73cb4dff2a987fc428d0982cd86a4db8497160 100644 (file)
--- a/PciIds/Html/Admin.pm
+++ b/PciIds/Html/Admin.pm
@@ -46,14 +46,14 @@ sub mailEncode( $$ ) {
 
 sub genHist( $$$$$$$$$$$ ) {
        my( $class, $email, $login, $time, $name, $note, $disc, $selname, $selvalue, $delname, $delvalue ) = @_;
-       print "<tr class='$class'>\n";
+       print "<tr class='$class'>";
        print "<td class='selects'><input type='radio' name='$selname' value='$selvalue'>\n";
        if( defined $delname ) {
-               print "<td class='deletes'><input type='checkbox' name='$delname' value='$delvalue'>\n" if defined $delname
+               print "<td class='deletes'><input type='checkbox' name='$delname' value='$delvalue'>\n";
        } else {
-               print "<td class='empty'>";
+               print "<td class='empty'>\n";
        }
-       print "<td>\n";
+       print "<td>";
        if( defined $name ) {
                if( $name eq '' ) {
                        print "<span class='name'>Deletion request<br></span>";
@@ -66,16 +66,16 @@ sub genHist( $$$$$$$$$$$ ) {
        print "<td>";
        print "<span class='author'>".mailEncode( $email, $login )."<br></span>" if( defined $email );
        print "<span class='time'>".safeEncode( $time )."</span>";
-       print "<td>";
 }
 
 sub genNewForm( $$ ) {
        my( $num, $values ) = @_;
        print "<tr class='newhistory'>";
-       print "<td><td class='deletes'><input type='checkbox' name='loc-$num-softdel' value='del'>\n";
+       print "<td class='empty'>";
+       print "<td class='deletes'><input type='checkbox' name='loc-$num-softdel' value='del'>\n";
        print "<td><span class='newname'>Name: <input type='text' name='name-$num'></span><span class='newnote'>Note: <input type='text' name='note-$num'></span><br>\n";
        print "<textarea id='disc-$num' name='disc-$num'></textarea>\n";
-       print "<td>\n";
+       print "<td>";
        if( @{$values} ) {
                print "<select id='ans-$num' name='ans-$num' onchange='answer( \"$num\" );'><option value='0'>Stock answers</option>";
                my $i = 0;
@@ -166,25 +166,26 @@ function answer( id ) {
                                $started = 1;
                        }
                        my $addr = PciIds::Address::new( $locId );
-                       $subcnt = 0;
-                       $cnt ++;
                        if( defined( $actHist ) ) {
-                               print "<table class='item'>\n";
+                               print "<p><table class='item'>\n";
                        } else {
-                               print "<table class='unnamedItem'>\n";
+                               print "<p><table class='unnamedItem'>\n";
                        }
                        print "<col class='controls' span='2'><col class='main'><col class='author'>\n";
-                       print "<tr class='label'><p>\n";
-                       print "<td class='selects'><input type='radio' name='loc-$cnt-sel' value='curr' checked='checked'>";
+                       print "<tr class='label'>\n";
+                       print "<td class='selects'>\n";
+                       print "<input type='hidden' name='loc-$cnt-subcnt' value='$subcnt'>" if( $subcnt );
+                       $subcnt = 0;
+                       $cnt ++;
+                       print "<input type='radio' name='loc-$cnt-sel' value='curr' checked='checked'>";
                        if( hasRight( $auth->{'accrights'}, 'prune' ) || ( !defined $actHist && !$tables->hasChildren( $addr->get() ) ) ) {
                                print "<td class='deletes'><input type='checkbox' name='loc-$cnt-del' value='del'>";
                        } else {
                                print "<td class='empty'>";
                        }
-                       print "<input type='hidden' name='loc-$cnt' value='$locId'>";
                        print "<td class='path' colspan='2'>";
                        genPathBare( $req, $addr, 1, 0, $tables );
-                       print "<input type='hidden' name='loc-$cnt-subcnt' value='$subcnt'>" if( $subcnt );
+                       print "<input type='hidden' name='loc-$cnt' value='$locId'>";
                        if( defined $actHist ) {
                                genHist( 'main-history', $actEmail, $actLogin, $actTime, $actName, $actNote, $actDisc, "loc-$cnt-sel", 'seen', undef, undef );
                        } else {