From 64067f46123814260269144620df055446bf2868 Mon Sep 17 00:00:00 2001 From: azaozz Date: Fri, 26 Jun 2009 11:07:10 +0000 Subject: [PATCH] Fix overlap in plugin and theme editors, props eddieringle, fixes #10101 for trunk git-svn-id: http://svn.automattic.com/wordpress/trunk@11647 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/colors-classic.css | 2 +- wp-admin/css/colors-fresh.css | 2 +- wp-admin/css/ie.css | 3 +- wp-admin/css/theme-editor-rtl.css | 9 ------ wp-admin/css/theme-editor.css | 43 ++++++++----------------- wp-admin/plugin-editor.php | 53 ++++++++++++++++--------------- wp-admin/theme-editor.php | 27 ++++++++-------- wp-admin/wp-admin.css | 6 ---- wp-includes/script-loader.php | 6 ++-- 9 files changed, 61 insertions(+), 90 deletions(-) diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index d02fb62b5..a6cb4f94a 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -267,7 +267,7 @@ td.help { color: #000; } -.side-info h5, .bordertitle { +.side-info h5 { border-bottom-color: #dadada; } diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 9142cd94f..7b73e98c0 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -267,7 +267,7 @@ td.help { color: #000; } -.side-info h5, .bordertitle { +.side-info h5 { border-bottom-color: #dadada; } diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 2194f2a5a..23eebb0cd 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -246,7 +246,8 @@ a.button { .tagchecklist, #col-container, #col-left, -#col-right { +#col-right, +.fileedit-sub { display: block; zoom: 100%; } diff --git a/wp-admin/css/theme-editor-rtl.css b/wp-admin/css/theme-editor-rtl.css index d06a26c00..a4dcb46eb 100644 --- a/wp-admin/css/theme-editor-rtl.css +++ b/wp-admin/css/theme-editor-rtl.css @@ -1,12 +1,3 @@ #templateside { float: left; } -#themeselector { - padding-right: 0; - padding-left: 5px; - float: left; -} -div.tablenav { - margin-right: 0; - margin-left: 210px; -} diff --git a/wp-admin/css/theme-editor.css b/wp-admin/css/theme-editor.css index 2f938d84f..0a2a554e0 100644 --- a/wp-admin/css/theme-editor.css +++ b/wp-admin/css/theme-editor.css @@ -11,41 +11,26 @@ #templateside { float: right; width: 190px; + word-wrap: break-word; } -#templateside h3, #postcustomstuff p.submit { +#templateside h3, +#postcustomstuff p.submit { margin: 0; } -h3#bordertitle { - margin-bottom: 10px; -} - #templateside h4 { - margin-bottom: 0; + margin: 1em 0 0; } -#templateside ol, #templateside ul { - list-style: none; +#templateside ol, +#templateside ul { margin: .5em; padding: 0; } -#templateside ol li, #templateside ul li { - margin: 1px 0; -} - -#themeselector { - padding-right: 5px; - float: right; - position: relative; - bottom: 25px; - top:20px; -} - -#themeselector select { - margin: 0; - padding: 0; +#templateside li { + margin: 4px 0; } .nonessential { @@ -56,11 +41,6 @@ h3#bordertitle { padding: 1px; } -div.bordertitle h2 { - border: none; - padding-bottom: 0; -} - div.tablenav { margin-right: 210px; } @@ -72,4 +52,9 @@ div.tablenav { line-height: 22px; vertical-align: top; font-weight: bold; -} \ No newline at end of file +} + +.fileedit-sub { + padding: 10px 0 8px; + line-height: 180%; +} diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index e297ef4ce..813c1e476 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -136,8 +136,25 @@ default:

-
-
+ +
+
+%s (active)'), $file); + else + echo sprintf(__('Browsing %s (active)'), $file); + } else { + if ( is_writeable($real_file) ) + echo sprintf(__('Editing %s (inactive)'), $file); + else + echo sprintf(__('Browsing %s (inactive)'), $file); + } + ?> +
+
+ @@ -221,10 +222,10 @@ foreach ( $plugin_files as $plugin_file ) :

the Codex for more information.'); ?>

- -
 
+ +
+include("admin-footer.php"); diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index 15d418359..95883e68a 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -117,8 +117,13 @@ $desc_header = ( $description != $file_show ) ? "$description (

-
-
+ +
+
+ +
+
+
-
-
- -


-

+

- +
@@ -223,15 +222,15 @@ if ($allowed_files) :
-

' . __('Oops, no such file exists! Double check the name and try again, merci.') . '

'; } - ?> -
 
+?> +
+include("admin-footer.php"); diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index f98f9b0c8..1bd9359f3 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -2092,12 +2092,6 @@ p.search-box { padding: 0 0 .2em 1px; } -.bordertitle { - padding-bottom: 5px; - border-bottom-width: 1px; - border-bottom-style: solid; -} - /* Edit posts */ td.post-title strong, td.plugin-title strong { diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index bb9fbc005..53fedda7c 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -421,9 +421,9 @@ function wp_default_styles( &$styles ) { $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' ); // all colors stylesheets need to have the same query strings (cache manifest compat) - $colors_version = '20090610'; + $colors_version = '20090625'; - $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090612' ); + $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090625' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090612' ); @@ -443,7 +443,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'widgets', '/wp-admin/css/widgets.css', array(), '20090603' ); $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20090514' ); $styles->add( 'install', '/wp-admin/css/install.css', array(), '20090514' ); - $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css', array(), '20090514' ); + $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css', array(), '20090625' ); $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20090514' ); $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); $styles->add( 'login', '/wp-admin/css/login.css', array(), '20090514' );