Changeset 8633

Timestamp:

08/13/2008 02:59:05 AM (18 years ago)

Author:

azaozz

Message:

Crazyhorse: some more merge cleanup

Location:

branches/crazyhorse/wp-admin

Files:

• admin-footer.php (modified) (2 diffs)
• admin-header.php (modified) (2 diffs)
• press-this.php (modified) (4 diffs)

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

@@ -1 @@
-<<<<<<< .working
-<?php if ( ! $fixed_bar ) { ?>
-<br class="clear" /></div><!-- wpbody-content -->
-<?php } ?>
-=======
 <?php
 /**
@@ -11 +6 @@
  * @subpackage Administration
  */
-?>
->>>>>>> .merge-right.r8619
+
+if ( ! $fixed_bar ) { ?>
+<br class="clear" /></div><!-- wpbody-content -->
+<?php } ?>
+
 </div><!-- wpbody -->
 </div><!-- wpcontent -->
 </div><!-- wpwrap -->
-
 <div id="footer">
 <p><?php

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

@@ -77 +77 @@
 <div id="wpcontent">
 <div id="wphead">
-<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>
+<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>
 </div>
 
@@ -127 +127 @@
 <?php } ?>
 
-<<<<<<< .working
-<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 if ( $gears_compat ) { ?>| <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?>
-</p></div>
-=======
 <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>
->>>>>>> .merge-right.r8619
 
 <?php

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

@@ -290 +290 @@
     <title><?php _e('Press This') ?></title>
 
+    <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce.js?ver=311"></script>
 <?php
     add_thickbox();
@@ -298 +299 @@
     wp_enqueue_script('editor_functions');
 
-    wp_teeny_mce();
+//  wp_teeny_mce();
 
     do_action('admin_print_styles');
@@ -304 +305 @@
     do_action('admin_head');
 ?>
-<<<<<<< .working
-<script type="text/javascript">
-    jQuery('#tags-input').hide();
-=======
     <script type="text/javascript">
     <?php if ( user_can_richedit() ) {
@@ -354 +351 @@
     jQuery('#tags-input').hide();
 
->>>>>>> .merge-right.r8619
     tag_update_quickclicks();