diff --git a/wp-admin/categories.php b/wp-admin/categories.php index 3ff761aa16..1ba6f49de9 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -128,23 +128,7 @@ default: die("You have no right to edit the categories for this blog.
Ask for a promotion to your blog admin. :)"); } ?> - +

Current Categories

diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php index e8956b1176..30f3db91ec 100644 --- a/wp-admin/link-add.php +++ b/wp-admin/link-add.php @@ -63,138 +63,172 @@ require('admin-header.php');
  • Link Categories
  • Import Blogroll
    • +
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +
    Add a link:
    URL:
    Display Name/Alt text:
    Image:
    Description:
    rel:
    XFN: - - - - - - - - - - - - - - - - - - - - - - - - - -
    - friendship - - - -
    - - physical - - -
    - - professional - - -
    - geographical - - - -
    - family - - - - -
    - romantic - - - -
    Notes:
    Rating: - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - -
    URI:
    Link Name:
    Image
    Description
    rel:
    XFN: + + + + + + + + + + + + + + + + + + + + + + + + +
    friendship + + + +
    physical + +
    professional + + +
    geographical + + + +
    family + + + + + +
    romantic + + + + + +
    Notes:
    Rating: (Leave at 0 for no rating.) -
    Target: -   -   -
    Visible: -   -
    : - -
    - -
    + +  (Leave at 0 for no rating.)
    Target +  + +  + +(Note that the target attribute is illegal in XHTML 1.1 and 1.0 Strict.)
    Visible: +  +
    Category:
    +

    + +

    +
    diff --git a/wp-admin/link-categories.php b/wp-admin/link-categories.php index d3f9c12b0a..cfafbace62 100644 --- a/wp-admin/link-categories.php +++ b/wp-admin/link-categories.php @@ -2,7 +2,6 @@ // Links // Copyright (C) 2002, 2003 Mike Little -- mike@zed1.com - $title = 'Link Categories'; $this_file='link-categories.php'; $parent_file = 'link-manager.php'; @@ -24,51 +23,51 @@ for ($i=0; $i$cat_name link category: this is the default one"); + die("Can't delete the $cat_name link category: this is the default one"); if ($user_level < get_settings('links_minadminlevel')) die ("Cheatin' uh ?"); @@ -99,13 +98,13 @@ switch ($action) { $wpdb->query("DELETE FROM $tablelinkcategories WHERE cat_id='$cat_id'"); $wpdb->query("UPDATE $tablelinks SET link_category=1 WHERE link_category='$cat_id'"); - header("Location: link-categories.php"); + header('Location: link-categories.php'); break; } // end delete - case "Edit": + case 'Edit': { - include_once ("./admin-header.php"); - $cat_id = $HTTP_POST_VARS["cat_id"]; + include_once ('admin-header.php'); + $cat_id = $HTTP_GET_VARS['cat_id']; $row = $wpdb->get_row("SELECT cat_id, cat_name, auto_toggle, show_images, show_description, " . " show_rating, show_updated, sort_order, sort_desc, text_before_link, text_after_link, " . " text_after_all, list_limit FROM $tablelinkcategories WHERE cat_id=$cat_id"); @@ -123,28 +122,38 @@ switch ($action) {
    -

    Edit Link Category 'cat_name?>'

    +

    Edit Link Category “cat_name?>”

    -

    + + - + - + - + - + - + - + - - + +
    Name:     - auto_toggle == 'Y') ? 'checked' : '';?> value="Y" /> auto-toggle?
    Show:Show: - show_images == 'Y') ? 'checked' : '';?> value="Y" /> images   - show_description == 'Y') ? 'checked' : '';?> value="Y" /> description   - show_rating == 'Y') ? 'checked' : '';?> value="Y" /> rating   - show_updated == 'Y') ? 'checked' : '';?> value="Y" /> updated +   +   +   +
    Sort order:Sort by:
    Text/HTMLText/HTML  
    before:Before:
    between:Between:
    after:After:
    limit: (leave empty for no limit)Limit: (How many links are shown. Empty for unlimited.)
    @@ -185,7 +194,7 @@ switch ($action) {
    -
    +

    Import Blogroll
    - - - - -
    -
    - Edit a link category:
    - - - - - - - - - - - + + + Edit a link category:
    +
    IdNameAuto
    Toggle?    		ShowSort OrderDesc?Text/HTMLLimit 
    + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -319,22 +326,22 @@ foreach ($results as $row) { } $style = ($i % 2) ? ' class="alternate"' : ''; ?> - > - - - - - - - - - - - - - - - + style="border-bottom: 1px dotted #9C9A9C;"> + + + + + + + + + + + + + + +
    NameIdAuto
    Toggle?    		ShowSort OrderDesc?Text/HTMLLimit 
    images?desc?rating?updated?beforebetweenafter
    images?desc?rating?updated?beforebetweenafter
    cat_id?>cat_name)?>auto_toggle?>show_images?>show_description?>show_rating?>show_updated?>sort_order?>sort_desc?>text_before_link)?> text_after_link)?> text_after_all)?>list_limit?>
    cat_name)?>cat_id?>auto_toggle?>show_images?>show_description?>show_rating?>show_updated?>sort_order?>sort_desc?>text_before_link)?> text_after_link)?> text_after_all)?>list_limit?>EditDelete
    -
    +
    - - - - +

    Add a Link Category:

    +
    Add a Link Category:
    Name:     @@ -407,15 +410,16 @@ foreach ($results as $row) {
    -
    - Note:
    - Deleting a link category does not delete links from that category.
    It will +

    Note:

    +

    Deleting a link category does not delete links from that category.
    + It will just set them back to the default category . +

    - + \ No newline at end of file diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php index 439828544b..6f495dda80 100644 --- a/wp-admin/link-import.php +++ b/wp-admin/link-import.php @@ -32,7 +32,7 @@ switch ($step) {
    -

    On this page you can import your blogroll.

    +

    Import your blogroll from another system

    diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index e9c6d87fd9..e7968df421 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -62,7 +62,7 @@ for ($i=0; $i - +
    @@ -580,8 +585,8 @@ LINKS; if ($show_buttons) { echo << - + +
    EditDelete LINKS; } else { diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 8290ca2c91..e092c62b3f 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -1,9 +1,30 @@ +* html #poststuff { + height: 100%; /* kill peekaboo bug in IE */ +} + a { border-bottom: 1px solid #69c; color: #00019b; text-decoration: none; } +a.delete:hover { + background: #c00; + color: #fff; +} + +a.edit, a.delete, a.edit:hover, a.delete:hover { + border-bottom: none; + display: block; + padding: 5px 0; + text-align: center; +} + +a.edit:hover { + background: #ccc; + color: #036; +} + a:visited { color: #006; } @@ -73,8 +94,8 @@ p, dl, dd, dt { } textarea, input, select { - background: #f0f0f0; - border: 1px solid #ccc; + background: #f4f4f4; + border: 1px solid #d8d8d8; font-family: Georgia, "Times New Roman", Times, serif; margin: 1px; padding: 2px; @@ -101,7 +122,7 @@ textarea, input, select { padding: 0; } -.post-categories li { +.post-categories li, #ed_toolbar { display: inline; } @@ -138,6 +159,10 @@ textarea, input, select { margin: 6px 0; } +#adminmenu .current, #adminmenu2 .current { + font-weight: bold; +} + #adminmenu .last, #adminmenu2 .last { border-right: none; } @@ -158,10 +183,6 @@ textarea, input, select { color: #171717; } -#adminmenu .current, #adminmenu2 .current { - font-weight: bold; -} - #adminmenu li, #adminmenu2 li { display: inline; line-height: 2.0em; @@ -214,10 +235,6 @@ textarea, input, select { width: 25px; } -#ed_toolbar { - display: inline; -} - #login { background: url(http://wordpress.org/images/wp-small.png) #fff no-repeat top center; border: 2px solid #333; @@ -254,10 +271,6 @@ textarea, input, select { margin-right: 11em; } -* html #poststuff { - height: 100%; /* kill peekaboo bug in IE */ -} - #poststuff textarea { width: 99%; } @@ -290,24 +303,24 @@ textarea, input, select { #titlediv, #poststatusdiv, #commentstatusdiv, #pingstatusdiv, #postpassworddiv { float: left; - margin-right: 5px; height: 6em; + margin-right: 5px; } #wphead { + background: url(../wp-images/header-shadow.png) repeat-x #f2f2f2; height: 42px; margin: 0; - background: repeat-x url(../wp-images/header-shadow.png) #f2f2f2; } #wphead a { - display: block; background: url(../wp-images/wp-small.png) no-repeat; + border-bottom: none; + display: block; height: 42px; + line-height: 30px; + margin: 3px 0 0 5px; text-decoration: none; text-indent: -1000px; - line-height: 30px; width: 200px; - border-bottom: none; - margin: 3px 0 0 5px; }