From: The PCI ID Mail Robot <pciids@ucw.cz>
Date: Sat, 3 Jul 2010 09:03:18 +0000 (+0200)
Subject: Merge branch 'master' of /home/vorner/pciids
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=904a25d66ec221203148aa1559b5d062860788ce;hp=1f467ca9c498cc684bbe453851b57c385fab5c10;p=pciids.git

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

diff --git a/PciIds/Html/Help.pm b/PciIds/Html/Help.pm
index de6e5ae..add3f01 100644
--- a/PciIds/Html/Help.pm
+++ b/PciIds/Html/Help.pm
@@ -41,11 +41,11 @@ sub getHelp( $$ ) {
 	print "<div class='bluesquare'><h1>$head</h1><p class='home'>The PCI ID Repository</div>\n";
 	print "<div class='clear'></div></div>\n";
 	genPath( $req, $addr, 1 );
-	my $url = setAddrPrefix( $req->uri(), 'read' ).buildExcept( 'help', $args ).'?help=';
+	my $url = setAddrPrefix( $req->uri(), 'mods' ).buildExcept( 'help', $args ).'?help=';
 	delete $args->{'help'};
 	my %repls = ( 'HELP_URL' => $url, 'AC_URL' => setAddrPrefix( $req->uri(), 'mods' ).buildExcept( 'action', $args ).'?action=' );
 	$repls{'AC_URL'} =~ s#mods/\?#mods/PC/?#;
-	$repls{'HELP_URL'} =~ s#read/\?#read/PC/?#;
+	$repls{'HELP_URL'} =~ s#(mods|read)/\?#$1/PC/?#;
 	while( defined( my $line = <HELP> ) ) {
 		$line =~ s/\$(\w+_URL)\$/$repls{$1}/g;
 		print $line;
diff --git a/PciIds/Html/Util.pm b/PciIds/Html/Util.pm
index 615bac5..18f7381 100644
--- a/PciIds/Html/Util.pm
+++ b/PciIds/Html/Util.pm
@@ -99,7 +99,7 @@ sub genCustomMenu( $$$$ ) {
 			PciIds::Html::Jump::jumpWindow( $req, $args );
 		} else {
 			my $prefix = '/mods';
-			$prefix = '/read' if( !defined( $action ) or ( $action eq 'list' ) or ( $action eq '' ) or ( $action eq 'help' ) );
+			$prefix = '/read' if( !defined( $action ) or ( $action eq 'list' ) or ( $action eq '' ) );
 			my $suffix = '';
 			$suffix = '?help='.$param if( $action eq 'help' );
 			item( $prefix.$url.$action.$suffix, $label );
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..08ee772
--- /dev/null
+++ b/TODO
@@ -0,0 +1,5 @@
+• Projít nápovědu, zkontrolovat chyby, zkusit vylepšit
+• Database export
+• Mailbot ‒ jiné typy IDček
+• Bouncy (nebude to běhat tam a zpět?)
+• Seznam všech vlastních položek
diff --git a/index.html b/index.html
index a82fb89..e82cd11 100644
--- a/index.html
+++ b/index.html
@@ -16,7 +16,7 @@ various programs (e.g., <a href="http://mj.ucw.cz/pciutils.html">The PCI Utiliti
 to display full human-readable names instead of cryptic numeric codes.
 
 <p class='announce'>Welcome to the new web interface of the PCI ID database.
-Many a thing has changed, so please read the <a href="/read/?action=help?help=index">help</a>
+Many a thing has changed, so please read the <a href="/mods/?action=help?help=index">help</a>
 even if you were familiar with the old website.
 
 <h2>Browse</h2>
@@ -31,7 +31,7 @@ entries or to update the existing ones:
 
 <p>Or you can go directly to your <a href="/mods/?action=profile">profile</a> or <a href="/mods/?action=notifications">notification list</a>.
 
-<p>You may want to read <a href="/read/?action=help?help=index">help</a> before you start using the
+<p>You may want to read <a href="/mods/?action=help?help=index">help</a> before you start using the
 web interface.
 
 <h2>Download</h2>
@@ -69,9 +69,9 @@ reason for the change.
 
 <p>Updates can be submitted either via the web interface, or as patches to the <code>pci.ids</code>
 file sent by e-mail to our mail robot at <a href="mailto:pci-ids@ucw.cz">pci-ids@ucw.cz</a>
-(see the <a href="/read/?action=help?help=mailsubmit">mail submit help</a>).
+(see the <a href="/mods/?action=help?help=mailsubmit">mail submit help</a>).
 
-<p><em>In all cases, please read the <a href="/read/?action=help?help=newitem">submission guidelines</a>
+<p><em>In all cases, please read the <a href="/mods/?action=help?help=newitem">submission guidelines</a>
 first.</em>
 
 <h2>Feedback</h2>