--- wikisrc/templates/page.tmpl	2010/07/03 23:39:37	1.11
+++ wikisrc/templates/page.tmpl	2012/09/02 00:20:58	1.19
@@ -13,6 +13,7 @@
 <TMPL_IF NAME="FAVICON">
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
+<link rel="stylesheet" href="http://www.NetBSD.org/global.css" type="text/css" />
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 <TMPL_IF NAME="EDITURL">
@@ -23,30 +24,122 @@
 <TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
 </head>
 <body>
-    <div id="header">
-      <div class="topNavigation">
-	<span>&raquo;</span> <a href="http://www.NetBSD.org/docs/guide/en/">The Guide</a> | <a href="http://man.NetBSD.org">Manual pages</a> | <a href="http://www.NetBSD.org/mailinglists/">Mailing lists</a> and <a href="http://mail-index.NetBSD.org/">Archives</a> | <a href="http://cvsweb.NetBSD.org/">CVS repository</a> | <a href="http://www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd">Report</a> or <a href="http://gnats.NetBSD.org/">query</a> a bug | <a href="http://www.NetBSD.org/docs/software/packages.html">Software Packages</a></div>
-      <div class="centralHeader">
-	<a href="/"><img height="90" width="506" alt="[NetBSD Logo]" src="http://www.netbsd.org/images/NetBSD-headerlogo.png"/></a>
-	<div class="headerTools">
-	  <br/>
-	    <div id="headerSearch">
+    <div id="centralHeader">
+      <div id="logo">
+        <a href="http://www.NetBSD.org/"><img src="http://www.NetBSD.org/images/NetBSD-smaller.png" alt="[NetBSD Logo]"/></a>
+        <div id="name"><a href="http://www.NetBSD.org/">The NetBSD Project</a></div>
+        <div id="slogan"><a href="http://www.NetBSD.org/">&ldquo;Of course it runs NetBSD&rdquo;</a></div>
+      </div>
+      <div id="headerTools">
+	<div id="headerSearch">
 <TMPL_IF NAME="SEARCHFORM">
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
-	  </div>
 	</div>
       </div>
-      <div class="navBar">
-	<a title="Home" href="http://www.netbsd.org/">Home</a>&nbsp;|&nbsp;
-	<a href="http://www.netbsd.org/about/">About</a>&nbsp;|&nbsp;
-	<a href="http://www.netbsd.org/gallery/">Gallery</a>&nbsp;|&nbsp;
-	<a href="http://www.netbsd.org/releases/">Download</a>&nbsp;|&nbsp;
-	<a href="http://www.netbsd.org/docs/">Documentation</a>&nbsp;|&nbsp;
-	<a href="http://www.netbsd.org/support/">Support</a>&nbsp;|&nbsp;
-	<a href="http://www.netbsd.org/community/">Community</a>&nbsp;|&nbsp;
-	<a href="http://www.netbsd.org/ports/">Ports</a>&nbsp;
-      </div>
+    </div>
+
+    <div id="navBar" role="navigation">
+	<span class="doNotDisplay">
+          Navigation:
+        </span>
+	<ul>
+	<li><a href="http://www.NetBSD.org/">
+		  Home</a></li>
+	<li>
+	<a href="http://www.NetBSD.org/">
+		  News &amp; Media</a><ul>
+	<li><a href="http://www.NetBSD.org//changes/">
+		    Recent changes</a></li>
+	<li><a href="http://blog.NetBSD.org/">
+		    NetBSD blog</a></li>
+	<li><a href="http://www.NetBSD.org/gallery/events.html">
+		    Events</a></li>
+	<li><a href="http://www.NetBSD.org/changes/rss.html">
+		    Feeds</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="http://www.NetBSD.org/about/">
+		  About</a><ul>
+	<li><a href="http://www.NetBSD.org/about/">
+		    NetBSD</a></li>
+	<li><a href="http://www.NetBSD.org/foundation/">
+		    The NetBSD Foundation</a></li>
+	<li><a href="http://www.NetBSD.org/gallery/">
+		    Advocacy</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="http://www.NetBSD.org/docs/">
+		  Documentation</a><ul>
+	<li><a href="http://www.NetBSD.org/docs/misc/index.html">
+		    FAQ &amp; HOWTOs</a></li>
+	<li><a href="http://www.NetBSD.org/docs/guide/en/">
+		    The Guide</a></li>
+	<li><a href="http://man.NetBSD.org/">
+		    Manual pages</a></li>
+	<li><a href="http://wiki.NetBSD.org/">
+		    Wiki</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="http://www.NetBSD.org/support/">
+		  Support</a><ul>
+	<li><a href="http://www.NetBSD.org/support/send-pr.html">
+		    Problem report guide</a></li>
+	<li><a href="http://www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd">
+		    Report a bug</a></li>
+	<li><a href="http://www.NetBSD.org/support/query-pr.html">
+		    Query bug database</a></li>
+	<li><a href="http://www.NetBSD.org/support/security/">
+		    Security</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="http://www.NetBSD.org/community/">
+		  Community</a><ul>
+	<li><a href="http://onetbsd.org/">
+		    Blogs</a></li>
+	<li><a href="http://www.NetBSD.org/mailinglists/">
+		    Mailing lists</a></li>
+	<li><a href="http://mail-index.NetBSD.org/">
+		    List archives</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="http://www.NetBSD.org/developers/">
+		  Developers</a><ul>
+	<li><a href="http://cvsweb.NetBSD.org/">
+		    Browse source</a></li>
+	<li><a href="http://nxr.NetBSD.org/">
+		    Cross-reference</a></li>
+	<li><a href="http://releng.NetBSD.org/">
+		    Release engineering</a></li>
+	<li><a href="http://wiki.NetBSD.org/projects/">
+		    Projects list</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="http://www.NetBSD.org/ports/">
+		  Ports</a><ul>
+	<li><a href="http://www.NetBSD.org/ports/history.html">
+		    History</a></li>
+	<li><a href="http://www.NetBSD.org/ports/emulators.html">
+		    Emulators</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="http://www.pkgsrc.org/">
+		Packages</a><ul>
+	<li><a href="http://www.pkgsrc.se/">
+		    Browse packages</a></li>
+	<li><a href="http://releng.NetBSD.org/index-pkgsrc.html">
+		    Release engineering</a></li>
+	</ul>
+	</li>
+	</ul>
+    </div>
  
       	  <TMPL_IF NAME="HAVE_ACTIONS">
 		  <div class="actions">
@@ -54,6 +147,9 @@
 		      <TMPL_IF NAME="EDITURL">
 			<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 		      </TMPL_IF>
+		      <TMPL_IF NAME="COMMENTSLINK">
+			<li><TMPL_VAR COMMENTSLINK></li>
+		      </TMPL_IF>
 		      <TMPL_IF NAME="GETSOURCEURL">
 			<li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
 		      </TMPL_IF>
@@ -95,12 +191,8 @@
 </div>
 
 <TMPL_UNLESS DYNAMIC>
-<TMPL_IF DISCUSSIONLINK>
-<div id="comments">
-<TMPL_IF NAME="COMMENTEDITURL">
-<h3><a href="<TMPL_VAR COMMENTEDITURL>" rel="nofollow">Discussion</a></h3>
-</TMPL_IF>
 <TMPL_IF COMMENTS>
+<div id="comments">
 <TMPL_VAR COMMENTS>
 <TMPL_IF ADDCOMMENTURL>
 <div class="addcomment">
@@ -111,7 +203,6 @@
 </TMPL_IF>
 </div>
 </TMPL_IF>
-</TMPL_IF>
 </TMPL_UNLESS>
 
 		      </TMPL_IF>
@@ -119,11 +210,6 @@
 <div id="footer" class="pagefooter">
 <TMPL_UNLESS DYNAMIC>
 <div id="pageinfo">
-
-		      <TMPL_IF NAME="COMMENTSLINK">
-			<li><TMPL_VAR COMMENTSLINK><br /></li>
-			    </TMPL_IF>
-
 <TMPL_IF NAME="TAGS">
 <div class="tags">
 Tags:
@@ -192,7 +278,7 @@ Last edited <TMPL_VAR MTIME>
           <span class="footcopy"><a href="about/disclaimer.html">
             Disclaimer</a> |
             <span class="copyright">
-              Copyright &copy; 2009-2010 The NetBSD Foundation, Inc.
+              Copyright &copy; 2009-2012 The NetBSD Foundation, Inc.
             </span>
             ALL
             RIGHTS RESERVED. <br /> NetBSD<sup>&reg;</sup> is a registered
