From fb02a3f4c5d97d964ecc347b1676c3d0d95e4d83 Mon Sep 17 00:00:00 2001 From: Jacob Parker Date: Thu, 15 Mar 2012 19:53:31 -0400 Subject: [PATCH] Tidying some stuff up --- .htaccess | 2 +- src/config.d | 4 ++-- srv/About/Clubs.md | 1 + srv/About/Clubs/index.md | 3 --- srv/About/Hardware.md | 2 +- templates/default.html | 1 + 6 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 srv/About/Clubs.md delete mode 100644 srv/About/Clubs/index.md diff --git a/.htaccess b/.htaccess index 33d5b27..7b23492 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,4 @@ RewriteEngine on -RewriteBase /~satalha/www/ +RewriteBase /~j3parker/ RewriteRule ^pub/(.*) - [L] RewriteRule ^(.*) bin/web [L] diff --git a/src/config.d b/src/config.d index cfb2174..b96a2cc 100644 --- a/src/config.d +++ b/src/config.d @@ -1,6 +1,6 @@ import std.regex; -const string url_root = "/~satalha/www/"; +const string url_root = "/~j3parker/"; const string site_title = "CSC"; const string site_subtitle = "UWaterloo Computer Science Club"; @@ -14,7 +14,7 @@ void init_handlers() { handler!("^About/Members/$").add("members.py"); handler!("^About/Members/(.+)$").add("member_info.py"); handler!("^About/Executive$").add("exec_positions.py"); - handler!("^About/Clubs/$").add("clubs.py"); + handler!("^About/Clubs$").add("clubs.py"); } template handler(string pattern) { diff --git a/srv/About/Clubs.md b/srv/About/Clubs.md new file mode 100644 index 0000000..fefc330 --- /dev/null +++ b/srv/About/Clubs.md @@ -0,0 +1 @@ +If you can read this, you broke the handlers bro! diff --git a/srv/About/Clubs/index.md b/srv/About/Clubs/index.md deleted file mode 100644 index c4da381..0000000 --- a/srv/About/Clubs/index.md +++ /dev/null @@ -1,3 +0,0 @@ -In here, describe how to get a club account - -Generate a table of links ala About/Members listing active clubs that we host diff --git a/srv/About/Hardware.md b/srv/About/Hardware.md index c89a65c..db6db31 100644 --- a/srv/About/Hardware.md +++ b/srv/About/Hardware.md @@ -7,7 +7,7 @@ All of our machines can be accessed via `ssh`.
- + diff --git a/templates/default.html b/templates/default.html index 52c7d88..bad3f4f 100644 --- a/templates/default.html +++ b/templates/default.html @@ -18,6 +18,7 @@ webmailnewsgroupsmailman + quoteboard
HostnameNotesGeneral Use?
HostnameNotesGeneral Use?
bit-shifterOffice terminal
strombolaOffice terminal
maltodextrinOffice terminal