Changeset 9063

Timestamp:

10/02/2008 11:04:09 AM (16 years ago)

Author:

azaozz

Message:

Add page options to edit/write page, remove the IE6 scrollbar hack (seems not to be needed any more), add the min-width to all admin pages, add the Page Options link to the end of the breadcrumbs

Location:

trunk/wp-admin

Files:

• admin-header.php (modified) (4 diffs)
• css/colors-classic.css (modified) (2 diffs)
• css/colors-fresh.css (modified) (2 diffs)
• wp-admin.css (modified) (5 diffs)

trunk/wp-admin/admin-header.php

@@ -10 +10 @@
 if (!isset($_GET["page"])) require_once('admin.php');
 wp_enqueue_script( 'wp-gears' );
-
-$min_width_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'widgets.php', 'comment.php', 'link.php' );
-$the_current_page = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
-$ie6_no_scrollbar = true;
-
-/**
- * Append 'minwidth' to value.
- *
- * @param mixed $c
- * @return string
- */
-function add_minwidth($c) {
-    return $c . 'minwidth ';
-}
-
-if ( in_array( $the_current_page, $min_width_pages ) ) {
-        $ie6_no_scrollbar = false;
-        add_filter( 'admin_body_class', 'add_minwidth' );
-}
 
 get_admin_page_title();
@@ -51 +32 @@
 //]]>
 </script>
-<?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') && $ie6_no_scrollbar ) : ?>
-<style type="text/css">* html { overflow-x: hidden; }</style>
-<?php endif;
+<?php
 
 $hook_suffixes = array();
@@ -87 +66 @@
     $breadcrumb = '<a href="index.php">' . __('Dashboard') . '</a> &rsaquo; ' . $title;
 }
+
+$settings_pages = array( 'categories.php', 'edit.php', 'edit-comments.php', 'edit-form-advanced.php', 'edit-link-categories.php', 'edit-link-form.php', 'edit-page-form.php', 'edit-tags.php', 'link-manager.php', 'upload.php', 'users.php', 'edit-pages.php', 'post-new.php', 'post.php', 'page-new.php', 'page.php' );
 ?>
-<img id="logo50" src="images/logo50.png" alt="" /> <h1><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?> <a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="View site" id="view-site-link"><img src="<?php echo trailingslashit( bloginfo('wpurl') ) . 'wp-admin/images/new-window-icon.gif'; ?>" alt="View site" /></a><span id="breadcrumb"><?php echo $breadcrumb ?></span></h1>
+
+<img id="logo50" src="images/logo50.png" alt="" /> <h1><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?> <a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="View site" id="view-site-link"><img src="<?php echo trailingslashit( bloginfo('wpurl') ) . 'wp-admin/images/new-window-icon.gif'; ?>" alt="" /></a>
+<span id="breadcrumb"><?php echo $breadcrumb ?></span>
+<?php if ( in_array( $pagenow, $settings_pages ) ) { ?>
+<span id="edit-settings">
+<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
+<a href="#edit_settings" id="hide-settings-link" class="show-settings" style="display:none;"><?php _e('Hide Options') ?></a>
+</span>
+<?php } ?></h1>
 </div>
 
@@ -105 +94 @@
 
 favorite_actions();
-
-$settings_pages = array( 'categories.php', 'edit.php', 'edit-comments.php', 'edit-form-advanced.php', 'edit-link-categories.php', 'edit-link-form.php', 'edit-page-form.php', 'edit-tags.php', 'link-manager.php', 'upload.php', 'users.php', 'edit-pages.php', 'post-new.php' );
-
-if ( in_array( $pagenow, $settings_pages ) ) { ?>
-<div id="edit-settings">
-<a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
-<a href="#edit_settings" id="hide-settings-link" class="show-settings" style="display:none;"><?php _e('Hide Options') ?></a>
-</div>
-<?php } ?>

trunk/wp-admin/css/colors-classic.css

@@ -240 +240 @@
 #login form .submit input:hover, div.dashboard-widget-submit input:hover,
 #edit-slug-buttons a.save:hover, #media-upload a.delete:hover,
-#media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover {
+#media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover,
+#edit-settings a.show-settings:hover {
     color: #d54e21;
 }
@@ -351 +352 @@
 }
 
-#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-sortable .postbox h3:hover span, a {
+#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-sortable .postbox h3:hover span, a, #edit-settings a.show-settings {
     color: #2e7ca0;
 }

trunk/wp-admin/css/colors-fresh.css

@@ -240 +240 @@
 #login form .submit input:hover, div.dashboard-widget-submit input:hover,
 #edit-slug-buttons a.save:hover, #media-upload a.delete:hover,
-#media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover {
+#media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover,
+#edit-settings a.show-settings:hover {
     color: #d54e21;
 }
@@ -349 +350 @@
 }
 
-#adminmenu a, #adminmenu ul.wp-submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, .ui-sortable .postbox h3:hover span, a {
+#adminmenu a, #adminmenu ul.wp-submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, .ui-sortable .postbox h3:hover span, a, #edit-settings a.show-settings {
     color: #2583ad;
 }

trunk/wp-admin/wp-admin.css

@@ -635 +635 @@
 
 #wphead #breadcrumb {
-    position: absolute;
     margin-top: 12px;
     margin-left: 10px;
@@ -1624 +1623 @@
 }
 
-body.minwidth {
+body.wp-admin {
     min-width: 785px;
 }
@@ -2061 +2060 @@
 /* show/hide settings */
 #edit-settings {
-    position: absolute;
-    right: 200px;
-    top: 46px;
-}
-
-.show-settings {
-    display: block;
+    margin-left: 20px;
+}
+
+#edit-settings a.show-settings {
     height: 18px;
     font-size: 11px;
@@ -2073 +2069 @@
     z-index: 1;
     padding: 3px 8px;
+}
+
+#edit-settings a.show-settings:hover {
+    text-decoration: none;
 }
 
@@ -2104 +2104 @@
     padding: 5px 3px;
     white-space: nowrap;
-    width: 12em;
+    overflow: hidden;
+    width: 13em;
 }