OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 25-Nov-2005 23:36:41 Branch: HEAD Handle: 2005112522364100 Modified files: openpkg-registry registry-ui.pl Log: W3C Markup Validation Service Summary: Revision Changes Path 1.24 +50 -53 openpkg-registry/registry-ui.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-registry/registry-ui.pl ============================================================================ $ cvs diff -u -r1.23 -r1.24 registry-ui.pl --- openpkg-registry/registry-ui.pl 25 Nov 2005 21:52:24 -0000 1.23 +++ openpkg-registry/registry-ui.pl 25 Nov 2005 22:36:41 -0000 1.24 @@ -342,19 +342,20 @@ my $head = ""; $head .= "<html>\n"; $head .= " <head>\n"; - $head .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"$myurl?page=css\">\n"; + $head .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"$myurl?page=css\"/>\n"; $head .= &printjscheckallboxes(); if ($cfg->{identification}->{mode} eq "ase") { $head .= $ase->canvas(-part => "head"); } $head .= " </head>\n"; $head .= " <body class=\"registry\"><div class=\"registry\">\n"; - $head .= " <img id=\"logo\" src=\"http://www.openpkg.org/openpkg.gif\" alt=\"\" width=\"148\" height=\"80\" align=\"right\">\n"; + $head .= " <img id=\"logo\" src=\"http://www.openpkg.org/openpkg.gif\" alt=\"\" width=\"148\" height=\"80\"/>\n"; $head .= " <h1>OpenPKG Registry</h1>\n"; if ($menu =~ m/-menu/) { - $head .= " <table id=\"menu\">\n"; - my $td = 0; + my $td; + $head .= " <table class=\"menu\">\n"; $head .= " <tr>\n"; + $td = 0; $head .= " " . &viewdropxmlform() . "\n"; $td++; $head .= " " . &viewloginform() . "\n"; $td++; $head .= " " . &viewassociationform() . "\n"; $td++; @@ -368,9 +369,10 @@ $head .= "authenticated as <b>" . $username . "</b>"; } else { - $head .= "you are <b>not logged in</b><p>\n"; + $head .= "you are <b>not logged in</b>\n"; } - $head .= " </td><tr>\n"; + $head .= " </td>\n"; + $head .= " </tr>\n"; $head .= " </table>\n"; } return $head; @@ -910,9 +912,9 @@ $html = ''; $html .= '<td>'; $html .= $cgi->start_form(); - $html .= $cgi->delete(-name=>'page'); - $html .= $cgi->hidden(-name=>'page', -value => "association"); - $html .= $cgi->submit('submit','association'); + $cgi->delete(-name=>'page'); + $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "association") . "</div>"; + $html .= "<div>" . $cgi->submit('submit','association') . "</div>"; $html .= $cgi->end_form; $html .= '</td>'; return $html; @@ -925,12 +927,12 @@ $html .= '<td>'; if ($cfg->{identification}->{mode} eq "ase") { $html .= $cgi->start_form(-action => $ase->url(-action => "login")); - $html .= $cgi->delete(-name=>'page'); - $html .= $cgi->hidden(-name=>'page', -value => "ase"); - $html .= $cgi->hidden(-name=>'ase-action', -value => "login"); - $html .= $cgi->hidden(-name=>'ase-mode_during', -value => "ase"); - $html .= $cgi->hidden(-name=>'ase-mode_after', -value => "asecomeback"); - $html .= $cgi->submit('submit','login'); + $cgi->delete(-name=>'page'); + $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "ase") . "</div>"; + $html .= "<div>" . $cgi->hidden(-name=>'ase-action', -value => "login") . "</div>"; + $html .= "<div>" . $cgi->hidden(-name=>'ase-mode_during', -value => "ase") . "</div>"; + $html .= "<div>" . $cgi->hidden(-name=>'ase-mode_after', -value => "asecomeback") . "</div>"; + $html .= "<div>" . $cgi->submit('submit','login') . "</div>"; $html .= $cgi->end_form; } elsif ($cfg->{identification}->{mode} eq "basicauth") { @@ -938,9 +940,9 @@ } elsif ($cfg->{identification}->{mode} eq "naive") { $html .= $cgi->start_form(); - $html .= $cgi->delete(-name=>'page'); - $html .= $cgi->hidden(-name=>'page', -value => "login"); - $html .= $cgi->submit('submit','login'); + $cgi->delete(-name=>'page'); + $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "login") . "</div>"; + $html .= "<div>" . $cgi->submit('submit','login') . "</div>"; $html .= $cgi->textfield( -name => 'username', -override => 1, @@ -1007,8 +1009,8 @@ -redirect => $redirect, }; $html .= $cgi->redirect($header); - $html .= $cgi->delete(-name=>'page'); - $html .= $cgi->hidden(-name=>'page', -value => "association"); + $cgi->delete(-name=>'page'); + $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "association") . "</div>"; return $html; } @@ -1076,12 +1078,12 @@ $html .= '<td>'; if ($cfg->{identification}->{mode} eq "ase") { $html .= $cgi->start_form(-action => $ase->url(-action => "logout")); - $html .= $cgi->delete(-name=>'page'); - $html .= $cgi->hidden(-name=>'page', -value => "ase"); - $html .= $cgi->hidden(-name=>'ase-action', -value => "logout"); - $html .= $cgi->hidden(-name=>'ase-mode_during', -value => "ase"); - $html .= $cgi->hidden(-name=>'ase-mode_after', -value => "dropxml"); - $html .= $cgi->submit('submit','logout'); + $cgi->delete(-name=>'page'); + $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "ase") . "</div>"; + $html .= "<div>" . $cgi->hidden(-name=>'ase-action', -value => "logout") . "</div>"; + $html .= "<div>" . $cgi->hidden(-name=>'ase-mode_during', -value => "ase") . "</div>"; + $html .= "<div>" . $cgi->hidden(-name=>'ase-mode_after', -value => "dropxml") . "</div>"; + $html .= "<div>" . $cgi->submit('submit','logout') . "</div>"; $html .= $cgi->end_form; } elsif ($cfg->{identification}->{mode} eq "basicauth") { @@ -1089,9 +1091,9 @@ } elsif ($cfg->{identification}->{mode} eq "naive") { $html .= $cgi->start_form(); - $html .= $cgi->delete(-name=>'page'); - $html .= $cgi->hidden(-name=>'page', -value => "logout"); - $html .= $cgi->submit('submit','logout'); + $cgi->delete(-name=>'page'); + $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "logout") . "</div>"; + $html .= "<div>" . $cgi->submit('submit','logout') . "</div>"; $html .= $cgi->end_form; } elsif ($cfg->{identification}->{mode} eq "constant") { @@ -1131,9 +1133,9 @@ $html = ''; $html .= '<td>'; $html .= $cgi->start_form(); - $html .= $cgi->delete(-name=>'page'); - $html .= $cgi->hidden(-name=>'page', -value => "dropxml"); - $html .= $cgi->submit('submit','dropxml'); + $cgi->delete(-name=>'page'); + $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "dropxml") . "</div>"; + $html .= "<div>" . $cgi->submit('submit','dropxml') . "</div>"; $html .= $cgi->end_form; $html .= '</td>'; return $html; @@ -1335,11 +1337,11 @@ $html .= "<tr>"; $html .= "<td colspan=\"2\">"; - $html .= $cgi->delete(-name=>'username'); - $html .= $cgi->hidden(-name=>'username', -value => $username); - $html .= $cgi->delete(-name=>'page'); - $html .= $cgi->hidden(-name=>'page', -value => "association"); - $html .= $cgi->submit("$mode/delete",'delete'); + $cgi->delete(-name=>'username'); + $html .= "<div>" . $cgi->hidden(-name=>'username', -value => $username) . "</div>"; + $cgi->delete(-name=>'page'); + $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "association") . "</div>"; + $html .= "<div>" . $cgi->submit("$mode/delete",'delete') . "</div>"; $html .= "</td>"; $html .= "<td colspan=\"2\">"; if ($mode eq "arrival") { @@ -1598,28 +1600,23 @@ $html .= "<h2>Paste registration data below</h2>"; } - $html .= $cgi->start_form(); - $html .= $cgi->delete(-name=>'page'); - $html .= $cgi->hidden(-name=>'page', -value => "dropxml"); - $html .= " <table id=\"menu\">\n"; + $html .= " <table class=\"menu\">\n"; $html .= " <tr>\n"; $html .= " <td>\n"; - $html .= $cgi->textarea( + $html .= $cgi->start_form(); + $cgi->delete(-name=>'page'); + $html .= "<div>" . $cgi->hidden(-name=>'page', -value => "dropxml") . "</div>"; + $html .= "<div>" . $cgi->textarea( -name => 'data', -columns => 80, -rows => 15, - -maxrows => 80, -default => '', - ) . "\n"; - $html .= " <tr>\n"; - $html .= " <td>\n"; - $html .= $cgi->submit('submit','register'); - $html .= " </td>\n"; - $html .= " <tr>\n"; + ) . "</div>\n"; + $html .= "<div>" . $cgi->submit('submit','register') . "</div>"; + $html .= $cgi->end_form; $html .= " </td>\n"; - $html .= " <tr>\n"; + $html .= " </tr>\n"; $html .= " </table>\n"; - $html .= $cgi->end_form; return $html; } @@ -1627,7 +1624,7 @@ { my $js; $js = <<'EOT'; -<SCRIPT language="JavaScript"><!-- +<script type="text/javascript"><!-- function checkallboxes(me) { var value=me.checked; var form=me.form; @@ -1639,7 +1636,7 @@ } } } -//--></SCRIPT> +//--></script> EOT return $js; } @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org