Merge branch 'dev' into live

[dylansserver.git] / index.php

diff --git a/index.php b/index.php
index 298fead..6883638 100644 (file)
--- a/index.php
+++ b/index.php
@@ -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 @@ abstract class cms {
     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>";
@@ -93,7 +93,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 +102,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>
 
@@ -145,6 +145,7 @@ class index extends cms {
     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 +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>