New admin interface

Takes less space now

diff --git a/PciIds/DBQ.pm b/PciIds/DBQ.pm
index 40ab21878f4d1b87a8c09a2d3c8919a2f774e2ab..20941c095131a0edbc34704631cdea67e7b042f2 100644 (file)
--- a/PciIds/DBQ.pm
+++ b/PciIds/DBQ.pm
@@ -31,8 +31,8 @@ sub new( $ ) {
                'newhistory' => 'INSERT INTO history (location, owner, discussion, nodename, nodenote) VALUES(?, ?, ?, ?, ?)',
                'history' => 'SELECT history.id, history.discussion, history.time, history.nodename, history.nodenote, history.seen, users.login, users.email FROM history LEFT OUTER JOIN users ON history.owner = users.id WHERE history.location = ? ORDER BY history.time',
                'admindump' => 'SELECT
-                       locations.id, locations.name, locations.note, locations.mainhistory, musers.login, main.discussion,
-                       history.id, history.discussion, history.nodename, history.nodenote, users.login
+                       locations.id, locations.name, locations.note, locations.mainhistory, musers.email, main.discussion,
+                       history.id, history.discussion, history.nodename, history.nodenote, users.email
                FROM
                        locations INNER JOIN history ON history.location = locations.id
                        LEFT OUTER JOIN users ON history.owner = users.id
@@ -40,7 +40,7 @@ sub new( $ ) {
                        LEFT OUTER JOIN users AS musers ON main.owner = musers.id
                WHERE history.seen = "0" AND locations.id LIKE ?
                ORDER BY locations.id, history.id
-               LIMIT 1000',#Dumps new discussion submits with their senders and corresponding main history and names
+               LIMIT 100',#Dumps new discussion submits with their senders and corresponding main history and names
                'delete-hist' => 'DELETE FROM history WHERE id = ?',
                'mark-checked' => 'UPDATE history SET seen = 1 WHERE id = ?',
                'delete-item' => 'DELETE FROM locations WHERE id = ?',
@@ -94,12 +94,18 @@ sub new( $ ) {
                'dropnotifsmail' => 'DELETE FROM pending WHERE notification = 0 AND EXISTS ( SELECT 1 FROM users WHERE users.id = pending.user AND nextmail <= ? )',
                'time' => 'SELECT NOW()',
                'searchname' => 'SELECT l.id, l.name, p.name FROM locations AS l JOIN locations AS p ON l.parent = p.id WHERE l.name LIKE ? ORDER BY l.id',
-               'searchlocalname' => 'SELECT l.id, l.name, p.name FROM locations AS l JOIN locations AS p ON l.parent = p.id WHERE l.name LIKE ? AND l.id LIKE ? ORDER BY l.id'
+               'searchlocalname' => 'SELECT l.id, l.name, p.name FROM locations AS l JOIN locations AS p ON l.parent = p.id WHERE l.name LIKE ? AND l.id LIKE ? ORDER BY l.id',
+               'hasChildren' => 'SELECT 1 FROM locations WHERE parent = ?'
        } );
 }
 
 my %sorts = ( 'id' => 1, 'rid' => 1, 'name' => 1, 'rname' => 1 );
 
+sub hasChildren( $$ ) {
+       my( $self, $parent ) = @_;
+       return scalar @{$self->query( 'hasChildren', [ $parent ] )};
+}
+
 sub nodes( $$$$ ) {
        my( $self, $parent, $args, $restrict ) = @_;
        my $q = 'id';

diff --git a/PciIds/Html/Admin.pm b/PciIds/Html/Admin.pm
index a8aa592884e337b6c326c25a90b0a177e46b09ac..1307b5537c0e3afa7591986c41acfc2e31f5ff79 100644 (file)
--- a/PciIds/Html/Admin.pm
+++ b/PciIds/Html/Admin.pm
@@ -10,12 +10,24 @@ use PciIds::Address;
 use PciIds::Log;
 use Apache2::Const qw(:common :http);
 
-sub genNewAdminForm( $$$$ ) {
-       my( $req, $args, $tables, $error ) = @_;
+sub safeEncode( $ ) {
+       my( $text ) = @_;
+       return encode( $text ) if defined $text;
+       return '';
+}
+
+sub mailEncode( $ ) {
+       my( $email ) = @_;
+       return '' unless defined $email;
+       return "<a href='mailto:$email'>".encode( $email )."</a>";
+}
+
+sub genNewAdminForm( $$$$$ ) {
+       my( $req, $args, $tables, $error, $auth ) = @_;
        my $address = PciIds::Address::new( $req->uri() );
        my $prefix = $address->get();
        $prefix = '' if( $args->{'global'} );
-       my $caption = 'Administration ‒ pending events '.( $args->{'global'} ? '(Global)' : '('.encode( $address->pretty() ).')' );
+       my $caption = 'Administration '.( $args->{'global'} ? '(Global)' : '('.encode( $address->pretty() ).')' );
        genHtmlHead( $req, $caption, undef );
        genCustomHead( $req, $args, $address, $caption, [ $address->canAddItem() ? [ 'Add item', 'newitem' ] : (), $address->canDiscuss() ? [ 'Discuss', 'newhistory' ] : (), [ 'Help', 'help', 'admin' ], [ '', 'jump' ] ], [ [ 'Log out', 'logout' ] ] );
        print "<div class='error'>$error</div>\n" if( defined $error );
@@ -25,52 +37,54 @@ sub genNewAdminForm( $$$$ ) {
        my $cnt = 0;
        my $hiscnt = 0;
        my $subcnt;
+       print "<table class='admin'>\n";
+       print "<col class='id-col'><col class='name-col'><col class='note-col'><col class='disc-col'><col class='auth-col'><col class='control-col' span='3'>\n";
+       print "<tr class='head'><th>ID<th>Name<th>Note<th>Discussion<th>Author<th>Ok<th>Sel<th>Del\n";
        foreach( @{$tables->adminDump( $prefix )} ) {
                my( $locId, $actName, $actNote, $actHist, $actUser, $actDisc,
                        $hist, $disc, $name, $note, $user ) = @{$_};
                if( !defined( $lastId ) || ( $lastId ne $locId ) ) {
+                       last if( $hiscnt > 80 );
                        $lastId = $locId;
-                       print "</div>\n" if( $started );
                        $started = 1;
-                       print "<div class='".( defined( $actHist ) ? 'item' : 'unnamedItem' )."'>\n";
                        my $addr = PciIds::Address::new( $locId );
-                       print "<h3><a href='/read/".$addr->get()."/'>".encode( $addr->pretty() )."</a></h3>\n";
-                       print htmlDiv( 'name', '<p>'.encode( $actName ) ) if( defined( $actName ) );
-                       print htmlDiv( 'note', '<p>'.encode( $actNote ) ) if( defined( $actNote ) );
-                       print '<p>'.encode( $actDisc ) if( defined( $actDisc ) );
-                       print '<p><a class="navigation" href="/read/'.$addr->parent()->get().'/">'.encode( $addr->parent()->pretty() )."</a>" if( defined( $addr->parent() ) );
-                       print htmlDiv( 'author', '<p>'.encode( $actUser ) ) if( defined( $actUser ) );
-                       print "<input type='hidden' name='subcnt-$cnt' value='$subcnt'>\n" if( defined( $subcnt ) );
+                       if( defined( $actHist ) ) {
+                               print "<tr class='item'>";
+                       } else {
+                               print "<tr class='unnamedItem'>";
+                       }
+                       print "<td><a href='/read/".$addr->get()."'>".encode( $addr->pretty() )."</a><td>".safeEncode( $actName )."<td>".safeEncode( $actNote )."<td>".safeEncode( $actDisc )."<td>".mailEncode( $actUser );
+
                        $subcnt = 0;
                        $cnt++;
                        print "<input type='hidden' name='loc-$cnt' value='".$addr->get()."'>\n";
-                       print "<p><input type='radio' name='action-$cnt' value='ignore' checked='checked'> I will decide later.\n";
-                       if( defined( $actHist ) ) {
-                               print "<br><input type='radio' name='action-$cnt' value='keep'> Keep current name.\n";
+                       print "<td class='empty'>";
+                       print "<td><input type='radio' name='loc-$cnt-sel' value='curr' checked='checked'>";
+                       if( hasRight( $auth->{'accrights'}, 'prune' ) || ( !defined $actHist && !$tables->hasChildren( $addr->get() ) ) ) {
+                               print "<td><input type='checkbox' name='loc-$cnt-del' value='del'>\n";
+                       } else {
+                               print "<td class='empty'>";
                        }
-                       print "<br><input type='radio' name='action-$cnt' value='delete'> Delete item.\n";
-                       print "<br>Add discussion:\n";
-                       print "<br><table>\n";
-                       print "<tr><td>Set name:<td><input type='text' name='name-$cnt' maxlength='200'>\n";
-                       print "<tr><td>Set note:<td><input type='text' name='note-$cnt' maxlength='1024'>\n";
-                       print "<tr><td>Discussion:<td><textarea name='discussion-$cnt' rows='2'></textarea>\n";
-                       print "</table>\n";
+                       print "<tr class='new'><td>New:<td><input type='text' name='name-$cnt' class='text'><td><input type='text' name='note-$cnt' class='text'><td><textarea name='disc-$cnt'></textarea>\n";
+                       print "<td colspan='3'>";
+                       genPathBare( $req, $addr, 0, 0 );
+                       print "<td><input type='checkbox' name='loc-$cnt-softdel'>\n";
                }
-               print "<div class='unseen-history'>\n";
-               print "<p class='name'>".encode( $name ) if( defined( $name ) );
-               print "<p class='note'>".encode( $note ) if( defined( $note ) );
-               print '<p>'.encode( $disc ) if( defined( $disc ) );
-               print "<p class='author'>".encode( $user ) if( defined( $user ) );
-               print "<p><input type='radio' name='action-$cnt' value='set-$hist'> Use this one.\n" if( defined( $name ) && ( $name ne "" ) );
+               print "<tr class='unseen-history'><td class='empty'><td>".safeEncode( ( defined $name && $name eq '' ) ? 'Deletion request' : $name )."<td>".safeEncode( $note )."<td>".safeEncode( $disc )."<td>".mailEncode( $user );
                $hiscnt ++;
-               print "<br><input type='checkbox' name='delete-$hiscnt' value='delete-$hist'> Delete history.\n";
-               print "</div>\n";
                $subcnt ++;
-               print "<input type='hidden' name='sub-$cnt-$subcnt' value='$hist'>\n";
+               print "<td><input type='checkbox' name='appr-$hiscnt' value='appr-$hist'>";
+               if( defined $name ) {
+                       print "<td><input type='radio' name='loc-$cnt-sel' value='$hist'>";
+               } else {
+                       print "<td class='empty'>";
+               }
+               print "<td><input type='checkbox' name='del-$hiscnt' value='del-$hist'>";
+               print "<input type='hidden' name='owner-$hist' value='$lastId'>\n";
        }
+       print "</table>\n";
        print "<input type='hidden' name='subcnt-$cnt' value='$subcnt'>\n" if( defined( $subcnt ) );
        if( $started ) {
-               print "</div>\n" if( $started );
                print "<p><input type='submit' name='submit' value='Submit'>\n";
                print "<input type='hidden' name='max-cnt' value='$cnt'><input type='hidden' name='max-hiscnt' value='$hiscnt'>\n";
        } else {
@@ -84,7 +98,7 @@ sub genNewAdminForm( $$$$ ) {
 sub adminForm( $$$$ ) {
        my( $req, $args, $tables, $auth ) = @_;
        if( defined( $auth->{'authid'} ) && hasRight( $auth->{'accrights'}, 'validate' ) ) {
-               return genNewAdminForm( $req, $args, $tables, undef );
+               return genNewAdminForm( $req, $args, $tables, undef, $auth );
        } else {
                return notLoggedComplaint( $req, $args, $auth );
        }
@@ -166,7 +180,7 @@ sub submitAdminForm( $$$$ ) {
                                markAllChecked( $tables, $i, \%deleted, $authid );
                        }
                }
-               return genNewAdminForm( $req, $args, $tables, $errors );
+               return genNewAdminForm( $req, $args, $tables, $errors, $auth );
        } else {
                return notLoggedComplaint( $req, $args, $auth );
        }

diff --git a/PciIds/Html/Util.pm b/PciIds/Html/Util.pm
index 060dff188f5256dfa25adcebf59983d30eb989af..cb9a0c30b4ad80011e42c0df127d62d41b89036d 100644 (file)
--- a/PciIds/Html/Util.pm
+++ b/PciIds/Html/Util.pm
@@ -7,7 +7,7 @@ use PciIds::Users;
 use Apache2::Const qw(:common :http);
 use APR::Table;
 
-our @EXPORT = qw(&genHtmlHead &htmlDiv &genHtmlTail &genTableHead &genTableTail &parseArgs &buildExcept &buildArgs &genMenu &genCustomMenu &encode &setAddrPrefix &HTTPRedirect &genPath &logItem &genLocMenu &genCustomHead);
+our @EXPORT = qw(&genHtmlHead &htmlDiv &genHtmlTail &genTableHead &genTableTail &parseArgs &buildExcept &buildArgs &genMenu &genCustomMenu &encode &setAddrPrefix &HTTPRedirect &genPath &logItem &genLocMenu &genCustomHead &genPathBare);
 
 sub encode( $ ) {
        return encode_entities( shift, "\"'&<>" );
@@ -150,8 +150,8 @@ sub HTTPRedirect( $$ ) {
        return HTTP_SEE_OTHER;
 }
 
-sub genPath( $$$ ) {
-       my( $req, $address, $printAddr ) = @_;
+sub genPathBare( $$$$ ) {
+       my( $req, $address, $printAddr, $started ) = @_;
        my $path;
        if( defined $address ) {
                $path = $address->path();
@@ -159,11 +159,21 @@ sub genPath( $$$ ) {
        } else {
                $path = [];
        }
-       print "<div class='path'>\n";
-       print "<p><a href='http://".$req->hostname()."/index.html'>Main page</a>";
        foreach my $addr ( reverse @{$path} ) {
-               print "&nbsp;-&gt;&nbsp;<a href='http://".$req->hostname()."/read/".$addr->get()."'>".encode( $addr->pretty() )."</a>";
+               if( $started ) {
+                       print "&nbsp;-&gt;&nbsp;";
+               } else {
+                       $started = 1;
+               }
+               print "<a href='http://".$req->hostname()."/read/".$addr->get()."'>".encode( $addr->pretty() )."</a>";
        }
+}
+
+sub genPath( $$$ ) {
+       my( $req, $address, $printAddr ) = @_;
+       print "<div class='path'>\n";
+       print "<p><a href='http://".$req->hostname()."/index.html'>Main page</a>";
+       genPathBare( $req, $address, $printAddr, 1 );
        print "</div>\n";
 }
 

diff --git a/static/screen.css b/static/screen.css
index c41a7f7c8b76af31061a1ddcf5ac9dd4eb260466..b1c0d30971710cfffc565a998827c55d692025f2 100644 (file)
--- a/static/screen.css
+++ b/static/screen.css
@@ -7,14 +7,27 @@ body
 {
        background: #D5D5D5;
 }
-.item, .history
+.item, .history,
+table.admin .unseen-history
 {
        background: #F0F0F0;
 }
-.main-history
+.main-history,
+table.admin .item,
+table.admin .new
 {
        background: #DDFFDD;
 }
+table.admin .empty
+{
+       background: #DDDDFF;
+}
+table.admin .unnamedItem td,
+table.admin .item td
+{
+       padding-top: 1ex;
+       padding-bottom: 1ex;
+}
 .help-example
 {
        background: #BBBBFF;
@@ -112,3 +125,18 @@ form.jump p
 {
        margin-top: 0px;
 }
+table.admin col.id-col,
+table.admin col.name-col,
+table.admin col.note-col,
+table.admin col.disc-col,
+table.admin col.auth-col
+{
+       width: 18%;
+}
+table.admin col.control-col
+{
+       width: 3%;
+}
+{
+       background: #DDFFDD;
+}