Changeset 8633

Show
Ignore:
Timestamp:
08/13/08 02:59:05 (3 months ago)
Author:
azaozz
Message:

Crazyhorse: some more merge cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r8620 r8633  
    1 <<<<<<< .working 
    2 <?php if ( ! $fixed_bar ) { ?> 
    3 <br class="clear" /></div><!-- wpbody-content --> 
    4 <?php } ?> 
    5 ======= 
    61<?php 
    72/** 
    …… 
    116 * @subpackage Administration 
    127 */ 
    13 ?> 
    14 >>>>>>> .merge-right.r8619 
     8 
     9if ( ! $fixed_bar ) { ?> 
     10<br class="clear" /></div><!-- wpbody-content --> 
     11<?php } ?> 
     12 
    1513</div><!-- wpbody --> 
    1614</div><!-- wpcontent --> 
    1715</div><!-- wpwrap --> 
    18  
    1916<div id="footer"> 
    2017<p><?php 

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

    r8620 r8633  
    7777<div id="wpcontent"> 
    7878<div id="wphead"> 
    79 <h1><a href="<?php echo clean_url( admin_url() ); ?>"><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?></a><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1> 
     79<h1><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1> 
    8080</div> 
    8181 
    …… 
    127127<?php } ?> 
    128128 
    129 <<<<<<< .working 
    130 <div id="user_info"><p> 
    131     <?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | 
    132     <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> 
    133     <?php if ( $gears_compat ) { ?>| <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?> 
    134 </p></div> 
    135 ======= 
    136129<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 
    138130 
    139131<?php 

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

    r8620 r8633  
    290290    <title><?php _e('Press This') ?></title> 
    291291 
     292    <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce.js?ver=311"></script> 
    292293<?php 
    293294    add_thickbox(); 
    …… 
    298299    wp_enqueue_script('editor_functions'); 
    299300 
    300   wp_teeny_mce(); 
     301//    wp_teeny_mce(); 
    301302 
    302303    do_action('admin_print_styles'); 
    …… 
    304305    do_action('admin_head'); 
    305306?> 
    306 <<<<<<< .working 
    307 <script type="text/javascript"> 
    308     jQuery('#tags-input').hide(); 
    309 ======= 
    310307    <script type="text/javascript"> 
    311308    <?php if ( user_can_richedit() ) { 
    …… 
    354351    jQuery('#tags-input').hide(); 
    355352 
    356 >>>>>>> .merge-right.r8619 
    357353    tag_update_quickclicks(); 
    358354