Make administration interface work

diff --git a/PciIds/Html/Admin.pm b/PciIds/Html/Admin.pm
index ea8cf9a3e44471103e00807f11a661b34109b592..8ad40dad9ca4c1ee7cf99ac13ff2ad36727842f3 100644 (file)
--- a/PciIds/Html/Admin.pm
+++ b/PciIds/Html/Admin.pm
@@ -38,14 +38,14 @@ sub genHist( $$$$$$$$$$$ ) {
        }
        print "<span class='note'>Note: ".encode( $note )."<br></span>" if defined $note && $note ne '';
        print safeEncode( $disc );
-       print "<td class='selects'><input type='radio' name='$selname' 'value='$selvalue'>\n";
+       print "<td class='selects'><input type='radio' name='$selname' value='$selvalue'>\n";
        print "<td class='deletes'><input type='checkbox' name='$delname' value='$delvalue'>\n" if defined $delname
 }
 
 sub genNewForm( $ ) {
        my( $num ) = @_;
        print "<tr class='newhistory'><td>TODO combo";
-       print "<td><span class='newname'>Name: <input type='text' name='name-$num'></span><span class='newnote'>Note: <input type='note-$num'></span><br>\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 name='disc-$num'></textarea>\n";
        print "<td><td class='deletes'><input type='checkbox' name='loc-$num-softdel' value='del'>\n";
 }
@@ -90,17 +90,24 @@ sub genNewAdminForm( $$$$$ ) {
                        print "<col class='author'><col class='main'><col class='controls' span='2'>\n";
                        print "<tr class='label'><p>\n";
                        print "<td class='path' colspan='2'>";
-                       genPathBare( $req, $addr, 0, 0, 0 );
+                       genPathBare( $req, $addr, 1, 0 );
                        print "<input type='hidden' name='loc-$cnt-subcnt' value='$subcnt'>" if( $subcnt );
                        $subcnt = 0;
                        $cnt ++;
                        print "<td class='selects'><input type='radio' name='loc-$cnt-sel' value='curr' checked='checked'>";
                        print "<td class='deletes'><input type='checkbox' name='loc-$cnt-del' value='del'>" if hasRight( $auth->{'accrights'}, 'prune' ) || ( !defined $actHist && !$tables->hasChildren( $addr->get() ) );
-                       genHist( 'main-history', $actEmail, $actLogin, $actTime, $actName, $actNote, $actDisc, "loc-$cnt-sel", 'seen', undef, undef ) if( defined $actHist );
+                       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 {
+                               print "<tr class='main-history'><td class='empty' colspan='2'><td><input type='radio' name='loc-$cnt-sel' value='seen'>";
+                       }
                }
                $hiscnt ++;
                $subcnt ++;
                genHist( 'unseen-history', $email, $login, $time, $name, $note, $disc, "loc-$cnt-sel", $hist, "del-$hiscnt", "del-$hist" );
+               print "<input type='hidden' name='owner-$hist' value='$locId'>";
+               print "<input type='hidden' name='his-$cnt-$subcnt' value='$hist'>";
        }
        print "<input type='hidden' name='subcnt-$cnt' value='$subcnt'>\n" if( defined( $subcnt ) );
        if( $started ) {
@@ -144,12 +151,10 @@ sub submitAdminForm( $$$$ ) {
                my $maxcnt = getFormValue( 'max-cnt', 0 );
                my $maxhiscnt = getFormValue( 'max-hiscnt', 0 );
                $errors = '';
-               # Scan for approved and deleted items
+               # Scan for deleted histories
                for( my $i = 1; $i <= $maxhiscnt; $i ++ ) {
                        my( $del ) = getFormValue( "del-$i", '' ) =~ /^del-(\d+)$/;
                        $deleted{$del} = 1 if( defined $del && $del ne '' );
-                       my( $appr ) = getFormValue( "appr-$i", '' ) =~ /^appr-(\d+)$/;
-                       $approved{$appr} = 1 if( defined $appr && $appr ne '' );
                }
                for( my $i = 1; $i <= $maxcnt; $i ++ ) {
                        my( $sel ) = getFormValue( "loc-$i-sel", '' ) =~ /^(\d+)$/;
@@ -166,17 +171,14 @@ sub submitAdminForm( $$$$ ) {
                                delete $approved{$id};
                        }
                }
-               #Do the deletes and approves
+               #Do the deletes
+               my %modified;
                foreach my $del ( keys %deleted ) {
                        $tables->deleteHistory( $del );
+                       $modified{getFormValue( "owner-$del", '' )} = 1;
                        tulog( $authid, "Discussion deleted $del" );
                }
-               foreach my $appr ( keys %approved ) {
-                       $tables->markChecked( $appr );
-                       tulog( $authid, "Discussion checked $appr" );
-               }
                #Handle the items
-               my $defaultSeen = getFormValue( 'default-seen', '' ) =~ /^default-seen$/;
                for( my $i = 1; $i <= $maxcnt; $i ++ ) {
                        my $addr = PciIds::Address::new( getFormValue( "loc-$i", '' ) );
                        next if $collision{$addr->get()};
@@ -203,8 +205,9 @@ sub submitAdminForm( $$$$ ) {
                                appendError( "You must specify name if you set note at item ".$addr->pretty() );
                                next;
                        }
+                       my $action = $modified{$addr->get()};
+                       $action = 1 if getFormValue( "loc-$i-sel", '' ) eq 'seen';
                        my( $select ) = getFormValue( "loc-$i-sel", '' ) =~ /^(\d+)$/;
-                       my $action = 0;
                        if( defined $name || defined $discussion || $delete ) {
                                my $histId = $tables->submitHistory( { 'name' => $name, 'note' => $note, 'text' => $discussion, 'delete' => $delete }, $auth, $addr );
                                $tables->markChecked( $histId );
@@ -219,12 +222,12 @@ sub submitAdminForm( $$$$ ) {
                                $action = 1;
                                notify( $tables, $addr->get(), $select, 2, 2 );
                        }
-                       if( $action && $defaultSeen ) {#Approve anything in this item
+                       if( $action ) {#Approve anything in this item
                                my $subcnt = getFormValue( "loc-$i-subcnt", 0 );
                                for( my $j = 1;  $j <= $subcnt; $j ++ ) {
                                        my( $id ) = getFormValue( "his-$i-$j", '' ) =~ /^(\d+)$/;
                                        next unless defined $id;
-                                       next if $approved{$id} || $deleted{$id};
+                                       next if $deleted{$id};
                                        $tables->markChecked( $id );
                                        tulog( $authid, "Discussion checked $id" );
                                }

diff --git a/PciIds/Html/Util.pm b/PciIds/Html/Util.pm
index d27435da8bd2610e37a9773fbed5e1a78146dc38..d883f9f799df15ab23cd7e2e84357a0000c474e5 100644 (file)
--- a/PciIds/Html/Util.pm
+++ b/PciIds/Html/Util.pm
@@ -21,6 +21,7 @@ sub genHtmlHead( $$$ ) {
        print '<html lang="en"><head><title>'.encode( $caption )."</title>\n";
        print "<link rel='stylesheet' type='text/css' media='screen' href='/static/screen.css'>\n";
        print "<link rel='stylesheet' type='text/css' media='print' href='/static/print.css'>\n";
+       print "<link rel='stylesheet' type='text/css' media='screen,print' href='/static/common.css'>\n";
        print $metas if( defined( $metas ) );
        print "</head><body>\n";
 }
@@ -150,7 +151,7 @@ sub HTTPRedirect( $$ ) {
        return HTTP_SEE_OTHER;
 }
 
-sub genPathBare( $$$$$ ) {
+sub genPathBare( $$$$ ) {
        my( $req, $address, $printAddr, $started ) = @_;
        my $path;
        if( defined $address ) {
@@ -183,7 +184,7 @@ sub genPath( $$$ ) {
        my( $req, $address, $printAddr ) = @_;
        print "<div class='path'>\n";
        print "<p><a href='http://".$req->hostname()."/index.html'>Main</a>";
-       genPathBare( $req, $address, $printAddr, 1, 1 );
+       genPathBare( $req, $address, $printAddr, 1 );
        print "</div>\n";
 }
 

diff --git a/static/common.css b/static/common.css
new file mode 100644 (file)
index 0000000..4412bbe
--- /dev/null
+++ b/static/common.css
@@ -0,0 +1,44 @@
+form table,
+table.subnodes
+{
+       width: 100%;
+       table-layout: fixed;
+}
+col.name-col
+{
+       width: 60%;
+}
+form table col.label
+{
+       width: 15%;
+}
+form table col.edit
+{
+       width: 85%;
+}
+input.text,
+input.password,
+textarea
+{
+       width: 100%;
+}
+input.jump
+{
+       width: 8em;
+}
+form.jump p
+{
+       margin-top: 0px;
+}
+form.admin col.author
+{
+       width: 20%;
+}
+form.admin col.main
+{
+       width: 74%;
+}
+form.admin col.controls
+{
+       width: 3%;
+}

diff --git a/static/print.css b/static/print.css
index 0cb1e3805b8c44ea0d269d88a11677d3da0bce04..98f0a8c9f40330555e67562aff147346f41306eb 100644 (file)
--- a/static/print.css
+++ b/static/print.css
@@ -1,4 +1,4 @@
-.menu, .navigation, .navigation-menu
+.navigation, .lmenu, .rmenu
 {
        overflow: hidden;
        display: none;
@@ -25,28 +25,3 @@
        border-bottom: dotted;
        border-bottom-width: 1px;
 }
-form table,
-table.subnodes
-{
-       width: 100%;
-       table-layout: fixed;
-}
-col.name-col
-{
-       width: 60%;
-}
-form table
-col.label
-{
-       width: 15%;
-}
-col.edit
-{
-       width: 85%;
-}
-input.text,
-input.password,
-textarea
-{
-       width: 100%;
-}

diff --git a/static/screen.css b/static/screen.css
index 3e7c650750f2111c97e6397924b17576be0a8620..9c4c25b149b22a7200076ebfb282ff149ee63023 100644 (file)
--- a/static/screen.css
+++ b/static/screen.css
@@ -83,54 +83,6 @@ ul.navigation
 {
        margin-left: -1em; /* Hack. Move the place the bullets would take if they were there back left. */
 }
-form table,
-table.subnodes
-{
-       width: 100%;
-       table-layout: fixed;
-}
-col.name-col
-{
-       width: 60%;
-}
-form table col.label
-{
-       width: 15%;
-}
-form table col.edit
-{
-       width: 85%;
-}
-input.text,
-input.password,
-textarea
-{
-       width: 100%;
-}
-input.jump
-{
-       width: 8em;
-}
-form.jump p
-{
-       margin-top: 0px;
-}
-form.admin col.author
-{
-       width: 20%;
-}
-form.admin col.main
-{
-       width: 74%;
-}
-form.admin col.controls
-{
-       width: 3%;
-}
-form.admin table
-{
-       background: #BBBBFF;
-}
 form.admin tr.label td.deletes
 {
        background: red;
@@ -139,3 +91,8 @@ form.admin .newhistory
 {
        background: #FFFFCC;
 }
+form.admin td.empty,
+form.admin table
+{
+       background: #BBBBFF;
+}