summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.DS_Storebin0 -> 6148 bytes
-rw-r--r--background.jpgbin34982 -> 0 bytes
-rw-r--r--etc/index.php (renamed from etc/index.html)0
-rw-r--r--footer.php2
-rw-r--r--head.php12
-rw-r--r--header.php7
-rw-r--r--images/favicon.ico (renamed from favicon.ico)bin4286 -> 4286 bytes
-rw-r--r--images/roly-saynotoweb3.gif (renamed from roly-saynotoweb3.gif)bin483 -> 483 bytes
-rw-r--r--index.html34
-rw-r--r--index.php29
-rw-r--r--music/index.php (renamed from music/index.html)0
-rw-r--r--photography/index.php (renamed from photography/index.html)0
-rw-r--r--programming/index.php (renamed from programming/index.html)0
-rwxr-xr-xupdatesite.command4
-rw-r--r--writing/cryptography.php (renamed from writing/cryptography.html)0
-rw-r--r--writing/index.html19
-rw-r--r--writing/index.php15
17 files changed, 67 insertions, 55 deletions
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..5f5f4c2
--- /dev/null
+++ b/.DS_Store
Binary files differ
diff --git a/background.jpg b/background.jpg
deleted file mode 100644
index a57f485..0000000
--- a/background.jpg
+++ /dev/null
Binary files differ
diff --git a/etc/index.html b/etc/index.php
index fd6e3c1..fd6e3c1 100644
--- a/etc/index.html
+++ b/etc/index.php
diff --git a/footer.php b/footer.php
new file mode 100644
index 0000000..6b9e15f
--- /dev/null
+++ b/footer.php
@@ -0,0 +1,2 @@
+ </div>
+</body> \ No newline at end of file
diff --git a/head.php b/head.php
new file mode 100644
index 0000000..b6c2d42
--- /dev/null
+++ b/head.php
@@ -0,0 +1,12 @@
+<?php
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+?>
+
+<head>
+ <link rel="stylesheet" href="/style.css">
+ <link rel="icon" type="image/x-icon" href="/images/favicon.ico">
+</head>
+
+<body>
+ <div class="contentpane"> \ No newline at end of file
diff --git a/header.php b/header.php
new file mode 100644
index 0000000..f4096c0
--- /dev/null
+++ b/header.php
@@ -0,0 +1,7 @@
+<?php if (getcwd() == $_SERVER["DOCUMENT_ROOT"]) { ?>
+ <h1><?php echo $title; ?></h1>
+<?php } else if (basename($_SERVER['PHP_SELF']) == "index.php") { ?>
+ <h1><?php echo $title; ?> | <a class="backbutton" href="..">[Back]</a></h1>
+<?php } else { ?>
+ <h1><?php echo $title; ?> | <a class="backbutton" href=".">[Back]</a></h1>
+<?php } ?> \ No newline at end of file
diff --git a/favicon.ico b/images/favicon.ico
index d858211..d858211 100644
--- a/favicon.ico
+++ b/images/favicon.ico
Binary files differ
diff --git a/roly-saynotoweb3.gif b/images/roly-saynotoweb3.gif
index 4f5a2f1..4f5a2f1 100644
--- a/roly-saynotoweb3.gif
+++ b/images/roly-saynotoweb3.gif
Binary files differ
diff --git a/index.html b/index.html
deleted file mode 100644
index a0a85bd..0000000
--- a/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<head>
- <link rel="stylesheet" href="/style.css">
- <link rel="icon" type="image/x-icon" href="/favicon.ico">
-</head>
-
-<body>
- <div class="contentpane">
- <h1>Hello, I'm Kai!</h1>
- <p>This is my Web site for cool things, like my programming, music, writing, photography, and anything else I
- think of.
- I'm a social sciences student at UVic, though I'm also passionate about technology. I also have another
- website at
- kaistevenson.com, which takes itself a little more seriously. You can also email me at kai@kaistevenson.com.
- </p>
- <ul>
- <li>
- <h2><a href="writing/">Writing../</a> /* Proudly part of the 84% */</h2>
- </li>
- <li>
- <h2><a href="programming/">Programming../</a> /* It's easier than it looks */</h2>
- </li>
- <li>
- <h2><a href="music/">Music../</a> /* Dmin7, G7, CMaj7 */</h2>
- </li>
- <li>
- <h2><a href="photography/">Photography../</a> /* No longer obscure-a */</h2>
- </li>
- <li>
- <h2><a href="etc/">Etc../</a> /* Everything else */</h2>
- </li>
- </ul>
- <!--<img style="padding: 50px; display: block; margin: auto;" src="roly-saynotoweb3.gif"> -->
- </div>
-</body> \ No newline at end of file
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..4bc28fb
--- /dev/null
+++ b/index.php
@@ -0,0 +1,29 @@
+<?php
+$title = "Hello, I'm Kai!";
+require($_SERVER["DOCUMENT_ROOT"] . "/head.php");
+require($_SERVER["DOCUMENT_ROOT"] . "/header.php");
+?>
+<p>This is my Web site for cool things, like my programming, music, writing, photography, and anything else I
+ think of.
+ I'm a social sciences student at UVic, though I'm also passionate about technology. I also have another
+ website at
+ kaistevenson.com, if you don't like static-ish sites :(. You can email me at kai@kaistevenson.com.
+</p>
+<ul>
+ <li>
+ <h2><a href="writing/">Writing../</a> /* Proudly part of the 84% */</h2>
+ </li>
+ <li>
+ <h2><a href="programming/">Programming../</a> /* It's easier than it looks */</h2>
+ </li>
+ <li>
+ <h2><a href="music/">Music../</a> /* Dmin7, G7, CMaj7 */</h2>
+ </li>
+ <li>
+ <h2><a href="photography/">Photography../</a> /* No longer obscure-a */</h2>
+ </li>
+ <li>
+ <h2><a href="etc/">Etc../</a> /* Everything else */</h2>
+ </li>
+</ul>
+<?php require($_SERVER["DOCUMENT_ROOT"] . "/footer.php"); ?> \ No newline at end of file
diff --git a/music/index.html b/music/index.php
index e4bacdb..e4bacdb 100644
--- a/music/index.html
+++ b/music/index.php
diff --git a/photography/index.html b/photography/index.php
index be57783..be57783 100644
--- a/photography/index.html
+++ b/photography/index.php
diff --git a/programming/index.html b/programming/index.php
index 86b2be2..86b2be2 100644
--- a/programming/index.html
+++ b/programming/index.php
diff --git a/updatesite.command b/updatesite.command
index 720b565..7b6ff9f 100755
--- a/updatesite.command
+++ b/updatesite.command
@@ -1,9 +1,9 @@
+rsync -avzP --rsh=ssh ~/Web/aetherdestroyer root@covalent.aetherdestroyer.net:/var/www/
+
if [ $# -eq 0 ]; then
exit 0
fi
-
-rsync -avzP --rsh=ssh ~/Web/aetherdestroyer root@aetherdestroyer.net:/var/www/
git add .
git commit -m "$1"
git push
diff --git a/writing/cryptography.html b/writing/cryptography.php
index 7fb73c0..7fb73c0 100644
--- a/writing/cryptography.html
+++ b/writing/cryptography.php
diff --git a/writing/index.html b/writing/index.html
deleted file mode 100644
index 6ee4ec9..0000000
--- a/writing/index.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<head>
- <link rel="stylesheet" href="/style.css">
- <link rel="icon" type="image/x-icon" href="/favicon.ico">
-</head>
-
-<body>
- <div class="contentpane">
- <h1>Writing | <a class="backbutton" href="../">[Back]</a></h1>
- <p>This is the index page for my writing. Obviously, if you follow the links below, you can read things I've
- written.
- Whether or not you want to do that is up to you.
- </p>
- <ul>
- <li>
- <h2><a href="cryptography.html">Cryptography</a> /* Keep yourself safe */</h2>
- </li>
- </ul>
- </div>
-</body> \ No newline at end of file
diff --git a/writing/index.php b/writing/index.php
new file mode 100644
index 0000000..aab6642
--- /dev/null
+++ b/writing/index.php
@@ -0,0 +1,15 @@
+<?php
+$title = "Hello, I'm Kai!";
+include($_SERVER["DOCUMENT_ROOT"] . "/head.php");
+include($_SERVER["DOCUMENT_ROOT"] . "/header.php");
+?>
+<p>This is the index page for my writing. Obviously, if you follow the links below, you can read things I've
+ written.
+ Whether or not you want to do that is up to you.
+</p>
+<ul>
+ <li>
+ <h2><a href="cryptography.php">Cryptography</a> /* Keep yourself safe */</h2>
+ </li>
+</ul>
+<?php include($_SERVER["DOCUMENT_ROOT"] . "/footer.php"); ?> \ No newline at end of file