From 02e511213ae892653af32a79dbd07341d7a5f9d9 Mon Sep 17 00:00:00 2001
From: Anika Henke <a.c.henke@arcor.de>
Date: Fri, 27 Jan 2006 20:32:38 +0100
Subject: [PATCH] further xhtml strictness -- part 3
darcs-hash:20060127193238-d5083-7af0a40e439cd5f63e45d4037611132a16856799.gz
---
inc/html.php | 2 +-
inc/parser/xhtml.php | 8 ++++----
lib/styles/style.css | 11 +++++++++++
lib/tpl/default/design.css | 6 ------
lib/tpl/default/footer.html | 14 +++++++-------
5 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/inc/html.php b/inc/html.php
index f506a4a0b..3dd91235a 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -421,7 +421,7 @@ function html_revisions(){
print $date;
- print ' <img src="'.DOKU_BASE.'lib/images/blank.gif" border="0" width="15" height="11" alt="" /> ';
+ print ' <img src="'.DOKU_BASE.'lib/images/blank.gif" width="15" height="11" alt="" /> ';
print '<a class="wikilink1" href="'.wl($ID).'">'.$ID.'</a> ';
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 9fd31f3b2..d9c750220 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -132,7 +132,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
$this->lastsec = $pos;
}
- $this->doc .= DOKU_LF.'<a name="'.$this->_headerToLink($text).'"></a><h'.$level.'>';
+ $this->doc .= DOKU_LF.'<a name="'.$this->_headerToLink($text).'" id="'.$this->_headerToLink($text).'"></a><h'.$level.'>';
$this->doc .= $this->_xmlEntities($text);
$this->doc .= "</h$level>".DOKU_LF;
}
@@ -182,11 +182,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
function underline_open() {
- $this->doc .= '<u>';
+ $this->doc .= '<em class="u">';
}
function underline_close() {
- $this->doc .= '</u>';
+ $this->doc .= '</em>';
}
function monospace_open() {
@@ -267,7 +267,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
// output the footnote reference and link, incl. onmouseover for insitu footnote popup
- $this->doc .= '<a href="#fn'.$id.'" name="fnt'.$id.'" class="fn_top" onmouseover="fnt(\''.$id.'\', this, event);">'.$id.')</a>';
+ $this->doc .= '<a href="#fn'.$id.'" name="fnt'.$id.'" id="fnt'.$id.'" class="fn_top" onmouseover="fnt(\''.$id.'\', this, event);">'.$id.')</a>';
}
function listu_open() {
diff --git a/lib/styles/style.css b/lib/styles/style.css
index 294144f1e..44187ddff 100644
--- a/lib/styles/style.css
+++ b/lib/styles/style.css
@@ -5,6 +5,12 @@
div.clearer {clear: both; line-height: 0; height: 0; overflow:hidden;}
+div.no {
+ display: inline;
+ margin: 0;
+ padding: 0;
+}
+
div.error{
background: #fcc url(../images/error.png) 0.5em 0px no-repeat;
color: #000;
@@ -48,6 +54,11 @@ div.success{
margin-right: auto;
}
+em.u {
+ font-style: normal;
+ text-decoration: underline;
+}
+
/* syntax highlighting code */
.code .br0 { color: #66cc66; }
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index f7055ddf9..6404e7713 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -47,12 +47,6 @@ div.nothing {
margin: 2em;
}
-div.no {
- display: inline;
- margin: 0;
- padding: 0;
-}
-
/* ---------------- forms ------------------------ */
form {
diff --git a/lib/tpl/default/footer.html b/lib/tpl/default/footer.html
index e75d029d3..9db2db4e8 100644
--- a/lib/tpl/default/footer.html
+++ b/lib/tpl/default/footer.html
@@ -8,19 +8,19 @@
?>
<div class="footerinc">
- <a target="_blank" href="<?php echo DOKU_BASE; ?>feed.php" title="Recent changes RSS feed"><img src="<?php echo DOKU_TPL; ?>images/button-rss.png" width="80" height="15" alt="Recent changes RSS feed" border="0" /></a>
+ <a target="_blank" href="<?php echo DOKU_BASE; ?>feed.php" title="Recent changes RSS feed"><img src="<?php echo DOKU_TPL; ?>images/button-rss.png" width="80" height="15" alt="Recent changes RSS feed" /></a>
- <a target="_blank" href="http://creativecommons.org/licenses/by-nc-sa/2.0/" rel="license" title="Creative Commons License"><img src="<?php echo DOKU_TPL; ?>images/button-cc.gif" width="80" height="15" alt="Creative Commons License" border="0" /></a>
+ <a target="_blank" href="http://creativecommons.org/licenses/by-nc-sa/2.0/" rel="license" title="Creative Commons License"><img src="<?php echo DOKU_TPL; ?>images/button-cc.gif" width="80" height="15" alt="Creative Commons License" /></a>
- <a target="_blank" href="https://www.paypal.com/xclick/business=andi%40splitbrain.org&item_name=DokuWiki+Donation&no_shipping=1&no_note=1&tax=0&currency_code=EUR&lc=US" title="Donate"><img src="<?php echo DOKU_TPL; ?>images/button-donate.gif" alt="Donate" border="0" /></a>
+ <a target="_blank" href="https://www.paypal.com/xclick/business=andi%40splitbrain.org&item_name=DokuWiki+Donation&no_shipping=1&no_note=1&tax=0&currency_code=EUR&lc=US" title="Donate"><img src="<?php echo DOKU_TPL; ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a>
- <a target="_blank" href="http://www.php.net" title="Powered by PHP"><img src="<?php echo DOKU_TPL; ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" border="0" /></a>
+ <a target="_blank" href="http://www.php.net" title="Powered by PHP"><img src="<?php echo DOKU_TPL; ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a>
- <a target="_blank" href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0"><img src="<?php echo DOKU_TPL; ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" border="0" /></a>
+ <a target="_blank" href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0"><img src="<?php echo DOKU_TPL; ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
- <a target="_blank" href="http://jigsaw.w3.org/css-validator/check/referer" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" border="0" /></a>
+ <a target="_blank" href="http://jigsaw.w3.org/css-validator/check/referer" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
- <a target="_blank" href="http://wiki.splitbrain.org/wiki:dokuwiki" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" border="0" /></a>
+ <a target="_blank" href="http://wiki.splitbrain.org/wiki:dokuwiki" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
<?php
--
GitLab