From: Dylan Lloyd <dylan@psu.edu>
Date: Sat, 26 Mar 2011 04:06:33 +0000 (-0400)
Subject: Merge branch 'dev' into live
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=be5a0cbae65d695ff538d62af97a57637ff00d86;hp=-c;p=dylansserver.git

Merge branch 'dev' into live
---

be5a0cbae65d695ff538d62af97a57637ff00d86
diff --combined index.php
index dacc716,a2c85ea..c6914b1
--- a/index.php
+++ b/index.php
@@@ -2,7 -2,7 +2,7 @@@
  
  abstract class cms {
  
-   private $config_file = '/etc/dylanstestserver.ini';
+   private $config_file = '/etc/dylansserver.ini';
    protected $db;
    protected $recaptcha_publickey;
    protected $recaptcha_privatekey;
@@@ -69,13 -69,13 +69,13 @@@
      return $return;
        }
  
-   public function display_head($title = "dylanstestserver",
+   public function display_head($title = "dylansserver",
                                    $home_link = "/") {
      $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#";
+       $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.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>";
@@@ -102,7 -102,7 +102,7 @@@
    <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>
  
@@@ -167,7 -167,7 +167,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>
@@@ -283,7 -283,7 +283,7 @@@ class page extends cms 
        $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 "<h1><span class='date'>$year_posted/$month_posted/$day_posted/</span><a href='$url'>$title</a></h1>";
        echo $entry['text'];
        echo "</div>";
      }
@@@ -294,7 -294,7 +294,7 @@@
  
    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>";
@@@ -303,7 -303,7 +303,7 @@@
      $forward_page = $this->page + 1;
      echo " <a href='/notes/page/$forward_page'>next</a>";
      }
 -    echo "</h2>";
 +    echo "</h1>";
      echo "</div>";
    }
  
@@@ -402,7 -402,7 +402,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;
@@@ -412,14 -412,14 +412,14 @@@
      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;
    }
@@@ -589,9 -589,9 +589,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>";
        }
@@@ -599,7 -599,7 +599,7 @@@
        $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();
@@@ -608,7 -608,9 +608,7 @@@
    private function write_navigation() {
      echo "<br>";
      echo "<div id='navigation'>";
 -    echo "<h2>";
      // fill me in!
 -    echo "</h2>";
      echo "</div>";
    }