From c7b28ffda48d3e6e225940a74b00ee5011f45b4b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 4 Feb 2012 13:26:50 +0000
Subject: [PATCH] added div.table around non-editable content as well (FS#1980)
---
inc/html.php | 2 ++
inc/media.php | 2 ++
lib/plugins/acl/admin.php | 2 ++
lib/plugins/config/admin.php | 4 ++++
lib/plugins/info/syntax.php | 8 ++++----
lib/plugins/usermanager/admin.php | 4 ++++
6 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/inc/html.php b/inc/html.php
index 1a2d7daef..ece26d136 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1176,6 +1176,7 @@ function html_diff($text='',$intro=true,$type=null){
ptln('</div>');
}
?>
+ <div class="table">
<table class="diff diff_<?php echo $type?>">
<tr>
<th colspan="2" <?php echo $l_minor?>>
@@ -1187,6 +1188,7 @@ function html_diff($text='',$intro=true,$type=null){
</tr>
<?php echo $tdf->format($df)?>
</table>
+ </div>
<?php
}
diff --git a/inc/media.php b/inc/media.php
index c53e1f5fc..66c531452 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1116,6 +1116,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
list($l_head, $r_head) = html_diff_head($l_rev, $r_rev, $image, true);
?>
+ <div class="table">
<table>
<tr>
<th><?php echo $l_head; ?></th>
@@ -1183,6 +1184,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
echo '</tr>'.NL;
echo '</table>'.NL;
+ echo '</div>'.NL;
if ($is_img && !$fromajax) echo '</div>';
}
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index a6b0624bc..c3461b78b 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -597,6 +597,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
echo '<input type="hidden" name="do" value="admin" />'.NL;
echo '<input type="hidden" name="page" value="acl" />'.NL;
echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />'.NL;
+ echo '<div class="table">';
echo '<table class="inline">';
echo '<tr>';
echo '<th>'.$this->getLang('where').'</th>';
@@ -642,6 +643,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
echo '</th>';
echo '</tr>';
echo '</table>';
+ echo '</div>';
echo '</div></form>'.NL;
}
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index c883e7b6a..9a9bb5329 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -131,6 +131,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
}
ptln(' <fieldset id="'.$setting->_key.'">');
ptln(' <legend>'.$setting->prompt($this).'</legend>');
+ ptln(' <div class="table">');
ptln(' <table class="inline">');
} else {
// config settings
@@ -151,6 +152,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
}
ptln(' </table>');
+ ptln(' </div>');
if ($in_fieldset) {
ptln(' </fieldset>');
}
@@ -161,6 +163,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
usort($undefined_settings, '_setting_natural_comparison');
$this->_print_h1('undefined_settings', $this->getLang('_header_undefined'));
ptln('<fieldset>');
+ ptln('<div class="table">');
ptln('<table class="inline">');
$undefined_setting_match = array();
foreach($undefined_settings as $setting) {
@@ -175,6 +178,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
ptln(' </tr>');
}
ptln('</table>');
+ ptln('</div>');
ptln('</fieldset>');
}
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 026a438bb..9aedbf0aa 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -174,7 +174,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
$hid = $this->_addToTOC($title, 3, $renderer);
$doc .= '<h3><a name="'.$hid.'" id="'.$hid.'">'.hsc($title).'</a></h3>';
$doc .= '<div class="level3">';
- $doc .= '<table class="inline"><tbody>';
+ $doc .= '<div class="table"><table class="inline"><tbody>';
$doc .= '<tr><th>Description</th><td colspan="2">'.$method['desc'].
'</td></tr>';
if ($method['params']){
@@ -190,7 +190,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
$doc .= '<tr><th>Return value</th><td>'.hsc(key($method['return'])).
'</td><td>'.hsc(current($method['return'])).'</td></tr>';
}
- $doc .= '</tbody></table>';
+ $doc .= '</tbody></table></div>';
$doc .= '</div>';
}
unset($po);
@@ -206,7 +206,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
global $PARSER_MODES;
$doc = '';
- $doc .= '<table class="inline"><tbody>';
+ $doc .= '<div class="table"><table class="inline"><tbody>';
foreach($PARSER_MODES as $mode => $modes){
$doc .= '<tr>';
$doc .= '<td class="leftalign">';
@@ -217,7 +217,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
$doc .= '</td>';
$doc .= '</tr>';
}
- $doc .= '</tbody></table>';
+ $doc .= '</tbody></table></div>';
return $doc;
}
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 8e90be093..8b646b426 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -149,6 +149,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
}
ptln("<form action=\"".wl($ID)."\" method=\"post\">");
formSecurityToken();
+ ptln(" <div class=\"table\">");
ptln(" <table class=\"inline\">");
ptln(" <thead>");
ptln(" <tr>");
@@ -206,6 +207,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
ptln(" </td></tr>");
ptln(" </tbody>");
ptln(" </table>");
+ ptln(" </div>");
ptln("</form>");
ptln("</div>");
@@ -256,6 +258,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
ptln("<form action=\"".wl($ID)."\" method=\"post\">",$indent);
formSecurityToken();
+ ptln(" <div class=\"table\">",$indent);
ptln(" <table class=\"inline\">",$indent);
ptln(" <thead>",$indent);
ptln(" <tr><th>".$this->lang["field"]."</th><th>".$this->lang["value"]."</th></tr>",$indent);
@@ -295,6 +298,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
ptln(" </tr>",$indent);
ptln(" </tbody>",$indent);
ptln(" </table>",$indent);
+ ptln(" </div>",$indent);
foreach ($notes as $note)
ptln("<div class=\"fn\">".$note."</div>",$indent);
--
GitLab