Changeset 8620

Show
Ignore:
Timestamp:
08/11/08 22:52:43 (3 months ago)
Author:
ryan
Message:

crazyhorse: merge with log:trunk@8334:8619 , merge arrows unresolved

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/crazyhorse/wp-admin/admin-ajax.php

    r8335 r8620  
    11<?php 
     2/** 
     3 * WordPress AJAX Process Execution. 
     4 * 
     5 * @package WordPress 
     6 * @subpackage Administration 
     7 */ 
     8 
     9/** 
     10 * Executing AJAX process. 
     11 * 
     12 * @since unknown 
     13 */ 
    214define('DOING_AJAX', true); 
    315 
    …… 
    1426    $s = $_GET['q']; // is this slashed already? 
    1527 
    16     if ( strstr( $s, ',' ) ) {  
    17         $s = explode( ',', $s );  
    18         $s = $s[count( $s ) - 1];  
     28    if ( strstr( $s, ',' ) ) { 
     29        $s = explode( ',', $s ); 
     30        $s = $s[count( $s ) - 1]; 
    1931    } 
    2032    $s = trim( $s ); 
    …… 
    279291        $x->send(); 
    280292    } 
    281      
     293 
    282294    $cat = wp_insert_category( $_POST, true ); 
    283295 
    …… 
    393405    list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1 ); 
    394406 
     407    if ( get_option('show_avatars') ) 
     408        add_filter( 'comment_author', 'floated_admin_avatar' ); 
     409 
    395410    if ( !$comments ) 
    396411        die('1'); 
    …… 
    399414        get_comment( $comment ); 
    400415        ob_start(); 
    401             _wp_comment_row( $comment->comment_ID, $mode, false ); 
     416            _wp_comment_row( $comment->comment_ID, $mode, $status ); 
    402417            $comment_list_item = ob_get_contents(); 
    403418        ob_end_clean(); 

  • branches/crazyhorse/wp-admin/admin-footer.php

    r8379 r8620  
     1<<<<<<< .working 
    12<?php if ( ! $fixed_bar ) { ?> 
    23<br class="clear" /></div><!-- wpbody-content --> 
    34<?php } ?> 
     5======= 
     6<?php 
     7/** 
     8 * WordPress Administration Template Footer 
     9 * 
     10 * @package WordPress 
     11 * @subpackage Administration 
     12 */ 
     13?> 
     14>>>>>>> .merge-right.r8619 
    415</div><!-- wpbody --> 
    516</div><!-- wpcontent --> 

  • branches/crazyhorse/wp-admin/admin-functions.php

    r7448 r8620  
    11<?php 
    2 // Deprecated.  Use includes/admin.php. 
     2/** 
     3 * Administration Functions 
     4 * 
     5 * This file is deprecated, use 'wp-admin/includes/admin.php' instead. 
     6 * 
     7 * @deprecated 2.5 
     8 * @package WordPress 
     9 * @subpackage Administration 
     10 */ 
     11 
    312_deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/admin.php' ); 
     13 
     14/** WordPress Administration API: Includes all Administration functions. */ 
    415require_once(ABSPATH . 'wp-admin/includes/admin.php'); 
    516?> 

  • branches/crazyhorse/wp-admin/admin-header.php

    r8379 r8620  
    11<?php 
     2/** 
     3 * WordPress Administration Template Header 
     4 * 
     5 * @package WordPress 
     6 * @subpackage Administration 
     7 */ 
     8 
    29@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); 
    310if (!isset($_GET["page"])) require_once('admin.php'); 
    …… 
    7481 
    7582<?php 
    76 $gears_compat = false; 
    77  
    78 if ( ($is_gecko || $is_winIE) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') === false ) {  
    79     $gears_compat = true; 
     83if ( ! $is_opera ) { 
    8084?> 
    8185    <div id="gears-info-box" class="info-box" style="display:none;"> 
    …… 
    9296    <div id="gears-msg2" style="display:none;"> 
    9397    <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> 
    94     <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p>  
    95     <p><?php _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser\'s Tools menu, then click the button below.'); ?></p> 
     98    <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> 
     99    <p><?php 
     100 
     101    if ( $is_safari ) 
     102        _e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.'); 
     103    else 
     104        _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.'); 
     105 
     106    ?></p> 
    96107    <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p> 
    97108    <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button> 
    …… 
    101112    <div id="gears-msg3" style="display:none;"> 
    102113    <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> 
    103     <p><?php _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); ?></p> 
     114    <p><?php 
     115 
     116    if ( $is_safari ) 
     117        _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.'); 
     118    else 
     119        _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); 
     120 
     121    ?></p> 
    104122    <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p> 
    105123    <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p> 
    …… 
    107125    </div> 
    108126    </div> 
    109  
    110127<?php } ?> 
    111128 
     129<<<<<<< .working 
    112130<div id="user_info"><p> 
    113131    <?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | 
    …… 
    115133    <?php if ( $gears_compat ) { ?>| <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?> 
    116134</p></div> 
     135======= 
     136<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>'); if ( ! $is_opera ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div> 
     137>>>>>>> .merge-right.r8619 
    117138 
    118139<?php 

  • branches/crazyhorse/wp-admin/admin-post.php

    r8335 r8620  
    11<?php 
    2 define('WP_ADMIN', TRUE); 
     2/** 
     3 * WordPress Administration Generic POST Handler. 
     4 * 
     5 * @package WordPress 
     6 * @subpackage Administration 
     7 */ 
     8 
     9/** We are located in WordPress Administration Panels */ 
     10define('WP_ADMIN', true); 
    311 
    412if ( defined('ABSPATH') ) 

  • branches/crazyhorse/wp-admin/admin.php

    r8335 r8620  
    11<?php 
     2/** 
     3 * WordPress Administration Bootstrap 
     4 * 
     5 * @package WordPress 
     6 * @subpackage Administration 
     7 */ 
     8 
     9/** 
     10 * In WordPress Administration Panels 
     11 * 
     12 * @since unknown 
     13 */ 
    214define('WP_ADMIN', TRUE); 
    315 

  • branches/crazyhorse/wp-admin/async-upload.php

    r8242 r8620  
    11<?php 
    2  
    3 /* This accepts file uploads from swfupload or other asynchronous upload methods. 
    4  
    5 */ 
     2/** 
     3 * Accepts file uploads from swfupload or other asynchronous upload methods. 
     4 * 
     5 * @package WordPress 
     6 * @subpackage Administration 
     7 */ 
    68 
    79if ( defined('ABSPATH') ) 
    …… 
    2325    wp_die(__('You do not have permission to upload files.')); 
    2426 
    25 // just fetch the detail form for that attachment   
     27// just fetch the detail form for that attachment 
    2628if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) { 
    2729    echo get_media_item($id); 

  • branches/crazyhorse/wp-admin/categories.php

    r8295 r8620  
    11<?php 
     2/** 
     3 * Categories Management Panel 
     4 * 
     5 * @package WordPress 
     6 * @subpackage Administration 
     7 */ 
     8 
     9/** Load WordPress Bootstrap */ 
    210require_once('admin.php'); 
    311 

  • branches/crazyhorse/wp-admin/comment.php

    r8379 r8620  
    11<?php 
     2/** 
     3 * Comment Management Panel 
     4 * 
     5 * @package WordPress 
     6 * @subpackage Administration 
     7 */ 
     8 
     9/** Load WordPress Bootstrap */ 
    210require_once('admin.php'); 
    311 
    …… 
    1018    $action = 'deletecomment'; 
    1119 
    12 function comment_footer_die( $msg ) {  // $msg is assumed to contain HTML and be sanitized 
     20/** 
     21 * Display error message at bottom of comments. 
     22 * 
     23 * @param string $msg Error Message. Assumed to contain HTML and be sanitized. 
     24 */ 
     25function comment_footer_die( $msg ) {  //  
    1326    echo "<div class='wrap'><p>$msg</p></div>"; 
    1427    include('admin-footer.php'); 

  • branches/crazyhorse/wp-admin/css/colors-classic.css

    r8335 r8620  
    4040#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, 
    4141#dragHelper li.widget-list-control-item h4.widget-title a, 
    42 #draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover { 
     42#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover, 
     43#plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited { 
    4344    color: #fff; 
    4445} 
    …… 
    330331} 
    331332 
    332 #rightnow .reallynow { 
     333#rightnow .reallynow, #plugin-information .action-button { 
    333334    background-color: #114973; 
    334335    color: #fff; 
    …… 
    340341} 
    341342 
     343<<<<<<< .working 
    342344div#media-upload-header { 
     345======= 
     346#adminmenu, div#media-upload-header, div#plugin-information-header { 
     347>>>>>>> .merge-right.r8619 
    343348    background-color: #14568a; 
    344349    border-bottom-color: #07273e; 
    …… 
    554559/* TinyMCE */ 
    555560.wp_themeSkin *, 
    556 .wp_themeSkin a:hover,  
    557 .wp_themeSkin a:link,  
    558 .wp_themeSkin a:visited,  
     561.wp_themeSkin a:hover, 
     562.wp_themeSkin a:link, 
     563.wp_themeSkin a:visited, 
    559564.wp_themeSkin a:active { 
    560565     color: #000; 
    …… 
    577582 
    578583/* Button */ 
    579 .wp_themeSkin .mceButton {  
     584.wp_themeSkin .mceButton { 
    580585    background-color: #e9e8e8; 
    581586    border-color: #83B4D5; 
    …… 
    583588 
    584589.wp_themeSkin a.mceButtonEnabled:hover, 
    585 .wp_themeSkin a.mceButtonActive,  
     590.wp_themeSkin a.mceButtonActive, 
    586591.wp_themeSkin a.mceButtonSelected { 
    587592    background-color: #d6d8da; 
    …… 
    600605} 
    601606 
    602 .wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,  
     607.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
    603608.wp_themeSkin .mceListBoxHover .mceOpen, 
    604609.wp_themeSkin .mceListBoxSelected .mceOpen, 
    …… 
    608613} 
    609614 
    610 .wp_themeSkin table.mceListBoxEnabled:hover .mceText,  
     615.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
    611616.wp_themeSkin .mceListBoxHover .mceText { 
    612617    border-color: #7789ba !important; 
    …… 
    614619 
    615620.wp_themeSkin select.mceListBox { 
    616     border-color: #b3c7e1;  
     621    border-color: #b3c7e1; 
    617622    background-color: #fff; 
    618623} 
    619624 
    620625/* SplitButton */ 
    621 .wp_themeSkin .mceSplitButton a.mceAction,  
     626.wp_themeSkin .mceSplitButton a.mceAction, 
    622627.wp_themeSkin .mceSplitButton a.mceOpen { 
    623628    background-color: #e9e8e8; 
    …… 
    631636    background-color: #d6d8da; 
    632637    border-color: #7789ba !important; 
    633 }  
     638} 
    634639 
    635640.wp_themeSkin .mceSplitButtonActive { 
    …… 
    670675 
    671676.wp_themeSkin .mceMenu .mceText { 
    672     color: #000;  
     677    color: #000; 
    673678} 
    674679 
    …… 
    681686} 
    682687.wp_themeSkin .mceMenuItemTitle a { 
    683     background-color: #ccc;  
     688    background-color: #ccc; 
    684689    border-bottom-color: #aaa; 
    685690} 

  • branches/crazyhorse/wp-admin/css/colors-fresh.css

    r8430 r8620  
    4444#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, 
    4545#dragHelper li.widget-list-control-item h4.widget-title a, 
    46 #draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover { 
     46#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover, 
     47#plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited { 
    4748    color: #fff; 
    4849} 
    …… 
    311312} 
    312313 
    313 #adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span, #rightnow .reallynow { 
     314#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span, #rightnow .reallynow, #plugin-information .action-button { 
    314315    background-color: #d54e21; 
    315316    color: #fff; 
    …… 
    320321} 
    321322 
     323<<<<<<< .working 
    322324div#media-upload-header { 
     325======= 
     326#adminmenu, div#media-upload-header, div#plugin-information-header { 
     327>>>>>>> .merge-right.r8619 
    323328    background-color: #e4f2fd; 
    324329    border-bottom-color: #c6d9e9; 
    …… 
    538543/* TinyMCE */ 
    539544.wp_themeSkin *, 
    540 .wp_themeSkin a:hover,  
    541 .wp_themeSkin a:link,  
    542 .wp_themeSkin a:visited,  
     545.wp_themeSkin a:hover, 
     546.wp_themeSkin a:link, 
     547.wp_themeSkin a:visited, 
    543548.wp_themeSkin a:active { 
    544549     color: #000; 
    …… 
    561566 
    562567/* Button */ 
    563 .wp_themeSkin .mceButton {  
     568.wp_themeSkin .mceButton { 
    564569    background-color: #e9e8e8; 
    565570    border-color: #abc0fb; 
    …… 
    567572 
    568573.wp_themeSkin a.mceButtonEnabled:hover, 
    569 .wp_themeSkin a.mceButtonActive,  
     574.wp_themeSkin a.mceButtonActive, 
    570575.wp_themeSkin a.mceButtonSelected { 
    571576    background-color: #d6d8da; 
    …… 
    584589} 
    585590 
    586 .wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,  
     591.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
    587592.wp_themeSkin .mceListBoxHover .mceOpen, 
    588593.wp_themeSkin .mceListBoxSelected .mceOpen, 
    …… 
    592597} 
    593598 
    594 .wp_themeSkin table.mceListBoxEnabled:hover .mceText,  
     599.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
    595600.wp_themeSkin .mceListBoxHover .mceText { 
    596601    border-color: #7789ba !important; 
    …… 
    598603 
    599604.wp_themeSkin select.mceListBox { 
    600     border-color: #b3c7e1;  
     605    border-color: #b3c7e1; 
    601606    background-color: #fff; 
    602607} 
    603608 
    604609/* SplitButton */ 
    605 .wp_themeSkin .mceSplitButton a.mceAction,  
     610.wp_themeSkin .mceSplitButton a.mceAction, 
    606611.wp_themeSkin .mceSplitButton a.mceOpen { 
    607612    background-color: #e9e8e8; 
    …… 
    615620    background-color: #d6d8da; 
    616621    border-color: #7789ba !important; 
    617 }  
     622} 
    618623 
    619624.wp_themeSkin .mceSplitButtonActive { 
    …… 
    654659 
    655660.wp_themeSkin .mceMenu .mceText { 
    656     color: #000;  
     661    color: #000; 
    657662} 
    658663 
    …… 
    665670} 
    666671.wp_themeSkin .mceMenuItemTitle a { 
    667     background-color: #ccc;  
     672    background-color: #ccc; 
    668673    border-bottom-color: #aaa; 
    669674} 

  • branches/crazyhorse/wp-admin/css/dashboard-rtl.css

    r8335 r8620  
    2626    font-family: sans-serif !important; 
    2727} 
    28      
     28 
    2929#dashboard-widgets .widget_rss ul li a { 
    3030    float:right; 

  • branches/crazyhorse/wp-admin/css/dashboard.css

    r8475 r8620  
    4141} 
    4242 
    43 div.dashboard-widget-holder {   
     43div.dashboard-widget-holder { 
    4444    margin-top: 20px; 
    4545    width: 50%; 
    …… 
    141141    border-radius: 3px; 
    142142    cursor: pointer; 
    143     text-decoration: none;  
     143    text-decoration: none; 
    144144} 
    145145 

  • branches/crazyhorse/wp-admin/css/global-rtl.css

    r8335 r8620  
    99.textleft { text-align: right; } 
    1010.textright { text-align: left; } 
    11      
     11 
    1212.wrap h2 { font-family: sans-serif; } 
    1313 

  • branches/crazyhorse/wp-admin/css/ie-rtl.css

    r7552 r8620  
    22body, td { 
    33    font-family: Tahoma,Verdana,sans-serif; 
     4} 
     5 
     6#wpcontent #sidemenu li a { 
     7    float: left; 
    48} 
    59 
    …… 
    5256    text-align: left; 
    5357} 
     58 
     59/* IE6 */ 
     60 
     61/* Search box gets stuck to the right, hidden outside view */