Administration interface

Submiting does not work
The combos for pre-select answes is not there yet

diff --git a/PciIds/DBQ.pm b/PciIds/DBQ.pm
index 6df3380ec8abc2dc16e348263dda79fcd63d43b6..5d1ee3fabc5e7e23e2a1142ff5120ebd2b4e6889 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.email, main.discussion,
-                       history.id, history.discussion, history.nodename, history.nodenote, users.email
+                       locations.id, locations.name, locations.note, locations.mainhistory, musers.email, musers.login, main.discussion, main.time,
+                       history.id, history.discussion, history.nodename, history.nodenote, users.email, users.login, history.time
                FROM
                        locations INNER JOIN history ON history.location = locations.id
                        LEFT OUTER JOIN users ON history.owner = users.id

diff --git a/PciIds/Html/Admin.pm b/PciIds/Html/Admin.pm
index 61a0291dde5850561fd3b4f5ff65a7588e322819..7408792a88e3986de67221d4ead73662d4a7fd95 100644 (file)
--- a/PciIds/Html/Admin.pm
+++ b/PciIds/Html/Admin.pm
@@ -16,10 +16,38 @@ sub safeEncode( $ ) {
        return '';
 }
 
-sub mailEncode( $ ) {
-       my( $email ) = @_;
+sub mailEncode( $$ ) {
+       my( $email, $user ) = @_;
        return '' unless defined $email;
-       return "<a href='mailto:$email'>".encode( $email )."</a>";
+       ( $user ) = $email =~ /^(.*)@/ unless( defined $user );
+       return "<a href='mailto:$email'>".encode( $user )."</a>";
+}
+
+sub genHist( $$$$$$$$$$$ ) {
+       my( $class, $email, $login, $time, $name, $note, $disc, $selname, $selvalue, $delname, $delvalue ) = @_;
+       print "<tr class='$class'><td>";
+       print "<span class='author'>".mailEncode( $email, $login )."<br></span>" if( defined $email );
+       print "<span class='time'>".safeEncode( $time )."</span>";
+       print "<td>";
+       if( defined $name ) {
+               if( $name eq '' ) {
+                       print "<span class='name'>Deletion request<br></span>";
+               } else {
+                       print "<span class='name'>Name: ".encode( $name )."<br></span>";
+               }
+       }
+       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='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 "<textarea name='disc-$num'></textarea>\n";
+       print "<td><td class='deletes'><input type='checkbox' name='loc-$num-softdel' value='del'>\n";
 }
 
 sub genNewAdminForm( $$$$$ ) {
@@ -38,59 +66,45 @@ sub genNewAdminForm( $$$$$ ) {
        my $cnt = 0;
        my $hiscnt = 0;
        my $subcnt;
-       print "<p><input type='checkbox' name='default-seen' value='default-seen' checked='checked'> Any action approves all discussion\n";
-       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 ) = @{$_};
+               my( $locId, $actName, $actNote, $actHist, $actEmail, $actLogin, $actDisc, $actTime,
+                       $hist, $disc, $name, $note, $email, $login, $time ) = @{$_};
                if( !defined( $lastId ) || ( $lastId ne $locId ) ) {
                        last if( $hiscnt > 80 );
                        $lastId = $locId;
-                       $started = 1;
+                       if( $started ) {
+                               genNewForm( $cnt );
+                               print "</table>\n";
+                       } else {
+                               $started = 1;
+                       }
                        my $addr = PciIds::Address::new( $locId );
                        if( defined( $actHist ) ) {
-                               print "<tr class='item'>";
+                               print "<table class='item'>\n";
                        } else {
-                               print "<tr class='unnamedItem'>";
+                               print "<table class='unnamedItem'>\n";
                        }
-                       print "<td><a href='/read/".$addr->get()."'>".encode( $addr->pretty() )."</a><td>".safeEncode( $actName )."<td>".safeEncode( $actNote )."<td>".safeEncode( $actDisc )."<td>".mailEncode( $actUser );
-
+                       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 );
                        print "<input type='hidden' name='loc-$cnt-subcnt' value='$subcnt'>" if( $subcnt );
                        $subcnt = 0;
-                       $cnt++;
-                       print "<input type='hidden' name='loc-$cnt' value='".$addr->get()."'>\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 "<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, 0 );
-                       print "<td><input type='checkbox' name='loc-$cnt-softdel' value='del'>\n";
+                       $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 "<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 ++;
                $subcnt ++;
-               print "<input type='hidden' name='his-$cnt-$subcnt' value='$hist'>";
-               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";
+               genHist( 'unseen-history', $email, $login, $time, $name, $note, $disc, "loc-$cnt-sel", $hist, "del-$hiscnt", "del-$hist" );
        }
-       print "</table>\n";
        print "<input type='hidden' name='subcnt-$cnt' value='$subcnt'>\n" if( defined( $subcnt ) );
        if( $started ) {
-               print "<input type='hidden' name='loc-$cnt-subcnt' value='$subcnt'>" if( $subcnt );
+               genNewForm( $cnt );
+               print "</table>\n";
                print "<p><input type='submit' name='submit' value='Submit'>\n";
+               print "<input type='hidden' name='loc-$cnt-subcnt' value='$subcnt'>" if( $subcnt );
                print "<input type='hidden' name='max-cnt' value='$cnt'><input type='hidden' name='max-hiscnt' value='$hiscnt'>\n";
        } else {
                print "<p>No pending items.\n";

diff --git a/static/screen.css b/static/screen.css
index 69315d8b627dc7043abb556b5c0e6d009c267697..3e7c650750f2111c97e6397924b17576be0a8620 100644 (file)
--- a/static/screen.css
+++ b/static/screen.css
@@ -3,31 +3,20 @@ body
        color: black;
        background: #DDDDFF;
 }
+form.admin table.unnamedItem tr.label,
 .unnamedItem, .unseen-history
 {
        background: #D5D5D5;
 }
-.item, .history,
-table.admin .unseen-history
+form.admin table.item tr.label,
+.item, .history
 {
        background: #F0F0F0;
 }
-.main-history,
-table.admin .item,
-table.admin .new
+.main-history
 {
        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;
@@ -126,18 +115,27 @@ 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
+form.admin col.author
+{
+       width: 20%;
+}
+form.admin col.main
 {
-       width: 18%;
+       width: 74%;
 }
-table.admin col.control-col
+form.admin col.controls
 {
        width: 3%;
 }
+form.admin table
 {
-       background: #DDFFDD;
+       background: #BBBBFF;
+}
+form.admin tr.label td.deletes
+{
+       background: red;
+}
+form.admin .newhistory
+{
+       background: #FFFFCC;
 }