--- wikisrc/templates/page.tmpl	2018/08/10 08:45:24	1.51
+++ wikisrc/templates/page.tmpl	2020/07/30 08:49:47	1.64
@@ -14,6 +14,7 @@
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
 <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" />
@@ -27,47 +28,62 @@
 <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="centralHeader">
-      <div id="logo">
-        <a href="//www.NetBSD.org/"><img src="//www.NetBSD.org/images/NetBSD-smaller.png" alt="[NetBSD Logo]"/></a>
-        <div id="name"><a href="//www.NetBSD.org/">The NetBSD Project</a></div>
-        <div id="slogan"><a href="//www.NetBSD.org/">&ldquo;Of course it runs NetBSD&rdquo;</a></div>
-      </div>
-    </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></label>
+    <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/">
-		  WWW Home</a></li>
-	<li>
-	<a href="//www.NetBSD.org/">
-		  News &amp; Media</a><ul>
+		  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/events.html">
-		    Events</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/about/">
-		    NetBSD</a></li>
 	<li><a href="//www.NetBSD.org/people/developers.html">
-		    NetBSD developers</a></li>
+		    Developers</a></li>
 	<li><a href="//www.NetBSD.org/gallery/">
-		    Advocacy</a></li>
+		    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>
@@ -86,32 +102,21 @@
 	<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">
-		    Problem report guide</a></li>
-	<li><a href="//www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd">
-		    Report a bug</a></li>
-	<li><a href="//www.NetBSD.org/support/query-pr.html">
-		    Query bug database</a></li>
+		    Bug reports</a></li>
 	<li><a href="//www.NetBSD.org/support/security/">
 		    Security</a></li>
 	</ul>
 	</li>
 	<li>
-	<a href="//www.NetBSD.org/community/">
-		  Community</a><ul>
-	<li><a href="//blog.NetBSD.org/">
-		    Blog</a></li>
-	<li><a href="//www.NetBSD.org/mailinglists/">
-		    Mailing lists</a></li>
-	<li><a href="//mail-index.NetBSD.org/">
-		    List archives</a></li>
-	</ul>
-	</li>
-	<li>
 	<a href="//www.NetBSD.org/developers/">
 		  Developers</a><ul>
 	<li><a href="http://cvsweb.NetBSD.org/">
-		    Browse source</a></li>
+		    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/">
@@ -120,59 +125,43 @@
 		    Projects list</a></li>
 	</ul>
 	</li>
-	<li>
-	<a href="//www.NetBSD.org/ports/">
-		  Ports</a><ul>
-	<li><a href="//www.NetBSD.org/ports/history.html">
-		    History</a></li>
-	<li><a href="//www.NetBSD.org/ports/emulators.html">
-		    Emulators</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="//www.pkgsrc.org/">
-		Packages</a><ul>
-	<li><a href="http://www.pkgsrc.se/">
-		    Browse packages</a></li>
-	<li><a href="//releng.NetBSD.org/index-pkgsrc.html">
-		    Release engineering</a></li>
-	</ul>
-	</li>
-	<li>
-	<a href="<TMPL_VAR BASEURL>">
-		Wiki</a><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>
+    </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>
-	</ul>
-	</li>
-	<li id="searchform">
-		<TMPL_IF NAME="SEARCHFORM">
-		<TMPL_VAR SEARCHFORM>
+		<TMPL_IF NAME="COMMENTSLINK">
+		<li><TMPL_VAR COMMENTSLINK></li>
 		</TMPL_IF>
-	</li>
-	</ul>
-    </div>
+		<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>
@@ -189,15 +178,7 @@
 </div>
 </div>
 
-<TMPL_IF SIDEBAR>
-<div id="sidebar">
-<TMPL_VAR SIDEBAR>
-</div>
-</TMPL_IF>
-
-<div id="content">
 <TMPL_VAR CONTENT>
-</div>
 
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF COMMENTS>
@@ -268,6 +249,8 @@ Last edited <TMPL_VAR MTIME>
 <!-- from <TMPL_VAR WIKINAME> -->
 </div><!-- .pagefooter -->
 
+</div>
+
 <div id="footer">
   <div id="footerContent">
     <span class="footfeed">
@@ -277,7 +260,7 @@ Last edited <TMPL_VAR MTIME>
     <span class="footcopy"><a href="//www.NetBSD.org/about/disclaimer.html">
       Disclaimer</a> |
       <span class="copyright">
-        Copyright &copy; 1994-2018 The NetBSD Foundation, Inc.
+        Copyright &copy; 1994-2020 The NetBSD Foundation, Inc.
       </span>
       ALL
       RIGHTS RESERVED. <br /> NetBSD<sup>&reg;</sup> is a registered
