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
This commit is contained in:
azaozz
parent
0c8f4cba63
commit
64067f4612
|
|
@ -267,7 +267,7 @@ td.help {
|
|||
color: #000;
|
||||
}
|
||||
|
||||
.side-info h5, .bordertitle {
|
||||
.side-info h5 {
|
||||
border-bottom-color: #dadada;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ td.help {
|
|||
color: #000;
|
||||
}
|
||||
|
||||
.side-info h5, .bordertitle {
|
||||
.side-info h5 {
|
||||
border-bottom-color: #dadada;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -246,7 +246,8 @@ a.button {
|
|||
.tagchecklist,
|
||||
#col-container,
|
||||
#col-left,
|
||||
#col-right {
|
||||
#col-right,
|
||||
.fileedit-sub {
|
||||
display: block;
|
||||
zoom: 100%;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,3 @@
|
|||
#templateside {
|
||||
float: left;
|
||||
}
|
||||
#themeselector {
|
||||
padding-right: 0;
|
||||
padding-left: 5px;
|
||||
float: left;
|
||||
}
|
||||
div.tablenav {
|
||||
margin-right: 0;
|
||||
margin-left: 210px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -73,3 +53,8 @@ div.tablenav {
|
|||
vertical-align: top;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.fileedit-sub {
|
||||
padding: 10px 0 8px;
|
||||
line-height: 180%;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -136,8 +136,25 @@ default:
|
|||
<div class="wrap">
|
||||
<?php screen_icon(); ?>
|
||||
<h2><?php echo esc_html( $title ); ?></h2>
|
||||
<div class="bordertitle">
|
||||
<form id="themeselector" action="plugin-editor.php" method="post">
|
||||
|
||||
<div class="fileedit-sub">
|
||||
<div class="alignleft">
|
||||
<big><?php
|
||||
if ( is_plugin_active($plugin) ) {
|
||||
if ( is_writeable($real_file) )
|
||||
echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
|
||||
else
|
||||
echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
|
||||
} else {
|
||||
if ( is_writeable($real_file) )
|
||||
echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
|
||||
else
|
||||
echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
|
||||
}
|
||||
?></big>
|
||||
</div>
|
||||
<div class="alignright">
|
||||
<form action="plugin-editor.php" method="post">
|
||||
<strong><label for="plugin"><?php _e('Select plugin to edit:'); ?> </label></strong>
|
||||
<select name="plugin" id="plugin">
|
||||
<?php
|
||||
|
|
@ -156,27 +173,11 @@ default:
|
|||
<input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" />
|
||||
</form>
|
||||
</div>
|
||||
<div class="tablenav">
|
||||
<div class="alignleft">
|
||||
<big><?php
|
||||
if ( is_plugin_active($plugin) ) {
|
||||
if ( is_writeable($real_file) )
|
||||
echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
|
||||
else
|
||||
echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
|
||||
} else {
|
||||
if ( is_writeable($real_file) )
|
||||
echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
|
||||
else
|
||||
echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
|
||||
}
|
||||
?></big>
|
||||
</div>
|
||||
<br class="clear" />
|
||||
</div>
|
||||
<br class="clear" />
|
||||
|
||||
<div id="templateside">
|
||||
<h3 id="bordertitle"><?php _e('Plugin Files'); ?></h3>
|
||||
<h3><?php _e('Plugin Files'); ?></h3>
|
||||
|
||||
<ul>
|
||||
<?php
|
||||
|
|
@ -222,9 +223,9 @@ foreach ( $plugin_files as $plugin_file ) :
|
|||
<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
|
||||
<?php endif; ?>
|
||||
</form>
|
||||
<div class="clear"> </div>
|
||||
<br class="clear" />
|
||||
</div>
|
||||
<?php
|
||||
break;
|
||||
}
|
||||
include("admin-footer.php") ?>
|
||||
include("admin-footer.php");
|
||||
|
|
|
|||
|
|
@ -117,8 +117,13 @@ $desc_header = ( $description != $file_show ) ? "<strong>$description</strong> (
|
|||
<div class="wrap">
|
||||
<?php screen_icon(); ?>
|
||||
<h2><?php echo esc_html( $title ); ?></h2>
|
||||
<div class="bordertitle">
|
||||
<form id="themeselector" action="theme-editor.php" method="post">
|
||||
|
||||
<div class="fileedit-sub">
|
||||
<div class="alignleft">
|
||||
<big><?php echo sprintf($desc_header, $file_show); ?></big>
|
||||
</div>
|
||||
<div class="alignright">
|
||||
<form action="theme-editor.php" method="post">
|
||||
<strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
|
||||
<select name="theme" id="theme">
|
||||
<?php
|
||||
|
|
@ -134,15 +139,11 @@ $desc_header = ( $description != $file_show ) ? "<strong>$description</strong> (
|
|||
<input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" />
|
||||
</form>
|
||||
</div>
|
||||
<div class="tablenav">
|
||||
<div class="alignleft">
|
||||
<big><?php echo sprintf($desc_header, $file_show); ?></big>
|
||||
</div>
|
||||
<br class="clear" />
|
||||
</div>
|
||||
<br class="clear" />
|
||||
<div id="templateside">
|
||||
<h3 id="bordertitle"><?php _e("Theme Files"); ?></h3>
|
||||
<h3><?php _e("Theme Files"); ?></h3>
|
||||
|
||||
<?php
|
||||
if ($allowed_files) :
|
||||
|
|
@ -193,9 +194,7 @@ if ($allowed_files) :
|
|||
</ul>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php
|
||||
if (!$error) {
|
||||
?>
|
||||
<?php if (!$error) { ?>
|
||||
<form name="template" id="template" action="theme-editor.php" method="post">
|
||||
<?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
|
||||
<div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1" class="codepress <?php echo $codepress_lang ?>"><?php echo $content ?></textarea>
|
||||
|
|
@ -228,10 +227,10 @@ if ($allowed_files) :
|
|||
echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
|
||||
}
|
||||
?>
|
||||
<div class="clear"> </div>
|
||||
<br class="clear" />
|
||||
</div>
|
||||
<?php
|
||||
break;
|
||||
}
|
||||
|
||||
include("admin-footer.php") ?>
|
||||
include("admin-footer.php");
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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' );
|
||||
|
|
|
|||
Loading…
Reference in New Issue