WordPress.org

Make WordPress Core

Changeset 11647


Ignore:
Timestamp:
06/26/09 11:07:10 (5 years ago)
Author:
azaozz
Message:

Fix overlap in plugin and theme editors, props eddieringle, fixes #10101 for trunk

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/css/colors-classic.css

    r11546 r11647  
    268268} 
    269269 
    270 .side-info h5, .bordertitle { 
     270.side-info h5 { 
    271271    border-bottom-color: #dadada; 
    272272} 
  • trunk/wp-admin/css/colors-fresh.css

    r11546 r11647  
    268268} 
    269269 
    270 .side-info h5, .bordertitle { 
     270.side-info h5 { 
    271271    border-bottom-color: #dadada; 
    272272} 
  • trunk/wp-admin/css/ie.css

    r11557 r11647  
    247247#col-container, 
    248248#col-left, 
    249 #col-right { 
     249#col-right, 
     250.fileedit-sub { 
    250251    display: block; 
    251252    zoom: 100%; 
  • trunk/wp-admin/css/theme-editor-rtl.css

    r9505 r11647  
    22    float: left; 
    33} 
    4 #themeselector { 
    5     padding-right: 0; 
    6     padding-left: 5px; 
    7     float: left; 
    8 } 
    9 div.tablenav { 
    10     margin-right: 0; 
    11     margin-left: 210px; 
    12 } 
  • trunk/wp-admin/css/theme-editor.css

    r10607 r11647  
    1212    float: right; 
    1313    width: 190px; 
     14    word-wrap: break-word; 
    1415} 
    1516 
    16 #templateside h3, #postcustomstuff p.submit { 
     17#templateside h3, 
     18#postcustomstuff p.submit { 
    1719    margin: 0; 
    1820} 
    1921 
    20 h3#bordertitle { 
    21     margin-bottom: 10px; 
     22#templateside h4 { 
     23    margin: 1em 0 0; 
    2224} 
    2325 
    24 #templateside h4 { 
    25     margin-bottom: 0; 
    26 } 
    27  
    28 #templateside ol, #templateside ul { 
    29     list-style: none; 
     26#templateside ol, 
     27#templateside ul { 
    3028    margin: .5em; 
    3129    padding: 0; 
    3230} 
    3331 
    34 #templateside ol li, #templateside ul li { 
    35     margin: 1px 0; 
    36 } 
    37  
    38 #themeselector { 
    39     padding-right: 5px; 
    40     float: right; 
    41     position: relative; 
    42     bottom: 25px; 
    43     top:20px; 
    44 } 
    45  
    46 #themeselector select { 
    47     margin: 0; 
    48     padding: 0; 
     32#templateside li { 
     33    margin: 4px 0; 
    4934} 
    5035 
     
    5540.highlight { 
    5641    padding: 1px; 
    57 } 
    58  
    59 div.bordertitle h2 { 
    60     border: none; 
    61     padding-bottom: 0; 
    6242} 
    6343 
     
    7454    font-weight: bold; 
    7555} 
     56 
     57.fileedit-sub { 
     58    padding: 10px 0 8px; 
     59    line-height: 180%; 
     60} 
  • trunk/wp-admin/plugin-editor.php

    r11530 r11647  
    137137<?php screen_icon(); ?> 
    138138<h2><?php echo esc_html( $title ); ?></h2> 
    139 <div class="bordertitle"> 
    140     <form id="themeselector" action="plugin-editor.php" method="post"> 
    141         <strong><label for="plugin"><?php _e('Select plugin to edit:'); ?> </label></strong> 
    142         <select name="plugin" id="plugin"> 
    143 <?php 
    144     foreach ( $plugins as $plugin_key => $a_plugin ) { 
    145         $plugin_name = $a_plugin['Name']; 
    146         if ( $plugin_key == $plugin ) 
    147             $selected = " selected='selected'"; 
    148         else 
    149             $selected = ''; 
    150         $plugin_name = esc_attr($plugin_name); 
    151         $plugin_key = esc_attr($plugin_key); 
    152         echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>"; 
    153     } 
    154 ?> 
    155         </select> 
    156         <input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" /> 
    157     </form> 
    158 </div> 
    159 <div class="tablenav"> 
     139 
     140<div class="fileedit-sub"> 
    160141<div class="alignleft"> 
    161142<big><?php 
     
    173154    ?></big> 
    174155</div> 
     156<div class="alignright"> 
     157    <form action="plugin-editor.php" method="post"> 
     158        <strong><label for="plugin"><?php _e('Select plugin to edit:'); ?> </label></strong> 
     159        <select name="plugin" id="plugin"> 
     160<?php 
     161    foreach ( $plugins as $plugin_key => $a_plugin ) { 
     162        $plugin_name = $a_plugin['Name']; 
     163        if ( $plugin_key == $plugin ) 
     164            $selected = " selected='selected'"; 
     165        else 
     166            $selected = ''; 
     167        $plugin_name = esc_attr($plugin_name); 
     168        $plugin_key = esc_attr($plugin_key); 
     169        echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>"; 
     170    } 
     171?> 
     172        </select> 
     173        <input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" /> 
     174    </form> 
     175</div> 
    175176<br class="clear" /> 
    176177</div> 
    177 <br class="clear" /> 
    178     <div id="templateside"> 
    179     <h3 id="bordertitle"><?php _e('Plugin Files'); ?></h3> 
     178 
     179<div id="templateside"> 
     180    <h3><?php _e('Plugin Files'); ?></h3> 
    180181 
    181182    <ul> 
     
    196197<?php endforeach; ?> 
    197198    </ul> 
    198     </div> 
    199     <form name="template" id="template" action="plugin-editor.php" method="post"> 
     199</div> 
     200<form name="template" id="template" action="plugin-editor.php" method="post"> 
    200201    <?php wp_nonce_field('edit-plugin_' . $file) ?> 
    201202        <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1" class="codepress <?php echo $codepress_lang ?>"><?php echo $content ?></textarea> 
     
    222223    <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> 
    223224<?php endif; ?> 
    224  </form> 
    225 <div class="clear"> &nbsp; </div> 
     225</form> 
     226<br class="clear" /> 
    226227</div> 
    227228<?php 
    228229    break; 
    229230} 
    230 include("admin-footer.php") ?> 
     231include("admin-footer.php"); 
  • trunk/wp-admin/theme-editor.php

    r11615 r11647  
    118118<?php screen_icon(); ?> 
    119119<h2><?php echo esc_html( $title ); ?></h2> 
    120 <div class="bordertitle"> 
    121     <form id="themeselector" action="theme-editor.php" method="post"> 
     120 
     121<div class="fileedit-sub"> 
     122<div class="alignleft"> 
     123<big><?php echo sprintf($desc_header, $file_show); ?></big> 
     124</div> 
     125<div class="alignright"> 
     126    <form action="theme-editor.php" method="post"> 
    122127        <strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong> 
    123128        <select name="theme" id="theme"> 
     
    135140    </form> 
    136141</div> 
    137 <div class="tablenav"> 
    138 <div class="alignleft"> 
    139 <big><?php echo sprintf($desc_header, $file_show); ?></big> 
    140 </div> 
    141142<br class="clear" /> 
    142143</div> 
    143144<br class="clear" /> 
    144145    <div id="templateside"> 
    145     <h3 id="bordertitle"><?php _e("Theme Files"); ?></h3> 
     146    <h3><?php _e("Theme Files"); ?></h3> 
    146147 
    147148<?php 
     
    194195<?php endif; ?> 
    195196</div> 
    196     <?php 
    197     if (!$error) { 
    198     ?> 
     197<?php if (!$error) { ?> 
    199198    <form name="template" id="template" action="theme-editor.php" method="post"> 
    200199    <?php wp_nonce_field('edit-theme_' . $file . $theme) ?> 
     
    224223        </div> 
    225224    </form> 
    226     <?php 
     225<?php 
    227226    } else { 
    228227        echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>'; 
    229228    } 
    230     ?> 
    231 <div class="clear"> &nbsp; </div> 
     229?> 
     230<br class="clear" /> 
    232231</div> 
    233232<?php 
     
    235234} 
    236235 
    237 include("admin-footer.php") ?> 
     236include("admin-footer.php"); 
  • trunk/wp-admin/wp-admin.css

    r11557 r11647  
    20932093} 
    20942094 
    2095 .bordertitle { 
    2096     padding-bottom: 5px; 
    2097     border-bottom-width: 1px; 
    2098     border-bottom-style: solid; 
    2099 } 
    2100  
    21012095/* Edit posts */ 
    21022096 
  • trunk/wp-includes/script-loader.php

    r11637 r11647  
    422422 
    423423    // all colors stylesheets need to have the same query strings (cache manifest compat) 
    424     $colors_version = '20090610'; 
    425  
    426     $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090612' ); 
     424    $colors_version = '20090625'; 
     425 
     426    $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090625' ); 
    427427    $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); 
    428428 
     
    444444    $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20090514' ); 
    445445    $styles->add( 'install', '/wp-admin/css/install.css', array(), '20090514' ); 
    446     $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css', array(), '20090514' ); 
     446    $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css', array(), '20090625' ); 
    447447    $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20090514' ); 
    448448    $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); 
Note: See TracChangeset for help on using the changeset viewer.