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

diff --git a/PciIds/Html/Notifications.pm b/PciIds/Html/Notifications.pm
index c8cc15c0dd4f73d53fe46f2d5feb8a3ae419978e..f8eb304799e9ae9fc81af7a77a394fabee745474 100644 (file)
--- a/PciIds/Html/Notifications.pm
+++ b/PciIds/Html/Notifications.pm
@@ -29,7 +29,7 @@ sub genNotifForm( $$$$$$ ) {
        my( $req, $args, $tables, $auth, $error, $data ) = @_;
        my $addr = PciIds::Address::new( $req->uri() );
        genHtmlHead( $req, 'Notifications', undef );
-       genCustomHead( $req, $args, $addr, "Notifications", [ $addr->canAddItem() ? [ 'New item', 'newitem' ] : (), $addr->canDiscuss ? [ 'Discuss', 'newhistory' ] : (), [ 'Help', 'help', 'notifications' ], [ '', 'jump' ] ], [ logItem( $auth ), [ 'Profile', 'profile' ] ] );
+       genCustomHead( $req, $args, $addr, "Notifications", [ $addr->canAddItem() ? [ 'New item', 'newitem' ] : (), $addr->canDiscuss ? [ 'Discuss', 'newhistory' ] : (), [ 'Help', 'help', 'notifications' ] ], [ logItem( $auth ), [ 'Profile', 'profile' ] ] );
        print "<div class='error'>$error</div>\n" if( defined $error );
        my $uri = $addr->get();
        my $notifs = $tables->notificationsUser( $auth->{'authid'} );

diff --git a/PciIds/Html/Util.pm b/PciIds/Html/Util.pm
index 32173f2cd4a52e7d8cb294dca23578df97e1b69f..633fe0a485fd22f1e64aea1c32c5c8c28bf4c978 100644 (file)
--- a/PciIds/Html/Util.pm
+++ b/PciIds/Html/Util.pm
@@ -59,22 +59,17 @@ sub genHtmlFooter( $$$ ) {
                require PciIds::Html::Jump;
                PciIds::Html::Jump::jumpWindow( $req, $args );
        }
-       print '<hr>
-<table width="100%">
-<tr>
-<td>
+       print '
+<div class="footer"><hr>
+<div class="campaign"><a href="http://sourceforge.net/"><img src="http://sourceforge.net/sflogo.php?group_id=35833" width="88" height="31" border="0" alt="SourceForge"></a></div>
+<div class="campaign"><a href="http://www.anybrowser.org/campaign/"><img src="/static/anybrowser.png" width=88 height=31 alt="Best viewed with any browser."></a></div>
+<p class="maintain">
 Maintained by <a href="http://mj.ucw.cz/">Martin Mares</a> and <a href="http://vorner.pretel.cz/">Michal
 Vaner</a> with great help by volunteers from the <a href="http://www.sourceforge.net/projects/pciids/">pciids project</a>
 at <a href="http://www.sourceforge.net/">SourceForge</a>.
-</td><td rowspan=2>
-<a href="http://www.anybrowser.org/campaign/"><img src="/static/anybrowser.png" width=88 height=31 alt="Best viewed with any browser."></a>
-</td><td rowspan=2>
-<a href="http://sourceforge.net/"><img src="http://sourceforge.net/sflogo.php?group_id=35833" width="88" height="31" border="0" alt="SourceForge"></a>
-</td></tr>
-<tr><td><span style="display: block">No counters, no frames, no syntax
-errors.</span></td></tr>
-</table>
+<p class="maintain">No counters, no frames, no syntax errors.
 </div>';
+       genHtmlTail();
 }
 
 sub htmlDiv( $$ ) {

diff --git a/help/notifications b/help/notifications
index ae29e085cda0e29e63523f5cf124261e3ebe3ec1..a34b75b048c7f24da50630e0084ac2c27d505468 100644 (file)
--- a/help/notifications
+++ b/help/notifications
@@ -6,7 +6,7 @@ Browse to the item and click the <a href='$AC_URL$notifications'>notifications</
 You can set:
 <ul>
        <li><strong>Effect range</strong> ‒ which ID's are considered for this notification. If the notification is not recursive, only the current ID is taken into account. Recursive notifications work on the given ID and its whole subtree (sub-items, their sub-items, …).
-       <li><strong>Notification level</strong> ‒ how serious an event needs to happen to trigger the notification. <em>None</em> means that the notification never happens (it ceases to exist, you can delete it by setting it to this level), <em>main comment</em> means whenever an admin approves a change of the name, <em>sub-item</em> is triggered when someone submits a new item with this one as a parent, <em>suggestion</em> is when someone suggests a new name for the item (but it is not yet approved) and <em>discussion</em> means whenever anybody writes anything.
+       <li><strong>Notification level</strong> ‒ how serious an event needs to happen to trigger the notification. <em>None</em> means that the notification never happens (it ceases to exist, you can delete it by setting it to this level), <em>main comment & sub-item</em> means whenever an admin approves a change of the name or when someone submits a new item with this one as a parent, <em>suggestion</em> is when someone suggests a new name for the item (but it is not yet approved) and <em>discussion</em> means whenever anybody writes anything.
        All the more general notifications contain the less general ones (when you check discussion and an admin approves a name change, it is triggered too, but not the other way around).
        <li><strong>Notification way</strong> ‒ the way the notification gets to you.
 </ul>

diff --git a/index.html b/index.html
index aa402efa029c52ba11474205f5b1a47968ef73bc..b6b21d423e2abd8487e956fc5d4afd384024005b 100644 (file)
--- a/index.html
+++ b/index.html
@@ -1,17 +1,17 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en"><head><title>The PCI ID Repository</title>
-<link rel='stylesheet' type='text/css' media='all' href='/static/common.css'>
-<link rel='stylesheet' type='text/css' media='screen' href='/static/screen.css'>
-<link rel='stylesheet' type='text/css' media='print' href='/static/print.css'>
+<link rel="stylesheet" type="text/css" media="all" href="/static/common.css">
+<link rel="stylesheet" type="text/css" media="screen" href="/static/screen.css">
+<link rel="stylesheet" type="text/css" media="print" href="/static/print.css">
 </head><body>
 
-<div class='top'><div class='bigbluesquare'>
+<div class="top"><div class="bigbluesquare">
 <h1>The PCI ID Repository</h1>
-<p class='home'>The home of the <code>pci.ids</code> file
+<p class="home">The home of the <code>pci.ids</code> file
 </div></div>
 
-<p>This is a public repository of all known ID's used in PCI devices:
-ID's of vendors, devices, subsystems and device classes. It is used in
+<p>This is a public repository of all known ID"s used in PCI devices:
+ID"s of vendors, devices, subsystems and device classes. It is used in
 various programs (e.g., <a href="http://mj.ucw.cz/pciutils.html">The PCI Utilities</a>)
 to display full human-readable names instaed of cryptic numeric codes.
 
@@ -21,11 +21,11 @@ to display full human-readable names instaed of cryptic numeric codes.
 entries or to update the existing ones:
 
 <ul>
-       <li><a href='/read/PC/'>PCI devices</a>
-       <li><a href='/read/PD/'>PCI device classes</a>
+       <li><a href="/read/PC/">PCI devices</a>
+       <li><a href="/read/PD/">PCI device classes</a>
 </ul>
 
-<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="/read/?action=help?help=index">help</a> before you start using the
 web interface.
 
 <h2>Download</h2>
@@ -35,14 +35,14 @@ web interface.
 the list used by your system:
 
 <ul>
-       <li><a href='/v2.2/pci.ids'>pci.ids</a>
-       <li><a href='/v2.2/pci.ids.gz'>pci.ids.gz</a> (compressed by gzip)
-       <li><a href='/v2.2/pci.ids.bz2'>pci.ids.bz2</a> (compressed by bzip2)
+       <li><a href="/v2.2/pci.ids">pci.ids</a>
+       <li><a href="/v2.2/pci.ids.gz">pci.ids.gz</a> (compressed by gzip)
+       <li><a href="/v2.2/pci.ids.bz2">pci.ids.bz2</a> (compressed by bzip2)
 </ul>
 
 <p>The above files require pciutils v2.2 or newer. If you are still using an older
-version for some reason, please get these instead: <a href='/pci.ids'>pci.ids-2.0</a>,
-<a href='/pci.ids.gz'>pci.ids-2.0.gz</a>, or <a href='/pci.ids.bz2'>pci.ids-2.0.bz2</a>. They
+version for some reason, please get these instead: <a href="/pci.ids">pci.ids-2.0</a>,
+<a href="/pci.ids.gz">pci.ids-2.0.gz</a>, or <a href="/pci.ids.bz2">pci.ids-2.0.bz2</a>. They
 could however lack some subsystems.
 
 <p>The contents of the database and the generated files can be distributed
@@ -62,32 +62,25 @@ welcome, but in this case please always add a discussion comment explaining the
 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>).
+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>).
 
-<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="/read/?action=help?help=newitem">submission guidelines</a>
 first.</em>
 
 <h2>Feedback</h2>
 
-<p>If you have encountered any problems or if you have any suggestions, please <a href='pciids-devel@lists.sourceforge.net'>let
+<p>If you have encountered any problems or if you have any suggestions, please <a href="mailto:pciids-devel@lists.sourceforge.net">let
 us know</a>.
 
-<div><hr>
-<table width="100%">
-<tr>
-<td>
+<div class="footer"><hr>
+<div class="campaign"><a href="http://sourceforge.net/"><img src="http://sourceforge.net/sflogo.php?group_id=35833" width="88" height="31" border="0" alt="SourceForge"></a></div>
+<div class="campaign"><a href="http://www.anybrowser.org/campaign/"><img src="/static/anybrowser.png" width=88 height=31 alt="Best viewed with any browser."></a></div>
+<p class="maintain">
 Maintained by <a href="http://mj.ucw.cz/">Martin Mares</a> and <a href="http://vorner.pretel.cz/">Michal
 Vaner</a> with great help by volunteers from the <a href="http://www.sourceforge.net/projects/pciids/">pciids project</a>
 at <a href="http://www.sourceforge.net/">SourceForge</a>.
-</td><td rowspan=2>
-<a href="http://www.anybrowser.org/campaign/"><img src="/static/anybrowser.png" width=88 height=31 alt="Best viewed with any browser."></a>
-</td><td rowspan=2>
-<a href="http://sourceforge.net/"><img src="http://sourceforge.net/sflogo.php?group_id=35833" width="88" height="31" border="0" alt="SourceForge"></a>
-</td></tr>
-<tr><td><span style="display: block">No counters, no frames, no syntax
-errors.</span></td></tr>
-</table>
+<p class="maintain">No counters, no frames, no syntax errors.
 </div>
 
 </body></html>

diff --git a/static/common.css b/static/common.css
index 826e573a8147fd6e484e315f9d7cfce257d562d1..740e0abf41f719281a71f89e5eea0e1b0f9b85f1 100644 (file)
--- a/static/common.css
+++ b/static/common.css
@@ -16,6 +16,12 @@ form table col.edit
 {
        width: 85%;
 }
+div.footer div.campaign
+{
+       float: right;
+       margin: 0.2em;
+       margin-top: 0.6em;
+}
 input.text,
 input.password,
 textarea

diff --git a/static/screen.css b/static/screen.css
index 2c199ed9d8b265b0239041dc9ff9aa1ffb7147a5..9b65e3875ba64e8681a1e4c4cd81bf24bc3d514e 100644 (file)
--- a/static/screen.css
+++ b/static/screen.css
@@ -89,6 +89,7 @@ div.bluesquare-example
        background-color: #4c3bff;
        color: #fffa45;
        border: solid blue;
+       border-width: 1px;
 }
 div.rmenu,
 div.lmenu