Pretty much the last set of changes I'm going to make:

- Make top-left image more friendly to caches by randomising the URL,
  rather than having the URL point to a CGI that returns a random image.
- Change the whole left side bar to use lists for the links, as they should
  be, rather than lines of text seperated by <br>'s.
- Add valid XHTML and CSS logos, because we now comply.

diff --git a/www/images/valid-xhtml11.png b/www/images/valid-xhtml11.png
new file mode 100644 (file)
index 0000000..2c63d93
Binary files /dev/null and b/www/images/valid-xhtml11.png differ

diff --git a/www/images/vcss.png b/www/images/vcss.png
new file mode 100644 (file)
index 0000000..9b2f596
Binary files /dev/null and b/www/images/vcss.png differ

diff --git a/www/menu.inc b/www/menu.inc
index 98f95fecec1f1a4e6a8fdc191a09cb627ef88e92..527f25f447b105d5148e6fe047706b4c9dc81c07 100644 (file)
--- a/www/menu.inc
+++ b/www/menu.inc
@@ -1,51 +1,61 @@
       <div id="menu">
         <h3 class="heading">
-          <img src="http://nwww.i-scream.org/cgi-bin/logo.jpg" class="cornerlogo" alt="a random image"/>
+          <img src="<!--#include virtual="/cgi-bin/logo.cgi" -->" class="cornerlogo" alt="a random image"/>
+          <br />
           Main
         </h3>
-        <p>
-          <a href="http://nwww.i-scream.org/">i-scream Home</a><br />
-          <a href="http://nwww.i-scream.org/#news">News</a><br />
-          <a href="http://nwww.i-scream.org/#search">Search</a><br />
-        </p>
+        <ul>
+          <li><a href="http://nwww.i-scream.org/">i-scream Home</a></li>
+          <li><a href="http://nwww.i-scream.org/#news">News</a></li>
+          <li><a href="http://nwww.i-scream.org/#search">Search</a></li>
+        </ul>
         <h3 class="heading">
           Projects
         </h3>
-        <p>
-          <a href="http://nwww.i-scream.org/libstatgrab/">libstatgrab</a><br />
-          <a href="http://nwww.i-scream.org/pystatgrab/">pystatgrab</a><br />
-          <a href="http://nwww.i-scream.org/laroona/">Laroona</a><br />
-          <a href="http://nwww.i-scream.org/cms/">CMS</a><br />
-          <br />
-          <a href="http://www.cs.kent.ac.uk/people/staff/tdb/#acl">Java TCP/UDP ACL's</a><br />
-        </p>
+        <ul>
+          <li><a href="http://nwww.i-scream.org/libstatgrab/">libstatgrab</a></li>
+          <li><a href="http://nwww.i-scream.org/pystatgrab/">pystatgrab</a></li>
+          <li><a href="http://nwww.i-scream.org/laroona/">Laroona</a></li>
+          <li><a href="http://nwww.i-scream.org/cms/">CMS</a></li>
+        </ul>
+        <ul>
+          <li><a href="http://www.cs.kent.ac.uk/people/staff/tdb/#acl">Java TCP/UDP ACL's</a></li>
+        </ul>
         <h3 class="heading">
           Resources
         </h3>
-        <p>
-          <a href="http://nwww.i-scream.org/cvs.xhtml">CVS Repository</a><br />
-          <a href="http://wiki.i-scream.org/">Wiki</a><br />
-          <br />
-          <a href="http://nwww.i-scream.org/mailinglists.xhtml">Mailing Lists</a><br />
-          <a href="http://nwww.i-scream.org/support.xhtml">Support</a><br />
-          <a href="http://nwww.i-scream.org/support.xhtml">Bug Tracking</a><br />
-          <br />
-          <a href="http://nwww.i-scream.org/license.xhtml">Licensing</a><br />
-        </p>
+        <ul>
+          <li><a href="http://nwww.i-scream.org/cvs.xhtml">CVS Repository</a></li>
+          <li><a href="http://wiki.i-scream.org/">Wiki</a></li>
+        </ul>
+        <ul>
+          <li><a href="http://nwww.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>
+          <li><a href="http://nwww.i-scream.org/support.xhtml">Support</a></li>
+          <li><a href="http://nwww.i-scream.org/support.xhtml">Bug Tracking</a></li>
+        </ul>
+        <ul>
+          <li><a href="http://nwww.i-scream.org/license.xhtml">Licensing</a></li>
+        </ul>
         <h3 class="heading">
           i-scream
         </h3>
-        <p>
-          <a href="http://nwww.i-scream.org/who.xhtml">Who We Are</a><br />
-          <a href="http://nwww.i-scream.org/pgpkey.xhtml">PGP Key</a><br />
-        </p>
+        <ul>
+          <li><a href="http://nwww.i-scream.org/who.xhtml">Who We Are</a></li>
+          <li><a href="http://nwww.i-scream.org/pgpkey.xhtml">PGP Key</a></li>
+        </ul>
         <h3 class="heading">
           Contact Us
         </h3>
-        <p>
-          <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>
-        </p>
+        <ul>
+          <li><a href="mailto:dev@i-scream.org">dev@i-scream.org</a></li>
+        </ul>
         <p class="logo">
+          <a href="http://validator.w3.org/check/referer">
+            <img src="http://nwww.i-scream.org/images/valid-xhtml11.png" alt="Valid XHTML 1.1!" />
+          </a>
+          <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img src="http://nwww.i-scream.org/images/vcss.png" alt="Valid CSS!" />
+          </a>
           <a href="http://www.freebsd.org/">
             <img src="http://nwww.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
           </a>

diff --git a/www/styles/style.css b/www/styles/style.css
index 162f79673b37e7f085470b301af778f851b49c7c..327a6b439053fa36f556bc35e6a5115dc97aabcc 100644 (file)
--- a/www/styles/style.css
+++ b/www/styles/style.css
@@ -34,15 +34,19 @@ html,body {
        margin: 0px;
        padding: 3px;
 }
-#menu p {
-       margin: 5px;
-       padding: 5px 0px 5px 0px;
-       text-align: center;
-}
 #menu .logo {
-       margin: 0px;
+       margin: 10px 0px 10px 0px;
        text-align: center;
 }
+#menu .logo img {
+       margin-top: 5px;
+}
+#menu ul {
+        margin: 5px;
+       padding: 5px 0px 5px 0px;
+       text-align: center;
+        list-style: none;
+}       
 
 /* Contains the main page - including header and footer */
 #main {