disinclined.org / git / dylansserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 63c6970)
Fixed validation errors
authorDylan Lloyd <dylan@psu.edu>
Sun, 6 Mar 2011 21:52:37 +0000 (16:52 -0500)
committerDylan Lloyd <dylan@psu.edu>
Thu, 10 Mar 2011 20:54:07 +0000 (15:54 -0500)
Cherry picked e8fefa2acf, all pages without reCAPTCHAs now validate.

404.php patch | blob | history
includes/style.css patch | blob | history
index.php patch | blob | history

diff --git a/404.php b/404.php
index 157d02d..1b17517 100644 (file)
--- a/404.php
+++ b/404.php
@@ -4,6 +4,7 @@
 <head>
   <meta name="generator" content=
   "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
+  <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 
   <title>404: not found</title>
 </head>
diff --git a/includes/style.css b/includes/style.css
index 2dc36e6..9bfd391 100644 (file)
--- 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 (file)
--- a/index.php
+++ b/index.php
@@ -69,8 +69,8 @@ abstract class cms {
                                                                $home_link = "/") {
     $scripts = "";
        $stylesheets = "<link href=\"/includes/style.css\" rel=\"stylesheet\" type=\"text/css\">";
-       if ($this->determine_type() == "index") {
-         $scripts = "<script type=\"text/javascript\" src=\"/includes/all.js\">";
+       if (cms::determine_type() == "index") {
+         $scripts = "<script type=\"text/javascript\" src=\"/includes/all.js\"></script>"; 
          $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&amp;ucn_task=conformance#";
        } else if ($this->determine_type() == 'note') {
          $scripts = "<script type=\"text/javascript\" src=\"http://www.google.com/recaptcha/api/js/recaptcha_ajax.js\"></script>";
@@ -92,7 +92,6 @@ abstract class cms {
   <link rel="icon" href="favicon.ico" type="image/png">
   $stylesheets
   $scripts
-</script>
 </head>
 
 <body>
@@ -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 "<ul id=\"portfolio\" style=\"text-align:right\">";
-               $this->list_projects();
-               echo <<<OTHER_PROJECTS
+         $this->display_head();
+         $this->display_exhibits();
+         echo "<ul id=\"portfolio\" style=\"text-align:right\">";
+         $this->list_projects();
+         echo <<<OTHER_PROJECTS
         <li>
           <h3>things i've done for others:</h3>
         </li>
@@ -178,12 +174,14 @@ class index extends cms {
         <li>
         </li>
 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 "<li>";
+         $this->display_contact();
+      echo "</li>";
       echo "</ul>";
-               $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 "<div id=\"exhibit\">";
          echo <<<HEREDOC
         <li>
           <h3>my projects:</h3>
@@ -390,22 +387,25 @@ class note extends cms {
   }
 
   private function display_note() {
-       echo "<div id=\"note\">";
-    echo "<h2><span style=\"color:grey;\">$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h2>";
-       echo $this->text;
+    echo <<<END_OF_NOTE
+       <div id='note'>
+    <h2><span style='color:grey;'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h2>
+       $this->text
+       </div>
+END_OF_NOTE;
   }
 
   private function write_navigation() {
     echo <<<END_OF_NAVIGATION
        <br>
-    <div id=\"navigation\">
+    <div id='navigation'>
     <h2>
 END_OF_NAVIGATION;
        if (!$this->comments_enabled) {
          $this->display_comment_link();
        }
     echo <<<END_OF_NAVIGATION
-       <a href="/notes/">notes</a>/
+       <a href="/notes/">back to notes</a>/
     </h2>
     </div>
 END_OF_NAVIGATION;
@@ -413,7 +413,7 @@ END_OF_NAVIGATION;
 
   private function display_comment_link() {
     if ($this->number_of_comments > 0) {
-         $anchor_text = "comments ($this->number_of_comments)";
+         $anchor_text = "comments($this->number_of_comments)/";
        } else {
          $anchor_text = "comment?";
        }
my (old) website