From: Dylan Lloyd Date: Sun, 27 Mar 2011 20:19:42 +0000 (-0400) Subject: Merge branch 'live' into seo X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=0184d096a76f47acb328c5e01fecf91190dfc5ab;hp=-c;p=dylansserver.git Merge branch 'live' into seo --- 0184d096a76f47acb328c5e01fecf91190dfc5ab diff --combined index.php index 230b2f0,b29d629..1eb083b --- a/index.php +++ b/index.php @@@ -2,10 -2,11 +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 +70,11 @@@ return $return; } - public function display_head($title = "dylanstestserver", + public function display_head($title = "dylansserver", $home_link = "/") { - $scripts = ""; + $scripts = $this->scripts; $stylesheets = ""; - if (cms::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 = ""; - $scripts .= ""; - $scripts .= ""; - $scripts .= ""; - } + $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.com&ucn_task=conformance#"; echo << @@@ -93,7 -86,7 +86,7 @@@ $this->title - + $stylesheets $scripts @@@ -102,7 -95,7 +95,7 @@@
@@@ -140,11 -133,13 +133,13 @@@ END_OF_CLOSE class index extends cms { public function display() { + $this->scripts = ""; $this->display_head(); $this->display_exhibits(); echo "
    "; $this->list_projects(); echo <<

    things i've done for others:

    @@@ -166,7 -161,7 +161,7 @@@
  • git://dylanstestserver.com
    • + "git">git://dylansserver.com

  • some notes:

    @@@ -281,17 -276,10 +276,17 @@@ class page extends cms $month_posted = $date_posted[1]; $datetime_posted = explode(' ', $date_posted[2]); $day_posted = $datetime_posted[0]; - echo "
    "; - echo "

    $year_posted/$month_posted/$day_posted/$title

    "; - echo $entry['text']; - echo "
    "; + $text = $entry['text']; + echo << +

    + + $year_posted/$month_posted/$day_posted/ + $title +

    + $text +
+END_NOTE; } echo ""; $this->write_navigation(); @@@ -330,6 -318,11 +325,11 @@@ class note extends cms public $number_of_comments; public function __construct() { + if (isset($_GET['comments'])) { + $this->scripts = " + + "; + } parent::__construct(); if (isset($_GET['comments'])) { $this->comments_enabled = true;