From daf4ca4eab09b934b46fb35293fcbfd854571ed4 Mon Sep 17 00:00:00 2001
From: Anika Henke <a.c.henke@arcor.de>
Date: Wed, 8 Mar 2006 23:50:06 +0100
Subject: killed some borders, widths and other strictness bugs

darcs-hash:20060308225006-d5083-d273d41551fee37d28442beef847eb57891ba73e.gz
---
 inc/html.php                                 | 13 +++++--------
 lib/plugins/config/settings/config.class.php |  6 +++---
 lib/plugins/usermanager/admin.php            |  5 +++--
 lib/tpl/default/design.css                   | 10 ++++++++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/inc/html.php b/inc/html.php
index 25ac1e7ce..e21047cda 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -453,7 +453,6 @@ function html_revisions(){
     print ' <a href="'.wl($ID,"rev=$rev,do=diff").'">';
     $p = array();
     $p['src']    = DOKU_BASE.'lib/images/diff.png';
-    $p['border'] = 0;
     $p['width']  = 15;
     $p['height'] = 11;
     $p['title']  = $lang['diff'];
@@ -513,7 +512,6 @@ function html_recent($first=0){
     print '<a href="'.wl($recent['id'],"do=diff").'">';
     $p = array();
     $p['src']    = DOKU_BASE.'lib/images/diff.png';
-    $p['border'] = 0;
     $p['width']  = 15;
     $p['height'] = 11;
     $p['title']  = $lang['diff'];
@@ -525,7 +523,6 @@ function html_recent($first=0){
     print '<a href="'.wl($recent['id'],"do=revisions").'">';
     $p = array();
     $p['src']    = DOKU_BASE.'lib/images/history.png';
-    $p['border'] = 0;
     $p['width']  = 12;
     $p['height'] = 14;
     $p['title']  = $lang['btn_revs'];
@@ -768,14 +765,14 @@ function html_diff($text='',$intro=true){
   $tdf = new TableDiffFormatter();
   if($intro) print p_locale_xhtml('diff');
   ?>
-    <table class="diff" width="100%">
+    <table class="diff">
       <tr>
-        <td colspan="2" width="50%" class="diff-header">
+        <th colspan="2">
           <?php echo $left?>
-        </td>
-        <td colspan="2" width="50%" class="diff-header">
+        </th>
+        <th colspan="2">
           <?php echo $right?>
-        </td>
+        </th>
       </tr>
       <?php echo $tdf->format($df)?>
     </table>
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index d5e77a261..48931bfc3 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -463,8 +463,8 @@ if (!class_exists('setting_onoff')) {
         $key = htmlspecialchars($this->_key);
         $checked = ($value) ? ' checked="checked"' : '';
 
-        $label = '<label for="config_'.$key.'">'.$this->prompt($plugin).'</label>';
-        $input = '<div class="input"><input id="config_'.$key.'" name="config['.$key.']" type="checkbox" class="checkbox" value="1"'.$checked.$disable.'/></div>';
+        $label = '<label for="config__'.$key.'">'.$this->prompt($plugin).'</label>';
+        $input = '<div class="input"><input id="config__'.$key.'" name="config['.$key.']" type="checkbox" class="checkbox" value="1"'.$checked.$disable.'/></div>';
         return array($label,$input);
     }
 
@@ -509,7 +509,7 @@ if (!class_exists('setting_multichoice')) {
 
         $key = htmlspecialchars($this->_key);
 
-        $label = '<label for="config_'.$key.'">'.$this->prompt($plugin).'</label>';
+        $label = '<label for="config__'.$key.'">'.$this->prompt($plugin).'</label>';
 
         $input = "<div class=\"input\">\n";
         $input .= '<select class="edit" id="config__'.$key.'" name="config['.$key.']"'.$disable.'>'."\n";
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 5e5645feb..496565a93 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -210,12 +210,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("        <input type=\"submit\" name=\"fn[search][clear]\" class=\"button\" value=\"".$this->lang['clear']."\" />");
         ptln("        <input type=\"hidden\" name=\"do\"    value=\"admin\" />");
         ptln("        <input type=\"hidden\" name=\"page\"  value=\"usermanager\" />");
+
+        $this->_htmlFilterSettings(2);
+
         ptln("      </td></tr>");
         ptln("    </tbody>");
         ptln("  </table>");
 
-        $this->_htmlFilterSettings(2);
-
         ptln("</form>");
         ptln("</div>");
 
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 4b98c8152..0f3502c98 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -547,11 +547,17 @@ div.dokuwiki a.toc:hover {
 }
 
 /* ---------------------------- Diff rendering --------------------------*/
-div.dokuwiki table.diff { background:__white__; }
+div.dokuwiki table.diff {
+  background:__white__;
+  width:100%;
+}
 div.dokuwiki td.diff-blockheader {font-weight:bold}
-div.dokuwiki td.diff-header {
+div.dokuwiki table.diff th {
   border-bottom: 1px solid __dark__;
   font-size:120%;
+  width: 50%;
+  font-weight: normal;
+  text-align: left;
 }
 div.dokuwiki td.diff-addedline {
     background:#ddffdd;
-- 
cgit v1.2.3