404: not found

From 0a144953e57bf457df61e58a3f94b0178c1f9707 Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Sun, 6 Mar 2011 16:52:37 -0500 Subject: [PATCH] Fixed validation errors Cherry picked e8fefa2acf, all pages without reCAPTCHAs now validate. --- 404.php | 1 + includes/style.css | 2 +- index.php | 46 +++++++++++++++++++++++----------------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/404.php b/404.php index 157d02d..1b17517 100644 --- a/404.php +++ b/404.php @@ -4,6 +4,7 @@ + 404: not found diff --git a/includes/style.css b/includes/style.css index 2dc36e6..9bfd391 100644 --- a/includes/style.css +++ b/includes/style.css @@ -135,7 +135,6 @@ li { /* notes */ #notes, #note { - float:right; text-align:right; margin-top:20px; } @@ -167,6 +166,7 @@ pre { #navigation { text-align:right; + font-family:sans-serif; } #comments { diff --git a/index.php b/index.php index 5598679..3f64a27 100644 --- a/index.php +++ b/index.php @@ -69,8 +69,8 @@ abstract class cms { $home_link = "/") { $scripts = ""; $stylesheets = ""; - if ($this->determine_type() == "index") { - $scripts = ""; $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&ucn_task=conformance#"; } else if ($this->determine_type() == 'note') { $scripts = ""; @@ -92,7 +92,6 @@ abstract class cms { $stylesheets $scripts - @@ -133,17 +132,14 @@ END_OF_CLOSE; } -class blank_page extends cms { - -} class index extends cms { public function display() { - $this->display_head(); - $this->display_exhibits(); - echo "

display_head(); + $this->display_exhibits(); + echo "

things i've done for others:

@@ -178,12 +174,14 @@ class index extends cms {

OTHER_PROJECTS; - // Because of the CSS necessary for the animations, - // the contact link needs to be in #portfolio to clear - // the floats. - $this->display_contact(); + // Because of the CSS necessary for the animations, + // the contact link needs to be in #portfolio to clear + // the floats. + echo "

"; + $this->display_contact(); + echo "

"; echo "

"; - $this->display_close($show_contact = false); + $this->display_close($show_contact = false); } protected function display_exhibits() { @@ -197,7 +195,6 @@ OTHER_PROJECTS; } private function list_projects() { - echo "

"; echo <<

my projects:

@@ -390,22 +387,25 @@ class note extends cms { } private function display_note() { - echo "

"; - echo "

$this->year_posted/$this->month_posted/$this->day_posted/$this->title

"; - echo $this->text; + echo << +

$this->year_posted/$this->month_posted/$this->day_posted/$this->title

+ $this->text +

+END_OF_NOTE; } private function write_navigation() { echo << -

things i've done for others:

my projects:

$this->year_posted/$this->month_posted/$this->day_posted/$this->title

$this->year_posted/$this->month_posted/$this->day_posted/$this->title

END_OF_NAVIGATION; if (!$this->comments_enabled) { $this->display_comment_link(); } echo <<notes/ + back to notes/