diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-23 14:23:22 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-23 14:23:22 +0000 |
| commit | de4299c81c010c6382a3d017cde8f2c3c957b91f (patch) | |
| tree | 0435da41b52907e1b6c0739773a12dc980a35017 /phpBB/adm | |
| parent | d6af193b53ac4a3b9dff78254f4da9f4cd5f9337 (diff) | |
| download | forums-de4299c81c010c6382a3d017cde8f2c3c957b91f.tar forums-de4299c81c010c6382a3d017cde8f2c3c957b91f.tar.gz forums-de4299c81c010c6382a3d017cde8f2c3c957b91f.tar.bz2 forums-de4299c81c010c6382a3d017cde8f2c3c957b91f.tar.xz forums-de4299c81c010c6382a3d017cde8f2c3c957b91f.zip | |
- build explain links a bit different...
- fix btn_ip reference (it is btn_info now)
- removed sql_report.css (we use the acp css)
- updated the sql report layout
git-svn-id: file:///svn/phpbb/trunk@5838 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/index.php | 9 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/sql_report.css | 131 |
3 files changed, 8 insertions, 133 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 2120232759..5a36a9e03e 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -140,7 +140,8 @@ function adm_page_header($page_title) function adm_page_footer($copyright_html = true) { - global $db, $config, $template, $SID, $user, $auth, $starttime, $phpbb_root_path, $phpEx, $cache; + global $db, $config, $template, $user, $auth, $cache; + global $SID, $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; // Output page creation time if (defined('DEBUG')) @@ -169,7 +170,11 @@ function adm_page_footer($copyright_html = true) } } - $debug_output .= ' | <a href="' . (($_SERVER['REQUEST_URI']) ? htmlspecialchars($_SERVER['REQUEST_URI']) : "index.$phpEx$SID") . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&' : '?') . 'explain=1">Explain</a>'; + $explain_url = $phpbb_root_path . str_replace('&', '&', $user->page['page']); + $explain_url = (strpos($explain_url, '?') !== false) ? str_replace('?', $SID . '&', $explain_url) : $explain_url . '?' . str_replace('?', '', $SID); + $explain_url .= ((strpos($explain_url, '?') === false) ? '?' : '&') . 'explain=1'; + + $debug_output .= ' | <a href="' . $explain_url . '">Explain</a>'; } } diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 1b6e284a30..e4018250a8 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -871,6 +871,7 @@ table.pmask td.name { color: #333333; } +/* Tooltip for permission roles */ .tooltip { width: 200px; color: #000; diff --git a/phpBB/adm/style/sql_report.css b/phpBB/adm/style/sql_report.css deleted file mode 100644 index 64d19b80c6..0000000000 --- a/phpBB/adm/style/sql_report.css +++ /dev/null @@ -1,131 +0,0 @@ -/* - $Id$ - - The original "subSilver" theme for phpBB2 - Created by subBlue design :: http://www.subBlue.com - Updated for phpBB 2.2 by psoTFX :: phpBB Group - Copyright (c) 2002 phpBB Group -*/ - -body { - background-color: white; - font-family: Verdana, Arial, Helvetica, sans-serif; - margin: 0; - border: 0; - padding: 0; -} - -p { - font-size: 8pt; -} - -.maintitle, h1 { - font: bold 18pt 'Trebuchet MS', Verdana, sans-serif; - text-decoration:none; - line-height: 120%; -} - -h2 { - font: bold 12pt Arial, Helvetica, sans-serif; - text-decoration:none; - line-height: 120%; -} - -.maintitle { - color: #12749B -} - -/* - Anchors -*/ -a:link, a:active, a:visited { color: #006699; text-decoration: none; } -a:hover { color: #DD6900; text-decoration: underline; } - -a.nav { color: #006699; text-decoration: none; } -a.nav:hover { text-decoration: underline; } - -a.th:link { color: #FFA34F; text-decoration: none; } -a.th:active { color: #FFA34F; text-decoration: none; } -a.th:visited { color: #FFA34F; text-decoration: none; } -a.th:hover { color: #FFA34F; text-decoration: underline; } - -/* - Non-tag specific -*/ -.gen, .gensmall { - color: black; -} -.gen { - font-size: 8pt; -} -.gensmall { - font-size: 7pt; -} -.nav { - color: black; - font-size: 7pt; - font-weight: bold; -} - -.error { color: #FF0000 } - -/* - Tables -*/ -table.bg { - background-color: #ACBBC6 -} - -th, td { - font: normal 8pt Verdana, Arial, Helvetica, sans-serif; -} - -th { - height: 25px; - background-color: #006699; - color: #FFA34F; - font-weight: bold; - font-size: 11px; -} - -td.cat { - height: 28px; - background-color: #D1D7DC; -} - -.row1 { - background-color: #EFEFEF; -} -.row2 { - background-color: #DEE3E7; -} -.row3 { - background-color: #D1D7DC; -} - -/* - Misc -*/ -hr { - height: 0px; - border: solid #D1D7DC 0px; - border-top-width: 1px; -} - -/* - Forms -*/ -input { - text-indent: 2px; -} - -textarea, select { - border: 1px solid; -} - -input, textarea, select { - color: black; - font: normal 8pt Verdana, Arial, Helvetica, sans-serif; - border-color: black; -} - |