From: Dylan Lloyd Date: Sat, 26 Mar 2011 20:05:10 +0000 (-0400) Subject: Merge branch 'dev' of dylansserver.com:dylansserver into dev X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=8cd0bc0d71cd02a8f4921836c8a3089ed6a01c01;hp=-c;p=dylansserver.git Merge branch 'dev' of dylansserver.com:dylansserver into dev --- 8cd0bc0d71cd02a8f4921836c8a3089ed6a01c01 diff --combined index.php index 8381c1b,b52593f..dd94e83 --- a/index.php +++ b/index.php @@@ -6,7 -6,6 +6,7 @@@ abstract class cms protected $db; protected $recaptcha_publickey; protected $recaptcha_privatekey; + protected $scripts; public $title; public $home_link; @@@ -72,9 -71,17 +72,9 @@@ 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=dylansserver.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 << @@@ -86,7 -93,7 +86,7 @@@ $this->title - + $stylesheets $scripts @@@ -133,7 -140,6 +133,7 @@@ END_OF_CLOSE class index extends cms { public function display() { + $this->scripts = ""; $this->display_head(); $this->display_exhibits(); echo "