Merge branch 'master' of github.com:j3parker/dweb
authorJacob Parker <j3parker@csclub.uwaterloo.ca>
Wed, 7 Mar 2012 07:59:42 +0000 (02:59 -0500)
committerJacob Parker <j3parker@csclub.uwaterloo.ca>
Wed, 7 Mar 2012 07:59:42 +0000 (02:59 -0500)
Conflicts:
src/web.d

1  2 
bin/changelog.sh
templates/default.html

@@@ -1,5 -1,3 +1,5 @@@
 +echo "<h1>Recent Changes</h1>"
 +echo "<p>This list was generated from the git log for the website. The git repository for this webpage can be accessed from FIXME.</p>"
  echo "<ul>"
- git log --pretty=format:'<li>%s - %aN (%ae) <b>(%cr)</b></li>' --abbrev-commit --date=relative --no-merges
 -git log --pretty=format:'<li>%s - %aN (%ae) <b>(%cr)</b></li>' --abbrev-commit --date=relative
++git log --pretty=format:'<li>%s - %aN <b>(%cr)</b></li>' --abbrev-commit --date=relative --no-merges
  echo "</ul>"
index 0000000,9381594..fafb96a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,41 +1,48 @@@
+ <!DOCTYPE html>
+ <html>
+   <head>
+     <title>{{ pagename }}</title>
+     <link rel="stylesheet" href="{{ url_root }}pub/style/style.css" type="text/css" media="screen, handheld" title="default">
+     <meta charset="UTF-8">
+     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   </head>
+   <body>
+     <div id="header">
+       <div class="superHeader">
+         <div class="left">
++          <a href=\"http://wiki.csclub.uwaterloo.ca/\">wiki</a>
++          <a href=\"http://git.csclub.uwaterloo.ca/\">git</a>
++          <a href=\"http://mirror.csclub.uwaterloo.ca/\">mirror</a>
++          <a href=\"http://csclub.uwaterloo.ca/stats\">stats</a>
++          <a href=\"http://mail.csclub.uwaterloo.ca/\">webmail</a>
++          <a href=\"http://csclub.uwaterloo.ca/newsgroup/\">newsgroups</a>
++          <a href=\"http://csclub.uwaterloo.ca/mailman/\">mailman</a>
+         </div>
+         <div class="right">
+           <a href="{{ url_root }}changelog">changelog</a>
+         </div>
+       </div>
+       <div class="midHeader">
+         <h1 class="headerTitle">
+           <a href="{{ url_root }}">{{ site_title }}</a>
+           <span id="headerSubTitle">{{ site_subtitle }}</a>
+         </h1>
+       </div>
+     </div>
+     <div id="horiz-side-bar">
+       {{ nav_tree }}
+     </div>
+     <div id="main-copy">
+       {{ content }}
+     </div>
+     <div id="footer">
+       <div class="left">
+         <a href="{{ url_root }}dweb">Powered by dweb</a>
+       </div>
+       <div class="right">&nbsp;</div>
+     </div>
+   </body>
+ </html>