Changeset 8115

Timestamp:

06/18/08 01:55:39 (5 months ago)

Author:

mdawaffe

Message:

crazyhorse: first pass at menu positioning - will break some things. Menu reorganization to come

Files:

• branches/crazyhorse/wp-admin/admin-footer.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/admin-header.php (modified) (2 diffs)
• branches/crazyhorse/wp-admin/css/colors-classic.css (modified) (9 diffs)
• branches/crazyhorse/wp-admin/css/colors-fresh.css (modified) (9 diffs)
• branches/crazyhorse/wp-admin/css/global.css (modified) (1 diff)
• branches/crazyhorse/wp-admin/menu-header.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/menu.php (modified) (3 diffs)
• branches/crazyhorse/wp-admin/wp-admin.css (modified) (6 diffs)

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

@@ -1 @@
-/div><!--
-
+br class="clear" /></div></div><!-- wpbody-content
+br class="clear" /><
-</div><!-- wpwrap -->
-<div id="footer">

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

@@ -112 +112 @@
-<?php } ?>
-
-
+
+
+
+
+
-
-<?php
@@ -121 +125 @@
-}
-?>
-
+<div id="wpbody-content">

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

@@ +1 @@
+#wpcontent {
+    background-color: #14568A;
+}
+#wpbody-content {
+    background-color: #fff;
+}
-a.page-numbers:hover {
-    border-color: #999;
@@ -133 +139 @@
-}
-
-sidemenu, #
+
-    color: #999;
-}
@@ -205 +211 @@
-}
-
-#submenu a.current, #submenu a:hover, 
+
-    color: #d54e21;
-}
-
-#sidemenu a:hover, 
+
-    color: #97c4d8;
-}
@@ -301 +307 @@
-}
-
-#submenu a {
-    color: #2782af
-}
-/* Because we don't want visited on these links */
-a.current, #sidemenu a.current
+li.current a
-    background-color: #fff;
-    border-color: #07273e;
@@ -313 +316 @@
-}
-
+#adminmenu li.current {
+    background-color: #fff;
+    border-right-color: #fff;
+}
+
-#adminmenu li a #awaiting-mod {
-    background-image: url(../images/comment-stalk-classic.gif);
@@ -332 +340 @@
-}
-
-#adminmenu, 
+
-    background-color: #14568a;
-    border-bottom-color: #07273e;
@@ -351 +359 @@
-input.readonly {
-    background-color: #ddd;
-}
-
-#dashmenu a.current {
-    background-color: #14568a;
-    color: #cfebf6;
-}
-
@@ -463 +466 @@
-#rightnow a {
-    color: #448abd;
-}
-
-#sidemenu a {
-    background-color: #14568a;
-    border-bottom-color: #07273e;
-    border-top-color: #14568a;
-    color: #cfebf6;
-}
-
@@ -544 +540 @@
-}
-
-, #dashmenu a.current:hover
+
-    color: #cfebf6;
-}

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

@@ +1 @@
+#wpcontent {
+    background-color: #e4f2fd;
+}
+#wpbody-content {
+    background-color: #fff;
+}
-a.page-numbers:hover {
-    border-color: #999;
@@ -133 +139 @@
-}
-
-sidemenu, #
+
-    color: #999;
-}
@@ -197 +203 @@
-}
-
-#sidemenu a:hover, #submenu a.current, #submenu a:hover, 
+
-    color: #d54e21;
-}
@@ -280 +286 @@
-}
-
-submenu a, #
+
-    color: #2583ad;
-}
-
-/* Because we don't want visited on these links */
-a.current, #sidemenu a.current
+li.current a
-    background-color: #fff;
-    border-color: #c6d9e9;
@@ -292 +298 @@
-}
-
+#adminmenu li.current {
+    background-color: #fff;
+    border-right-color: #fff;
+}
+
-#adminmenu li a #awaiting-mod {
-    background-image: url(../images/comment-stalk-fresh.gif);
@@ -305 +316 @@
-}
-
-#adminmenu, 
+
-    background-color: #e4f2fd;
-    border-bottom-color: #c6d9e9;
@@ -324 +335 @@
-input.readonly {
-    background-color: #ddd;
-}
-
-#dashmenu a.current {
-    background-color: #e4f2fd;
-    color: #555;
-}
-
@@ -432 +438 @@
-#rightnow a {
-    color: #448abd;
-}
-
-#sidemenu a {
-    background-color: #e4f2fd;
-    border-bottom-color: #c6d9e9;
-    border-top-color: #e4f2fd;
-}
-
@@ -512 +512 @@
-}
-
-dashmenu a.current:hover, #
+
-    color: #555;
-}

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

@@ +1 @@
+/* 2 column liquid layout */
+div#wpbody {
+    float: right;
+    clear: right;
+    width: 100%;
+    margin-left: -210px;
+}
+
+div#wpbody-content {
+    margin-left: 200px;
+    border-width: 1px 0 0 1px;
+    border-style: solid;
+}
+
+ul#adminmenu {
+    float: left;
+    clear: left;
+    width: 190px; /* + 10 padding */
+    position: relative;
+}
+
-/* styles for use by people extending the WordPress interface */
-
-
-body    {

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

@@ -7 +7 @@
-get_admin_page_parent();
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
-
-
-
-
+
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-do_action( 'adminmenu' );
-?>
+
+
-</ul>
-
-
+
+
-<?php
-$side_items = array();
-foreach ( $menu as $key => $item ) {
-    if ( 26 > $key || $key > 40 )
-        continue;
-
-
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-</ul>
-
-
-<?php
-// Sub-menu
-if ( isset($submenu["$parent_file"]) ) :
-?>
-<ul id="submenu">
-<?php
-foreach ($submenu["$parent_file"] as $item) :
-     if ( !current_user_can($item[1]) )
-         continue;
-
-if ( isset($submenu_file) ) {
-    if ( $submenu_file == $item[2] ) $class = ' class="current"';
-    else $class = '';
-} else if ( (isset($plugin_page) && $plugin_page == $item[2]) || (!isset($plugin_page) && $self == $item[2]) ) $class = ' class="current"';
-else $class = '';
-
-$menu_hook = get_plugin_page_hook($item[2], $parent_file);
-
-if (file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || ! empty($menu_hook)) {
-    if ( 'admin.php' == $pagenow )
-        echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
-    else
-        echo "\n\t<li><a href='{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
- } else {
-    echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
- }
-endforeach;
-?>
-
-</ul>
-<?php
-else :
-?>
-<div id="minisub"></div>
-<?php
-
-endif;
-
-do_action('admin_notices');

branches/crazyhorse/wp-admin/menu.php

@@ -5 +5 @@
-// The minimum level the user needs to access the item: between 0 and 10
-// The URL of the item's file
+
+$awaiting_mod = wp_count_comments();
+$awaiting_mod = $awaiting_mod->moderated;
+
+$top_menu = array();
+$top_menu[5] = array( __('My Account'), 'read', 'profile.php' );
+$top_menu[10] = array( __('My Dashboard'), 'read', 'index.php' );
+$top_menu[15] = array( __('New Post'), 'edit_posts', 'post-new.php' );
+$top_menu[20] = array( sprintf( __('Comments (%s)'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php' );
+$top_menu[25] = array( __('Help'), 'read', 'index.php?help' ); // place holder
+
+$top_submenu = array();
+$top_submenu['profile.php'][5] = array( __('Something'), 'read', 'profile.php?something' ); // place holder
+
-$menu[0] = array(__('Dashboard'), 'read', 'index.php');
-
@@ -21 +35 @@
-    $menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
-
-$awaiting_mod = wp_count_comments();
-$awaiting_mod = $awaiting_mod->moderated;
-$menu[15] = array(__('Design'), 'switch_themes', 'themes.php');
-$menu[20] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php');
@@ -82 +94 @@
-$_wp_menu_nopriv = array();
-// Loop over submenus and remove pages for which the user does not have privs.
-
-
-
-
-
+
+
+
+
+
+
+
-        }
+
+        if ( empty(${$sub_loop}[$parent]) )
+            unset(${$sub_loop}[$parent]);
-    }
-
-    if ( empty($submenu[$parent]) )
-        unset($submenu[$parent]);
-}
-

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

@@ -587 +587 @@
-    position: absolute;
-    right: 15px;
-11px
+0
-    font-size: 11px;
+    line-height: 31px;
+    height: 31px;
-}
-
@@ -594 +596 @@
-    margin: 0;
-    padding: 0;
+    line-height: 31px;
-}
-
-#wphead {
-top-width: 30px
-top-
-
-
-submenu a, #sidemenu a, #
+width: 31px 0 0
+
+
+
+
-    text-decoration: none;
-}
@@ -632 +635 @@
-/* menu stuff */
-
+#dashmenu .wp-submenu, #adminmenu .wp-submenu {
+    display: none;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
-#dashmenu {
-
+
+
-    list-style: none;
-    position: absolute;
-7px
+0
-    left: 0;
+    height: 31px;
-    font-size: 11px;
-
+
+
+
+
+
+
+
+
+
+
-}
-
-#dashmenu a {
-    padding: 5px 6px;
-220%
+31px
-    margin-right: 8px;
-}
-
-#dashmenu a.current {
-    border: none;
-    -moz-border-radius-topleft: 3px;
-    -khtml-border-top-left-radius: 3px;
-    -webkit-border-top-left-radius: 3px;
-    border-top-left-radius: 3px;
-    -moz-border-radius-topright: 3px;
-    -khtml-border-top-right-radius: 3px;
-    -webkit-border-top-right-radius: 3px;
-    border-top-right-radius: 3px;
-}
-
-#adminmenu {
-    margin: 0;
+    padding: 10px 0 10px 10px;
-    list-style: none;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -674 +695 @@
-}
-
-#adminmenu a.current, #sidemenu a.current {
-    font-weight: normal;
-    padding-left: 6px;
-    padding-right: 6px;
-    -moz-border-radius-topleft: 4px;
-    -khtml-border-top-left-radius: 4px;
-    -webkit-border-top-left-radius: 4px;
-    border-top-left-radius: 4px;
-    -moz-border-radius-topright: 4px;
-    -khtml-border-top-right-radius: 4px;
-    -webkit-border-top-right-radius: 4px;
-    border-top-right-radius: 4px;
-    border-width: 1px;
-    border-style: solid;
-}
-
-#adminmenu a.current {
-    border-bottom-width: 2px;
-}
-
-#sidemenu {
-    margin: -30px 15px 0 315px;
-    list-style: none;
-    position: relative;
-    float: right;
-    padding-left: 10px;
-    font-size:12px;
-}
-
-#sidemenu a {
-    padding: 0 7px;
-    display: block;
-    float: left;
-    line-height: 28px;
-    border-top-width: 1px;
-    border-top-style: solid;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-}
-
-#dashmenu li, #adminmenu li, #submenu li, #sidemenu li {
-    display: inline;
-    line-height: 200%;
-    list-style: none;
-    text-align: center;
-    white-space: nowrap;
-    margin: 0;
-    padding: 0;
-}
-
-#submenu li {
-    padding: 0 0 8px 17px;
-}
-
-#adminmenu li a #awaiting-mod {
-    position: absolute;
-    margin-left: -0.4em;
-    margin-top: 0.2em;
-    font-size: 0.7em;
@@ -797 +763 @@
-}
-
-#submenu {
-    margin: 0;
-    list-style: none;
-    padding: 6px 0 3px 0;
-}
-
-#submenu li {
-    font-size: 14px;
-}
-
-#minisub { /* for empty submenus */
-    height: 15px;
-}
-
-/* end menu stuff */
-
@@ -821 +773 @@
-    position: relative;
-    min-height: 100%;
-}
-#wpcontent{
-    padding-bottom: 95px;
-}
-#footer {