disinclined.org / git / dylansserver.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'live' into seo
[dylansserver.git] / index.php
diff --git a/index.php b/index.php
index 424f850..1eb083b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -2,10 +2,11 @@
 
 abstract class cms {
 
-  private $config_file = '/etc/dylanstestserver.ini';
+  private $config_file = '/etc/dylansserver.ini';
   protected $db;
   protected $recaptcha_publickey;
   protected $recaptcha_privatekey;
+  protected  $scripts;
   public $title;
   public $home_link;
 
@@ -69,19 +70,11 @@ abstract class cms {
     return $return;
       }
 
-  public function display_head($title = "dylanstestserver",
+  public function display_head($title = "dylansserver",
                                   $home_link = "/") {
-    $scripts = "";
+    $scripts = $this->scripts;
     $stylesheets = "<link href='/includes/style.css' rel='stylesheet' type='text/css'>";
-    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>";
-      $scripts .= "<script type='text/javascript' src='/includes/jquery-core.js'></script>";
-      $scripts .= "<script type='text/javascript' src='/includes/jquery-all-components.js'></script>";
-      $scripts .= "<script type='text/javascript' src='/includes/ajax.js'></script>";
-    }
+    $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.com&amp;ucn_task=conformance#";
     echo <<<END_OF_HEAD
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
@@ -93,7 +86,7 @@ abstract class cms {
   <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 
   <title>$this->title</title>
-  <link rel="icon" href="favicon.ico" type="image/png">
+  <link rel="icon" href="/favicon.ico" type="image/png">
   $stylesheets
   $scripts
 </head>
@@ -102,7 +95,7 @@ abstract class cms {
   <div id="structure">
     <div id="banner">
       <a href="$this->home_link">
-      <img src="/images/dylanstestserver.png" alt="dylanstestserver"
+      <img src="/images/dylansserver.png" alt="dylansserver"
       border="0"></a>
     </div>
 
@@ -140,11 +133,13 @@ END_OF_CLOSE;
 class index extends cms {
 
   public function display() {
+    $this->scripts = "<script type='text/javascript' src='/includes/index.js'></script>"; 
     $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>
 
@@ -166,7 +161,7 @@ class index extends cms {
         </li>
 
         <li><a href=
-        "git">git://dylanstestserver.com</a></li>
+        "git">git://dylansserver.com</a></li>
 
         <li>
           <h3>some notes:</h3>
@@ -281,10 +276,17 @@ class page extends cms {
       $month_posted = $date_posted[1];
       $datetime_posted = explode(' ', $date_posted[2]);
       $day_posted = $datetime_posted[0];
-      echo "<div class='note'>";
-      echo "<h2><span style='color:grey;'>$year_posted/$month_posted/$day_posted/</span><a href='$url'>$title</a></h2>";
-      echo $entry['text'];
-      echo "</div>";
+      $text = $entry['text'];
+      echo <<<END_NOTE
+      <div class='note'>
+      <h1>
+        <span class='date'>
+          $year_posted/$month_posted/$day_posted/
+        </span><a rel="canonical" href='$url'>$title</a>
+      </h1>
+      $text
+      </div>
+END_NOTE;
     }
     echo "</div>";
     $this->write_navigation();
@@ -293,7 +295,7 @@ class page extends cms {
 
   private function write_navigation() {
     echo "<div id='navigation'>";
-    echo "<h2>";
+    echo "<h1>";
     if($this->page > 1){
       $previous_page = $this->page - 1;
       echo "<a href='/notes/page/$previous_page'>prev</a>";
@@ -302,7 +304,7 @@ class page extends cms {
     $forward_page = $this->page + 1;
     echo " <a href='/notes/page/$forward_page'>next</a>";
     }
-    echo "</h2>";
+    echo "</h1>";
     echo "</div>";
   }
 
@@ -323,6 +325,11 @@ class note extends cms {
   public $number_of_comments;
 
   public function __construct() {
+    if (isset($_GET['comments'])) {
+      $this->scripts = "
+        <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+        <script type='text/javascript' src='/includes/comment.js'></script>";
+    }
     parent::__construct();
     if (isset($_GET['comments'])) {
       $this->comments_enabled = true;
@@ -401,7 +408,7 @@ class note extends cms {
   private function display_note() {
     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>
+    <h1><span class='date'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h1>
     $this->text
     </div>
 END_OF_NOTE;
@@ -411,14 +418,14 @@ END_OF_NOTE;
     echo <<<END_OF_NAVIGATION
     <br>
     <div id='navigation'>
-    <h2>
+    <h1>
 END_OF_NAVIGATION;
     if (!$this->comments_enabled) {
       $this->display_comment_link();
     }
     echo <<<END_OF_NAVIGATION
     <a href="/notes/">back to notes</a>/
-    </h2>
+    </h1>
     </div>
 END_OF_NAVIGATION;
   }
@@ -588,9 +595,9 @@ class archive extends cms {
         $datetime_posted = explode(' ', $date_posted[2]);
         $day_posted = $datetime_posted[0];
         echo "<div class='note'>";
-        echo "<h2><span style='color:grey;'>";
+        echo "<h1><span class='date'>";
         echo "$year_posted/$month_posted/$day_posted/";
-        echo "</span><a href='$url'>$title</a></h2>";
+        echo "</span><a href='$url'>$title</a></h1>";
         echo $entry['text'];
         echo "</div>";
       }
@@ -598,7 +605,7 @@ class archive extends cms {
       $this->write_navigation();
     } else {
       echo "<br>";
-      echo "<h2 style='font-family:sans-serif;'>sorry, nothing here</h2>";
+      echo "<h1>sorry, nothing here</h2>";
       echo "<pre>Empty set (0.00 sec)</pre>";
     }
     $this->display_close();
@@ -607,9 +614,7 @@ class archive extends cms {
   private function write_navigation() {
     echo "<br>";
     echo "<div id='navigation'>";
-    echo "<h2>";
     // fill me in!
-    echo "</h2>";
     echo "</div>";
   }
 
my (old) website