Changeset 6549

Timestamp:

01/04/2008 11:47:06 AM (17 years ago)

Author:

matt

Message:

There's a lockup in the tri-menu area. Traffic ahead. Eliminating generic file editor.

Location:

trunk/wp-admin

Files:

• menu-header.php (modified) (3 diffs)
• menu.php (modified) (3 diffs)
• templates.php (deleted)
• wp-admin.css (modified) (5 diffs)

trunk/wp-admin/menu-header.php

@@ -1 @@
-<ul id="adminmenu">
 <?php
 $self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
@@ -6 +5 @@
 get_admin_page_parent();
 
-foreach ($menu as $item) {
+// We're going to do this loop three times
+?>
+
+<ul id="dashmenu">
+<?php
+foreach ( $menu as $key => $item ) {
+    if ( 3 < $key ) // get each menu item before 3
+        continue;
+    $class = '';
+    // 0 = name, 1 = capability, 2 = file
+    if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
+
+    if ( !empty($submenu[$item[2]]) ) {
+        $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
+        $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
+        if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+            echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+        else
+            echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+    } else if ( current_user_can($item[1]) ) {
+        if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") )
+            echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+        else
+            echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
+    }
+}
+do_action( 'dashmenu' );
+?>
+</ul>
+
+<ul id="adminmenu">
+<?php
+foreach ( $menu as $key => $item ) {
+    if ( 5 > $key || $key > 25 ) // get each menu item before 3
+        continue;
+
     $class = '';
 
@@ -26 +60 @@
     }
 }
-
+do_action( 'adminmenu' );
 ?>
 </ul>
+
+<ul id="sidemenu">
+<?php
+foreach ( $menu as $key => $item ) {
+    if ( 26 > $key ) // get each menu item before 3
+        continue;
+
+    $class = '';
+
+    // 0 = name, 1 = capability, 2 = file
+    if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
+
+    if ( !empty($submenu[$item[2]]) ) {
+        $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
+        $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
+        if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+            echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a> |</li>";
+        else
+            echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a> |</li>";
+    } else if ( current_user_can($item[1]) ) {
+        if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") )
+            echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a> |</li>";
+        else
+            echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a> |</li>";
+    }
+}
+do_action( 'sidemenu' );
+?>
+</ul>
+
 
 <?php

trunk/wp-admin/menu.php

@@ -20 +20 @@
     $awaiting_mod = '99+'; // to not blow out layout
 $menu[15] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='comment-count'>$awaiting_mod</span>" ), 'edit_posts', 'edit-comments.php');
-$menu[20] = array(__('Blogroll'), 'manage_links', 'link-manager.php');
 $menu[25] = array(__('Design'), 'switch_themes', 'themes.php');
 $menu[30] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
@@ -31 +30 @@
 
 $_wp_real_parent_file['post.php'] = 'post-new.php'; // Back-compat
-$submenu['post-new.php'][5] = array(__('Write Post'), 'edit_posts', 'post-new.php');
-$submenu['post-new.php'][10] = array(__('Write Page'), 'edit_pages', 'page-new.php');
+$submenu['post-new.php'][5] = array(__('Post'), 'edit_posts', 'post-new.php');
+$submenu['post-new.php'][10] = array(__('Page'), 'edit_pages', 'page-new.php');
 
 $submenu['edit-comments.php'][5] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
@@ -41 +40 @@
 $submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
 $submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
-$submenu['edit.php'][12] = array(__('Uploads'), 'upload_files', 'upload.php');
-$submenu['edit.php'][15] = array(__('Categories'), 'manage_categories', 'categories.php');
-$submenu['edit.php'][30] = array(__('Files'), 'edit_files', 'templates.php');
-$submenu['edit.php'][35] = array(__('Import'), 'import', 'import.php');
-$submenu['edit.php'][40] = array(__('Export'), 'import', 'export.php');
+$submenu['edit.php'][15] = array(__('Links'), 'manage_links', 'link-manager.php');
+$submenu['edit.php'][20] = array(__('Categories'), 'manage_categories', 'categories.php');
+$submenu['edit.php'][25] = array(__('Media Library'), 'upload_files', 'upload.php');
+$submenu['edit.php'][30] = array(__('Import'), 'import', 'import.php');
+$submenu['edit.php'][35] = array(__('Export'), 'import', 'export.php');
 
-$submenu['link-manager.php'][5] = array(__('Manage Blogroll'), 'manage_links', 'link-manager.php');
-$submenu['link-manager.php'][10] = array(__('Add Link'), 'manage_links', 'link-add.php');
-$submenu['link-manager.php'][20] = array(__('Import Links'), 'manage_links', 'link-import.php');
-$submenu['link-manager.php'][30] = array(__('Categories'), 'manage_links', 'edit-link-categories.php');
+
+$submenu['edit.php'][50] = array(__('Add Link'), 'manage_links', 'link-add.php'); // todo: axe
+$submenu['edit.php'][55] = array(__('Import Links'), 'manage_links', 'link-import.php'); // todo: axe
+$submenu['edit.php'][60] = array(__('Categories'), 'manage_links', 'edit-link-categories.php'); // todo: axe
 
 if ( current_user_can('edit_users') ) {

trunk/wp-admin/wp-admin.css

@@ -900 +900 @@
 }
 
+/* menu stuff */
+
+#dashmenu {
+    margin: 0;
+    list-style: none;
+    position: absolute;
+    top: 7px;
+    left: 0;
+    padding-left: 12px;
+}
+
+#dashmenu a {
+    color: #999;
+    padding: 6px;
+    line-height: 220%;
+    margin-right: 8px;
+}
+
+#dashmenu a:hover, #dashmenu a.current, #dashmenu a.current:hover {
+    background: #e4f2fd;
+    -moz-border-radius-topleft: 3px;
+    -moz-border-radius-topright: 3px;       
+    color: #555;
+}
+
 #adminmenu {
     margin: 0;
@@ -911 +936 @@
     font-size: 16px;
     color: #2583ad;
-    padding: 6px 6px;
+    padding: 6px;
     line-height: 200%;
     border: 1px solid #e4f2fd;
@@ -932 +957 @@
 }
 
-#adminmenu li, #submenu li {
+#sidemenu {
+    margin: 0;
+    color: #999;
+    list-style: none;
+    position: absolute;
+    right: 25%;
+    top: 55px;
+    padding-left: 10px;
+}
+
+#sidemenu a {
+    color: #2583ad;
+    padding: 3px;
+    line-height: 200%;
+}
+
+#sidemenu a:hover, #sidemenu a.current, #sidemenu a.current:hover {
+    color: #d54e21;
+}
+
+#dashmenu li, #adminmenu li, #submenu li, #sidemenu li {
     display: inline;
     line-height: 200%;
@@ -938 +983 @@
     text-align: center;
     white-space: nowrap;
+    margin: 0;
+    padding: 0;
 }
 
@@ -972 +1019 @@
 }
 
+/* end menu stuff */
+
 /* Admin Footer */