--- wikisrc/templates/page.tmpl	2012/09/02 00:20:58	1.19
+++ wikisrc/templates/page.tmpl	2016/04/15 17:39:25	1.32
@@ -13,9 +13,14 @@
 <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="//wiki.netbsd.org/global.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>
@@ -26,7 +31,7 @@
 <body>
     <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>
+        <a href="http://www.NetBSD.org/"><img src="//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>
@@ -45,7 +50,7 @@
         </span>
 	<ul>
 	<li><a href="http://www.NetBSD.org/">
-		  Home</a></li>
+		  WWW Home</a></li>
 	<li>
 	<a href="http://www.NetBSD.org/">
 		  News &amp; Media</a><ul>
@@ -99,7 +104,7 @@
 	<li>
 	<a href="http://www.NetBSD.org/community/">
 		  Community</a><ul>
-	<li><a href="http://onetbsd.org/">
+	<li><a href="http://netbsd.fi/">
 		    Blogs</a></li>
 	<li><a href="http://www.NetBSD.org/mailinglists/">
 		    Mailing lists</a></li>
@@ -141,27 +146,27 @@
 	</ul>
     </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="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>">RecentChanges</a></li>
-		      </TMPL_IF>
-		    </ul>
-		  </div>
+<TMPL_IF NAME="HAVE_ACTIONS">
+    <div class="actions">
+        <ul>
+        <li><a href="<TMPL_VAR BASEURL>">Wiki Home</a></li>
+        <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>">RecentChanges</a></li>
+        </TMPL_IF>
+        </ul>
     </div>
 
 <div class="pageheader">
@@ -205,7 +210,7 @@
 </TMPL_IF>
 </TMPL_UNLESS>
 
-		      </TMPL_IF>
+</TMPL_IF>
 
 <div id="footer" class="pagefooter">
 <TMPL_UNLESS DYNAMIC>
@@ -261,33 +266,28 @@ Last edited <TMPL_VAR MTIME>
 <!-- from <TMPL_VAR WIKINAME> -->
 </div><!-- .pagefooter #footer -->
 
-<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-2012 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 class="rowOfBoxes">
+  <div id="footer2">
+    <div id="footerLogo">
+		<!-- isc logo used to go here -->
     </div>
-</TMPL_IF>
+    <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; 1994-2016 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>
 
 </body>
 </html>
