better_xhtml_compliance_1.patch

darcs-hash:20060114163558-d5083-0d8e27162de2b0bfe9783e31cf4ca45a99006dd5.gz

6 files changed, 30 insertions, 19 deletions

diff --git a/inc/html.php b/inc/html.php
index 74047035b..b46176897 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -186,7 +186,7 @@ function html_backtomedia_button($params,$akey=''){
   global $conf;
   global $lang;
   
-  $ret = '<form class="button" method="get" action="'.DOKU_BASE.'lib/exe/media.php">';
+  $ret = '<form class="button" method="get" action="'.DOKU_BASE.'lib/exe/media.php"><div class="no">';
   
   reset($params);
   while (list($key, $val) = each($params)) {
@@ -200,7 +200,7 @@ function html_backtomedia_button($params,$akey=''){
     $ret .= 'accesskey="'.$akey.'" ';
   }
   $ret .= '/>';
-  $ret .= '</form>';
+  $ret .= '</div></form>';
 
   return $ret;
 }
@@ -231,7 +231,7 @@ function html_btn($name,$id,$akey,$params,$method='get'){
     $params['id'] = $id;
   }
  
-  $ret .= '<form class="button" method="'.$method.'" action="'.$script.'">';
+  $ret .= '<form class="button" method="'.$method.'" action="'.$script.'"><div class="no">';
   
   reset($params);
   while (list($key, $val) = each($params)) {
@@ -245,7 +245,7 @@ function html_btn($name,$id,$akey,$params,$method='get'){
     $ret .= 'accesskey="'.$akey.'" ';
   }
   $ret .= '/>';
-  $ret .= '</form>';
+  $ret .= '</div></form>';
 
   return $ret;
 }
@@ -327,8 +327,8 @@ function html_search(){
   flush();
 
   //show progressbar
-  print '<div align="center">';
-  print '<script language="javascript" type="text/javascript" charset="utf-8">';
+  print '<div class="centeralign">';
+  print '<script type="text/javascript" charset="utf-8">';
   print 'showLoadBar();';
   print '</script>';
   print '<br /></div>';
@@ -371,7 +371,7 @@ function html_search(){
   }
 
   //hide progressbar
-  print '<script language="javascript" type="text/javascript" charset="utf-8">';
+  print '<script type="text/javascript" charset="utf-8">';
   print 'hideLoadBar();';
   print '</script>';
 }
@@ -979,7 +979,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
         <div id="toolbar"></div>
 
         <?php if($wr){?>
-        <script language="javascript" type="text/javascript" charset="utf-8">
+        <script type="text/javascript" charset="utf-8">
           <?php /* sets changed to true when previewed */?>
           textChanged = <?php ($pr) ? print 'true' : print 'false' ?>;
         </script>
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 3b253bb89..dc8922ee7 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -162,7 +162,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     }
     
     function hr() {
-        $this->doc .= '<hr noshade="noshade" size="1" />'.DOKU_LF;
+        $this->doc .= '<hr />'.DOKU_LF;
     }
     
     function strong_open() {
@@ -400,7 +400,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         if ( array_key_exists($smiley, $this->smileys) ) {
             $title = $this->_xmlEntities($this->smileys[$smiley]);
             $this->doc .= '<img src="'.DOKU_BASE.'lib/images/smileys/'.$this->smileys[$smiley].
-                '" align="middle" alt="'.
+                '" class="middle" alt="'.
                     $this->_xmlEntities($smiley).'" />';
         } else {
             $this->doc .= $this->_xmlEntities($smiley);
diff --git a/inc/pluginutils.php b/inc/pluginutils.php
index 4c81f9abb..2b1dd4aa8 100644
--- a/inc/pluginutils.php
+++ b/inc/pluginutils.php
@@ -29,7 +29,7 @@ function plugin_printCSSJS(){
             print '  <link rel="stylesheet" media="print" type="text/css" href="'.DOKU_BASE.$dir.'print.css" />'."\n";
         }
         if(@file_exists(DOKU_INC.$dir.'script.js')){
-            print '  <script type="text/javascript" language="javascript" charset="utf-8" src="'.DOKU_BASE.$dir.'script.js"></script>'."\n";
+            print '  <script type="text/javascript" charset="utf-8" src="'.DOKU_BASE.$dir.'script.js"></script>'."\n";
         }
     } else {
         // no plugin manager (or aggregate files not setup) so individual instances of these files for any plugin that uses them
@@ -46,7 +46,7 @@ function plugin_printCSSJS(){
                 print '  <link rel="stylesheet" media="print" type="text/css" href="'.DOKU_BASE.$dir.'print.css" />'."\n";
             }
             if(@file_exists(DOKU_INC.$dir.'script.js')){
-                print '  <script type="text/javascript" language="javascript" charset="utf-8" src="'.DOKU_BASE.$dir.'script.js"></script>'."\n";
+                print '  <script type="text/javascript" charset="utf-8" src="'.DOKU_BASE.$dir.'script.js"></script>'."\n";
             }
         }
     }
diff --git a/inc/template.php b/inc/template.php
index 4993de19c..f2f214bd9 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -206,7 +206,7 @@ function tpl_metaheaders($alt=true){
   $js_edit  = ($ACT=='edit' || $ACT=='preview') ? 1 : 0;
   $js_write = ($INFO['writable']) ? 1 : 0;
   if($js_edit && $js_write){
-    ptln('<script language="javascript" type="text/javascript" charset="utf-8">',$it);
+    ptln('<script type="text/javascript" charset="utf-8">',$it);
     ptln("NS='".$INFO['namespace']."';",$it+2);
     if($conf['useacl'] && $_SERVER['REMOTE_USER']){
       require_once('inc/toolbar.php');
@@ -214,7 +214,7 @@ function tpl_metaheaders($alt=true){
     }
     ptln('</script>',$it);
   }
-  ptln('<script language="javascript" type="text/javascript" charset="utf-8" src="'.
+  ptln('<script type="text/javascript" charset="utf-8" src="'.
        DOKU_BASE.'lib/exe/js.php?edit='.$js_edit.'&amp;write='.$js_write.'"></script>',$it);
 }
 
@@ -489,7 +489,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){
   global $lang;
   global $ACT;
   
-  print '<form action="'.wl().'" accept-charset="utf-8" class="search" name="search">';
+  print '<form action="'.wl().'" accept-charset="utf-8" class="search" name="search"><div class="no">';
   print '<input type="hidden" name="do" value="search" />';
   print '<input type="text" ';
   if($ACT == 'search') print 'value="'.htmlspecialchars($_REQUEST['id']).'" ';
@@ -497,7 +497,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){
   print 'id="qsearch_in" accesskey="f" name="id" class="edit" />';
   print '<input type="submit" value="'.$lang['btn_search'].'" class="button" />';
   if($ajax) print '<div id="qsearch_out" class="ajax_qsearch JSpopup"></div>';
-  print '</form>';
+  print '</div></form>';
 }
 
 /**
@@ -691,7 +691,7 @@ function tpl_mediafilelist(){
       $del = '<a href="'.DOKU_BASE.'lib/exe/media.php?delete='.urlencode($item['id']).'" '.
              'onclick="return confirm(\''.$ask.'\')" onkeypress="return confirm(\''.$ask.'\')">'.
              '<img src="'.DOKU_BASE.'lib/images/del.png" alt="'.$lang['btn_delete'].'" '.
-             'align="bottom" title="'.$lang['btn_delete'].'" /></a>';
+             'title="'.$lang['btn_delete'].'" /></a>';
     }else{
       $del = '';
     }
@@ -806,7 +806,7 @@ function tpl_mediauploadform(){
   ptln('<input type="text" name="id" class="edit" />',4);
   ptln('<input type="submit" class="button" value="'.$lang['btn_upload'].'" accesskey="s" />',4);
   if($AUTH >= AUTH_DELETE){
-    ptln('<label for="ow"><input type="checkbox" name="ow" value="1" id="ow">'.$lang['txt_overwrt'].'</label>',4);
+    ptln('<label for="ow"><input type="checkbox" name="ow" value="1" id="ow" />'.$lang['txt_overwrt'].'</label>',4);
   }
   ptln('</form>',2);
 }
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 229bbc58c..7e9bd2db6 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -47,6 +47,12 @@ div.nothing {
 	margin: 2em;
 }
 
+div.no {
+  display: inline;
+  margin: 0;
+  padding: 0;
+}
+
 /* ---------------- forms ------------------------ */
 
 form {
@@ -313,6 +319,11 @@ img.mediacenter {
   margin-right: auto;
 }
 
+/* smileys */
+img.middle {
+  vertical-align: middle;
+}
+
 acronym {
   cursor: help;
   border-bottom: 1px dotted __black__;
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index ad1e75aa2..01dd60d66 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -112,6 +112,6 @@
 </div>
 <?php /*old includehook*/ @include(dirname(__FILE__).'/footer.html')?>
 
-<?php tpl_indexerWebBug()?>
+<div class="no"><?php tpl_indexerWebBug()?></div>
 </body>
 </html>