From 2917579b95ea69d1e5dd1186c5fe7cb0810006ee Mon Sep 17 00:00:00 2001 From: saxmatt Date: Mon, 8 Dec 2003 03:46:42 +0000 Subject: [PATCH] New admin styling and improved navigation. git-svn-id: http://svn.automattic.com/wordpress/trunk@590 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/b2menutop.php | 3 +- wp-admin/categories.php | 2 +- wp-admin/edit-comments.php | 1 + wp-admin/linkcategories.php | 38 +++------ wp-admin/linkmanager.php | 166 +++++++++++++++--------------------- wp-admin/links.import.php | 46 ++++------ wp-admin/wp-admin.css | 16 ++-- wp-admin/wp-moderation.php | 3 +- 8 files changed, 118 insertions(+), 157 deletions(-) diff --git a/wp-admin/b2menutop.php b/wp-admin/b2menutop.php index ba3ed22de..dc6e8e557 100644 --- a/wp-admin/b2menutop.php +++ b/wp-admin/b2menutop.php @@ -11,7 +11,8 @@ foreach ($menu as $item) { if ($continue) { $item = explode("\t", $item); // 0 = user level, 1 = file, 2 = name - if (substr($PHP_SELF, -7) == substr($item[1], -7)) $class = ' class="current"'; + $self = str_replace('/wp-admin/', '', $PHP_SELF); + if ((substr($self, -20) == substr($item[1], -20)) || ($parent_file && ($item[1] == $parent_file))) $class = ' class="current"'; if ($user_level >= $item[0]) echo "\n\t
  • {$item[2]}
    • "; } } diff --git a/wp-admin/categories.php b/wp-admin/categories.php index 081bd8bc9..e73355741 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -147,7 +147,7 @@ default:

    Current Categories

    - +
    diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index f65e3fc22..39c4234f3 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -1,5 +1,6 @@ list_limit = ''; } ?> + + +

    Edit Link Category 'cat_name?>'

    @@ -291,6 +274,11 @@ switch ($action) { die("You have no right to edit the link categories for this blog.
    Ask for a promotion to your blog admin :)"); } ?> +

    Name Description
    diff --git a/wp-admin/linkmanager.php b/wp-admin/linkmanager.php index 16de1ba77..be5820e08 100644 --- a/wp-admin/linkmanager.php +++ b/wp-admin/linkmanager.php @@ -1,31 +1,7 @@ -
    +
    - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +
    Edit a link:Edit a link:
    URL:
    URL:
    Display Name/Alt text:
    Display Name/Alt text:
    Image:
    Image:
    Description:
    Description:
    Rel:
    Rel:
    Notes:
    Notes:
    Rating:
    Rating:
    Target:
    Target:    
    Visible:
    Visible: @@ -387,13 +363,13 @@ switch ($action) { No
    :
    :
      @@ -477,22 +453,22 @@ function checkAll(form) } //--> - +
    - - - - - - +
    Link Categories:Manage Link CategoriesImport Blogroll
    +
    - Show links in category:
    + Show links in category:
    		 - Order by: + Order by:  
    @@ -541,16 +517,15 @@ function checkAll(form) - +
    - + - + - - + + + + - - + + LINKS; $show_buttons = 1; // default @@ -608,21 +585,18 @@ LINKS; - - -LINKS; + echo "\n"; } + echo "\n\t"; } } ?> -
    NameURLURI CategoryRelrel Image Visible  Action  
    $link->link_name
    Description: $link->link_description    		 $short_url $link->category $link->link_rel$image$visible$image$visible LINKS; } else { - echo <<      
    +
    - +
    @@ -659,36 +633,36 @@ LINKS;
    -
    Manage Multiple Links:
    Use the checkboxes on the right to select multiple links and choose an action below:
    - +
    + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/wp-admin/links.import.php b/wp-admin/links.import.php index 234acd84e..350437e92 100644 --- a/wp-admin/links.import.php +++ b/wp-admin/links.import.php @@ -1,34 +1,11 @@ + + +

    On this page you can import your blogroll.

    @@ -65,8 +49,14 @@ switch ($step) { Your OPML code:
  • Did you use - >blogrolling.com -  or >blo.gs ? + +  or  + + ?
  • Now select a category you want to put these links in.
    diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index ae4cf68b5..62aacb51a 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -158,6 +158,10 @@ textarea, input, select { color: #171717; } +#adminmenu .current { + font-weight: bold; +} + #adminmenu li, #adminmenu2 li { display: inline; line-height: 2.0em; @@ -287,16 +291,18 @@ textarea, input, select { } #wphead { - background: url(../b2-img/wp-small.png) no-repeat; - border-bottom: 4px solid #333; - height: 42px; - margin: 0 2px; + height: 44px; + margin: 0; + background: repeat-x url(../b2-img/header-shadow.png) #f2f2f2; } #wphead a { display: block; - height: 42px; + background: url(../b2-img/wp-small.png) no-repeat; + height: 44px; text-decoration: none; text-indent: -1000px; width: 200px; + border-bottom: none; + margin: 3px 0 0 5px; } diff --git a/wp-admin/wp-moderation.php b/wp-admin/wp-moderation.php index 9aa688cf4..2a245c293 100644 --- a/wp-admin/wp-moderation.php +++ b/wp-admin/wp-moderation.php @@ -1,5 +1,6 @@ */ function add_magic_quotes($array) {
    • Add a link:
    URL:
    Add a link:
    URL:
    Display Name/Alt text:
    Display Name/Alt text:
    Image:
    Image:
    Description:
    Description:
    Rel:
    rel:
    Notes:
    Notes:
    Rating:
    Rating:
    Target:
    Target:    
    Visible:
    Visible: @@ -716,13 +690,13 @@ LINKS; No
    :
    :