page.tmpl: Normalize whitespace to ease merge conflict resolution
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:09:43 +0000 (00:09 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:09:43 +0000 (00:09 -0500)
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
templates/page.tmpl

index e0a080b7897064f7ed72e3e0ce280905af91f5bd..d4d681084f54a0a566467d86d9e2a235b31d3f32 100644 (file)
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-       <head>
-               <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-               <meta http-equiv="Content-Style-Type" content="text/css" />
-               <meta name="robots" content="all" />
-               <meta name="author" content="SIPB" />
-               <meta name="description" content="MIT Student Information Processing Board" />  
-               <meta name="keywords" content="SIPB, MIT, hackers" />
-               <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>
-               <title><TMPL_VAR TITLE></title>
-               
-               <link rel="stylesheet" type="text/css" href="<TMPL_VAR BASEURL>style.css" />
-       </head>
-       
-       <body>
-               <div id="content-block">
-                        <div id="logo">
-                               <a href="<TMPL_VAR BASEURL>./"><img src="<TMPL_VAR BASEURL>images/grumpyfuzzball_half.png" alt="grumpy fuzzball" /></a>
-                               <a href="<TMPL_VAR BASEURL>./"><img src="<TMPL_VAR BASEURL>images/SIPBlogo.png" alt="MIT Student Information Processing Board" id="sipb-logo" /></a>
-                               <div id="hidden-title"><h1>SIPB: MIT Student Information Processing Board</h1></div>
-                        </div>
-                        
-                        <ul id="navigation">
-                               <li class="first-navbox">
-                                       <a href="<TMPL_VAR BASEURL>projects/"><span>Projects</span></a>
-                               </li>
-                               <li class="second-navbox">
-                                       <a href="<TMPL_VAR BASEURL>doc/"><span>Docs</span></a>
-                               </li>
-                               <li class="third-navbox">
-                                       <a href="<TMPL_VAR BASEURL>office/"><span>Office</span></a>
-                               </li>
-                               <li class="fourth-navbox">
-                                       <a href="<TMPL_VAR BASEURL>join/"><span>Join</span></a>
-                               </li>
-                        </ul>
-                        <!--<div id="events-block">
-                               <h4>Who are we?</h4>
-                               <p>We are MIT's volunteer student computing group, improving computing at MIT since 1969. Today, SIPB projects provide innovative services and special expertise to the MIT community. We have an office just outside the Athena cluster in the student center W20, and you are welcome to come by to ask us for help or to hang around and use our computers.</p>
-                               <br />
-                               <div class="solid-item iap">
-                                       <div class="extra-large">IAP 2009</div>
-                                       <a href="<TMPL_VAR BASEURL>iap/">view SIPB classes</a>
-                                </div>
-                        </div>-->
-                        <h1><TMPL_VAR TITLE></h1>
-                        <TMPL_IF NAME="PARENTLINKS">
-                        <div id="breadcrumbs">
-                               <ul>
-                                       <TMPL_LOOP NAME="PARENTLINKS">
-                                               <li><a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>&#187;</li>
-                                       </TMPL_LOOP>
-                               </ul>
-                               <br style="clear:both;" />
-                        </div>
-                        </TMPL_IF>
-                        <div id="featured-block" class="<TMPL_UNLESS NAME="PARENTLINKS">is-top</TMPL_UNLESS>">
-                               <TMPL_VAR CONTENT>
-                        </div>
-                       <div id="prefooter"></div>      
-               </div>
-               <div id="footer">
-                       <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="RECENTCHANGESURL">
-                                       <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</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="COMMENTSLINK">
-                                       <li><TMPL_VAR COMMENTSLINK><br /></li>
-                                       <TMPL_ELSE>
-                                       <TMPL_IF NAME="DISCUSSIONLINK">
-                                       <li><TMPL_VAR DISCUSSIONLINK><br /></li>
-                                       </TMPL_IF>
-                                       </TMPL_IF>
-                               </ul>
-                       </div>
-                       </TMPL_IF>
-                       <p>&copy; 2009 Student Information Processing Board</p>
-                       <p>Unless otherwise specified, all content on this wiki is released under a dual license of the Creative Commons Attribution-Share Alike license, and the GNU Free Documentation License, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover-Texts.<br />
-                        This follows the SIPB Documentation Licensing Recommendation.</p>
-               </div>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title><TMPL_VAR TITLE></title>
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="robots" content="all" />
+<meta name="author" content="SIPB" />
+<meta name="description" content="MIT Student Information Processing Board" /> 
+<meta name="keywords" content="SIPB, MIT, hackers" />
+<link rel="stylesheet" type="text/css" href="<TMPL_VAR BASEURL>style.css" />
+<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>
+</head>
+<body>
+
+<div id="content-block">
+
+<div id="logo">
+<a href="<TMPL_VAR BASEURL>./"><img src="<TMPL_VAR BASEURL>images/grumpyfuzzball_half.png" alt="grumpy fuzzball" /></a>
+<a href="<TMPL_VAR BASEURL>./"><img src="<TMPL_VAR BASEURL>images/SIPBlogo.png" alt="MIT Student Information Processing Board" id="sipb-logo" /></a>
+<div id="hidden-title"><h1>SIPB: MIT Student Information Processing Board</h1></div>
+</div>
+
+<ul id="navigation">
+<li class="first-navbox">
+<a href="<TMPL_VAR BASEURL>projects/"><span>Projects</span></a>
+</li>
+<li class="second-navbox">
+<a href="<TMPL_VAR BASEURL>doc/"><span>Docs</span></a>
+</li>
+<li class="third-navbox">
+<a href="<TMPL_VAR BASEURL>office/"><span>Office</span></a>
+</li>
+<li class="fourth-navbox">
+<a href="<TMPL_VAR BASEURL>join/"><span>Join</span></a>
+</li>
+</ul>
+
+<h1><TMPL_VAR TITLE></h1>
+
+<TMPL_IF NAME="PARENTLINKS">
+<div id="breadcrumbs">
+<ul>
+<TMPL_LOOP NAME="PARENTLINKS">
+<li><a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>&#187;</li>
+</TMPL_LOOP>
+</ul>
+<br style="clear:both;" />
+</div>
+</TMPL_IF>
+
+<div id="featured-block" class="<TMPL_UNLESS NAME="PARENTLINKS">is-top</TMPL_UNLESS>">
+<TMPL_VAR CONTENT>
+</div>
+
+<div id="prefooter"></div>
+
+</div>
+
+<div id="footer">
+
+<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="RECENTCHANGESURL">
+<li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</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="COMMENTSLINK">
+<li><TMPL_VAR COMMENTSLINK><br /></li>
+<TMPL_ELSE>
+<TMPL_IF NAME="DISCUSSIONLINK">
+<li><TMPL_VAR DISCUSSIONLINK><br /></li>
+</TMPL_IF>
+</TMPL_IF>
+</ul>
+</div>
+</TMPL_IF>
+
+<p>&copy; 2009 Student Information Processing Board</p>
+<p>Unless otherwise specified, all content on this wiki is released under a dual license of the Creative Commons Attribution-Share Alike license, and the GNU Free Documentation License, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover-Texts.<br />
+ This follows the SIPB Documentation Licensing Recommendation.</p>
+
+</div>
+
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
@@ -108,5 +109,6 @@ try {
 var pageTracker = _gat._getTracker("UA-15235584-1");
 pageTracker._trackPageview();
 } catch(err) {}</script>
-       </body>
+
+</body>
 </html>