Cherry picked
e8fefa2acf, all pages without reCAPTCHAs now validate.
<head>
<meta name="generator" content=
"HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
<head>
<meta name="generator" content=
"HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
+ <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<title>404: not found</title>
</head>
<title>404: not found</title>
</head>
/* notes */
#notes, #note {
/* notes */
#notes, #note {
text-align:right;
margin-top:20px;
}
text-align:right;
margin-top:20px;
}
#navigation {
text-align:right;
#navigation {
text-align:right;
+ font-family:sans-serif;
$home_link = "/") {
$scripts = "";
$stylesheets = "<link href=\"/includes/style.css\" rel=\"stylesheet\" type=\"text/css\">";
$home_link = "/") {
$scripts = "";
$stylesheets = "<link href=\"/includes/style.css\" rel=\"stylesheet\" type=\"text/css\">";
- if ($this->determine_type() == "index") {
- $scripts = "<script type=\"text/javascript\" src=\"/includes/all.js\">";
+ 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&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>";
$home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&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>";
<link rel="icon" href="favicon.ico" type="image/png">
$stylesheets
$scripts
<link rel="icon" href="favicon.ico" type="image/png">
$stylesheets
$scripts
-class blank_page extends cms {
-
-}
class index extends cms {
public function display() {
class index extends cms {
public function display() {
- $this->display_head();
- $this->display_exhibits();
- echo "<ul id=\"portfolio\" style=\"text-align:right\">";
- $this->list_projects();
- echo <<<OTHER_PROJECTS
+ $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>
<li>
<h3>things i've done for others:</h3>
</li>
<li>
</li>
OTHER_PROJECTS;
<li>
</li>
OTHER_PROJECTS;
- // Because of the CSS necessary for the animations,
- // the contact link needs to be in #portfolio to clear
- // the floats.
- $this->display_contact();
+ // Because of the CSS necessary for the animations,
+ // the contact link needs to be in #portfolio to clear
+ // the floats.
+ echo "<li>";
+ $this->display_contact();
+ echo "</li>";
- $this->display_close($show_contact = false);
+ $this->display_close($show_contact = false);
}
protected function display_exhibits() {
}
protected function display_exhibits() {
}
private function list_projects() {
}
private function list_projects() {
- echo "<div id=\"exhibit\">";
echo <<<HEREDOC
<li>
<h3>my projects:</h3>
echo <<<HEREDOC
<li>
<h3>my projects:</h3>
}
private function display_note() {
}
private function display_note() {
- echo "<div id=\"note\">";
- echo "<h2><span style=\"color:grey;\">$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h2>";
- echo $this->text;
+ 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>
+ $this->text
+ </div>
+END_OF_NOTE;
}
private function write_navigation() {
echo <<<END_OF_NAVIGATION
<br>
}
private function write_navigation() {
echo <<<END_OF_NAVIGATION
<br>
- <div id=\"navigation\">
<h2>
END_OF_NAVIGATION;
if (!$this->comments_enabled) {
$this->display_comment_link();
}
echo <<<END_OF_NAVIGATION
<h2>
END_OF_NAVIGATION;
if (!$this->comments_enabled) {
$this->display_comment_link();
}
echo <<<END_OF_NAVIGATION
- <a href="/notes/">notes</a>/
+ <a href="/notes/">back to notes</a>/
</h2>
</div>
END_OF_NAVIGATION;
</h2>
</div>
END_OF_NAVIGATION;
private function display_comment_link() {
if ($this->number_of_comments > 0) {
private function display_comment_link() {
if ($this->number_of_comments > 0) {
- $anchor_text = "comments ($this->number_of_comments)";
+ $anchor_text = "comments($this->number_of_comments)/";
} else {
$anchor_text = "comment?";
}
} else {
$anchor_text = "comment?";
}