--- wikisrc/templates/page.tmpl	2010/05/16 16:03:11	1.5
+++ wikisrc/templates/page.tmpl	2020/07/30 08:49:47	1.64
@@ -13,63 +13,155 @@
 <TMPL_IF NAME="FAVICON">
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
+<link rel="stylesheet" href="//wiki.netbsd.org/global.css" type="text/css" />
+<link rel="stylesheet" href="//www.netbsd.org/donations/thermo/fundraiser.css" type="text/css" />
+<link rel="stylesheet" href="//wiki.netbsd.org/style.css" type="text/css" />
+<TMPL_IF LOCAL_CSS>
+<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
+<TMPL_ELSE>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+</TMPL_IF>
+
 <TMPL_IF NAME="EDITURL">
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
 <TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
 <TMPL_IF NAME="RELVCS"><TMPL_VAR RELVCS></TMPL_IF>
 <TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
 </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">
-<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>
- 
-      	  <TMPL_IF NAME="HAVE_ACTIONS">
-		  <div class="actions">
-		    <ul>
-		      <TMPL_IF NAME="EDITURL">
-			<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
-		      </TMPL_IF>
-		      <TMPL_IF NAME="HISTORYURL">
-			<li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
-		      </TMPL_IF>
-		      <TMPL_IF NAME="GETSOURCEURL">
-			<li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
-		      </TMPL_IF>
-		      <TMPL_IF NAME="PREFSURL">
-			<li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
-		      </TMPL_IF>
-		      <TMPL_IF NAME="RECENTCHANGESURL">
-			<li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
-		      </TMPL_IF>
-		    </ul>
-		  </div>
+    <!-- For non-visual user agents: -->
+    <div id="top"><a href="#content" id="skiplink" tabindex="1">Skip to main content.</a></div>
+
+
+
+    <!-- mobile menu icon -->
+    <input id="hamburger" type="checkbox"/>
+    <label class="menuicon" for="hamburger"><span></span><span></span><span></span></label>
+
+    <div id="navBar" role="navigation">
+        <div id="centralHeader">
+          <div id="logo">
+            <a href="//www.NetBSD.org/"><img id="projectLogo" src="//www.NetBSD.org/images/NetBSD-smaller-tb.png" alt="" height="120"/></a>
+          </div>
+            <a href="https://netbsd.org/donations/#how-to-donate">
+              <div id="fundraiser">
+                <br />
+                <div id="fundraiser-amount">
+                  <div id="fundraiser-raised"></div>
+                </div>
+              </div>
+            </a>
+        </div>
+	<span class="doNotDisplay">
+          Navigation:
+        </span>
+	<ul>
+	<li id="searchform">
+		<TMPL_IF NAME="SEARCHFORM">
+		<TMPL_VAR SEARCHFORM>
+		</TMPL_IF>
+	</li>
+	<li><a href="//www.NetBSD.org/">
+		  Home</a><ul>
+	<li><a href="//www.NetBSD.org//changes/">
+		    Recent changes</a></li>
+	<li><a href="//blog.NetBSD.org/">
+		    NetBSD blog</a></li>
+	<li><a href="//www.NetBSD.org/gallery/presentations/">
+		    Presentations</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="//www.NetBSD.org/about/">
+		  About</a><ul>
+	<li><a href="//www.NetBSD.org/people/developers.html">
+		    Developers</a></li>
+	<li><a href="//www.NetBSD.org/gallery/">
+		    Gallery</a></li>
+	<li><a href="//wiki.NetBSD.org/ports/">
+		    Ports</a></li>
+	<li><a href="http://pkgsrc.se/">
+		    Packages</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="//www.NetBSD.org/docs/">
+		  Documentation</a><ul>
+	<li><a href="//www.NetBSD.org/docs/misc/index.html">
+		    FAQ &amp; HOWTOs</a></li>
+	<li><a href="//www.NetBSD.org/docs/guide/en/">
+		    The Guide</a></li>
+	<li><a href="http://man.NetBSD.org/">
+		    Manual pages</a></li>
+	<li><a href="//wiki.NetBSD.org/">
+		    Wiki</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="//www.NetBSD.org/support/">
+		  Support</a><ul>
+	<li><a href="//wiki.NetBSD.org/community/">
+		    Community</a></li>
+	<li><a href="//www.NetBSD.org/support/send-pr.html">
+		    Bug reports</a></li>
+	<li><a href="//www.NetBSD.org/support/security/">
+		    Security</a></li>
+	</ul>
+	</li>
+	<li>
+	<a href="//www.NetBSD.org/developers/">
+		  Developers</a><ul>
+	<li><a href="http://cvsweb.NetBSD.org/">
+		    CVSWeb</a></li>
+	<li><a href="//anonhg.NetBSD.org/">
+		    Mercurial</a></li>
+	<li><a href="//nxr.NetBSD.org/">
+		    Cross-reference</a></li>
+	<li><a href="//releng.NetBSD.org/">
+		    Release engineering</a></li>
+	<li><a href="//wiki.NetBSD.org/projects/">
+		    Projects list</a></li>
+	</ul>
+	</li>
     </div>
 
+<TMPL_IF SIDEBAR>
+<div id="sidebar">
+<TMPL_VAR SIDEBAR>
+</div>
+</TMPL_IF>
+
+<div class="actions"><ul>
+	<TMPL_IF NAME="HAVE_ACTIONS">
+		<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>
+		<TMPL_IF NAME="HISTORYURL">
+		<li><a href="<TMPL_VAR HISTORYURL>">
+			    History</a></li>
+		</TMPL_IF>
+		<li><a href="<TMPL_VAR BASEURL>wiki/new_page" rel="nofollow">
+			    New</a></li>
+		<TMPL_IF NAME="RECENTCHANGESURL">
+		<li><a href="<TMPL_VAR RECENTCHANGESURL>">
+			    Recent Changes</a></li>
+		</TMPL_IF>
+	</TMPL_IF>
+</ul></div>
+
+
+<div id="content">
+
 <div class="pageheader">
 <div class="header">
 <span>
@@ -86,19 +178,9 @@
 </div>
 </div>
 
-<TMPL_IF SIDEBAR>
-<div id="sidebar">
-<TMPL_VAR SIDEBAR>
-</div>
-</TMPL_IF>
-
-<div id="content">
-<TMPL_UNLESS NAME="DISCUSSIONLINK">
-This is a discussion page. Its contents have not been vetted by developers.<br />
-</TMPL_UNLESS>
 <TMPL_VAR CONTENT>
-</div>
 
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF COMMENTS>
 <div id="comments">
 <TMPL_VAR COMMENTS>
@@ -111,21 +193,11 @@ This is a discussion page. Its contents 
 </TMPL_IF>
 </div>
 </TMPL_IF>
+</TMPL_UNLESS>
 
-		      </TMPL_IF>
-
-<div id="footer" class="pagefooter">
+<div class="pagefooter">
 <TMPL_UNLESS DYNAMIC>
 <div id="pageinfo">
-
-		      <TMPL_IF NAME="COMMENTSLINK">
-			<li><TMPL_VAR COMMENTSLINK><br /></li>
-			  <TMPL_ELSE>
-			    <TMPL_IF NAME="DISCUSSIONLINK">
-			      <TMPL_VAR DISCUSSIONLINK><br />
-			      </TMPL_IF>
-			    </TMPL_IF>
-
 <TMPL_IF NAME="TAGS">
 <div class="tags">
 Tags:
@@ -165,39 +237,37 @@ Last edited <TMPL_VAR MTIME>
 <!-- Created <TMPL_VAR CTIME> -->
 </div>
 
+<TMPL_IF NAME="HAVE_ACTIONS">
+<TMPL_IF NAME="PREFSURL">
+<a href="<TMPL_VAR PREFSURL>">Preferences | Logout</a>
+</TMPL_IF>
+</TMPL_IF>
+
 </div><!-- #pageinfo -->
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 </TMPL_UNLESS>
 <!-- from <TMPL_VAR WIKINAME> -->
-</div><!-- .pagefooter #footer -->
+</div><!-- .pagefooter -->
 
-<TMPL_IF COPYRIGHT>
-<TMPL_VAR COPYRIGHT>
-    <div class="rowOfBoxes">
-      <div id="footer">
-        <div id="footerLogo">
-          <a href="http://www.isc.org/"><img src="images/hosted-isc.png"
-             alt="wiki.NetBSD.org is hosted at ISC"
-             border="0" width="84" height="41"/></a>
-        </div>
-        <div id="footerContent">
-          <span class="footfeed">
-            <a href="http://www.NetBSD.org/cgi-bin/feedback.cgi">
-              Contact</a> |
-          </span>
-          <span class="footcopy"><a href="about/disclaimer.html">
-            Disclaimer</a> |
-            <span class="copyright">
-              Copyright &copy; 2009-2010 The NetBSD Foundation, Inc.
-            </span>
-            ALL
-            RIGHTS RESERVED. <br /> NetBSD<sup>&reg;</sup> is a registered
-            trademark of The NetBSD Foundation, Inc.
-          </span>
-        </div>
-      </div>
-    </div>
-</TMPL_IF>
+</div>
+
+<div id="footer">
+  <div id="footerContent">
+    <span class="footfeed">
+      <a href="//www.NetBSD.org/cgi-bin/feedback.cgi">
+        Contact</a> |
+    </span>
+    <span class="footcopy"><a href="//www.NetBSD.org/about/disclaimer.html">
+      Disclaimer</a> |
+      <span class="copyright">
+        Copyright &copy; 1994-2020 The NetBSD Foundation, Inc.
+      </span>
+      ALL
+      RIGHTS RESERVED. <br /> NetBSD<sup>&reg;</sup> is a registered
+      trademark of The NetBSD Foundation, Inc.
+    </span>
+  </div>
+</div>
 
 </body>
 </html>
