]> scripts.mit.edu Git - autoinstalls/wordpress.git/commitdiff
Wordpress 2.6.2 wordpress-2.6.2
authorEdward Z. Yang <ezyang@mit.edu>
Sat, 21 Nov 2009 01:20:10 +0000 (20:20 -0500)
committerEdward Z. Yang <ezyang@mit.edu>
Sat, 21 Nov 2009 01:20:10 +0000 (20:20 -0500)
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
290 files changed:
index.php
readme.html
wp-admin/admin-ajax.php
wp-admin/admin-header.php
wp-admin/admin-post.php [new file with mode: 0644]
wp-admin/admin.php
wp-admin/async-upload.php
wp-admin/bookmarklet.php [deleted file]
wp-admin/categories.php
wp-admin/comment.php
wp-admin/css/colors-classic-rtl.css
wp-admin/css/colors-classic.css
wp-admin/css/colors-fresh-rtl.css
wp-admin/css/colors-fresh.css
wp-admin/css/dashboard-rtl.css
wp-admin/css/global-rtl.css [new file with mode: 0644]
wp-admin/css/global.css
wp-admin/css/ie-rtl.css
wp-admin/css/ie.css
wp-admin/css/install-rtl.css
wp-admin/css/install.css
wp-admin/css/login-rtl.css
wp-admin/css/media-rtl.css
wp-admin/css/media.css
wp-admin/css/press-this-ie-rtl.css [new file with mode: 0644]
wp-admin/css/press-this-ie.css [new file with mode: 0644]
wp-admin/css/press-this-rtl.css [new file with mode: 0644]
wp-admin/css/press-this.css [new file with mode: 0644]
wp-admin/css/theme-editor-rtl.css
wp-admin/css/widgets-rtl.css
wp-admin/css/widgets.css
wp-admin/custom-header.php
wp-admin/edit-category-form.php
wp-admin/edit-comments.php
wp-admin/edit-form-advanced.php
wp-admin/edit-form-comment.php
wp-admin/edit-link-categories.php
wp-admin/edit-link-category-form.php
wp-admin/edit-link-form.php
wp-admin/edit-page-form.php
wp-admin/edit-pages.php
wp-admin/edit-tag-form.php
wp-admin/edit-tags.php
wp-admin/edit.php
wp-admin/export.php
wp-admin/gears-manifest.php [new file with mode: 0644]
wp-admin/images/gear.png [new file with mode: 0644]
wp-admin/images/loading-publish.gif [new file with mode: 0644]
wp-admin/images/loading.gif [new file with mode: 0644]
wp-admin/images/logo.gif [new file with mode: 0644]
wp-admin/images/no.png [new file with mode: 0644]
wp-admin/images/required.gif [new file with mode: 0644]
wp-admin/images/tab.png [new file with mode: 0644]
wp-admin/images/yes.png [new file with mode: 0644]
wp-admin/import/blogger.php
wp-admin/import/dotclear.php
wp-admin/import/greymatter.php
wp-admin/import/mt.php
wp-admin/import/textpattern.php
wp-admin/import/wordpress.php
wp-admin/import/wp-cat2tag.php
wp-admin/includes/bookmark.php
wp-admin/includes/class-wp-filesystem-base.php [new file with mode: 0644]
wp-admin/includes/class-wp-filesystem-direct.php
wp-admin/includes/class-wp-filesystem-ftpext.php
wp-admin/includes/class-wp-filesystem-ftpsockets.php
wp-admin/includes/comment.php
wp-admin/includes/dashboard.php
wp-admin/includes/export.php
wp-admin/includes/file.php
wp-admin/includes/image.php
wp-admin/includes/media.php
wp-admin/includes/misc.php
wp-admin/includes/plugin.php
wp-admin/includes/post.php
wp-admin/includes/schema.php
wp-admin/includes/taxonomy.php
wp-admin/includes/template.php
wp-admin/includes/theme.php
wp-admin/includes/update.php
wp-admin/includes/upgrade.php
wp-admin/includes/user.php
wp-admin/includes/widgets.php
wp-admin/index.php
wp-admin/install-helper.php
wp-admin/install.php
wp-admin/js/editor.js
wp-admin/js/forms.js
wp-admin/js/gallery.js [new file with mode: 0644]
wp-admin/js/link.js
wp-admin/js/media-upload.js
wp-admin/js/post.js
wp-admin/js/revisions-js.php [new file with mode: 0644]
wp-admin/js/theme-preview.js [new file with mode: 0644]
wp-admin/js/widgets.js
wp-admin/js/word-count.js [new file with mode: 0644]
wp-admin/js/wp-gears.js [new file with mode: 0644]
wp-admin/link-add.php
wp-admin/link-category.php
wp-admin/link-import.php
wp-admin/link-manager.php
wp-admin/link-parse-opml.php
wp-admin/link.php
wp-admin/media.php
wp-admin/menu-header.php
wp-admin/menu.php
wp-admin/moderation.php
wp-admin/options-discussion.php
wp-admin/options-general.php
wp-admin/options-misc.php
wp-admin/options-permalink.php
wp-admin/options-privacy.php
wp-admin/options-reading.php
wp-admin/options-writing.php
wp-admin/options.php
wp-admin/page-new.php
wp-admin/page.php
wp-admin/plugin-editor.php
wp-admin/plugins.php
wp-admin/post-new.php
wp-admin/post.php
wp-admin/press-this.php [new file with mode: 0644]
wp-admin/revision.php [new file with mode: 0644]
wp-admin/rtl.css
wp-admin/setup-config.php
wp-admin/sidebar.php
wp-admin/theme-editor.php
wp-admin/themes.php
wp-admin/update-links.php
wp-admin/update.php
wp-admin/upgrade.php
wp-admin/upload.php
wp-admin/user-edit.php
wp-admin/users.php
wp-admin/widgets.php
wp-admin/wp-admin.css
wp-app.php
wp-atom.php
wp-blog-header.php
wp-comments-post.php
wp-commentsrss2.php
wp-config-sample.php
wp-content/plugins/akismet/akismet.php
wp-content/plugins/akismet/readme.txt [new file with mode: 0644]
wp-content/plugins/hello.php
wp-content/themes/classic/index.php
wp-content/themes/classic/style.css
wp-content/themes/default/comments.php
wp-content/themes/default/images/header-img.php
wp-content/themes/default/searchform.php
wp-content/themes/default/single.php
wp-content/themes/default/style.css
wp-cron.php
wp-feed.php
wp-includes/Text/Diff.php [new file with mode: 0644]
wp-includes/Text/Diff/Engine/native.php [new file with mode: 0644]
wp-includes/Text/Diff/Engine/shell.php [new file with mode: 0644]
wp-includes/Text/Diff/Engine/string.php [new file with mode: 0644]
wp-includes/Text/Diff/Engine/xdiff.php [new file with mode: 0644]
wp-includes/Text/Diff/Renderer.php [new file with mode: 0644]
wp-includes/Text/Diff/Renderer/inline.php [new file with mode: 0644]
wp-includes/atomlib.php
wp-includes/author-template.php
wp-includes/bookmark-template.php
wp-includes/bookmark.php
wp-includes/cache.php
wp-includes/canonical.php
wp-includes/capabilities.php
wp-includes/category-template.php
wp-includes/category.php
wp-includes/class-IXR.php
wp-includes/class-phpass.php
wp-includes/class-phpmailer.php
wp-includes/class-pop3.php
wp-includes/class-smtp.php
wp-includes/class-snoopy.php
wp-includes/class.wp-dependencies.php [new file with mode: 0644]
wp-includes/class.wp-scripts.php [new file with mode: 0644]
wp-includes/class.wp-styles.php [new file with mode: 0644]
wp-includes/classes.php
wp-includes/comment-template.php
wp-includes/comment.php
wp-includes/cron.php
wp-includes/default-filters.php
wp-includes/deprecated.php
wp-includes/feed.php
wp-includes/formatting.php
wp-includes/functions.php
wp-includes/functions.wp-scripts.php [new file with mode: 0644]
wp-includes/functions.wp-styles.php [new file with mode: 0644]
wp-includes/general-template.php
wp-includes/images/blank.gif [new file with mode: 0644]
wp-includes/js/autosave.js
wp-includes/js/jquery/jquery.dimensions.min.js [deleted file]
wp-includes/js/jquery/jquery.js
wp-includes/js/jquery/suggest.js
wp-includes/js/jquery/ui.core.js [new file with mode: 0644]
wp-includes/js/jquery/ui.sortable.js [new file with mode: 0644]
wp-includes/js/jquery/ui.tabs.js
wp-includes/js/swfupload/handlers.js
wp-includes/js/thickbox/macFFBgHack.png [new file with mode: 0644]
wp-includes/js/thickbox/thickbox.css
wp-includes/js/tinymce/langs/wp-langs.php
wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js
wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
wp-includes/js/tinymce/plugins/inlinepopups/template.htm
wp-includes/js/tinymce/plugins/media/css/media.css
wp-includes/js/tinymce/plugins/media/editor_plugin.js
wp-includes/js/tinymce/plugins/media/js/media.js
wp-includes/js/tinymce/plugins/media/media.htm
wp-includes/js/tinymce/plugins/paste/blank.htm
wp-includes/js/tinymce/plugins/paste/editor_plugin.js
wp-includes/js/tinymce/plugins/paste/pastetext.htm
wp-includes/js/tinymce/plugins/paste/pasteword.htm
wp-includes/js/tinymce/plugins/safari/editor_plugin.js
wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
wp-includes/js/tinymce/plugins/wordpress/img/audio.gif [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wordpress/img/image.gif [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wordpress/img/media.gif [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wordpress/img/video.gif [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wordpress/popups.css [deleted file]
wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wpeditimage/editimage.html [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wpeditimage/img/image.png [new file with mode: 0644]
wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js [new file with mode: 0644]
wp-includes/js/tinymce/themes/advanced/about.htm
wp-includes/js/tinymce/themes/advanced/anchor.htm
wp-includes/js/tinymce/themes/advanced/charmap.htm
wp-includes/js/tinymce/themes/advanced/color_picker.htm
wp-includes/js/tinymce/themes/advanced/editor_template.js
wp-includes/js/tinymce/themes/advanced/image.htm
wp-includes/js/tinymce/themes/advanced/img/icons.gif
wp-includes/js/tinymce/themes/advanced/js/color_picker.js
wp-includes/js/tinymce/themes/advanced/js/image.js
wp-includes/js/tinymce/themes/advanced/link.htm
wp-includes/js/tinymce/themes/advanced/skins/default/content.css
wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css
wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
wp-includes/js/tinymce/themes/advanced/source_editor.htm
wp-includes/js/tinymce/tiny_mce.js
wp-includes/js/tinymce/tiny_mce_config.php
wp-includes/js/tinymce/tiny_mce_ext.js
wp-includes/js/tinymce/tiny_mce_popup.js
wp-includes/js/tinymce/utils/editable_selects.js
wp-includes/js/tinymce/utils/mctabs.js
wp-includes/js/tinymce/utils/validate.js
wp-includes/js/tinymce/wordpress.css
wp-includes/js/tinymce/wp-mce-help.php
wp-includes/js/wp-ajax.js [deleted file]
wp-includes/js/wp-lists.js
wp-includes/kses.php
wp-includes/l10n.php
wp-includes/link-template.php
wp-includes/media.php
wp-includes/pluggable.php
wp-includes/plugin.php
wp-includes/post-template.php
wp-includes/post.php
wp-includes/query.php
wp-includes/rewrite.php
wp-includes/rss.php
wp-includes/script-loader.php
wp-includes/shortcodes.php
wp-includes/streams.php
wp-includes/taxonomy.php
wp-includes/template-loader.php
wp-includes/theme.php
wp-includes/update.php
wp-includes/user.php
wp-includes/vars.php
wp-includes/version.php
wp-includes/widgets.php
wp-includes/wp-db.php
wp-includes/wp-diff.php [new file with mode: 0644]
wp-links-opml.php
wp-load.php [new file with mode: 0644]
wp-login.php
wp-mail.php
wp-pass.php
wp-rdf.php
wp-register.php
wp-rss.php
wp-rss2.php
wp-settings.php
wp-trackback.php
xmlrpc.php

index b1c655cd5206a392562d94d6f8dbd7a0da2cafbe..49403ecc2d8a343da95ad8d354b4f16a73f094d9 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,5 +1,18 @@
 <?php
 <?php
-/* Short and sweet */
+/**
+ * Front to the WordPress application. This file doesn't do anything, but loads
+ * wp-blog-header.php which does and tells WordPress to load the theme.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Tells WordPress to load the WordPress theme and output it.
+ *
+ * @var bool
+ */
 define('WP_USE_THEMES', true);
 define('WP_USE_THEMES', true);
+
+/** Loads the WordPress Environment and Template */
 require('./wp-blog-header.php');
 ?>
\ No newline at end of file
 require('./wp-blog-header.php');
 ?>
\ No newline at end of file
index a60861c5fa26171f6d4e0ff64419ba56129254b9..45fd3f888b3c4ead84d6beda4dbc8e31372f0da6 100644 (file)
@@ -8,7 +8,7 @@
 <body>
 <h1 id="logo" style="text-align: center">
        <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
 <body>
 <h1 id="logo" style="text-align: center">
        <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
-       <br /> Version 2.5
+       <br /> Version 2.6.1
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
 
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
 
@@ -29,7 +29,7 @@
 
 <h1>Upgrading</h1>
 <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
 
 <h1>Upgrading</h1>
 <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
-<h2>Upgrading from any previous WordPress to 2.5:</h2>
+<h2>Upgrading from any previous WordPress to 2.6.1:</h2>
 <ol>
        <li>Delete your old WP files, saving ones you've modified.</li>
        <li>Upload the new files.</li>
 <ol>
        <li>Delete your old WP files, saving ones you've modified.</li>
        <li>Upload the new files.</li>
index 4e34333ca74d2d36c9a840a2776eb3310145009a..4485935147ed90a97b3f8cb89a57f5c84e5a2551 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 define('DOING_AJAX', true);
 
 <?php
 define('DOING_AJAX', true);
 
-require_once('../wp-config.php');
+require_once('../wp-load.php');
 require_once('includes/admin.php');
 
 if ( !is_user_logged_in() )
 require_once('includes/admin.php');
 
 if ( !is_user_logged_in() )
@@ -13,9 +13,14 @@ if ( isset($_GET['action']) && 'ajax-tag-search' == $_GET['action'] ) {
 
        $s = $_GET['q']; // is this slashed already?
 
 
        $s = $_GET['q']; // is this slashed already?
 
-       if ( strstr( $s, ',' ) )
-               die; // it's a multiple tag insert, we won't find anything
-       $results = $wpdb->get_col( "SELECT name FROM $wpdb->terms WHERE name LIKE ('%$s%')" );
+       if ( strstr( $s, ',' ) ) { 
+               $s = explode( ',', $s ); 
+               $s = $s[count( $s ) - 1]; 
+       }
+       $s = trim( $s );
+       if ( strlen( $s ) < 2 )
+        die; // require 2 chars for matching
+       $results = $wpdb->get_col( "SELECT name FROM $wpdb->terms WHERE name LIKE ('%". $s . "%')" );
        echo join( $results, "\n" );
        die;
 }
        echo join( $results, "\n" );
        die;
 }
@@ -25,14 +30,17 @@ switch ( $action = $_POST['action'] ) :
 case 'delete-comment' :
        check_ajax_referer( "delete-comment_$id" );
        if ( !$comment = get_comment( $id ) )
 case 'delete-comment' :
        check_ajax_referer( "delete-comment_$id" );
        if ( !$comment = get_comment( $id ) )
-               die('0');
+               die('1');
        if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
                die('-1');
 
        if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
                die('-1');
 
-       if ( isset($_POST['spam']) && 1 == $_POST['spam'] )
+       if ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
+               if ( 'spam' == wp_get_comment_status( $comment->comment_ID ) )
+                       die('1');
                $r = wp_set_comment_status( $comment->comment_ID, 'spam' );
                $r = wp_set_comment_status( $comment->comment_ID, 'spam' );
-       else
+       } else {
                $r = wp_delete_comment( $comment->comment_ID );
                $r = wp_delete_comment( $comment->comment_ID );
+       }
 
        die( $r ? '1' : '0' );
        break;
 
        die( $r ? '1' : '0' );
        break;
@@ -41,24 +49,38 @@ case 'delete-cat' :
        if ( !current_user_can( 'manage_categories' ) )
                die('-1');
 
        if ( !current_user_can( 'manage_categories' ) )
                die('-1');
 
+       $cat = get_category( $id );
+       if ( !$cat || is_wp_error( $cat ) )
+               die('1');
+
        if ( wp_delete_category( $id ) )
                die('1');
        if ( wp_delete_category( $id ) )
                die('1');
-       else    die('0');
+       else
+               die('0');
        break;
 case 'delete-tag' :
        check_ajax_referer( "delete-tag_$id" );
        if ( !current_user_can( 'manage_categories' ) )
                die('-1');
 
        break;
 case 'delete-tag' :
        check_ajax_referer( "delete-tag_$id" );
        if ( !current_user_can( 'manage_categories' ) )
                die('-1');
 
+       $tag = get_term( $id, 'post_tag' );
+       if ( !$tag || is_wp_error( $tag ) )
+               die('1');
+
        if ( wp_delete_term($id, 'post_tag'))
                die('1');
        if ( wp_delete_term($id, 'post_tag'))
                die('1');
-       else    die('0');
+       else
+               die('0');
        break;
 case 'delete-link-cat' :
        check_ajax_referer( "delete-link-category_$id" );
        if ( !current_user_can( 'manage_categories' ) )
                die('-1');
 
        break;
 case 'delete-link-cat' :
        check_ajax_referer( "delete-link-category_$id" );
        if ( !current_user_can( 'manage_categories' ) )
                die('-1');
 
+       $cat = get_term( $id, 'link_category' );
+       if ( !$cat || is_wp_error( $cat ) )
+               die('1');
+
        $cat_name = get_term_field('name', $id, 'link_category');
 
        // Don't delete the default cats.
        $cat_name = get_term_field('name', $id, 'link_category');
 
        // Don't delete the default cats.
@@ -89,14 +111,20 @@ case 'delete-link' :
        if ( !current_user_can( 'manage_links' ) )
                die('-1');
 
        if ( !current_user_can( 'manage_links' ) )
                die('-1');
 
+       $link = get_bookmark( $id );
+       if ( !$link || is_wp_error( $link ) )
+               die('1');
+
        if ( wp_delete_link( $id ) )
                die('1');
        if ( wp_delete_link( $id ) )
                die('1');
-       else    die('0');
+       else
+               die('0');
        break;
 case 'delete-meta' :
        check_ajax_referer( "delete-meta_$id" );
        if ( !$meta = get_post_meta_by_id( $id ) )
        break;
 case 'delete-meta' :
        check_ajax_referer( "delete-meta_$id" );
        if ( !$meta = get_post_meta_by_id( $id ) )
-               die('0');
+               die('1');
+
        if ( !current_user_can( 'edit_post', $meta->post_id ) )
                die('-1');
        if ( delete_meta( $meta->meta_id ) )
        if ( !current_user_can( 'edit_post', $meta->post_id ) )
                die('-1');
        if ( delete_meta( $meta->meta_id ) )
@@ -108,6 +136,9 @@ case 'delete-post' :
        if ( !current_user_can( 'delete_post', $id ) )
                die('-1');
 
        if ( !current_user_can( 'delete_post', $id ) )
                die('-1');
 
+       if ( !get_post( $id ) )
+               die('1');
+
        if ( wp_delete_post( $id ) )
                die('1');
        else
        if ( wp_delete_post( $id ) )
                die('1');
        else
@@ -118,19 +149,28 @@ case 'delete-page' :
        if ( !current_user_can( 'delete_page', $id ) )
                die('-1');
 
        if ( !current_user_can( 'delete_page', $id ) )
                die('-1');
 
+       if ( !get_page( $id ) )
+               die('1');
+
        if ( wp_delete_post( $id ) )
                die('1');
        if ( wp_delete_post( $id ) )
                die('1');
-       else    die('0');
+       else
+               die('0');
        break;
 case 'dim-comment' :
        if ( !$comment = get_comment( $id ) )
                die('0');
        break;
 case 'dim-comment' :
        if ( !$comment = get_comment( $id ) )
                die('0');
+
        if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
                die('-1');
        if ( !current_user_can( 'moderate_comments' ) )
                die('-1');
 
        if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
                die('-1');
        if ( !current_user_can( 'moderate_comments' ) )
                die('-1');
 
-       if ( 'unapproved' == wp_get_comment_status($comment->comment_ID) ) {
+       $current = wp_get_comment_status( $comment->comment_ID );
+       if ( $_POST['new'] == $current )
+               die('1');
+
+       if ( 'unapproved' == $current ) {
                check_ajax_referer( "approve-comment_$id" );
                if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
                        die('1');
                check_ajax_referer( "approve-comment_$id" );
                if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
                        die('1');
@@ -150,6 +190,9 @@ case 'add-category' : // On the Fly
                $parent = 0;
        $post_category = isset($_POST['post_category'])? (array) $_POST['post_category'] : array();
        $checked_categories = array_map( 'absint', (array) $post_category );
                $parent = 0;
        $post_category = isset($_POST['post_category'])? (array) $_POST['post_category'] : array();
        $checked_categories = array_map( 'absint', (array) $post_category );
+       $popular_ids = isset( $_POST['popular_ids'] ) ?
+                       array_map( 'absint', explode( ',', $_POST['popular_ids'] ) ) :
+                       false;
 
        $x = new WP_Ajax_Response();
        foreach ( $names as $cat_name ) {
 
        $x = new WP_Ajax_Response();
        foreach ( $names as $cat_name ) {
@@ -163,7 +206,7 @@ case 'add-category' : // On the Fly
                        continue;
                $category = get_category( $cat_id );
                ob_start();
                        continue;
                $category = get_category( $cat_id );
                ob_start();
-                       wp_category_checklist( 0, $cat_id, $checked_categories );
+                       wp_category_checklist( 0, $cat_id, $checked_categories, $popular_ids );
                $data = ob_get_contents();
                ob_end_clean();
                $x->add( array(
                $data = ob_get_contents();
                ob_end_clean();
                $x->add( array(
@@ -349,13 +392,16 @@ case 'add-comment' :
 
        list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1 );
 
 
        list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1 );
 
+       if ( get_option('show_avatars') )
+               add_filter( 'comment_author', 'floated_admin_avatar' );
+
        if ( !$comments )
                die('1');
        $x = new WP_Ajax_Response();
        foreach ( (array) $comments as $comment ) {
                get_comment( $comment );
                ob_start();
        if ( !$comments )
                die('1');
        $x = new WP_Ajax_Response();
        foreach ( (array) $comments as $comment ) {
                get_comment( $comment );
                ob_start();
-                       _wp_comment_row( $comment->comment_ID, $mode, false );
+                       _wp_comment_row( $comment->comment_ID, $mode, $status );
                        $comment_list_item = ob_get_contents();
                ob_end_clean();
                $x->add( array(
                        $comment_list_item = ob_get_contents();
                ob_end_clean();
                $x->add( array(
@@ -459,10 +505,11 @@ case 'add-user' :
        $x->send();
        break;
 case 'autosave' : // The name of this action is hardcoded in edit_post()
        $x->send();
        break;
 case 'autosave' : // The name of this action is hardcoded in edit_post()
-       $nonce_age = check_ajax_referer( 'autosave', 'autosavenonce');
+       define( 'DOING_AUTOSAVE', true );
+
+       $nonce_age = check_ajax_referer( 'autosave', 'autosavenonce' );
        global $current_user;
 
        global $current_user;
 
-       $_POST['post_status'] = 'draft';
        $_POST['post_category'] = explode(",", $_POST['catslist']);
        $_POST['tags_input'] = explode(",", $_POST['tags_input']);
        if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
        $_POST['post_category'] = explode(",", $_POST['catslist']);
        $_POST['tags_input'] = explode(",", $_POST['tags_input']);
        if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
@@ -476,8 +523,9 @@ case 'autosave' : // The name of this action is hardcoded in edit_post()
 
        $supplemental = array();
 
 
        $supplemental = array();
 
-       $id = 0;
+       $id = $revision_id = 0;
        if($_POST['post_ID'] < 0) {
        if($_POST['post_ID'] < 0) {
+               $_POST['post_status'] = 'draft';
                $_POST['temp_ID'] = $_POST['post_ID'];
                if ( $do_autosave ) {
                        $id = wp_write_post();
                $_POST['temp_ID'] = $_POST['post_ID'];
                if ( $do_autosave ) {
                        $id = wp_write_post();
@@ -508,8 +556,18 @@ case 'autosave' : // The name of this action is hardcoded in edit_post()
                        if ( !current_user_can('edit_post', $post_ID) )
                                die(__('You are not allowed to edit this post.'));
                }
                        if ( !current_user_can('edit_post', $post_ID) )
                                die(__('You are not allowed to edit this post.'));
                }
+
                if ( $do_autosave ) {
                if ( $do_autosave ) {
-                       $id = edit_post();
+                       // Drafts are just overwritten by autosave
+                       if ( 'draft' == $post->post_status ) {
+                               $id = edit_post();
+                       } else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
+                               $revision_id = wp_create_post_autosave( $post->ID );
+                               if ( is_wp_error($revision_id) )
+                                       $id = $revision_id;
+                               else
+                                       $id = $post->ID;
+                       }
                        $data = $message;
                } else {
                        $id = $post->ID;
                        $data = $message;
                } else {
                        $id = $post->ID;
index 0185a9868386f9fc55b7a5a10b037b50909f7b4c..54fdea489274eab7098d13fe6fd1378781714d59 100644 (file)
@@ -5,6 +5,7 @@ if ( $editing ) {
        if ( user_can_richedit() )
                wp_enqueue_script( 'wp_tiny_mce' );
 }
        if ( user_can_richedit() )
                wp_enqueue_script( 'wp_tiny_mce' );
 }
+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']);
 
 $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']);
@@ -28,14 +29,13 @@ get_admin_page_title();
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> &#8212; WordPress</title>
 <?php
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> &#8212; WordPress</title>
 <?php
+
 wp_admin_css( 'css/global' );
 wp_admin_css();
 wp_admin_css( 'css/colors' );
 wp_admin_css( 'css/global' );
 wp_admin_css();
 wp_admin_css( 'css/colors' );
+wp_admin_css( 'css/ie' );
+
 ?>
 ?>
-<!--[if gte IE 6]>
-<?php wp_admin_css( 'css/ie' );
-?>
-<![endif]-->
 <script type="text/javascript">
 //<![CDATA[
 addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document).ready(func); else if (typeof wpOnload!='function'){wpOnload=func;} else {var oldonload=wpOnload; wpOnload=function(){oldonload();func();}}};
 <script type="text/javascript">
 //<![CDATA[
 addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document).ready(func); else if (typeof wpOnload!='function'){wpOnload=func;} else {var oldonload=wpOnload; wpOnload=function(){oldonload();func();}}};
@@ -44,26 +44,83 @@ addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document
 <?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 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;
-if ( isset($page_hook) )
-       do_action('admin_print_scripts-' . $page_hook);
-else if ( isset($plugin_page) )
-       do_action('admin_print_scripts-' . $plugin_page);
-do_action('admin_print_scripts');
+
+$hook_suffixes = array();
 
 if ( isset($page_hook) )
 
 if ( isset($page_hook) )
-       do_action('admin_head-' . $page_hook);
+       $hook_suffixes[] = "-$page_hook";
 else if ( isset($plugin_page) )
 else if ( isset($plugin_page) )
-       do_action('admin_head-' . $plugin_page);
-do_action('admin_head');
+       $hook_suffixes[] = "-$plugin_page";
+else if ( isset($pagenow) )
+       $hook_suffixes[] = "-$pagenow";
+
+$hook_suffixes[] = '';
+
+foreach ( $hook_suffixes as $hook_suffix )
+       do_action("admin_print_styles$hook_suffix"); // do_action( 'admin_print_styles-XXX' ); do_action( 'admin_print_styles' );
+foreach ( $hook_suffixes as $hook_suffix )
+       do_action("admin_print_scripts$hook_suffix"); // do_action( 'admin_print_scripts-XXX' ); do_action( 'admin_print_scripts' );
+foreach ( $hook_suffixes as $hook_suffix )
+       do_action("admin_head$hook_suffix"); // do_action( 'admin_head-XXX' ); do_action( 'admin_head' );
+unset($hook_suffixes, $hook_suffix);
+
 ?>
 </head>
 <body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>">
 <div id="wpwrap">
 <div id="wpcontent">
 <div id="wphead">
 ?>
 </head>
 <body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>">
 <div id="wpwrap">
 <div id="wpcontent">
 <div id="wphead">
-<h1><?php bloginfo('name'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1>
+<h1><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1>
 </div>
 </div>
-<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>') ?></p></div>
+
+<?php
+if ( ! $is_opera ) { 
+?>
+       <div id="gears-info-box" class="info-box" style="display:none;">
+       <img src="images/gear.png" title="Gear" alt="" class="gears-img" />
+       <div id="gears-msg1">
+       <h3 class="info-box-title"><?php _e('Speed up WordPress'); ?></h3>
+       <p><?php _e('WordPress now has support for Gears, which adds new features to your web browser.'); ?><br />
+       <a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p>
+       <p><?php _e('After you install and enable Gears most of WordPress&#8217; images, scripts, and CSS files will be stored locally on your computer. This speeds up page load time.'); ?></p>
+       <p><strong><?php _e('Don&#8217;t install on a public or shared computer.'); ?></strong></p>     <div class="submit"><button onclick="window.location = 'http://gears.google.com/?action=install&amp;return=<?php echo urlencode( admin_url() ); ?>';" class="button"><?php _e('Install Now'); ?></button>
+       <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div>
+       </div>
+
+       <div id="gears-msg2" style="display:none;">
+       <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
+       <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> 
+       <p><?php 
+       
+       if ( $is_safari )
+               _e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.');
+       else
+               _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.'); 
+       
+       ?></p>
+       <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p>
+       <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button>
+       <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div>
+       </div>
+
+       <div id="gears-msg3" style="display:none;">
+       <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
+       <p><?php
+       
+       if ( $is_safari )
+               _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.');
+       else
+               _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); 
+       
+       ?></p>
+       <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p>
+       <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p>
+       <div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Close'); ?></button></div>
+       </div>
+       </div>
+<?php } ?>
+
+<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>'); if ( ! $is_opera ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div>
 
 <?php
 require(ABSPATH . 'wp-admin/menu-header.php');
 
 <?php
 require(ABSPATH . 'wp-admin/menu-header.php');
diff --git a/wp-admin/admin-post.php b/wp-admin/admin-post.php
new file mode 100644 (file)
index 0000000..f45fc62
--- /dev/null
@@ -0,0 +1,24 @@
+<?php
+define('WP_ADMIN', TRUE);
+
+if ( defined('ABSPATH') )
+       require_once(ABSPATH . 'wp-load.php');
+else
+       require_once('../wp-load.php');
+
+require_once(ABSPATH . 'wp-admin/includes/admin.php');
+
+if ( !wp_validate_auth_cookie() )
+       wp_die(__('Cheatin&#8217; uh?'));
+
+nocache_headers();
+
+do_action('admin_init');
+
+$action = 'admin_post';
+if ( !empty($_REQUEST['action']) )
+       $action .= '_' . $_REQUEST['action'];
+
+do_action($action);
+
+?>
\ No newline at end of file
index 1664820796b96a41bcb47bbb5d09f87c4dea255b..20ff3693f5562b4e1d21c8ba6bee960223d995e0 100644 (file)
@@ -2,12 +2,12 @@
 define('WP_ADMIN', TRUE);
 
 if ( defined('ABSPATH') )
 define('WP_ADMIN', TRUE);
 
 if ( defined('ABSPATH') )
-       require_once( ABSPATH . 'wp-config.php');
+       require_once(ABSPATH . 'wp-load.php');
 else
 else
-    require_once('../wp-config.php');
+       require_once('../wp-load.php');
 
 if ( get_option('db_version') != $wp_db_version ) {
 
 if ( get_option('db_version') != $wp_db_version ) {
-       wp_redirect(get_option('siteurl') . '/wp-admin/upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI'])));
+       wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
        exit;
 }
 
        exit;
 }
 
@@ -26,8 +26,8 @@ $time_format = get_option('time_format');
 
 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
 
 
 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
 
-wp_admin_css_color('classic', __('Classic'), get_option( 'siteurl' ) . "/wp-admin/css/colors-classic.css", array('#07273E', '#14568A', '#D54E21', '#2683AE'));
-wp_admin_css_color('fresh', __('Fresh'), get_option( 'siteurl' ) . "/wp-admin/css/colors-fresh.css", array('#464646', '#CEE1EF', '#D54E21', '#2683AE'));
+wp_admin_css_color('classic', __('Classic'), admin_url("css/colors-classic.css"), array('#07273E', '#14568A', '#D54E21', '#2683AE'));
+wp_admin_css_color('fresh', __('Fresh'), admin_url("css/colors-fresh.css"), array('#464646', '#CEE1EF', '#D54E21', '#2683AE'));
 
 wp_enqueue_script( 'common' );
 wp_enqueue_script( 'jquery-color' );
 
 wp_enqueue_script( 'common' );
 wp_enqueue_script( 'jquery-color' );
@@ -58,7 +58,7 @@ if (isset($plugin_page)) {
                        wp_die(__('Invalid plugin page'));
                }
 
                        wp_die(__('Invalid plugin page'));
                }
 
-               if (! ( file_exists(ABSPATH . PLUGINDIR . "/$plugin_page") && is_file( ABSPATH . PLUGINDIR . "/$plugin_page") ) )
+               if (! ( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) )
                        wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
 
                do_action('load-' . $plugin_page);
                        wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
 
                do_action('load-' . $plugin_page);
@@ -66,7 +66,7 @@ if (isset($plugin_page)) {
                if (! isset($_GET['noheader']))
                        require_once(ABSPATH . 'wp-admin/admin-header.php');
 
                if (! isset($_GET['noheader']))
                        require_once(ABSPATH . 'wp-admin/admin-header.php');
 
-               include(ABSPATH . PLUGINDIR . "/$plugin_page");
+               include(WP_PLUGIN_DIR . "/$plugin_page");
        }
 
        include(ABSPATH . 'wp-admin/admin-footer.php');
        }
 
        include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -113,4 +113,7 @@ if (isset($plugin_page)) {
        do_action("load-$pagenow");
 }
 
        do_action("load-$pagenow");
 }
 
+if ( !empty($_REQUEST['action']) )
+       do_action('admin_action_' . $_REQUEST['action']);
+
 ?>
 ?>
index 1a37dceb96bf725f18e8de357dd4dd8292e7cbaf..18b810414168c571a4bc7e864b921885a89c6ac9 100644 (file)
@@ -5,17 +5,19 @@
 */
 
 if ( defined('ABSPATH') )
 */
 
 if ( defined('ABSPATH') )
-       require_once( ABSPATH . 'wp-config.php');
+       require_once(ABSPATH . 'wp-load.php');
 else
 else
-    require_once('../wp-config.php');
+       require_once('../wp-load.php');
 
 // Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
 
 // Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-if ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+       $_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
        $_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
 unset($current_user);
 require_once('admin.php');
 
        $_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
 unset($current_user);
 require_once('admin.php');
 
-header('Content-Type: text/plain');
+header('Content-Type: text/plain; charset=' . get_option('blog_charset'));
 
 if ( !current_user_can('upload_files') )
        wp_die(__('You do not have permission to upload files.'));
 
 if ( !current_user_can('upload_files') )
        wp_die(__('You do not have permission to upload files.'));
@@ -26,6 +28,8 @@ if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
        exit;
 }
 
        exit;
 }
 
+check_admin_referer('media-form');
+
 $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
 if (is_wp_error($id)) {
        echo '<div id="media-upload-error">'.wp_specialchars($id->get_error_message()).'</div>';
 $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
 if (is_wp_error($id)) {
        echo '<div id="media-upload-error">'.wp_specialchars($id->get_error_message()).'</div>';
diff --git a/wp-admin/bookmarklet.php b/wp-admin/bookmarklet.php
deleted file mode 100644 (file)
index 8618458..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-$mode = 'bookmarklet';
-require_once('admin.php');
-
-if ( ! current_user_can('edit_posts') )
-       wp_die(__('Cheatin&#8217; uh?'));
-
-if ('b' == $a):
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<script type="text/javascript">
-<!--
-window.close()
--->
-</script>
-</head>
-<body></body>
-</html>
-<?php
-exit;
-endif;
-
-$post = get_default_post_to_edit();
-
-$popuptitle = wp_specialchars(stripslashes($popuptitle));
-$text       = wp_specialchars(stripslashes(urldecode($text)));
-
-$popuptitle = funky_javascript_fix($popuptitle);
-$text       = funky_javascript_fix($text);
-
-$post_title = wp_specialchars($_REQUEST['post_title']);
-if (!empty($post_title))
-       $post->post_title =  stripslashes($post_title);
-else
-       $post->post_title = $popuptitle;
-
-
-$content  = wp_specialchars($_REQUEST['content']);
-$popupurl = clean_url($_REQUEST['popupurl']);
-if ( !empty($content) ) {
-       $post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) );
-} else {
-       $post->post_content = '<a href="'.$popupurl.'">'.$popuptitle.'</a>'."\n$text";
-}
-
-/* /big funky fixes */
-
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><?php bloginfo('name') ?> &rsaquo; Bookmarklet &#8212; WordPress</title>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<?php
-wp_admin_css( 'css/global' );
-wp_admin_css();
-?>
-
-<style type="text/css">
-<!--
-
-#wpbookmarklet textarea,input,select {
-       border-width: 1px;
-       border-color: #cccccc;
-       border-style: solid;
-       padding: 2px;
-       margin: 1px;
-}
-
-#wpbookmarklet .checkbox {
-       background-color: #ffffff;
-       border-width: 0px;
-       padding: 0px;
-       margin: 0px;
-}
-
-#wpbookmarklet textarea {
-       font-family: Verdana, Geneva, Arial, Helvetica;
-       font-size: 0.9em;
-}
-
-#wpbookmarklet .wrap {
-       border: 0px;
-}
-
-#wpbookmarklet #postdiv {
-       margin-bottom: 0.5em;
-}
-
-#wpbookmarklet #titlediv {
-       margin-bottom: 1em;
-}
-
--->
-</style>
-</head>
-<body id="wpbookmarklet">
-<div id="wphead">
-<h1><?php bloginfo('name') ?></h1>
-</div>
-
-<?php require('edit-form.php'); ?>
-
-<?php do_action('admin_footer', ''); ?>
-
-</body>
-</html>
index 945da0c63df477dea003cc0d7c3086f041f062cf..d2e8fb3720f45eef84691d3928a941c124463556 100644 (file)
@@ -126,6 +126,7 @@ endif; ?>
 <?php endif; ?>
 
 <p id="post-search">
 <?php endif; ?>
 
 <p id="post-search">
+       <label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label>
        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
        <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
        <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
@@ -134,6 +135,24 @@ endif; ?>
 
 <div class="tablenav">
 
 
 <div class="tablenav">
 
+<?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+       $pagenum = 1;
+if( !$catsperpage || $catsperpage < 0 )
+       $catsperpage = 20;
+
+$page_links = paginate_links( array(
+       'base' => add_query_arg( 'pagenum', '%#%' ),
+       'format' => '',
+       'total' => ceil(wp_count_terms('category') / $catsperpage),
+       'current' => $pagenum
+));
+
+if ( $page_links )
+       echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
 <div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-categories'); ?>
 <div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-categories'); ?>
@@ -147,7 +166,7 @@ endif; ?>
 <table class="widefat">
        <thead>
        <tr>
 <table class="widefat">
        <thead>
        <tr>
-               <th scope="col" class="check-column"><input type="checkbox" onclick="checkAll(document.getElementById('posts-filter'));" /></th>
+               <th scope="col" class="check-column"><input type="checkbox" /></th>
         <th scope="col"><?php _e('Name') ?></th>
         <th scope="col"><?php _e('Description') ?></th>
         <th scope="col" class="num"><?php _e('Posts') ?></th>
         <th scope="col"><?php _e('Name') ?></th>
         <th scope="col"><?php _e('Description') ?></th>
         <th scope="col" class="num"><?php _e('Posts') ?></th>
@@ -155,13 +174,18 @@ endif; ?>
        </thead>
        <tbody id="the-list" class="list:cat">
 <?php
        </thead>
        <tbody id="the-list" class="list:cat">
 <?php
-cat_rows();
+cat_rows(0, 0, 0, $pagenum, $catsperpage);
 ?>
        </tbody>
 </table>
 </form>
 
 <div class="tablenav">
 ?>
        </tbody>
 </table>
 </form>
 
 <div class="tablenav">
+
+<?php
+if ( $page_links )
+       echo "<div class='tablenav-pages'>$page_links</div>";
+?>
 <br class="clear" />
 </div>
 <br class="clear" />
 <br class="clear" />
 </div>
 <br class="clear" />
index 72d014703a98b8e838909aeac144762bd5cdea1b..d1e394ea9a3d7f6d77ba8f481b43a89026e6ab7e 100644 (file)
@@ -21,7 +21,7 @@ case 'editcomment' :
        $title = __('Edit Comment');
 
        wp_enqueue_script('comment');
        $title = __('Edit Comment');
 
        wp_enqueue_script('comment');
-       //wp_enqueue_script('thickbox');
+
        require_once('admin-header.php');
 
        $comment_id = absint( $_GET['c'] );
        require_once('admin-header.php');
 
        $comment_id = absint( $_GET['c'] );
@@ -78,7 +78,7 @@ if ( 'spam' == $_GET['dt'] ) {
 
 <table width="100%">
 <tr>
 
 <table width="100%">
 <tr>
-<td><input type='button' class="button" value='<?php _e('No'); ?>' onclick="self.location='<?php echo get_option('siteurl'); ?>/wp-admin/edit-comments.php';" /></td>
+<td><input type='button' class="button" value='<?php _e('No'); ?>' onclick="self.location='<?php echo admin_url('edit-comments.php'); ?>" /></td>
 <td class="textright"><input type='submit' class="button" value='<?php echo $button; ?>' /></td>
 </tr>
 </table>
 <td class="textright"><input type='submit' class="button" value='<?php echo $button; ?>' /></td>
 </tr>
 </table>
@@ -146,7 +146,7 @@ case 'deletecomment' :
        else if ( '' != wp_get_original_referer() && false == $noredir )
                wp_redirect( wp_get_original_referer() );
        else
        else if ( '' != wp_get_original_referer() && false == $noredir )
                wp_redirect( wp_get_original_referer() );
        else
-               wp_redirect( get_option('siteurl') . '/wp-admin/edit-comments.php' );
+               wp_redirect( admin_url('edit-comments.php') );
 
        die;
        break;
 
        die;
        break;
@@ -171,7 +171,7 @@ case 'unapprovecomment' :
        if ( '' != wp_get_referer() && false == $noredir )
                wp_redirect( wp_get_referer() );
        else
        if ( '' != wp_get_referer() && false == $noredir )
                wp_redirect( wp_get_referer() );
        else
-               wp_redirect( get_option('siteurl') . '/wp-admin/edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments' );
+               wp_redirect( admin_url('edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );
 
        exit();
        break;
 
        exit();
        break;
@@ -193,14 +193,10 @@ case 'approvecomment' :
 
        wp_set_comment_status( $comment->comment_ID, 'approve' );
 
 
        wp_set_comment_status( $comment->comment_ID, 'approve' );
 
-       if ( true == get_option('comments_notify') )
-               wp_notify_postauthor( $comment->comment_ID );
-
-
        if ( '' != wp_get_referer() && false == $noredir )
                wp_redirect( wp_get_referer() );
        else
        if ( '' != wp_get_referer() && false == $noredir )
                wp_redirect( wp_get_referer() );
        else
-               wp_redirect( get_option('siteurl') . '/wp-admin/edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments' );
+               wp_redirect( admin_url('edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );
 
        exit();
        break;
 
        exit();
        break;
@@ -229,4 +225,4 @@ default:
 
 include('admin-footer.php');
 
 
 include('admin-footer.php');
 
-?>
\ No newline at end of file
+?>
index 5d0d05cf3eb9f84a9a1230407bb461883d32b663..4c6f3271d9342986b460f184e1b9bcb4fb5f6288 100644 (file)
@@ -1,3 +1,24 @@
+.post-com-count {
+}
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
+       background-image: url(../images/comment-stalk-rtl.gif);
+       background-position:right bottom;
+}
+#footer {
+       background-position:99% 10px;
+}
 #poststuff .closed .togbox, #poststuff .togbox {
 #poststuff .closed .togbox, #poststuff .togbox {
-background-image: url(../images/toggle-arrow-rtl.gif) !important;
-}
\ No newline at end of file
+       background-image: url(../images/toggle-arrow-rtl.gif) !important;
+}
+.bar {
+       border-right-color: transparent;
+       border-left-color: #99d;
+}
+.plugins .togl {
+       border-right-color: transparent;
+       border-left-color: #ccc;
+}
+#upload-menu li.current {
+       border-right-color: transparent;
+       border-left-color: #448abd;
+}
index 6f83c661e22c8575faf89300861b1125b65c5533..65d0f3831420af13aa75ce541ee8447a9355ded8 100644 (file)
@@ -2,7 +2,7 @@ a.page-numbers:hover {
        border-color: #999;
 }
 
        border-color: #999;
 }
 
-body   {
+body, .form-table .pre {
        background-color: #fff;
        color: #333;
 }
        background-color: #fff;
        color: #333;
 }
@@ -37,7 +37,7 @@ input.disabled, textarea.disabled {
        color: #fff;
 }
 
        color: #fff;
 }
 
-ul#category-tabs li.ui-tabs-selected, li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form {
+ul#category-tabs li.ui-tabs-selected, li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title {
        background-color: #cfebf7;
 }
 
        background-color: #cfebf7;
 }
 
@@ -63,7 +63,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
        color: #000;
 }
 
        color: #000;
 }
 
-ul.widget-control-list .sorthelper {
+.sorthelper {
        background-color: #ccf3fa;
 }
 
        background-color: #ccf3fa;
 }
 
@@ -204,11 +204,11 @@ ul.widget-control-list .sorthelper {
        border-color: #535353;
 }
 
        border-color: #535353;
 }
 
-.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover {
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.del-link:hover {
        color: #d54e21;
 }
 
        color: #d54e21;
 }
 
-#adminmenu a:hover, #sidemenu a:hover {
+#adminmenu a:hover, #sidemenu a:hover, .ui-tabs-nav a:hover {
        color: #97c4d8;
 }
 
        color: #97c4d8;
 }
 
@@ -239,7 +239,8 @@ ul.widget-control-list .sorthelper {
        border-bottom-color: #999;
 }
 
        border-bottom-color: #999;
 }
 
-.submitbox .submitdelete:hover {
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
        color: #fff;
        background-color: #f00;
        border-bottom-color: #f00;
        color: #fff;
        background-color: #f00;
        border-bottom-color: #f00;
@@ -291,11 +292,11 @@ ul.widget-control-list .sorthelper {
        color: #5a5a5a;
 }
 
        color: #5a5a5a;
 }
 
-#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a {
+#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, a {
        color: #2e7ca0;
 }
 
        color: #2e7ca0;
 }
 
-#adminmenu a {
+#adminmenu a, .ui-tabs-nav a {
        color: #cfebf6;
 }
 
        color: #cfebf6;
 }
 
@@ -303,7 +304,7 @@ ul.widget-control-list .sorthelper {
        color: #2782af
 }
 /* Because we don't want visited on these links */
        color: #2782af
 }
 /* Because we don't want visited on these links */
-#adminmenu a.current, #sidemenu a.current {
+#adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
        background-color: #fff;
        border-color: #07273e;
        border-bottom-color: #fff;
        background-color: #fff;
        border-color: #07273e;
        border-bottom-color: #fff;
@@ -311,11 +312,11 @@ ul.widget-control-list .sorthelper {
        font-weight: bold;
 }
 
        font-weight: bold;
 }
 
-#adminmenu li a #awaiting-mod {
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
        background-image: url(../images/comment-stalk-classic.gif);
 }
 
        background-image: url(../images/comment-stalk-classic.gif);
 }
 
-#adminmenu li a #awaiting-mod span {
+#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
        background-color: #d54e21;
        color: #fff;
 }
        background-color: #d54e21;
        color: #fff;
 }
@@ -326,7 +327,7 @@ ul.widget-control-list .sorthelper {
 }
 
 
 }
 
 
-#adminmenu li a:hover #awaiting-mod span {
+#adminmenu li a:hover #awaiting-mod span, #sidemenu li a:hover #update-plugins span {
        background-color: #07273E;
 }
 
        background-color: #07273E;
 }
 
@@ -414,11 +415,11 @@ input.readonly {
        background-color: #fff;
 }
 
        background-color: #fff;
 }
 
-#plugins .active {
+.plugins .active {
        background-color: #BBEEBB;
 }
 
        background-color: #BBEEBB;
 }
 
-#plugins .togl {
+.plugins .togl {
        border-right-color: #ccc;
 }
 
        border-right-color: #ccc;
 }
 
@@ -426,7 +427,7 @@ input.readonly {
        background-color: #ffffe0;
 }
 
        background-color: #ffffe0;
 }
 
-#plugins tr {
+.plugins tr {
        background-color: #fff;
 }
 
        background-color: #fff;
 }
 
@@ -550,11 +551,6 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
        color: #f00;
 }
 
        color: #f00;
 }
 
-#media-upload a.delete { 
-       color: #888; 
-}
-
-
 /* TinyMCE */
 .wp_themeSkin *,
 .wp_themeSkin a:hover, 
 /* TinyMCE */
 .wp_themeSkin *,
 .wp_themeSkin a:hover, 
@@ -565,7 +561,7 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
 }
 
 /* Containers */
 }
 
 /* Containers */
-.wp_themeSkin table {
+.wp_themeSkin table, #wp_editbtns {
        background: #83B4D5;
 }
 
        background: #83B4D5;
 }
 
@@ -717,3 +713,18 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
        background-color: #ddd;
        color: #333;
 }
        background-color: #ddd;
        color: #333;
 }
+
+/* Diff */
+
+table.diff .diff-deletedline {
+       background-color: #ffdddd;
+}
+table.diff .diff-deletedline del {
+       background-color: #ff9999;
+}
+table.diff .diff-addedline {
+       background-color: #ddffdd;
+}
+table.diff .diff-addedline ins {
+       background-color: #99ff99;
+}
index 5d0d05cf3eb9f84a9a1230407bb461883d32b663..d7b7afbb705b2ad68ad4dca329a16a7415315b50 100644 (file)
@@ -1,3 +1,24 @@
+.bar {
+       border-right-color: transparent;
+       border-left-color: #99d;
+}
+.post-com-count {
+}
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
+       background-image: url(../images/comment-stalk-rtl.gif);
+       background-position:right bottom;
+}
+#footer {
+       background-position:99% 10px;
+}
+.plugins .togl {
+       border-right-color: transparent;
+       border-left-color: #ccc;
+}
 #poststuff .closed .togbox, #poststuff .togbox {
 #poststuff .closed .togbox, #poststuff .togbox {
-background-image: url(../images/toggle-arrow-rtl.gif) !important;
-}
\ No newline at end of file
+       background-image: url(../images/toggle-arrow-rtl.gif);
+}
+#upload-menu li.current {
+       border-right-color:transparent;
+       border-left-color: #448abd;
+}
index 1332c3765c44121e606dfaf5c7689437e60cd0da..09e0c58226b7683020c54bc187f7ab16bc64cde2 100644 (file)
@@ -2,7 +2,7 @@ a.page-numbers:hover {
        border-color: #999;
 }
 
        border-color: #999;
 }
 
-body   {
+body, .form-table .pre {
        background-color: #fff;
        color: #333;
 }
        background-color: #fff;
        color: #333;
 }
@@ -41,7 +41,7 @@ input.disabled, textarea.disabled {
        color: #fff;
 }
 
        color: #fff;
 }
 
-li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form {
+li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title {
        background-color: #eaf3fa;
 }
 
        background-color: #eaf3fa;
 }
 
@@ -63,7 +63,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
        color: #000;
 }
 
        color: #000;
 }
 
-ul.widget-control-list .sorthelper {
+.sorthelper {
        background-color: #ccf3fa;
 }
 
        background-color: #ccf3fa;
 }
 
@@ -196,7 +196,7 @@ ul.widget-control-list .sorthelper {
        border-color: #535353;
 }
 
        border-color: #535353;
 }
 
-.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover {
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #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 {
        color: #d54e21;
 }
 
        color: #d54e21;
 }
 
@@ -226,7 +226,8 @@ ul.widget-control-list .sorthelper {
        border-bottom-color: #999;
 }
 
        border-bottom-color: #999;
 }
 
-.submitbox .submitdelete:hover {
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
        color: #fff;
        background-color: #f00;
        border-bottom-color: #f00;
        color: #fff;
        background-color: #f00;
        border-bottom-color: #f00;
@@ -278,28 +279,28 @@ ul.widget-control-list .sorthelper {
        color: #666;
 }
 
        color: #666;
 }
 
-#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a {
+#adminmenu a, #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, a {
        color: #2583ad;
 }
 
 /* Because we don't want visited on these links */
        color: #2583ad;
 }
 
 /* Because we don't want visited on these links */
-#adminmenu a.current, #sidemenu a.current {
+#adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
        background-color: #fff;
        border-color: #c6d9e9;
        border-bottom-color: #fff;
        color: #d54e21;
 }
 
        background-color: #fff;
        border-color: #c6d9e9;
        border-bottom-color: #fff;
        color: #d54e21;
 }
 
-#adminmenu li a #awaiting-mod {
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
        background-image: url(../images/comment-stalk-fresh.gif);
 }
 
        background-image: url(../images/comment-stalk-fresh.gif);
 }
 
-#adminmenu li a #awaiting-mod span, #rightnow .reallynow {
+#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span, #rightnow .reallynow {
        background-color: #d54e21;
        color: #fff;
 }
 
        background-color: #d54e21;
        color: #fff;
 }
 
-#adminmenu li a:hover #awaiting-mod span {
+#adminmenu li a:hover #awaiting-mod span, #sidemenu li a:hover #update-plugins span {
        background-color: #264761;
 }
 
        background-color: #264761;
 }
 
@@ -383,11 +384,11 @@ input.readonly {
        background-color: #fff;
 }
 
        background-color: #fff;
 }
 
-#plugins .active {
+.plugins .active {
        background-color: #e7f7d3;
 }
 
        background-color: #e7f7d3;
 }
 
-#plugins .togl {
+.plugins .togl {
        border-right-color: #ccc;
 }
 
        border-right-color: #ccc;
 }
 
@@ -395,7 +396,7 @@ input.readonly {
        background-color: #ffffe0;
 }
 
        background-color: #ffffe0;
 }
 
-#plugins tr {
+.plugins tr {
        background-color: #fff;
 }
 
        background-color: #fff;
 }
 
@@ -532,7 +533,7 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
 }
 
 /* Containers */
 }
 
 /* Containers */
-.wp_themeSkin table {
+.wp_themeSkin table, #wp_editbtns {
        background: #cee1ef;
 }
 
        background: #cee1ef;
 }
 
@@ -688,3 +689,18 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
        background-color: #ddd;
        color: #333;
 }
        background-color: #ddd;
        color: #333;
 }
+
+/* Diff */
+
+table.diff .diff-deletedline {
+       background-color: #ffdddd;
+}
+table.diff .diff-deletedline del {
+       background-color: #ff9999;
+}
+table.diff .diff-addedline {
+       background-color: #ddffdd;
+}
+table.diff .diff-addedline ins {
+       background-color: #99ff99;
+}
index 29e59cf28b03b7bc58d0e9b0545c3b0cd36d64c3..3c4fd61aa576886b1d45a2925feb2db3f7a46cc1 100644 (file)
@@ -1,62 +1,62 @@
+/* Right Now */
 #rightnow {
 #rightnow {
-       margin-left: 15px;
+       margin-right:0;
+       margin-left: 7px;
 }
 }
-
 #rightnow .reallynow span {
        text-align: right;
        float: right;
 }
 #rightnow .reallynow span {
        text-align: right;
        float: right;
 }
-
 #rightnow .reallynow a {
        text-align: left;
        float: left;
        margin: 1px 0 0 6px;
 }
 #rightnow .reallynow a {
        text-align: left;
        float: left;
        margin: 1px 0 0 6px;
 }
-
-h3.dashboard-widget-title span {
-       text-align: right;
-       float: right;
+/* Widgets */
+div#dashboard-widgets-wrap {
+       margin-right:0;
+       margin-left:-13px;
 }
 }
-
-#dashboard-widgets .widget_rss ul li a {
+div.dashboard-widget-holder {
        float:right;
        float:right;
-       font-weight:bold;
-       margin:0pt 0pt 0.2em 0.5em;
 }
 }
-
-#dashboard-widgets .widget_rss ul li span.rss-date {
+div.dashboard-widget {
+       margin-right:0;
+       margin-left: 20px;
+}
+h3.dashboard-widget-title span {
+       text-align: right;
        float: right;
 }
        float: right;
 }
-
 h3.dashboard-widget-title small {
        text-align: left;
 h3.dashboard-widget-title small {
        text-align: left;
-       float: left;
+       float:left;
 }
 }
-div.dashboard-widget-content ul,
-div.dashboard-widget-content ol,
-div.dashboard-widget-content dl {
+div.dashboard-widget-submit input  {
+       font-family: Tahoma;
+}
+div.dashboard-widget-content ul, div.dashboard-widget-content ol, div.dashboard-widget-content dl {
        padding-left:0;
        padding-right:15px;
 }
        padding-left:0;
        padding-right:15px;
 }
-div#dashboard-widgets-wrap
-{
-       margin-right:0;
-       margin-left:-10px;
+#dashboard_secondary div.dashboard-widget-content ul li {
+       float:right;
 }
 }
-
-div.dashboard-widget {
-       margin-right:0;
-       margin-left:20px;
+#dashboard_secondary div.dashboard-widget-content ul li .post {
+       font-family:arial;
+}
+#dashboard_secondary div.dashboard-widget-content ul li a {
+       border-right:0 none;
+       border-left: 1px solid #dadada;
+       height:110px;
+}
+#dashboard_secondary div.dashboard-widget-content ul li a cite {
+       font-family: Tahoma;
 }
 }
-
 #dashboard-widgets .widget_rss ul li span.rss-date {
        float:right;
 }
 #dashboard-widgets .widget_rss ul li a {
 #dashboard-widgets .widget_rss ul li span.rss-date {
        float:right;
 }
 #dashboard-widgets .widget_rss ul li a {
-       float:right;
-       margin:0 0 0.2em 0.5em;
+       float: right;
+       margin: 0 0 .2em .5em;
 }
 }
-#dashboard_secondary div.dashboard-widget-content ul li a {
-       border-right:0 none;
-       border-left:1px solid #DADADA;
-}
\ No newline at end of file
diff --git a/wp-admin/css/global-rtl.css b/wp-admin/css/global-rtl.css
new file mode 100644 (file)
index 0000000..c1dfe5e
--- /dev/null
@@ -0,0 +1,31 @@
+body, td {
+       font-family: Tahoma;
+}
+textarea, input, select {
+       font-family: Tahoma;
+}
+h1, h2, h3 {
+       font-family:arial;
+}
+.widefat td {
+       padding: 7px 10px 9px 15px;
+}
+.widefat th {
+       padding: 9px 10px 6px 15px;
+       text-align: right;
+}
+.widefat th input {
+       margin: 0 8px 0 0;
+}
+.widefat .check-column {
+       text-align: left;
+}
+.wrap h2 {
+       font-family:arial;
+       margin: 5px -4px 0 0;
+       padding-right:0;
+       padding-left: 280px;
+}
+.wrap h2.long-header {
+       padding-left: 0;
+}
index 926aa88bd7aa1156221389385e4cc5003720785d..295adea8725e5d31295c3213b7ed6de7ecff2043 100644 (file)
@@ -194,3 +194,7 @@ th.check-column + th, th.check-column + td {
        padding-bottom: 7px;
        padding-right: 280px;
 }
        padding-bottom: 7px;
        padding-right: 280px;
 }
+
+.wrap h2.long-header {
+       padding-right: 0;
+}
index 54cadd07bf8e962b97aa7caddd19a15dd6b244b4..1aa7cdb7db1518e7af15c535d0c44fd2d45b4b65 100644 (file)
@@ -1,53 +1,73 @@
-/* footer */
-body, td {
-       font-family: Tahoma,Verdana,sans-serif;
+#poststuff .postbox h3 {
+       padding-left:0;
+       padding-right: 23px;
 }
 }
-
-.wrap {
-       text-align: right;
+* html #poststuff .postarea, * html #poststuff #titlediv {
+       margin-left:0;
+       margin-right: 3%;
 }
 }
-
-.wrap h2 {
-       margin: 5px 0 0 4px;
-}
-
-#footer {
-       padding-left:50px;
+* html #poststuff h2 {
+       margin-right: 0;
 }
 }
-#footer p {
-       background:none;
-       height:auto;
-       padding: 5px 5px 0;
-}
-
 #bh {
 #bh {
+       padding-right:0;
        padding-left: 15px;
        padding-left: 15px;
-       padding-right: 0px;
 }
 }
-/* write post */
+div#dashboard-widgets {
+       padding-right:0;
+       padding-left: 1px;
+}
+#tagchecklist span a {
+       margin: 4px -9px 0 0;
+}
 #poststuff .togbox {
 #poststuff .togbox {
-       margin-right:-16px;
+       margin-left:0;
+       margin-right: -19px;
 }
 }
-#poststuff h3 {
-       padding-right:20px;
+.widefat th input {
+       margin: 0 5px 0 0;
 }
 }
-
-p#widget-search, p#post-search {
-       padding-left: 15px;
+/* ---------- add by navid */
+#dashmenu { /* fix top right bottom in admin */
+       direction:ltr;
+}
+#sidemenu a { /* fix left admin buttom ex. plugins, options */
+       float:left;
 }
 }
-
-.widefat th {
-       padding-bottom: 8px;
+.wrap h2 {
+       margin:5px 4px 0 0;
+}
+#editor-toolbar {/* fix hover in media uploader icon */
+       direction:ltr;
+}
+#TB_window { /* fix theme preview */
+       left:2%;
+}
+/* fix widget page */
+form#widgets-filter {
+       position:static;
 }
 }
-
-/* template editor */
-#template textarea {
+#widget-search {
+       display:none;
+}
+/* fix manage comment page */
+ul.view-switch li {
        float:left;
 }
        float:left;
 }
-
-/* Editor */
-
-.mceToolbar {
-       direction: ltr;
-       text-align: left;
-}
\ No newline at end of file
+form#posts-filter {
+       position:static;
+}
+#post-search {
+       display:none;
+}
+#submenu {
+       margin-right: 20px;
+}
+/* Fixes for media-upload window */
+/* Center media-upload panel on screen */
+#TB_window { 
+       width: 670px; 
+       position: absolute; 
+       top: 50%; 
+       left: 50%; 
+       margin-right: 335px !important; }
index 39ef2546374d009cbbc9005d084a4caf2fcc2258..e4d035548b1cb9af93df5ada915b88eca50bea89 100644 (file)
@@ -111,7 +111,10 @@ div#dashboard-widgets {
 .tablenav-pages {
        display: block;
        margin-top: -3px;
 .tablenav-pages {
        display: block;
        margin-top: -3px;
+}
 
 
+table.ie-fixed {
+       table-layout: fixed;
 }
 
 #post-search .button, #widget-search .button {
 }
 
 #post-search .button, #widget-search .button {
index 806dbc54b187204c59b660e3048c65d5e5a6c524..efef9612102bfd287808cc635da8c30fc36dab10 100644 (file)
@@ -1,19 +1,27 @@
 body {
 body {
-       font-size: 11px;;
+       font-family: Tahoma;
+}
+/* Half the page disapears on IE6 */
+* html body {
+       width: 700px; 
+       position: absolute; 
+       left: 50%; 
+       margin-right: 350px;
 }
 ul, ol {
        padding: 5px 22px 5px 5px;
 }
 }
 ul, ol {
        padding: 5px 22px 5px 5px;
 }
-.form-table th {
-       text-align: right;
+.step, th {
+       text-align:right;
 }
 }
-input {
-       padding: 1px
+.submit input, .button, .button-secondary  {
+       font-family: Tahoma;
+       margin-right:0;
+}
+.form-table th {
+       text-align:right;
 }
 }
-#logo {
-       text-align: left;
+h1 {
+       font-family:arial;
+       margin: 5px -4px 0 0;
 }
 }
-#admin_email {
-       direction: ltr;
-       text-align: left;
-}
\ No newline at end of file
index 5f4164c6155fe98900b765419726d62de36b488d..cfa03253b575f0d38bf5d3c9677722435061ad91 100644 (file)
@@ -7,8 +7,10 @@ body {
        margin: 2em auto 0 auto;
        width: 700px;
        padding: 1em 2em;
        margin: 2em auto 0 auto;
        width: 700px;
        padding: 1em 2em;
+       -moz-border-radius: 12px;
+       -khtml-border-radius: 12px;
        -webkit-border-radius: 12px;
        -webkit-border-radius: 12px;
-       font-size: 62.5%;
+       border-radius: 12px;
 }
 
 a { color: #2583ad; text-decoration: none; }
 }
 
 a { color: #2583ad; text-decoration: none; }
@@ -25,34 +27,41 @@ h2 { font-size: 16px; }
 
 p, li {
        padding-bottom: 2px;
 
 p, li {
        padding-bottom: 2px;
-       font-size: 1.3em;
-       line-height: 1.8em;
+       font-size: 13px;
+       line-height: 18px;
 }
 
 code {
 }
 
 code {
-       font-size: 1.3em;
+       font-size: 13px;
 }
 
 ul, ol { padding: 5px 5px 5px 22px; }
 
 #logo { margin: 6px 0 14px 0px; border-bottom: none;}
 
 }
 
 ul, ol { padding: 5px 5px 5px 22px; }
 
 #logo { margin: 6px 0 14px 0px; border-bottom: none;}
 
-.step a, .step input { font-size: 2em; }
+.step {
+       margin: 20px 0 15px;
+}
 
 
-td input { font-size: 1.5em; }
+.step input {
+       font-size: 18px;
+}
+
+a.button {
+       font-size: 18px;
+}
 
 .step, th { text-align: left; padding: 0; }
 
 .submit input, .button, .button-secondary {
        font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
 
 .step, th { text-align: left; padding: 0; }
 
 .submit input, .button, .button-secondary {
        font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-       padding: 6px;
-       border: none;
+       padding: 5px 7px 7px;
+       border: 1px solid #a3a3a3;
        margin-left: 0;
        margin-left: 0;
-       font-size: 13px !important;
-       -moz-border-radius: 2px;
-       -khtml-border-radius: 2px;
-       -webkit-border-radius: 2px;
-       border-radius: 2px;
+       -moz-border-radius: 3px;
+       -khtml-border-radius: 3px;
+       -webkit-border-radius: 3px;
+       border-radius: 3px;
        color: #246;
        background: #e5e5e5;
 }
        color: #246;
        background: #e5e5e5;
 }
@@ -63,6 +72,7 @@ td input { font-size: 1.5em; }
 
 .submit input:hover, .button:hover, .button-secondary:hover {
        color: #d54e21;
 
 .submit input:hover, .button:hover, .button-secondary:hover {
        color: #d54e21;
+       border-color: #535353;
 }
 
 .form-table {
 }
 
 .form-table {
@@ -75,12 +85,13 @@ td input { font-size: 1.5em; }
        margin-bottom: 9px;
        padding: 10px;
        border-bottom: 8px solid #fff;
        margin-bottom: 9px;
        padding: 10px;
        border-bottom: 8px solid #fff;
+       font-size: 12px;
 }
 
 .form-table th {
 }
 
 .form-table th {
-       font-size: 12px;
+       font-size: 13px;
        text-align: left;
        text-align: left;
-       padding: 12px 10px 10px 10px;
+       padding: 16px 10px 10px 10px;
        border-bottom: 8px solid #fff;
        width: 110px;
        vertical-align: top;
        border-bottom: 8px solid #fff;
        width: 110px;
        vertical-align: top;
@@ -100,6 +111,12 @@ td input { font-size: 1.5em; }
        font-size: 11px;
 }
 
        font-size: 11px;
 }
 
+.form-table input {
+       line-height: 20px;
+       font-size: 15px;
+       padding: 2px;
+}
+
 h1 {
        border-bottom: 1px solid #dadada;
        clear: both;
 h1 {
        border-bottom: 1px solid #dadada;
        clear: both;
@@ -116,9 +133,10 @@ h1 {
 
 #error-page p {
        font-size: 14px;
 
 #error-page p {
        font-size: 14px;
-       line-height: 1.6em;
+       line-height: 16px;
+       margin: 25px 0 20px;
 }
 
 #error-page code {
 }
 
 #error-page code {
-       font-size: 1em;
+       font-size: 15px;
 }
\ No newline at end of file
 }
\ No newline at end of file
index fc272634ae22404b44f6a2896bb0a06054423695..daefbacb6af8c31fd41012fa961615e4756784b9 100644 (file)
@@ -1,32 +1,37 @@
 body {
 body {
-       font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-       direction: rtl;
+       font-family: Tahoma;
 }
 form {
        margin-left:0;
 }
 form {
        margin-left:0;
-       margin-right:8px;
+       margin-right: 8px;
 }
 form .forgetmenot {
        float:right;
 }
 }
 form .forgetmenot {
        float:right;
 }
+#login form .submit input  {
+       font-family: Tahoma;
+}
 form .submit {
        float:left;
 }
 form .submit {
        float:left;
 }
+#backtoblog a {
+       left:auto;
+       right:15px;
+}
 #login_error, .message {
 #login_error, .message {
-       margin:0 8px 16px 0;
+       margin: 0 8px 16px 0;
 }
 #nav {
 }
 #nav {
-       margin: 0 8px 0 0;
+       margin:0 8px 0 0;
 }
 #user_pass, #user_login, #user_email {
        margin-right:0;
        margin-left: 6px;
 }
 #user_pass, #user_login, #user_email {
        margin-right:0;
        margin-left: 6px;
-       direction:ltr;
 }
 h1 a {
        text-decoration:none;
 }
 }
 h1 a {
        text-decoration:none;
 }
-#backtoblog a {
-       left: auto;
-       right: 15px;
-}
\ No newline at end of file
+/* ltr input */
+#user_login, #user_pass {
+       direction:ltr;
+}
index f0c00dfe7b4324f4c1280ef465d8e3a39f8649c5..b23ad0e88c8d789eb3d1b41231f955cd76007a41 100644 (file)
@@ -1,21 +1,66 @@
-ul#sidemenu {
-       left: auto;
-       right: 0;
+body#media-upload ul#sidemenu {
+       left:auto;
+       right:0;
+       width: 620px;
+}
+#search-filter {
+       text-align:left;
 }
 .align .field label {
 }
 .align .field label {
-       display: block;
+       padding: 0 28px 0 0;
+       margin: 0 0 0 1em;
+}
+.image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label {
+       background-position:center right;
+}
+tr.image-size label {
+       margin: 0 0 0 1em;
+}
+.filename.original {
        float: right;
        float: right;
-       padding: 0 25px 0 0;
-       margin: 5px 3px 5px 5px; 
 }
 }
-.align .field input {
-       display: block;
+.crunching {
+       text-align: left;
+       margin-right:0;
+       margin-left: 5px;
+}
+button.dismiss {
+       right:auto;
+       left:5px;
+}
+.file-error {
+       margin: 0 50px 5px 0;
+}
+.progress {
+       left:auto;
+       right:0;
+}
+.bar {
+       border-right-width:0;
+       border-left-width: 3px;
+       border-left-style: solid;
+}
+.media-item .pinkynail {
+       float:right;
+}
+.describe-toggle-on, .describe-toggle-off {
+       float: left;
+       margin-right:0;
+       margin-left: 20px;
+}
+/* Specific to Uploader */
+
+#media-upload .media-upload-form p {
+       margin: 0 0 1em 1em;
+}
+.filename {
        float: right;
        float: right;
-       margin: 5px 15px 5px 0;
-}
-.image-align-none-label,
-.image-align-left-label,
-.image-align-center-label,
-.image-align-right-label {
-       background-position: center right;
-}
\ No newline at end of file
+       margin-left:0;
+       margin-right: 10px;
+}
+#media-upload .describe th.label {
+       text-align:right;
+}
+.menu_order {
+       float:left;
+}
index c77a069c21c0377708048743e47c422bbc24b472..d04866afe0da6e0d16c804062ab12e844af24725 100644 (file)
@@ -32,6 +32,7 @@ form {
 .media-upload-form label, .media-upload-form legend {
        display:block;
        font-weight: bold;
 .media-upload-form label, .media-upload-form legend {
        display:block;
        font-weight: bold;
+       font-size: 13px;
        margin-bottom: 0.5em;
        margin: 0 0 0.5em 0;
 }
        margin-bottom: 0.5em;
        margin: 0 0 0.5em 0;
 }
@@ -196,6 +197,11 @@ abbr.required {
 #media-upload .media-upload-form p {
        margin: 0 1em 1em 0;
 }
 #media-upload .media-upload-form p {
        margin: 0 1em 1em 0;
 }
+
+#media-upload .media-upload-form p.ml-submit {
+       padding: 1em 0;
+}
+
 #media-upload p.help {
        font-style: italic;
        font-weight: normal;
 #media-upload p.help {
        font-style: italic;
        font-weight: normal;
@@ -217,10 +223,17 @@ abbr.required {
        min-height: 36px;
        width: 100%;
 }
        min-height: 36px;
        width: 100%;
 }
+
+#media-upload .ui-sortable .media-item {
+       cursor: move;
+}
+
 .filename {
 .filename {
+       float: left;
        line-height: 36px;
        margin-left: 10px;
        line-height: 36px;
        margin-left: 10px;
-       float: left;
+       overflow: hidden;
+       max-width: 430px;
 }
 #media-upload .describe {
        border-top-width: 1px;
 }
 #media-upload .describe {
        border-top-width: 1px;
@@ -228,6 +241,7 @@ abbr.required {
        padding: 5px;
        width: 100%;
        clear: both;
        padding: 5px;
        width: 100%;
        clear: both;
+       cursor: default;
 }
 #media-upload .describe th.label {
        padding-top: .5em;
 }
 #media-upload .describe th.label {
        padding-top: .5em;
@@ -240,3 +254,62 @@ abbr.required {
        margin-bottom: 1em;
        height: 3em;
 }
        margin-bottom: 1em;
        height: 3em;
 }
+
+#media-upload #filter {
+       width: 623px;
+}
+
+#media-upload #filter .subsubsub {
+       margin: 8px 0;
+}
+
+#filter .tablenav select {
+       border-style:solid;
+       border-width:1px;
+       padding:2px;
+       vertical-align:top;
+}
+
+#media-upload a.delete,
+#media-upload a.del-link {
+       padding: 0 3px 1px;
+}
+
+#media-upload .del-attachment {
+       display: none;
+       margin: 5px 0;
+}
+
+.menu_order {
+       float: right;
+       font-size: 11px;
+       margin: 10px 10px 0;
+}
+
+.menu_order_input {
+       border: 1px solid #DDDDDD;
+       font-size: 10px;
+       padding: 1px;
+       width: 23px;
+}
+
+.ui-sortable-helper {
+       background-color: #fff;
+       border: 1px solid #aaa;
+       opacity: 0.6;
+       filter: alpha(opacity=60);
+}
+
+#media-upload th.order-head {
+        width: 25%;
+        text-align: center;
+}
+
+#media-upload .widefat {
+       width: 626px;
+       border-style: solid solid none;
+}
+
+.sorthelper {
+       z-index: -1;
+}
diff --git a/wp-admin/css/press-this-ie-rtl.css b/wp-admin/css/press-this-ie-rtl.css
new file mode 100644 (file)
index 0000000..912e0e2
--- /dev/null
@@ -0,0 +1,3 @@
+.ui-tabs-nav {
+       margin-right: 0;
+}
diff --git a/wp-admin/css/press-this-ie.css b/wp-admin/css/press-this-ie.css
new file mode 100644 (file)
index 0000000..e9667c1
--- /dev/null
@@ -0,0 +1,7 @@
+#posting {
+       position: static !important;
+}
+ .ui-tabs-nav {
+       margin-left: 0;
+       border: 0 !important;
+}
diff --git a/wp-admin/css/press-this-rtl.css b/wp-admin/css/press-this-rtl.css
new file mode 100644 (file)
index 0000000..f75d7ec
--- /dev/null
@@ -0,0 +1,98 @@
+body {
+       font-family: Tahoma;
+}
+.ui-tabs-nav {
+       padding-left:0;
+       padding-right:8px;
+}
+.ui-tabs-nav li {
+       float: right;
+}
+.button {
+       font-family: Tahoma;
+       margin-left:0;
+       margin-right: 5px;
+}
+#wphead #viewsite {
+       margin-left:0;
+       margin-right: 10px;
+}
+#viewsite {
+       right:auto;
+       left: 8px;
+}
+#wphead #viewsite a {
+       font-family: Tahoma;
+}
+h1 {
+       right:auto;
+       left:0;
+}
+div#posting {
+       padding-left:0;
+       padding-right: 16px;
+}
+#photo_directions span {
+       right:auto;
+       left:3px;
+}
+#img_container a {
+       float:right;
+}
+#img_container a, #img_container a:link, #img_container a:visited {
+       margin:0 0 4px 4px;
+}
+div#categories {
+       right:auto;
+       left:16px;
+}
+div#categories h2 {
+       margin: .5em 1em .5em 0;
+}
+#tagsdiv #newtag {
+       margin-right:0; 
+       margin-left: 5px;       
+}
+#jaxtag {
+       padding-left:0;
+       padding-right: 1em;
+}
+#tagchecklist {
+       padding-left:0;
+       padding-right: 1em;
+}
+#tagchecklist span {
+       margin-right: 10px;
+       margin-left: .5em;
+       float: right;
+}
+#tagchecklist span a {
+       margin: 6px -9px 0pt 0;
+       float: right;
+}
+.submitbox {
+       float: left;
+}
+.submitbox .submit input {
+       text-align:right;
+}
+.video_split #extra_fields {
+       float:right;
+}
+.video_split .editor_area {
+       float: left;
+}
+.ac_results li {
+       text-align:right;
+}
+#TB_ajaxContent #options {
+       right:auto;
+       left:25px;
+}
+#post_status {
+       margin-left:0;
+       margin-right: 10px;
+}
+#footer {
+       padding: 10px 60px 0 0;
+}
diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css
new file mode 100644 (file)
index 0000000..daf60ba
--- /dev/null
@@ -0,0 +1,521 @@
+body {
+       font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+       color: #333;
+       margin: 0px;
+       padding: 0px;
+}
+
+img { border: 0; }
+/* Tabs */
+@media projection , screen {
+       .ui-tabs-hide {
+               display: none;
+       }
+}
+
+@media print {
+       .ui-tabs-nav {
+               display: none;
+       }
+}
+
+.ui-tabs-nav {
+       list-style: none;
+       border-bottom: 1px solid #C6D9E9;
+       padding-left: 8px;
+       margin-bottom: .5em;
+       margin-top: -2em;
+}
+
+/* Additional IE specific bug fixes... */
+* html .ui-tabs-nav { /* auto clear, @ IE 6 & IE 7 Quirks Mode */
+       display: inline-block;
+}
+
+* :first-child+html .ui-tabs-nav {
+       /* @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */
+       display: inline-block;
+}
+
+.ui-tabs-nav:after {
+       /* clearing without presentational markup, IE gets extra treatment */
+       display: block;
+       clear: both;
+       content: " ";
+}
+
+.ui-tabs-nav li {
+       float: left;
+       margin: 0;
+       height: 2em;
+       line-height: 2em;
+}
+
+.ui-tabs-nav a,.ui-tabs-nav a span {
+       display: block;
+}
+
+.ui-tabs-nav a {
+       margin: 1px 0 0;
+       /* position: relative makes opacity fail for disabled tab in IE */
+       padding-left: 0;
+       color: #27537a;
+       font-weight: bold;
+       line-height: 2em;
+       text-align: center;
+       text-decoration: none;
+       white-space: nowrap; /* required in IE 6 */
+       outline: 0; /* prevent dotted border in Firefox */
+       padding: 0 1em;
+}
+
+.ui-tabs-nav .ui-tabs-selected a {
+       position: relative;
+       top: 1px;
+       z-index: 2;
+       margin-top: 0;
+       -moz-border-radius-topleft: 4px;
+       -moz-border-radius-topright: 4px;
+       -webkit-border-top-left-radius: 4px;
+       -webkit-border-top-right-radius: 4px;
+       border-style: solid;
+       border-width: 1px;
+       background: white;
+       border-bottom-width: 2px;
+       margin-top: -2px;
+}
+
+.ui-tabs-nav a:hover,.ui-tabs-nav a:focus,.ui-tabs-nav a:active,
+.ui-tabs-nav .ui-tabs-selected a:link,.ui-tabs-nav .ui-tabs-selected a:visited { 
+       cursor: pointer;
+}
+
+/* Header */
+#wphead {
+       border-top: none;
+       height: 2em;
+       padding-top: 8px;
+}
+
+.button {
+       font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+       padding: 3px 5px;
+       font-size: 12px;
+       line-height: 1.5em;
+       border-width: 1px;
+       border-style: solid;
+       -moz-border-radius: 3px;
+       -khtml-border-radius: 3px;
+       -webkit-border-radius: 3px;
+       border-radius: 3px;
+       cursor: pointer;
+       margin-left: 5px;
+       text-decoration: none;
+}
+
+.howto {
+       font-size: 11px;
+       font-style: italic;
+       display: block;
+}
+
+#wphead #viewsite {
+       position: absolute;
+       margin-top: 12px;
+       margin-left: 10px;
+}
+
+#viewsite {
+       position: relative;
+       right: 8px;
+       top: 6px;
+       margin: 0 !important;
+}
+
+#wphead #viewsite a {
+       font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+       padding: 3px 4px;
+       display: block;
+       letter-spacing: normal;
+       border-width: 1px;
+       border-style: solid;
+       -moz-border-radius: 3px;
+       -khtml-border-radius: 3px;
+       -webkit-border-radius: 3px;
+       border-radius: 3px;
+       text-decoration: none;
+}
+
+#previewview {
+       padding-top: 8px !important;
+       padding-bottom: 8px !important;
+}
+
+h1 {
+       font-size: .75em;
+       line-height: 2.666em;
+       top: .5em;
+       right: 0;
+       margin: 0 !important;
+       padding: 0 !important;
+       width: 236px;
+       background: none;
+}
+
+input.text {
+       border: 0pt none;
+       outline-color: -moz-use-text-color;
+       outline-style: none;
+       outline-width: medium;
+       padding: 0pt;
+       width: 100%;
+       border-style: solid;
+       color: #333333;
+}
+
+/* Editor/Main Column */
+
+div#container {
+       margin: 0;
+       min-width: 500px;
+}
+
+div#container form {
+       margin: 0px;
+       padding: 0px;
+}
+
+div#posting {
+       padding-left: 16px;
+       position: absolute;
+       z-index: 1;
+       width: 66%;
+}
+
+#post_title {
+       width: 99%;
+}
+
+.titlewrap {
+       border-style: solid;
+       border-width: 1px;
+       padding: 2px 3px;
+       border-color: #CCCCCC;
+}
+
+div#posting h2 {
+       margin: .5em 0 .25em 0;
+       font-size: 12px;
+       padding: 3px;
+       background: ;
+}
+
+.editor-container {
+       border-width: 1px;
+       border-color: #ccc;
+       border-style: solid;
+       margin-bottom: 1em;
+}
+
+/* Photo Styles */
+
+#photo_directions {
+       margin-top: .25em;
+       display: block;
+       position: relative;
+}
+
+#photo_directions span {
+       display: block;
+       position: absolute;
+       top: 0;
+       right: 3px;
+}
+
+#photo_saving {
+       margin: 0 8px 8px;
+       vertical-align: middle;
+}
+
+#img_container {
+       background-color: #fff;
+       overflow: auto;
+       height: 100px;
+}
+
+#img_container a {
+       display: block;
+       width: 79px;
+       height: 79px;
+       float: left;
+}
+
+#img_container img {
+       width: 75px;
+       height: 75px;
+       border: 0px;
+       padding: 2px;
+       background-color: #f4f4f4;
+       cursor: pointer;
+}
+#img_container a, #img_container a:link, #img_container a:visited {
+       border: 2px solid #ccc;
+       margin: 0 4px 4px 0;
+} 
+#img_container a:hover, #img_container a:active {
+       border: 2px solid #000;
+}
+
+/* Submit Column */
+
+div#categories {
+       font-size: 85%;
+       position: absolute;
+       top: 50px;
+       right: 16px;
+       width: 27%;
+       z-index: 2;
+}
+
+div#categories h2 {
+       color: #333;
+       font-size: 12px;
+       margin: .5em 0 .5em 1em;
+       padding: 0;
+}
+
+#categories-all {
+       overflow: auto;
+       padding: 0 1em 1em 1em;
+       height: 15em;
+}
+
+#categories ul {
+       list-style: none;
+       padding: 0;
+       margin: 0;
+}
+
+#tagsdiv #newtag {
+       padding: 3px;
+       margin-right: 5px;
+       width: 16em;    
+}
+
+#jaxtag {
+       clear: both;
+       padding-left: 1em;
+       margin: 0;
+}
+
+#tagchecklist {
+       padding-left: 1em;
+       margin-bottom: 1em;
+       font-size: 12px;
+       overflow: auto;
+}
+
+#tagchecklist strong {
+       position: absolute;
+       font-size: .75em;
+}
+
+#tagchecklist span {
+       margin-right: .5em;
+       margin-left: 10px;
+       display: block;
+       float: left;
+       font-size: 11px;
+       line-height: 1.8em;
+       white-space: nowrap;
+       cursor: default;
+}
+
+#tagchecklist span a {
+       margin: 6px 0pt 0pt -9px;
+       cursor: pointer;
+       width: 10px;
+       height: 10px;
+       display: block;
+       float: left;
+       text-indent: -9999px;
+       overflow: hidden;
+       position: absolute;
+}
+.submit {
+       -moz-border-radius-bottomleft: 3px;
+       -khtml-border-bottom-left-radius: 3px;
+       -webkit-border-bottom-left-radius: 3px;
+       border-bottom-left-radius: 3px;
+       -moz-border-radius-bottomright: 3px;
+       -khtml-border-bottom-right-radius: 3px;
+       -webkit-border-bottom-right-radius: 3px;
+       border-bottom-right-radius: 3px;
+       margin: 0;
+       padding: 10px;
+}
+.submitbox {
+       width: 100%;
+       float: right;
+}
+
+.submitbox .submit a:hover {
+       border-bottom-width: 1px;
+       border-bottom-style: solid;
+}
+
+.submitbox .submit input {
+       border: none;
+       text-align: left;
+       padding: 6px 4px;
+       font-size: 12px;
+       margin: 2px;
+       -moz-border-radius: 3px;
+       -khtml-border-radius: 3px;
+       -webkit-border-radius: 3px;
+       border-radius: 3px;
+       cursor: pointer;
+}
+
+.submitbox #previewview {
+       padding: 15px 10px;
+       -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;
+}
+
+/* Video Styles */
+.video_split #extra_fields {
+       width: 27%;
+       height: 300px;
+       float: left;
+}
+
+#embed_code {
+       border: 0;
+       width: 99%;
+       height: 200px;
+}
+.video_split .editor_area {
+       width: 70%;
+       float: right;
+}
+
+.ac_results {
+       padding: 0;
+       margin: 0;
+       list-style: none;
+       position: absolute;
+       z-index: 10000;
+       display: none;
+       border-width: 1px;
+       border-style: solid;
+}
+
+.ac_results li {
+       padding: 2px 5px;
+       white-space: nowrap;
+       text-align: left;
+}
+
+.ac_over {
+       cursor: pointer;
+}
+
+.ac_match {
+       text-decoration: underline;
+}
+
+.photolist {
+       display: none;
+}
+
+#extra_fields small {
+       display: block;
+       margin-top: .5em;
+       padding-bottom: .25em;
+}
+
+#TB_ajaxContent #options {
+       position: absolute;
+       top: 20px;
+       right: 25px;
+       padding: 5px;
+}
+#TB_ajaxContent h3 {
+       margin-bottom: .25em;
+}
+
+.updated {
+       margin: 0;
+       margin-left: 15px;
+       margin-right: 15px;
+       padding: 0;
+       max-width: 980px;
+       border-width: 1px;
+       border-style: solid;
+       padding: 0 0.6em;
+       max-width: 950px;
+       margin-top: 1em;
+       margin-bottom: 1em;
+}
+
+.updated p, .error p {
+       margin: 0.6em 0;
+}
+
+.updated a, .error a {
+       text-decoration: underline;
+}
+
+.updated a {
+       text-decoration: none;
+       padding-bottom: 2px;
+}
+
+#post_status {
+       margin-left: 10px;
+       margin-bottom: 1em;
+       display: block;
+}
+
+/* Footer */
+
+#footer {
+       height: 65px;
+       display: block;
+       width: 640px;
+       padding: 10px 0 0 60px;
+       margin: 0;
+       position: absolute;
+       bottom: 0;
+       font-size: 12px;
+}
+
+#footer p {
+       margin: 0;
+       padding: 7px 0;
+}
+
+#footer p a {
+       text-decoration: none;
+}
+
+#footer p a:hover {
+       text-decoration: underline;
+}
+
+
+/* Utility Classes */
+.centered {
+       text-align: center;
+}
+
+.hidden {
+       display: none;
+}
\ No newline at end of file
index 407886b284c31867f0fd570f363e652649dcddee..7b9f31bb2b20a1fb823abe42862a9eecb8ebe331 100644 (file)
@@ -1,11 +1,15 @@
+#template textarea {
+       font-family:monospace;
+}
 #templateside {
        float:left;
 }
 #themeselector {
        padding-right:0;
 #templateside {
        float:left;
 }
 #themeselector {
        padding-right:0;
-       padding-left:5px;
+       padding-left: 5px;
+       float: left;
 }
 div.tablenav {
 }
 div.tablenav {
-       margin-left:210px;
        margin-right:0;
        margin-right:0;
-}
\ No newline at end of file
+       margin-left: 210px;
+}
index e17aadc215bb33685202b24e0cdb028b10a0ddff..70838cd41aeba9fbadff68fe7afd50ef7942de24 100644 (file)
@@ -1,50 +1,45 @@
+/* 2 column liquid layout */
 div.widget-liquid-left-holder {
 div.widget-liquid-left-holder {
-       clear:right;
-       float:right;
+       float: right;
+       clear: right;
        margin-right:0;
        margin-right:0;
-       margin-left:-310px;
+       margin-left: -310px;
 }
 div.widget-liquid-left {
        margin-right:0;
 }
 div.widget-liquid-left {
        margin-right:0;
-       margin-left:310px;
+       margin-left: 320px;
 }
 div.widget-liquid-right {
 }
 div.widget-liquid-right {
-       clear:left;
-       float:left;
+       float: left;
+       clear: left;
 }
 p#widget-search {
 }
 p#widget-search {
+       right:auto;
        left:0;
        left:0;
-       right:auto
+}
+h4.widget-title span {
+       float: right;
+}
+h4.widget-title a {
+       float: left;
+       margin-left:0;
+       margin-right: 1em;
 }
 ul#widget-list li.widget-list-item h4.widget-title {
        float:right;
 }
 ul#widget-list li.widget-list-item h4.widget-title {
        float:right;
-       text-align:right;
 }
 ul#widget-list li.widget-list-item div.widget-description {
 }
 ul#widget-list li.widget-list-item div.widget-description {
-       margin:0 200px 0 0;
-       padding:0 4em 0 0;
+       margin: 0 200px 0 0;
+       padding: 0 4em 0 0;
 }
 .widget-control-save, .widget-control-remove {
 }
 .widget-control-save, .widget-control-remove {
-       float:right;
        margin-right:0;
        margin-right:0;
-       margin-left:8px;
+       margin-left: 8px;
+       float: right;
 }
 }
-h4.widget-title a {
-       right:auto;
-       left:1em;
-}
-li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, #draghelper li.widget-list-control-item h4.widget-title a:visited {
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited {
        right:auto;
        right:auto;
-       left:1em;
-}
-
-li.widget-list-control-item div.widget-control {
-       padding:0 0 0 10px;
-}
-ul.widget-control-list div.widget-control-actions {
-       margin-right:0;
-       margin-left:-10px;
+       left: 1em;
 }
 }
-ul.widget-control-list .widget-title {
-       text-align:right;
-}
\ No newline at end of file
index 5d044cf6dcf75739b98b07a4c91066ad012fd93f..f21f22a1cc178c68d7efedc5ace9e5643f10d84a 100644 (file)
@@ -45,10 +45,20 @@ ul#widget-list li.widget-list-item {
        margin: 0;
        border-bottom-width: 1px;
        border-bottom-style: solid;
        margin: 0;
        border-bottom-width: 1px;
        border-bottom-style: solid;
-       background-color: transparent;
        line-height: 1;
 }
 
        line-height: 1;
 }
 
+h4.widget-title span {
+       float: left;
+}
+
+h4.widget-title a {
+       float: right;
+       text-decoration: underline;
+       border-bottom: none;
+       margin-left: 1em;
+}
+
 ul#widget-list li.widget-list-item h4.widget-title {
        position: relative;
        margin: 0;
 ul#widget-list li.widget-list-item h4.widget-title {
        position: relative;
        margin: 0;
@@ -59,7 +69,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
        -moz-border-radius: 3px;
        -khtml-border-radius: 3px;
        -webkit-border-radius: 3px;
        -moz-border-radius: 3px;
        -khtml-border-radius: 3px;
        -webkit-border-radius: 3px;
-       border-radius: 3px;;
+       border-radius: 3px;
 }
 
 #dragHelper h4.widget-title {
 }
 
 #dragHelper h4.widget-title {
@@ -74,7 +84,6 @@ ul#widget-list li.widget-list-item div.widget-description {
        font-size: 11px;
 }
 
        font-size: 11px;
 }
 
-
 ul#widget-list li.widget-list-item ul.widget-control-info {
        display: none;
 }
 ul#widget-list li.widget-list-item ul.widget-control-info {
        display: none;
 }
@@ -91,27 +100,26 @@ ul.widget-control-list {
        padding: 0 1em;
 }
 
        padding: 0 1em;
 }
 
-ul.widget-control-list li {
-       position: relative;
-}
-
 div#current-widgets p.submit {
        padding: 1em;
 }
 
 li.widget-list-control-item {
 div#current-widgets p.submit {
        padding: 1em;
 }
 
 li.widget-list-control-item {
-       margin: 0 0 1em;
+       margin: 1em 0;
        -moz-border-radius: 3px;
        -khtml-border-radius: 3px;
        -webkit-border-radius: 3px;
        border-radius: 3px;
 }
 
        -moz-border-radius: 3px;
        -khtml-border-radius: 3px;
        -webkit-border-radius: 3px;
        border-radius: 3px;
 }
 
-li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4, li.widget-sortable h4 {
+li.widget-list-control-item h4, 
+#dragHelper li.widget-list-control-item h4, 
+li.widget-sortable h4 {
        margin: 0;
        margin: 0;
-       padding: 0.4em 2.5em 0.4em 0.8em;
        cursor: move;
        font-size: 13px;
        cursor: move;
        font-size: 13px;
+       padding: 0.4em 0.8em;
+       position: relative;
        -moz-border-radius: 3px;
        -khtml-border-radius: 3px;
        -webkit-border-radius: 3px;
        -moz-border-radius: 3px;
        -khtml-border-radius: 3px;
        -webkit-border-radius: 3px;
@@ -129,13 +137,6 @@ li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4, li.w
        text-decoration: none;
 }
 
        text-decoration: none;
 }
 
-h4.widget-title a {
-       position: absolute;
-       right: 1em;
-       text-decoration: underline;
-       border-bottom: none;
-}
-
 li.widget-list-control-item h4.widget-title a,
 #dragHelper li.widget-list-control-item h4.widget-title a,
 #draghelper li.widget-list-control-item h4.widget-title a:visited {
 li.widget-list-control-item h4.widget-title a,
 #dragHelper li.widget-list-control-item h4.widget-title a,
 #draghelper li.widget-list-control-item h4.widget-title a:visited {
@@ -143,16 +144,15 @@ li.widget-list-control-item h4.widget-title a,
 }
 
 li.widget-list-control-item h4.widget-title a:hover {
 }
 
 li.widget-list-control-item h4.widget-title a:hover {
-
        text-decoration: none;
        border-bottom: none;
 }
 
 li.widget-list-control-item div.widget-control {
        display: none;
        text-decoration: none;
        border-bottom: none;
 }
 
 li.widget-list-control-item div.widget-control {
        display: none;
-       margin: 1em;
-       padding: 0 10px 0 7px; /* Correction for padding, margin, border of inputs */
+       padding: 15px;
        font-size: 11px;
        font-size: 11px;
+       position: relative;
 }
 
 li.widget-list-control-item div.widget-control p {
 }
 
 li.widget-list-control-item div.widget-control p {
@@ -161,15 +161,9 @@ li.widget-list-control-item div.widget-control p {
 }
 
 ul.widget-control-list div.widget-control-actions {
 }
 
 ul.widget-control-list div.widget-control-actions {
-       margin-right: -10px; /* Correction for padding, margin, border of inputs */
-       margin-left: -6px;
        border-top-width: 1px;
        border-top-style: solid;
        border-top-width: 1px;
        border-top-style: solid;
-       padding: 0.5em 0 0.8em;
-}
-
-ul.widget-control-list .widget-title {
-       
+       padding: 0.5em 0 0;
 }
 
 .widget-control-edit {
 }
 
 .widget-control-edit {
index c54d9a924122617c76e931818e44dfd3a28aa0a0..b1f583d144071bfad226299221ea01b41e45f602 100644 (file)
@@ -189,7 +189,7 @@ Event.observe( window, 'load', hide_text );
 <div id="desc"><?php bloginfo('description');?></div>
 </div>
 <?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?>
 <div id="desc"><?php bloginfo('description');?></div>
 </div>
 <?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?>
-<form method="post" action="<?php echo get_option('siteurl') ?>/wp-admin/themes.php?page=custom-header&amp;updated=true">
+<form method="post" action="<?php echo admin_url('themes.php?page=custom-header&amp;updated=true') ?>">
 <input type="button" value="<?php _e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
 <input type="button" value="<?php _e('Select a Text Color'); ?>" onclick="colorSelect($('textcolor'), 'pickcolor')" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" />
 <?php wp_nonce_field('custom-header') ?>
 <input type="button" value="<?php _e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
 <input type="button" value="<?php _e('Select a Text Color'); ?>" onclick="colorSelect($('textcolor'), 'pickcolor')" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" />
 <?php wp_nonce_field('custom-header') ?>
index 60368c2f0abd2394246b27af52833d4c05641d39..f32cfd4fdaa848b0a1259b6da2dfd30ecc089f6e 100644 (file)
@@ -26,18 +26,18 @@ if ( ! empty($cat_ID) ) {
        <table class="form-table">
                <tr class="form-field form-required">
                        <th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
        <table class="form-table">
                <tr class="form-field form-required">
                        <th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
-                       <td><input name="cat_name" id="cat_name" type="text" value="<?php echo attribute_escape($category->name); ?>" size="40" /><br />
+                       <td><input name="cat_name" id="cat_name" type="text" value="<?php echo attribute_escape($category->name); ?>" size="40" aria-required="true" /><br />
             <?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></td>
                </tr>
                <tr class="form-field">
                        <th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
             <?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></td>
                </tr>
                <tr class="form-field">
                        <th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
-                       <td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo attribute_escape($category->slug); ?>" size="40" /><br />
+                       <td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br />
             <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
                </tr>
                <tr class="form-field">
                        <th scope="row" valign="top"><label for="category_parent"><?php _e('Category Parent') ?></label></th>
                        <td>
             <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
                </tr>
                <tr class="form-field">
                        <th scope="row" valign="top"><label for="category_parent"><?php _e('Category Parent') ?></label></th>
                        <td>
-                               <?php wp_dropdown_categories('hide_empty=0&name=category_parent&orderby=name&selected=' . $category->parent . '&hierarchical=1&show_option_none=' . __('None')); ?><br />
+                               <?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
                 <?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?>
                        </td>
                </tr>
                 <?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?>
                        </td>
                </tr>
index bc62681bc4b6e415d1bf37694b4082bca21b897b..62fb2df69d1ab1e23e7d3a09dc75a4e4d7dbd194 100644 (file)
@@ -12,8 +12,7 @@ if ( !empty( $_REQUEST['delete_comments'] ) ) {
        $comments_deleted = $comments_approved = $comments_unapproved = $comments_spammed = 0;
        foreach ($_REQUEST['delete_comments'] as $comment) : // Check the permissions on each
                $comment = (int) $comment;
        $comments_deleted = $comments_approved = $comments_unapproved = $comments_spammed = 0;
        foreach ($_REQUEST['delete_comments'] as $comment) : // Check the permissions on each
                $comment = (int) $comment;
-               $post_id = (int) $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = $comment");
-               // $authordata = get_userdata( $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $post_id") );
+               $post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment) );
                if ( !current_user_can('edit_post', $post_id) )
                        continue;
                if ( !empty( $_REQUEST['spamit'] ) ) {
                if ( !current_user_can('edit_post', $post_id) )
                        continue;
                if ( !empty( $_REQUEST['spamit'] ) ) {
@@ -31,6 +30,8 @@ if ( !empty( $_REQUEST['delete_comments'] ) ) {
                }
        endforeach;
        $redirect_to = basename( __FILE__ ) . '?deleted=' . $comments_deleted . '&approved=' . $comments_approved . '&spam=' . $comments_spammed . '&unapproved=' . $comments_unapproved;
                }
        endforeach;
        $redirect_to = basename( __FILE__ ) . '?deleted=' . $comments_deleted . '&approved=' . $comments_approved . '&spam=' . $comments_spammed . '&unapproved=' . $comments_unapproved;
+       if ( isset($_REQUEST['apage']) )
+               $redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to );
        if ( !empty($_REQUEST['mode']) )
                $redirect_to = add_query_arg('mode', $_REQUEST['mode'], $redirect_to);
        if ( !empty($_REQUEST['comment_status']) )
        if ( !empty($_REQUEST['mode']) )
                $redirect_to = add_query_arg('mode', $_REQUEST['mode'], $redirect_to);
        if ( !empty($_REQUEST['comment_status']) )
@@ -97,7 +98,7 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp
 <?php
 $status_links = array();
 $num_comments = wp_count_comments();
 <?php
 $status_links = array();
 $num_comments = wp_count_comments();
-$stati = array('moderated' => sprintf(__ngettext('Awaiting Moderation (%s)', 'Awaiting Moderation (%s)', $num_comments->moderated), "<span class='comment-count'>$num_comments->moderated</span>"), 'approved' => _c('Approved|plural'));
+$stati = array('moderated' => sprintf(__ngettext('Awaiting Moderation (%s)', 'Awaiting Moderation (%s)', number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"), 'approved' => _c('Approved|plural'));
 $class = ( '' === $comment_status ) ? ' class="current"' : '';
 $status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('Show All Comments')."</a>";
 foreach ( $stati as $status => $label ) {
 $class = ( '' === $comment_status ) ? ' class="current"' : '';
 $status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('Show All Comments')."</a>";
 foreach ( $stati as $status => $label ) {
@@ -117,6 +118,7 @@ unset($status_links);
 </ul>
 
 <p id="post-search">
 </ul>
 
 <p id="post-search">
+       <label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label>
        <input type="text" id="post-search-input" name="s" value="<?php echo $search; ?>" />
        <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
 </p>
        <input type="text" id="post-search-input" name="s" value="<?php echo $search; ?>" />
        <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
 </p>
@@ -132,22 +134,24 @@ unset($status_links);
 
 <?php
 
 
 <?php
 
+$comments_per_page = apply_filters('comments_per_page', 20, $comment_status);
+
 if ( isset( $_GET['apage'] ) )
        $page = abs( (int) $_GET['apage'] );
 else
        $page = 1;
 
 if ( isset( $_GET['apage'] ) )
        $page = abs( (int) $_GET['apage'] );
 else
        $page = 1;
 
-$start = $offset = ( $page - 1 ) * 20;
+$start = $offset = ( $page - 1 ) * $comments_per_page;
 
 
-list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, 25 ); // Grab a few extra
+list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 5 ); // Grab a few extra
 
 
-$comments = array_slice($_comments, 0, 20);
-$extra_comments = array_slice($_comments, 20);
+$comments = array_slice($_comments, 0, $comments_per_page);
+$extra_comments = array_slice($_comments, $comments_per_page);
 
 $page_links = paginate_links( array(
        'base' => add_query_arg( 'apage', '%#%' ),
        'format' => '',
 
 $page_links = paginate_links( array(
        'base' => add_query_arg( 'apage', '%#%' ),
        'format' => '',
-       'total' => ceil($total / 20),
+       'total' => ceil($total / $comments_per_page),
        'current' => $page
 ));
 
        'current' => $page
 ));
 
@@ -173,6 +177,9 @@ if ( $page_links )
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php do_action('manage_comments_nav', $comment_status); ?>
 <?php wp_nonce_field('bulk-comments'); ?>
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php do_action('manage_comments_nav', $comment_status); ?>
 <?php wp_nonce_field('bulk-comments'); ?>
+<?php if ( isset($_GET['apage']) ) { ?>
+       <input type="hidden" name="apage" value="<?php echo absint( $_GET['apage'] ); ?>" />
+<?php } ?>
 </div>
 
 <br class="clear" />
 </div>
 
 <br class="clear" />
@@ -186,7 +193,7 @@ if ($comments) {
 <table class="widefat">
 <thead>
   <tr>
 <table class="widefat">
 <thead>
   <tr>
-    <th scope="col" class="check-column"><input type="checkbox" onclick="checkAll(document.getElementById('comments-form'));" /></th>
+    <th scope="col" class="check-column"><input type="checkbox" /></th>
     <th scope="col"><?php _e('Comment') ?></th>
     <th scope="col"><?php _e('Date') ?></th>
     <th scope="col" class="action-links"><?php _e('Actions') ?></th>
     <th scope="col"><?php _e('Comment') ?></th>
     <th scope="col"><?php _e('Date') ?></th>
     <th scope="col" class="action-links"><?php _e('Actions') ?></th>
index 85042a149633afd7ee04b0e6a02fc83cc68d293f..983bc27d8d06abe238cf5fede35ff20ff856a229 100644 (file)
@@ -1,12 +1,46 @@
- <?php
-$action = isset($action)? $action : '';
+<?php
+
+$action = isset($action) ? $action : '';
 if ( isset($_GET['message']) )
        $_GET['message'] = absint( $_GET['message'] );
 $messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) );
 $messages[2] = __('Custom field updated.');
 $messages[3] = __('Custom field deleted.');
 $messages[4] = __('Post updated.');
 if ( isset($_GET['message']) )
        $_GET['message'] = absint( $_GET['message'] );
 $messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) );
 $messages[2] = __('Custom field updated.');
 $messages[3] = __('Custom field deleted.');
 $messages[4] = __('Post updated.');
+
+if ( isset($_GET['revision']) )
+       $messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
+
+$notice = false;
+$notices[1] = __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>.' );
+
+if ( !isset($post_ID) || 0 == $post_ID ) {
+       $form_action = 'post';
+       $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
+       $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
+       $autosave = false;
+} else {
+       $post_ID = (int) $post_ID;
+       $form_action = 'editpost';
+       $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+       $autosave = wp_get_post_autosave( $post_id );
+
+       // Detect if there exists an autosave newer than the post and if that autosave is different than the post
+       if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) ) {
+               foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
+                       if ( wp_text_diff( $autosave->$autosave_field, $post->$autosave_field ) ) {
+                               $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );
+                               break;
+                       }
+               }
+               unset($autosave_field, $_autosave_field);
+       }
+}
+
 ?>
 ?>
+<?php if ( $notice ) : ?>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
+<?php endif; ?>
 <?php if (isset($_GET['message'])) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>
 <?php if (isset($_GET['message'])) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>
@@ -20,33 +54,15 @@ $messages[4] = __('Post updated.');
 <h2><?php _e('Write Post') ?></h2>
 <?php
 
 <h2><?php _e('Write Post') ?></h2>
 <?php
 
-if (!isset($post_ID) || 0 == $post_ID) {
-       $form_action = 'post';
-       $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
-       $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
+if ( !isset($post_ID) || 0 == $post_ID)
        wp_nonce_field('add-post');
        wp_nonce_field('add-post');
-} else {
-       $post_ID = (int) $post_ID;
-       $form_action = 'editpost';
-       $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+else
        wp_nonce_field('update-post_' .  $post_ID);
        wp_nonce_field('update-post_' .  $post_ID);
-}
 
 $form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />';
 
 $form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />';
 
 
 $form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />';
 
 $form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />';
 
-$form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />';
-
-if ('' != $post->pinged) {
-       $pings = '<p>'. __('Already pinged:') . '</p><ul>';
-       $already_pinged = explode("\n", trim($post->pinged));
-       foreach ($already_pinged as $pinged_url) {
-               $pings .= "\n\t<li>" . wp_specialchars($pinged_url) . "</li>";
-       }
-       $pings .= '</ul>';
-}
-
 $saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />';
 
 ?>
 $saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />';
 
 ?>
@@ -57,14 +73,7 @@ $saveasdraft = '<input name="save" type="submit" id="save" class="button" tabind
 <input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
 <input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
 <input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
 <input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
-<input name="referredby" type="hidden" id="referredby" value="<?php
-if ( !empty($_REQUEST['popupurl']) )
-       echo clean_url(stripslashes($_REQUEST['popupurl']));
-else if ( strpos( wp_get_referer(), '/wp-admin/' ) === false && $post_ID && url_to_postid(wp_get_referer()) === $post_ID  )
-       echo 'redo';
-else
-       echo clean_url(stripslashes(wp_get_referer()));
-?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
 <?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
 
 <?php echo $form_extra ?>
 <?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
 
 <?php echo $form_extra ?>
@@ -83,10 +92,13 @@ else
 
 <div class="inside">
 
 
 <div class="inside">
 
-<p><strong><?php _e('Publish Status') ?></strong></p>
+<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
 <p>
 <p>
-<select name='post_status' tabindex='4'>
-<?php if ( current_user_can('publish_posts') ) : // Contributors only get "Unpublished" and "Pending Review" ?>
+<select name='post_status' id='post_status' tabindex='4'>
+<?php 
+// only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability) 
+if ( current_user_can('publish_posts') OR ( $post->post_status == 'publish' AND current_user_can('edit_post', $post->ID) ) ) :
+?>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
 <?php if ( 'future' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
 <?php if ( 'future' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
@@ -98,7 +110,7 @@ else
 </p>
 
 <?php if ( current_user_can( 'publish_posts' ) ) : ?>
 </p>
 
 <?php if ( current_user_can( 'publish_posts' ) ) : ?>
-<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label></p>
+<p id="private-checkbox"><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label></p>
 <?php endif; ?>
 <?php
 if ($post_ID) {
 <?php endif; ?>
 <?php
 if ($post_ID) {
@@ -156,6 +168,7 @@ if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) )
 <br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
 <br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
+<span id="wp-word-count"></span>
 </p>
 
 <div class="side-info">
 </p>
 
 <div class="side-info">
@@ -172,6 +185,9 @@ if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) )
 <li><a href="edit.php?post_status=draft"><?php _e('View Drafts'); ?></a></li>
 <?php do_action('post_relatedlinks_list'); ?>
 </ul>
 <li><a href="edit.php?post_status=draft"><?php _e('View Drafts'); ?></a></li>
 <?php do_action('post_relatedlinks_list'); ?>
 </ul>
+
+<h5><?php _e('Shortcuts') ?></h5>
+<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?>  <a href="<?php echo get_shortcut_link(); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
 </div>
 
 <?php do_action('submitpost_box'); ?>
 </div>
 
 <?php do_action('submitpost_box'); ?>
@@ -179,7 +195,7 @@ if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) )
 
 <div id="post-body">
 <div id="titlediv">
 
 <div id="post-body">
 <div id="titlediv">
-<h3><?php _e('Title') ?></h3>
+<h3><label for="title"><?php _e('Title') ?></label></h3>
 <div id="titlewrap">
        <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" />
 </div>
 <div id="titlewrap">
        <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" />
 </div>
@@ -194,7 +210,7 @@ endif; ?>
 </div>
 
 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
 </div>
 
 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-<h3><?php _e('Post') ?></h3>
+<h3><label for="content"><?php _e('Post') ?></label></h3>
 <?php the_editor($post->post_content); ?>
 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 <?php the_editor($post->post_content); ?>
 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
@@ -205,23 +221,22 @@ endif; ?>
 <?php echo $form_pingback ?>
 <?php echo $form_prevstatus ?>
 
 <?php echo $form_pingback ?>
 <?php echo $form_prevstatus ?>
 
-<div id="tagsdiv" class="postbox <?php echo postbox_classes('tagsdiv', 'post'); ?>">
-<h3><?php _e('Tags'); ?></h3>
-<div class="inside">
-<p id="jaxtag"><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" /></p>
+<?php
+function post_tags_meta_box($post) {
+?>
+<p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
 <div id="tagchecklist"></div>
 <div id="tagchecklist"></div>
-</div>
-</div>
-
-<div id="categorydiv" class="postbox <?php echo postbox_classes('categorydiv', 'post'); ?>">
-<h3><?php _e('Categories') ?></h3>
-<div class="inside">
+<?php
+}
+add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'normal', 'core');
 
 
+function post_categories_meta_box($post) {
+?>
 <div id="category-adder" class="wp-hidden-children">
        <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
        <p id="category-add" class="wp-hidden-child">
 <div id="category-adder" class="wp-hidden-children">
        <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
        <p id="category-add" class="wp-hidden-child">
-               <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" />
-               <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
+               <label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/>
+               <label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
                <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
                <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
                <span id="category-ajax-response"></span>
                <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
                <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
                <span id="category-ajax-response"></span>
@@ -241,12 +256,13 @@ endif; ?>
 
 <div id="categories-all" class="ui-tabs-panel">
        <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
 
 <div id="categories-all" class="ui-tabs-panel">
        <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-               <?php wp_category_checklist($post_ID) ?>
+               <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
        </ul>
 </div>
        </ul>
 </div>
-
-</div>
-</div>
+<?php
+}
+add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'normal', 'core');
+?>
 
 <?php do_meta_boxes('post', 'normal', $post); ?>
 
 
 <?php do_meta_boxes('post', 'normal', $post); ?>
 
@@ -254,32 +270,41 @@ endif; ?>
 
 <h2><?php _e('Advanced Options'); ?></h2>
 
 
 <h2><?php _e('Advanced Options'); ?></h2>
 
-<div id="postexcerpt" class="postbox <?php echo postbox_classes('postexcerpt', 'post'); ?>">
-<h3><?php _e('Excerpt') ?></h3>
-<div class="inside"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea>
+<?php
+function post_excerpt_meta_box($post) {
+?>
+<label class="hidden" for="excerpt"><?php _e('Excerpt') ?></label><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea>
 <p><?php _e('Excerpts are optional hand-crafted summaries of your content. You can <a href="http://codex.wordpress.org/Template_Tags/the_excerpt" target="_blank">use them in your template</a>'); ?></p>
 <p><?php _e('Excerpts are optional hand-crafted summaries of your content. You can <a href="http://codex.wordpress.org/Template_Tags/the_excerpt" target="_blank">use them in your template</a>'); ?></p>
-</div>
-</div>
+<?php
+}
+add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'advanced', 'core');
+
+function post_trackback_meta_box($post) {
+       $form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />';
+       if ('' != $post->pinged) {
+               $pings = '<p>'. __('Already pinged:') . '</p><ul>';
+               $already_pinged = explode("\n", trim($post->pinged));
+               foreach ($already_pinged as $pinged_url) {
+                       $pings .= "\n\t<li>" . wp_specialchars($pinged_url) . "</li>";
+               }
+               $pings .= '</ul>';
+       }
 
 
-<div id="trackbacksdiv" class="postbox <?php echo postbox_classes('trackbacksdiv', 'post'); ?>">
-<h3><?php _e('Trackbacks') ?></h3>
-<div class="inside">
-<p><?php _e('Send trackbacks to:'); ?> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
+?>
+<p><label for="trackback"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
 <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
 <?php
 if ( ! empty($pings) )
        echo $pings;
 <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
 <?php
 if ( ! empty($pings) )
        echo $pings;
-?>
-</div>
-</div>
+}
+add_meta_box('trackbacksdiv', __('Trackbacks'), 'post_trackback_meta_box', 'post', 'advanced', 'core');
 
 
-<div id="postcustom" class="postbox <?php echo postbox_classes('postcustom', 'post'); ?>">
-<h3><?php _e('Custom Fields') ?></h3>
-<div class="inside">
+function post_custom_meta_box($post) {
+?>
 <div id="postcustomstuff">
 <table cellpadding="3">
 <?php
 <div id="postcustomstuff">
 <table cellpadding="3">
 <?php
-$metadata = has_meta($post_ID);
+$metadata = has_meta($post->ID);
 list_meta($metadata);
 ?>
 
 list_meta($metadata);
 ?>
 
@@ -290,55 +315,66 @@ list_meta($metadata);
 <div id="ajax-response"></div>
 </div>
 <p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
 <div id="ajax-response"></div>
 </div>
 <p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
-</div>
-</div>
+<?php
+}
+add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'advanced', 'core');
 
 
-<?php do_action('dbx_post_advanced'); ?>
+do_action('dbx_post_advanced');
 
 
-<div id="commentstatusdiv" class="postbox <?php echo postbox_classes('commentstatusdiv', 'post'); ?>">
-<h3><?php _e('Comments &amp; Pings') ?></h3>
-<div class="inside">
+function post_comment_status_meta_box($post) {
+?>
 <input name="advanced_view" type="hidden" value="1" />
 <p><label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
 <?php _e('Allow Comments') ?></label></p>
 <p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
 <p><?php _e('These settings apply to this post only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
 <input name="advanced_view" type="hidden" value="1" />
 <p><label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
 <?php _e('Allow Comments') ?></label></p>
 <p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
 <p><?php _e('These settings apply to this post only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
-</div>
-</div>
+<?php
+}
+add_meta_box('commentstatusdiv', __('Comments &amp; Pings'), 'post_comment_status_meta_box', 'post', 'advanced', 'core');
 
 
-<div id="passworddiv" class="postbox <?php echo postbox_classes('passworddiv', 'post'); ?>">
-<h3><?php _e('Password Protect This Post') ?></h3>
-<div class="inside">
-<p><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
+function post_password_meta_box($post) {
+?>
+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
-</div>
-</div>
-
-<div id="slugdiv" class="postbox <?php echo postbox_classes('slugdiv', 'post'); ?>">
-<h3><?php _e('Post Slug') ?></h3>
-<div class="inside">
-<input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
-</div>
-</div>
+<?php
+}
+add_meta_box('passworddiv', __('Password Protect This Post'), 'post_password_meta_box', 'post', 'advanced', 'core');
 
 
+function post_slug_meta_box($post) {
+?>
+<label class="hidden" for="post_name"><?php _e('Post Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
 <?php
 <?php
+}
+add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'advanced', 'core');
+
 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
 if ( $post->post_author && !in_array($post->post_author, $authors) )
        $authors[] = $post->post_author;
 if ( $authors && count( $authors ) > 1 ) :
 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
 if ( $post->post_author && !in_array($post->post_author, $authors) )
        $authors[] = $post->post_author;
 if ( $authors && count( $authors ) > 1 ) :
+function post_author_meta_box($post) {
+       global $current_user, $user_ID;
+       $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
+       if ( $post->post_author && !in_array($post->post_author, $authors) )
+               $authors[] = $post->post_author;
 ?>
 ?>
-<div id="authordiv" class="postbox <?php echo postbox_classes('authordiv', 'post'); ?>">
-<h3><?php _e('Post Author'); ?></h3>
-<div class="inside">
-<?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?>
-</div>
-</div>
-<?php endif; ?>
+<label class="hidden" for="post_author_override"><?php _e('Post Author'); ?></label><?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?>
+<?php
+}
+add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'advanced', 'core');
+endif;
 
 
-<?php do_meta_boxes('post', 'advanced', $post); ?>
+if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
+function post_revisions_meta_box($post) {
+       wp_list_post_revisions();
+}
+add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'advanced', 'core');
+endif;
 
 
-<?php do_action('dbx_post_sidebar'); ?>
+do_meta_boxes('post', 'advanced', $post);
+
+do_action('dbx_post_sidebar');
+?>
 </div>
 </div>
 
 </div>
 </div>
 
index dfef0a78e9adfc9b18931f499944f5b1710f5059..601f4cbb4ee17cb719e99de99ed8dbcf587cb3f5 100644 (file)
@@ -22,9 +22,9 @@ $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment-
 
 <div class="inside">
 
 
 <div class="inside">
 
-<p><strong><?php _e('Approval Status') ?></strong></p>
+<p><strong><label for='comment_status'><?php _e('Approval Status') ?></label></strong></p>
 <p>
 <p>
-<select name='comment_status'>
+<select name='comment_status' id='comment_status'>
 <option<?php selected( $comment->comment_approved, '1' ); ?> value='1'><?php _e('Approved') ?></option>
 <option<?php selected( $comment->comment_approved, '0' ); ?> value='0'><?php _e('Moderated') ?></option>
 <option<?php selected( $comment->comment_approved, 'spam' ); ?> value='spam'><?php _e('Spam') ?></option>
 <option<?php selected( $comment->comment_approved, '1' ); ?> value='1'><?php _e('Approved') ?></option>
 <option<?php selected( $comment->comment_approved, '0' ); ?> value='0'><?php _e('Moderated') ?></option>
 <option<?php selected( $comment->comment_approved, 'spam' ); ?> value='spam'><?php _e('Spam') ?></option>
@@ -64,28 +64,28 @@ echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletec
 
 <div id="post-body">
 <div id="namediv" class="stuffbox">
 
 <div id="post-body">
 <div id="namediv" class="stuffbox">
-<h3><?php _e('Name') ?></h3>
+<h3><label for="name"><?php _e('Name') ?></label></h3>
 <div class="inside">
 <input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
 </div>
 </div>
 
 <div id="emaildiv" class="stuffbox">
 <div class="inside">
 <input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
 </div>
 </div>
 
 <div id="emaildiv" class="stuffbox">
-<h3><?php _e('E-mail') ?></h3>
+<h3><label for="email"><?php _e('E-mail') ?></label></h3>
 <div class="inside">
 <input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" />
 </div>
 </div>
 
 <div id="uridiv" class="stuffbox">
 <div class="inside">
 <input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" />
 </div>
 </div>
 
 <div id="uridiv" class="stuffbox">
-<h3><?php _e('URL') ?></h3>
+<h3><label for="newcomment_author_url"><?php _e('URL') ?></label></h3>
 <div class="inside">
 <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" />
 </div>
 </div>
 
 <div id="postdiv" class="postarea">
 <div class="inside">
 <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" />
 </div>
 </div>
 
 <div id="postdiv" class="postarea">
-<h3><?php _e('Comment') ?></h3>
+<h3><label for="content"><?php _e('Comment') ?></label></h3>
 <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>
 <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>
index b8dfebcfaa3d020bdc11f8e00fb4c6d5fab4bc0f..c7a5e9d99efbf6cc40e2df2001250ed97e3f723d 100644 (file)
@@ -10,12 +10,13 @@ if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) {
 
        foreach( (array) $_GET['delete'] as $cat_ID ) {
                $cat_name = get_term_field('name', $cat_ID, 'link_category');
 
        foreach( (array) $_GET['delete'] as $cat_ID ) {
                $cat_name = get_term_field('name', $cat_ID, 'link_category');
-
+               $default_cat_id = get_option('default_link_category');
+               
                // Don't delete the default cats.
                // Don't delete the default cats.
-               if ( $cat_ID == get_option('default_link_category') )
+               if ( $cat_ID == $default_cat_id )
                        wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
 
                        wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
 
-               wp_delete_term($cat_ID, 'link_category');
+               wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));
        }
 
        $location = 'edit-link-categories.php';
        }
 
        $location = 'edit-link-categories.php';
@@ -62,6 +63,7 @@ endif; ?>
 <?php endif; ?>
 
 <p id="post-search">
 <?php endif; ?>
 
 <p id="post-search">
+       <label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label>
        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
        <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
        <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
@@ -101,7 +103,7 @@ if ( $page_links )
 <table class="widefat">
        <thead>
        <tr>
 <table class="widefat">
        <thead>
        <tr>
-        <th scope="col" class="check-column"><input type="checkbox" onclick="checkAll(document.getElementById('posts-filter'));" /></th>
+        <th scope="col" class="check-column"><input type="checkbox" /></th>
         <th scope="col"><?php _e('Name') ?></th>
         <th scope="col"><?php _e('Description') ?></th>
         <th scope="col" class="num" style="width: 90px;"><?php _e('Links') ?></th>
         <th scope="col"><?php _e('Name') ?></th>
         <th scope="col"><?php _e('Description') ?></th>
         <th scope="col" class="num" style="width: 90px;"><?php _e('Links') ?></th>
index 67b0be1d10341724ea00d7ac032edcefa8eeb901..81a686be4bfe3111639b60517d1aba13c47dd691 100644 (file)
@@ -26,11 +26,11 @@ if ( ! empty($cat_ID) ) {
        <table class="form-table">
                <tr class="form-field form-required">
                        <th scope="row" valign="top"><label for="name"><?php _e('Category name') ?></label></th>
        <table class="form-table">
                <tr class="form-field form-required">
                        <th scope="row" valign="top"><label for="name"><?php _e('Category name') ?></label></th>
-                       <td><input name="name" id="name" type="text" value="<?php echo $category->name; ?>" size="40" /></td>
+                       <td><input name="name" id="name" type="text" value="<?php echo $category->name; ?>" size="40" aria-required="true" /></td>
                </tr>
                <tr class="form-field">
                        <th scope="row" valign="top"><label for="slug"><?php _e('Category slug') ?></label></th>
                </tr>
                <tr class="form-field">
                        <th scope="row" valign="top"><label for="slug"><?php _e('Category slug') ?></label></th>
-                       <td><input name="slug" id="slug" type="text" value="<?php echo $category->slug; ?>" size="40" />
+                       <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $category->slug)); ?>" size="40" />
             <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
                </tr>
                <tr class="form-field">
             <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
                </tr>
                <tr class="form-field">
index 15c3fb5d2ff2a6f97c61f2a9ffbe8ff108f62e89..48b95ccf7def693d9ec1c0c34af3347a307f5aff 100644 (file)
@@ -74,7 +74,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
 
 <div id="post-body">
 <div id="namediv" class="stuffbox">
 
 <div id="post-body">
 <div id="namediv" class="stuffbox">
-<h3><?php _e('Name') ?></h3>
+<h3><label for="link_name"><?php _e('Name') ?></label></h3>
 <div class="inside">
        <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /><br />
     <?php _e('Example: Nifty blogging software'); ?>
 <div class="inside">
        <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /><br />
     <?php _e('Example: Nifty blogging software'); ?>
@@ -82,7 +82,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
 </div>
 
 <div id="addressdiv" class="stuffbox">
 </div>
 
 <div id="addressdiv" class="stuffbox">
-<h3><?php _e('Web Address') ?></h3>
+<h3><label for="link_url"><?php _e('Web Address') ?></label></h3>
 <div class="inside">
        <input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /><br />
     <?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?>
 <div class="inside">
        <input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /><br />
     <?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?>
@@ -90,21 +90,19 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
 </div>
 
 <div id="descriptiondiv" class="stuffbox">
 </div>
 
 <div id="descriptiondiv" class="stuffbox">
-<h3><?php _e('Description') ?></h3>
+<h3><label for="link_description"><?php _e('Description') ?></label></h3>
 <div class="inside">
        <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" /><br />
     <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?>
 </div>
 </div>
 
 <div class="inside">
        <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" /><br />
     <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?>
 </div>
 </div>
 
-<div id="linkcategorydiv" class="postbox <?php echo postbox_classes('linkcategorydiv', 'link'); ?>">
-<h3><?php _e('Categories') ?></h3>
-<div class="inside">
-
+<?php function link_categories_meta_box($link) { ?>
 <div id="category-adder" class="wp-hidden-children">
        <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
        <p id="link-category-add" class="wp-hidden-child">
 <div id="category-adder" class="wp-hidden-children">
        <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
        <p id="link-category-add" class="wp-hidden-child">
-               <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" />
+               <label class="hidden" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
+               <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" aria-required="true" />
                <input type="button" id="category-add-sumbit" class="add:categorychecklist:linkcategorydiv button" value="<?php _e( 'Add' ); ?>" />
                <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
                <span id="category-ajax-response"></span>
                <input type="button" id="category-add-sumbit" class="add:categorychecklist:linkcategorydiv button" value="<?php _e( 'Add' ); ?>" />
                <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
                <span id="category-ajax-response"></span>
@@ -118,7 +116,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
 
 <div id="categories-all" class="ui-tabs-panel">
        <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
 
 <div id="categories-all" class="ui-tabs-panel">
        <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-               <?php wp_link_category_checklist($link_id); ?>
+               <?php wp_link_category_checklist($link->link_id); ?>
        </ul>
 </div>
 
        </ul>
 </div>
 
@@ -127,17 +125,17 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
                <?php wp_popular_terms_checklist('link_category'); ?>
        </ul>
 </div>
                <?php wp_popular_terms_checklist('link_category'); ?>
        </ul>
 </div>
-
-</div>
-</div>
+<?php
+}
+add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core');
+?>
 
 <?php do_meta_boxes('link', 'normal', $link); ?>
 
 <h2><?php _e('Advanced Options'); ?></h2>
 
 
 <?php do_meta_boxes('link', 'normal', $link); ?>
 
 <h2><?php _e('Advanced Options'); ?></h2>
 
-<div id="linktargetdiv" class="postbox <?php echo postbox_classes('linktargetdiv', 'link'); ?>">
-<h3><?php _e('Target') ?></h3>
-<div class="inside">
+<?php function link_target_meta_box($link) { ?>
+<fieldset><legend class="hidden"><?php _e('Target') ?></legend>
 <label for="link_target_blank" class="selectit">
 <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
 <code>_blank</code></label><br />
 <label for="link_target_blank" class="selectit">
 <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
 <code>_blank</code></label><br />
@@ -147,16 +145,17 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
 <label for="link_target_none" class="selectit">
 <input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> />
 <?php _e('none') ?></label>
 <label for="link_target_none" class="selectit">
 <input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> />
 <?php _e('none') ?></label>
+</fieldset>
 <p><?php _e('Choose the frame your link targets. Essentially this means if you choose <code>_blank</code> your link will open in a new window.'); ?></p>
 <p><?php _e('Choose the frame your link targets. Essentially this means if you choose <code>_blank</code> your link will open in a new window.'); ?></p>
-</div>
-</div>
+<?php
+}
+add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'advanced', 'core');
 
 
-<div id="linkxfndiv" class="postbox <?php echo postbox_classes('linkxfndiv', 'link'); ?>">
-<h3><?php _e('Link Relationship (XFN)') ?></h3>
-<div class="inside">
+function link_xfn_meta_box($link) {
+?>
 <table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5">
        <tr>
 <table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5">
        <tr>
-               <th style="width: 20%;" scope="row"><?php _e('rel:') ?></th>
+               <th style="width: 20%;" scope="row"><label for="link_rel"><?php _e('rel:') ?></label></th>
                <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
        </tr>
        <tr>
                <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
        </tr>
        <tr>
@@ -164,15 +163,15 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
                        <table cellpadding="3" cellspacing="5" class="form-table">
                                <tr>
                                        <th scope="row"> <?php _e('identity') ?> </th>
                        <table cellpadding="3" cellspacing="5" class="form-table">
                                <tr>
                                        <th scope="row"> <?php _e('identity') ?> </th>
-                                       <td>
+                                       <td><fieldset><legend class="hidden"> <?php _e('identity') ?> </legend>
                                                <label for="me">
                                                <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
                                                <?php _e('another web address of mine') ?></label>
                                                <label for="me">
                                                <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
                                                <?php _e('another web address of mine') ?></label>
-                                       </td>
+                                       </fieldset></td>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('friendship') ?> </th>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('friendship') ?> </th>
-                                       <td>
+                                       <td><fieldset><legend class="hidden"> <?php _e('friendship') ?> </legend>
                                                <label for="contact">
                                                <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
                                                <label for="acquaintance">
                                                <label for="contact">
                                                <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
                                                <label for="acquaintance">
@@ -181,30 +180,30 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
                                                <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
                                                <label for="friendship">
                                                <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
                                                <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
                                                <label for="friendship">
                                                <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
-                                       </td>
+                                       </fieldset></td>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('physical') ?> </th>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('physical') ?> </th>
-                                       <td>
+                                       <td><fieldset><legend class="hidden"> <?php _e('physical') ?> </legend>
                                                <label for="met">
                                                <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
                                                <?php _e('met') ?></label>
                                                <label for="met">
                                                <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
                                                <?php _e('met') ?></label>
-                                       </td>
+                                       </fieldset></td>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('professional') ?> </th>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('professional') ?> </th>
-                                       <td>
+                                       <td><fieldset><legend class="hidden"> <?php _e('professional') ?> </legend>
                                                <label for="co-worker">
                                                <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
                                                <?php _e('co-worker') ?></label>
                                                <label for="colleague">
                                                <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
                                                <?php _e('colleague') ?></label>
                                                <label for="co-worker">
                                                <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
                                                <?php _e('co-worker') ?></label>
                                                <label for="colleague">
                                                <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
                                                <?php _e('colleague') ?></label>
-                                       </td>
+                                       </fieldset></td>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('geographical') ?> </th>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('geographical') ?> </th>
-                                       <td>
+                                       <td><fieldset><legend class="hidden"> <?php _e('geographical') ?> </legend>
                                                <label for="co-resident">
                                                <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
                                                <?php _e('co-resident') ?></label>
                                                <label for="co-resident">
                                                <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
                                                <?php _e('co-resident') ?></label>
@@ -214,11 +213,11 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
                                                <label for="geographical">
                                                <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
                                                <?php _e('none') ?></label>
                                                <label for="geographical">
                                                <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
                                                <?php _e('none') ?></label>
-                                       </td>
+                                       </fieldset></td>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('family') ?> </th>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('family') ?> </th>
-                                       <td>
+                                       <td><fieldset><legend class="hidden"> <?php _e('family') ?> </legend>
                                                <label for="child">
                                                <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
                                                <?php _e('child') ?></label>
                                                <label for="child">
                                                <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
                                                <?php _e('child') ?></label>
@@ -237,11 +236,11 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
                                                <label for="family">
                                                <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
                                                <?php _e('none') ?></label>
                                                <label for="family">
                                                <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
                                                <?php _e('none') ?></label>
-                                       </td>
+                                       </fieldset></td>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('romantic') ?> </th>
                                </tr>
                                <tr>
                                        <th scope="row"> <?php _e('romantic') ?> </th>
-                                       <td>
+                                       <td><fieldset><legend class="hidden"> <?php _e('romantic') ?> </legend>
                                                <label for="muse">
                                                <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
                                                <?php _e('muse') ?></label>
                                                <label for="muse">
                                                <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
                                                <?php _e('muse') ?></label>
@@ -254,19 +253,19 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
                                                <label for="romantic">
                                                <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
                                                <?php _e('sweetheart') ?></label>
                                                <label for="romantic">
                                                <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
                                                <?php _e('sweetheart') ?></label>
-                                       </td>
+                                       </fieldset></td>
                                </tr>
                        </table>
                </td>
        </tr>
 </table>
 <p><?php _e('If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.'); ?></p>
                                </tr>
                        </table>
                </td>
        </tr>
 </table>
 <p><?php _e('If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.'); ?></p>
-</div>
-</div>
+<?php
+}
+add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'advanced', 'core');
 
 
-<div id="linkadvanceddiv" class="postbox <?php echo postbox_classes('linkadvanceddiv', 'link'); ?>">
-<h3><?php _e('Advanced') ?></h3>
-<div class="inside">
+function link_advanced_meta_box($link) {
+?>
 <table class="form-table" style="width: 100%;" cellspacing="2" cellpadding="5">
        <tr class="form-field">
                <th valign="top"  scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
 <table class="form-table" style="width: 100%;" cellspacing="2" cellpadding="5">
        <tr class="form-field">
                <th valign="top"  scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
@@ -294,12 +293,13 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
                </td>
        </tr>
 </table>
                </td>
        </tr>
 </table>
-</div>
-</div>
+<?php
+}
+add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'advanced', 'core');
 
 
-<?php do_meta_boxes('link', 'advanced', $link); ?>
+do_meta_boxes('link', 'advanced', $link);
 
 
-<?php if ( $link_id ) : ?>
+if ( $link_id ) : ?>
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
 <input type="hidden" name="order_by" value="<?php echo attribute_escape($order_by); ?>" />
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
 <input type="hidden" name="order_by" value="<?php echo attribute_escape($order_by); ?>" />
index e800a46795af065bb68a0da95801c7d3d5cc4adc..eb58d20c268ee9d2d8f46539c6ed689d10c27887 100644 (file)
@@ -5,10 +5,12 @@ $messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s
 $messages[2] = __('Custom field updated.');
 $messages[3] = __('Custom field deleted.');
 $messages[4] = __('Page updated.');
 $messages[2] = __('Custom field updated.');
 $messages[3] = __('Custom field deleted.');
 $messages[4] = __('Page updated.');
-?>
-<?php if (isset($_GET['message'])) : ?>
-<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php endif;
+
+if ( isset($_GET['revision']) )
+       $messages[5] = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
+
+$notice = false;
+$notices[1] = __( 'There is an autosave of this page that is more recent than the version below.  <a href="%s">View the autosave</a>.' );
 
 if (!isset($post_ID) || 0 == $post_ID) {
        $form_action = 'post';
 
 if (!isset($post_ID) || 0 == $post_ID) {
        $form_action = 'post';
@@ -20,17 +22,23 @@ if (!isset($post_ID) || 0 == $post_ID) {
        $form_action = 'editpost';
        $nonce_action = 'update-page_' . $post_ID;
        $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
        $form_action = 'editpost';
        $nonce_action = 'update-page_' . $post_ID;
        $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+       $autosave = wp_get_post_autosave( $post_id );
+       if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) )
+               $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );
 }
 
 $temp_ID = (int) $temp_ID;
 $user_ID = (int) $user_ID;
 
 }
 
 $temp_ID = (int) $temp_ID;
 $user_ID = (int) $user_ID;
 
-$sendto = clean_url(stripslashes(wp_get_referer()));
-
-if ( 0 != $post_ID && $sendto == get_permalink($post_ID) )
-       $sendto = 'redo';
 ?>
 
 ?>
 
+<?php if ( $notice ) : ?>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
+<?php endif; ?>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php endif; ?>
+
 <form name="post" action="page.php" method="post" id="post">
 <div class="wrap">
 <h2><?php _e('Write Page') ?></h2>
 <form name="post" action="page.php" method="post" id="post">
 <div class="wrap">
 <h2><?php _e('Write Page') ?></h2>
@@ -44,15 +52,11 @@ if (isset($mode) && 'bookmarklet' == $mode)
 <input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
 <input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
 <input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
 <input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
 <input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
 <input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
+<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
 <?php echo $form_extra ?>
 <input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
 <?php echo $form_extra ?>
 <input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
-<input name="referredby" type="hidden" id="referredby" value="<?php
-if ( strpos( wp_get_referer(), '/wp-admin/' ) === false && $post_ID && url_to_postid(wp_get_referer()) === $post_ID )
-       echo 'redo';
-else
-       echo clean_url(stripslashes(wp_get_referer()));
-?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
 <?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
 
 <div id="poststuff">
 <?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
 
 <div id="poststuff">
@@ -68,14 +72,14 @@ else
 </div>
 
 <div class="inside">
 </div>
 
 <div class="inside">
-
-<p><strong><?php _e('Publish Status') ?></strong></p>
+<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
 <p>
 <p>
-<select name='post_status' tabindex='4'>
-<?php if ( current_user_can('publish_pages') ) : ?>
+<select name='post_status' tabindex='4' id='post_status'>
+<?php // Show publish in dropdown if user can publish or if they can re-publish this page ('edit_published_pages')
+// 'publish' option will be selected for published AND private posts (checkbox overrides dropdown)
+if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) : 
+?>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
-<?php else: ?>
-<option<?php selected( $post->post_status, 'private' ); ?> value='private'><?php _e('Published') ?></option>
 <?php endif; ?>
 <?php if ( 'future' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Pending') ?></option>
 <?php endif; ?>
 <?php if ( 'future' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Pending') ?></option>
@@ -84,8 +88,10 @@ else
 <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option>
 </select>
 </p>
 <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option>
 </select>
 </p>
+<?php if ( current_user_can( 'publish_posts' ) ) : ?> 
+<p id="private-checkbox"><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
+<?php endif; ?>
 
 
-<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
 <?php
 if ($post_ID) {
        if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
 <?php
 if ($post_ID) {
        if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
@@ -140,6 +146,7 @@ if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
 <br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
 <br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
+<span id="wp-word-count"></span>
 </p>
 
 <div class="side-info">
 </p>
 
 <div class="side-info">
@@ -159,7 +166,7 @@ if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
 
 <div id="post-body">
 <div id="titlediv">
 
 <div id="post-body">
 <div id="titlediv">
-<h3><?php _e('Title') ?></h3>
+<h3><label for="title"><?php _e('Title') ?></label></h3>
 <div id="titlewrap">
   <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" />
 </div>
 <div id="titlewrap">
   <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" />
 </div>
@@ -174,7 +181,7 @@ endif; ?>
 </div>
 
 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
 </div>
 
 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-<h3><?php _e('Page') ?></h3>
+<h3><label for="content"><?php _e('Page') ?></label></h3>
 <?php the_editor($post->post_content); ?>
 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 <?php the_editor($post->post_content); ?>
 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
@@ -188,13 +195,14 @@ endif; ?>
 
 <h2><?php _e('Advanced Options'); ?></h2>
 
 
 <h2><?php _e('Advanced Options'); ?></h2>
 
-<div id="pagepostcustom" class="postbox <?php echo postbox_classes('pagepostcustom', 'page'); ?>">
-<h3><?php _e('Custom Fields') ?></h3>
-<div class="inside">
+
+<?php 
+function page_custom_meta_box($post){
+?>
 <div id="postcustomstuff">
 <table cellpadding="3">
 <?php
 <div id="postcustomstuff">
 <table cellpadding="3">
 <?php
-$metadata = has_meta($post_ID);
+$metadata = has_meta($post->ID);
 list_meta($metadata);
 ?>
 
 list_meta($metadata);
 ?>
 
@@ -205,83 +213,97 @@ list_meta($metadata);
 <div id="ajax-response"></div>
 </div>
 <p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
 <div id="ajax-response"></div>
 </div>
 <p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
-</div>
-</div>
+<?php
+}
+add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'advanced', 'core');
 
 
-<div id="pagecommentstatusdiv" class="postbox <?php echo postbox_classes('pagecommentstatusdiv', 'page'); ?>">
-<h3><?php _e('Comments &amp; Pings') ?></h3>
-<div class="inside">
+function page_comments_status_meta_box($post){
+?>
 <input name="advanced_view" type="hidden" value="1" />
 <p><label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
 <?php _e('Allow Comments') ?></label></p>
 <p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
 <p><?php _e('These settings apply to this page only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
 <input name="advanced_view" type="hidden" value="1" />
 <p><label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
 <?php _e('Allow Comments') ?></label></p>
 <p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
 <p><?php _e('These settings apply to this page only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
-</div>
-</div>
+<?php 
+}
+add_meta_box('pagecommentstatusdiv', __('Comments &amp; Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core');
 
 
-<div id="pagepassworddiv" class="postbox <?php echo postbox_classes('pagepassworddiv', 'page'); ?>">
-<h3><?php _e('Password Protect This Page') ?></h3>
-<div class="inside">
-<p><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
+function page_password_meta_box($post){
+?>
+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p>
 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p>
-</div>
-</div>
+<?php
+}
+add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'advanced', 'core');
 
 
-<div id="pageslugdiv" class="postbox <?php echo postbox_classes('pageslugdiv', 'page'); ?>">
-<h3><?php _e('Page Slug') ?></h3>
-<div class="inside">
-<input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
-</div>
-</div>
+function page_slug_meta_box($post){
+?>
+<label class="hidden" for="post_name"><?php _e('Page Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
+<?php
+}
+add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'advanced', 'core');
 
 
-<div id="pageparentdiv" class="postbox <?php echo postbox_classes('pageparentdiv', 'page'); ?>">
-<h3><?php _e('Page Parent') ?></h3>
-<div class="inside">
-<select name="parent_id">
+function page_parent_meta_box($post){
+?>
+<label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label>
+<select name="parent_id" id="parent_id">
 <option value='0'><?php _e('Main Page (no parent)'); ?></option>
 <?php parent_dropdown($post->post_parent); ?>
 </select>
 <p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
 <option value='0'><?php _e('Main Page (no parent)'); ?></option>
 <?php parent_dropdown($post->post_parent); ?>
 </select>
 <p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
-</div>
-</div>
+<?php
+}
+add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'advanced', 'core');
 
 
-<?php if ( 0 != count( get_page_templates() ) ) { ?>
-<div id="pagetemplatediv" class="postbox <?php echo postbox_classes('pagetemplatediv', 'page'); ?>">
-<h3><?php _e('Page Template') ?></h3>
-<div class="inside">
-<select name="page_template">
+if ( 0 != count( get_page_templates() ) ) {
+       function page_template_meta_box($post){
+?>
+<label class="hidden" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
 <option value='default'><?php _e('Default Template'); ?></option>
 <?php page_template_dropdown($post->page_template); ?>
 </select>
 <p><?php _e('Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them above.'); ?></p>
 <option value='default'><?php _e('Default Template'); ?></option>
 <?php page_template_dropdown($post->page_template); ?>
 </select>
 <p><?php _e('Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them above.'); ?></p>
-</div>
-</div>
-<?php } ?>
+<?php
+       }
+       add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'advanced', 'core');
+}
 
 
-<div id="pageorderdiv" class="postbox <?php echo postbox_classes('pageorderdiv', 'page'); ?>">
-<h3><?php _e('Page Order') ?></h3>
-<div class="inside">
-<p><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p>
+function page_order_meta_box($post){
+?>
+<p><label class="hidden" for="menu_order"><?php _e('Page Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p>
 <p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p>
 <p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p>
-</div>
-</div>
-
 <?php
 <?php
+}
+add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'advanced', 'core');
+
+
 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
 if ( $post->post_author && !in_array($post->post_author, $authors) )
        $authors[] = $post->post_author;
 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
 if ( $post->post_author && !in_array($post->post_author, $authors) )
        $authors[] = $post->post_author;
-if ( $authors && count( $authors ) > 1 ) :
+if ( $authors && count( $authors ) > 1 ) {
+       function page_author_meta_box($post){
+               global $current_user, $user_ID;
+               $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
+               if ( $post->post_author && !in_array($post->post_author, $authors) )
+                       $authors[] = $post->post_author;
 ?>
 ?>
-<div id="pageauthordiv" class="postbox <?php echo postbox_classes('pageauthordiv', 'page'); ?>">
-<h3><?php _e('Page Author'); ?></h3>
-<div class="inside">
-<?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?>
-</div>
-</div>
-<?php endif; ?>
+<label class="hidden" for="post_author_override"><?php _e('Page Author'); ?></label><?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?>
+<?php
+       }
+       add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'advanced', 'core');
+}
 
 
-<?php do_meta_boxes('page', 'advanced', $post); ?>
+
+if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
+function page_revisions_meta_box($post) {
+       wp_list_post_revisions();
+}
+add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'advanced', 'core');
+endif;
+
+do_meta_boxes('page', 'advanced', $post);
+?>
 
 </div>
 </div>
 
 </div>
 </div>
index ee4bee2c26e13d9c03c39578f8943ec2c869b9ca..c49bc1ffc28f9c2ffee27403a80b21ce6cdc5376 100644 (file)
@@ -20,8 +20,8 @@ if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) {
        }
 
        $sendback = wp_get_referer();
        }
 
        $sendback = wp_get_referer();
-       if (strpos($sendback, 'page.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/page-new.php';
-       elseif (strpos($sendback, 'attachments.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
+       if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php');
+       elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
        $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
 
        wp_redirect($sendback);
        $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
 
        wp_redirect($sendback);
@@ -111,12 +111,32 @@ endif;
 ?>
 
 <p id="post-search">
 ?>
 
 <p id="post-search">
+       <label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label>
        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
        <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
 </p>
 
 <div class="tablenav">
 
        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
        <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
 </p>
 
 <div class="tablenav">
 
+<?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+       $pagenum = 1;
+if( !$per_page || $per_page < 0 )
+       $per_page = 20;
+
+$num_pages = ceil(count($posts) / $per_page);
+$page_links = paginate_links( array(
+       'base' => add_query_arg( 'pagenum', '%#%' ),
+       'format' => '',
+       'total' => $num_pages,
+       'current' => $pagenum
+));
+
+if ( $page_links )
+       echo "<div class='tablenav-pages'>$page_links</div>";
+?>
+
 <div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-pages'); ?>
 <div class="alignleft">
 <input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
 <?php wp_nonce_field('bulk-pages'); ?>
@@ -150,7 +170,7 @@ if ($posts) {
   </tr>
   </thead>
   <tbody>
   </tr>
   </thead>
   <tbody>
-  <?php page_rows($posts); ?>
+  <?php page_rows($posts, $pagenum, $per_page); ?>
   </tbody>
 </table>
 
   </tbody>
 </table>
 
@@ -168,6 +188,10 @@ if ($posts) {
 ?>
 
 <div class="tablenav">
 ?>
 
 <div class="tablenav">
+<?php
+if ( $page_links )
+       echo "<div class='tablenav-pages'>$page_links</div>";
+?>
 <br class="clear" />
 </div>
 
 <br class="clear" />
 </div>
 
@@ -175,7 +199,7 @@ if ($posts) {
 
 if ( 1 == count($posts) && is_singular() ) :
 
 
 if ( 1 == count($posts) && is_singular() ) :
 
-       $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
+       $comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $id) );
        if ( $comments ) :
                // Make sure comments, post, and post_author are cached
                update_comment_cache($comments);
        if ( $comments ) :
                // Make sure comments, post, and post_author are cached
                update_comment_cache($comments);
index 62a8e2b8ff632a32b80b83d43b6591b107fb52c0..de0f6c8f778c6288f5081eb2f7f47499ee16de39 100644 (file)
@@ -26,12 +26,12 @@ if ( ! empty($tag_ID) ) {
        <table class="form-table">
                <tr class="form-field form-required">
                        <th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
        <table class="form-table">
                <tr class="form-field form-required">
                        <th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
-                       <td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" />
+                       <td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" aria-required="true" />
             <p><?php _e('The name is how the tag appears on your site.'); ?></p></td>
                </tr>
                <tr class="form-field">
                        <th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
             <p><?php _e('The name is how the tag appears on your site.'); ?></p></td>
                </tr>
                <tr class="form-field">
                        <th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
-                       <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape($tag->slug); ?>" size="40" />
+                       <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
             <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
                </tr>
        </table>
             <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
                </tr>
        </table>
index b50269be09f1ac9f4b3b92f07bce5c8f8d918a05..fffe7cab0b4a3207b28693bef49781f6f1d69f36 100644 (file)
@@ -133,6 +133,7 @@ endif; ?>
 <?php endif; ?>
 
 <p id="post-search">
 <?php endif; ?>
 
 <p id="post-search">
+       <label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label>
        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
        <input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
 </p>
        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
        <input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
 </p>
@@ -172,7 +173,7 @@ if ( $page_links )
 <table class="widefat">
        <thead>
        <tr>
 <table class="widefat">
        <thead>
        <tr>
-       <th scope="col" class="check-column"><input type="checkbox" onclick="checkAll(document.getElementById('posts-filter'));" /></th>
+       <th scope="col" class="check-column"><input type="checkbox" /></th>
         <th scope="col"><?php _e('Name') ?></th>
         <th scope="col" class="num" style="width: 90px"><?php _e('Posts') ?></th>
        </tr>
         <th scope="col"><?php _e('Name') ?></th>
         <th scope="col" class="num" style="width: 90px"><?php _e('Posts') ?></th>
        </tr>
index b7cdcf45b57028652f4f006e4085ce95e165a55a..467a9bb540314d995ca9aac9c967a9bd50a39201 100644 (file)
@@ -20,8 +20,8 @@ if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) {
        }
 
        $sendback = wp_get_referer();
        }
 
        $sendback = wp_get_referer();
-       if (strpos($sendback, 'post.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/post-new.php';
-       elseif (strpos($sendback, 'attachments.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
+       if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('post-new.php');
+       elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
        $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
 
        wp_redirect($sendback);
        $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
 
        wp_redirect($sendback);
@@ -116,6 +116,7 @@ endif;
 ?>
 
 <p id="post-search">
 ?>
 
 <p id="post-search">
+       <label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label>
        <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
        <input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
 </p>
        <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
        <input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
 </p>
@@ -205,7 +206,7 @@ if ( $page_links )
 
 if ( 1 == count($posts) && is_singular() ) :
 
 
 if ( 1 == count($posts) && is_singular() ) :
 
-       $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
+       $comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $id) );
        if ( $comments ) :
                // Make sure comments, post, and post_author are cached
                update_comment_cache($comments);
        if ( $comments ) :
                // Make sure comments, post, and post_author are cached
                update_comment_cache($comments);
index 99505e4ade98a31fd860feedcf1f502c8daa35c3..08a0b25716508f4775de7e5ded491a92ecb91cc7 100644 (file)
@@ -22,9 +22,9 @@ require_once ('admin-header.php');
 
 <table class="form-table">
 <tr>
 
 <table class="form-table">
 <tr>
-<th><?php _e('Restrict Author'); ?></th>
+<th><label for="author"><?php _e('Restrict Author'); ?></label></th>
 <td>
 <td>
-<select name="author">
+<select name="author" id="author">
 <option value="all" selected="selected"><?php _e('All Authors'); ?></option>
 <?php
 $authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );
 <option value="all" selected="selected"><?php _e('All Authors'); ?></option>
 <?php
 $authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );
diff --git a/wp-admin/gears-manifest.php b/wp-admin/gears-manifest.php
new file mode 100644 (file)
index 0000000..baf6c19
--- /dev/null
@@ -0,0 +1,209 @@
+<?php
+
+define( 'ABSPATH', dirname(dirname(__FILE__)) );
+define( 'WPINC', '/wp-includes' );
+
+function __() {}
+function add_filter() {}
+function attribute_escape() {}
+function apply_filters() {}
+function get_option() {}
+function is_lighttpd_before_150() {}
+function add_action() {}
+function do_action_ref_array() {}
+function get_bloginfo() {}
+function is_admin() {return true;}
+function site_url() {}
+function admin_url() {}
+function wp_guess_url() {}
+
+require(ABSPATH . '/wp-includes/script-loader.php');
+require(ABSPATH . '/wp-includes/version.php');
+
+$wp_scripts = new WP_Scripts();
+wp_default_scripts($wp_scripts);
+
+$wp_styles = new WP_Styles();
+wp_default_styles($wp_styles);
+
+$defaults = $man_version = '';
+foreach ( $wp_scripts->registered as $script ) {
+       if ( empty($script->src) || strpos($script->src, 'tiny_mce_config.php') ) continue;
+       $ver = empty($script->ver) ? $wp_version : $script->ver;
+       $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src );
+       $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
+       $man_version .= $ver;
+}
+
+foreach ( $wp_styles->registered as $style ) {
+       if ( empty($style->src) ) continue;
+
+       $ver = empty($style->ver) ? $wp_version : $style->ver;
+       $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src );
+       if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css';
+       $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
+
+       if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) {
+               if ( is_bool( $style->extra['rtl'] ) )
+                       $rtl_href = str_replace( '.css', '-rtl.css', $src );
+               else 
+                       $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] );
+
+               $defaults .= '{ "url" : "' . $rtl_href . '?ver=' . $ver . '" },' . "\n";
+       }
+       $man_version .= $ver;
+}
+
+$man_version = md5($man_version);
+
+header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
+header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
+header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
+header( 'Pragma: no-cache' );
+header( 'Content-Type: application/x-javascript; charset=UTF-8' );
+?>
+{
+"betaManifestVersion" : 1,
+"version" : "<?php echo $man_version; ?>_20080810",
+"entries" : [
+<?php echo $defaults; ?>
+
+{ "url" : "images/align-center.png" },
+{ "url" : "images/align-left.png" },
+{ "url" : "images/align-none.png" },
+{ "url" : "images/align-right.png" },
+{ "url" : "images/browse-happy.gif" },
+{ "url" : "images/bubble_bg.gif" },
+{ "url" : "images/comment-grey-bubble.png" },
+{ "url" : "images/comment-pill.gif" },
+{ "url" : "images/comment-stalk-classic.gif" },
+{ "url" : "images/comment-stalk-fresh.gif" },
+{ "url" : "images/comment-stalk-rtl.gif" },
+{ "url" : "images/date-button.gif" },
+{ "url" : "images/fade-butt.png" },
+{ "url" : "images/gear.png" },
+{ "url" : "images/logo-ghost.png" },
+{ "url" : "images/logo-login.gif" },
+{ "url" : "images/logo.gif" },
+{ "url" : "images/media-button-gallery.gif" },
+{ "url" : "images/media-button-image.gif" },
+{ "url" : "images/media-button-music.gif" },
+{ "url" : "images/media-button-other.gif" },
+{ "url" : "images/media-button-video.gif" },
+{ "url" : "images/media-buttons.gif" },
+{ "url" : "images/tab.png" },
+{ "url" : "images/tail.gif" },
+{ "url" : "images/toggle-arrow-rtl.gif" },
+{ "url" : "images/toggle-arrow.gif" },
+{ "url" : "images/wordpress-logo.png" },
+{ "url" : "images/xit.gif" },
+{ "url" : "images/loading-publish.gif" },
+{ "url" : "images/loading.gif" },
+{ "url" : "images/required.gif" },
+{ "url" : "images/no.png" },
+{ "url" : "images/yes.png" },
+
+<?php if ( is_file(ABSPATH.'/wp-includes/js/tinymce/tiny_mce.js') ) { ?>
+{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/utils/validate.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311g" },
+{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311" },
+
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311g" },
+{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
+
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311g" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },
+
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/fm.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/sflogo.png" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.gif" },
+{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flash.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flv_player.swf" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/quicktime.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/realmedia.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/shockwave.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/media/img/trans.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/image.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" },
+<?php } ?>
+
+{ "url" : "../wp-includes/images/crystal/archive.png" },
+{ "url" : "../wp-includes/images/crystal/audio.png" },
+{ "url" : "../wp-includes/images/crystal/code.png" },
+{ "url" : "../wp-includes/images/crystal/default.png" },
+{ "url" : "../wp-includes/images/crystal/document.png" },
+{ "url" : "../wp-includes/images/crystal/interactive.png" },
+{ "url" : "../wp-includes/images/crystal/text.png" },
+{ "url" : "../wp-includes/images/crystal/video.png" },
+{ "url" : "../wp-includes/images/crystal/spreadsheet.png" },
+{ "url" : "../wp-includes/images/rss.png" },
+{ "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" },
+{ "url" : "../wp-includes/js/thickbox/tb-close.png" },
+{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" }
+]}
diff --git a/wp-admin/images/gear.png b/wp-admin/images/gear.png
new file mode 100644 (file)
index 0000000..f7ac7f4
Binary files /dev/null and b/wp-admin/images/gear.png differ
diff --git a/wp-admin/images/loading-publish.gif b/wp-admin/images/loading-publish.gif
new file mode 100644 (file)
index 0000000..fc1baf5
Binary files /dev/null and b/wp-admin/images/loading-publish.gif differ
diff --git a/wp-admin/images/loading.gif b/wp-admin/images/loading.gif
new file mode 100644 (file)
index 0000000..85b99d4
Binary files /dev/null and b/wp-admin/images/loading.gif differ
diff --git a/wp-admin/images/logo.gif b/wp-admin/images/logo.gif
new file mode 100644 (file)
index 0000000..cd49514
Binary files /dev/null and b/wp-admin/images/logo.gif differ
diff --git a/wp-admin/images/no.png b/wp-admin/images/no.png
new file mode 100644 (file)
index 0000000..e2db55f
Binary files /dev/null and b/wp-admin/images/no.png differ
diff --git a/wp-admin/images/required.gif b/wp-admin/images/required.gif
new file mode 100644 (file)
index 0000000..119350f
Binary files /dev/null and b/wp-admin/images/required.gif differ
diff --git a/wp-admin/images/tab.png b/wp-admin/images/tab.png
new file mode 100644 (file)
index 0000000..413c755
Binary files /dev/null and b/wp-admin/images/tab.png differ
diff --git a/wp-admin/images/yes.png b/wp-admin/images/yes.png
new file mode 100644 (file)
index 0000000..2f86f0a
Binary files /dev/null and b/wp-admin/images/yes.png differ
index 0ea5727d2e28210a4032788215c3c7c5d9afe850..140d8f2bbd745cdcfb7c9351b10f6591b25d1d00 100644 (file)
@@ -641,7 +641,7 @@ class Blogger_Import {
                $host = $this->blogs[$importing_blog]['host'];
 
                // Get an array of posts => authors
                $host = $this->blogs[$importing_blog]['host'];
 
                // Get an array of posts => authors
-               $post_ids = (array) $wpdb->get_col("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'blogger_blog' AND meta_value = '$host'");
+               $post_ids = (array) $wpdb->get_col( $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'blogger_blog' AND meta_value = %s", $host) );
                $post_ids = join( ',', $post_ids );
                $results = (array) $wpdb->get_results("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN ($post_ids)");
                foreach ( $results as $row )
                $post_ids = join( ',', $post_ids );
                $results = (array) $wpdb->get_results("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN ($post_ids)");
                foreach ( $results as $row )
@@ -658,7 +658,7 @@ class Blogger_Import {
                        $post_ids = (array) array_keys( $authors_posts, $this->blogs[$importing_blog]['authors'][$author][0] );
                        $post_ids = join( ',', $post_ids);
 
                        $post_ids = (array) array_keys( $authors_posts, $this->blogs[$importing_blog]['authors'][$author][0] );
                        $post_ids = join( ',', $post_ids);
 
-                       $wpdb->query("UPDATE $wpdb->posts SET post_author = $user_id WHERE id IN ($post_ids)");
+                       $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE id IN ($post_ids)", $user_id) );
                        $this->blogs[$importing_blog]['authors'][$author][1] = $user_id;
                }
                $this->save_vars();
                        $this->blogs[$importing_blog]['authors'][$author][1] = $user_id;
                }
                $this->save_vars();
index 16df934ffe762b8cb88eda87c7f4ae398aff3b6b..da1047ffb272be85c4171bda3204e8cdda2f81b0 100644 (file)
@@ -13,7 +13,7 @@ if(!function_exists('get_comment_count'))
        function get_comment_count($post_ID)
        {
                global $wpdb;
        function get_comment_count($post_ID)
        {
                global $wpdb;
-               return $wpdb->get_var('SELECT count(*) FROM '.$wpdb->comments.' WHERE comment_post_ID = '.$post_ID);
+               return $wpdb->get_var( $wpdb->prepare("SELECT count(*) FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
        }
 }
 
        }
 }
 
@@ -22,7 +22,7 @@ if(!function_exists('link_exists'))
        function link_exists($linkname)
        {
                global $wpdb;
        function link_exists($linkname)
        {
                global $wpdb;
-               return $wpdb->get_var('SELECT link_id FROM '.$wpdb->links.' WHERE link_name = "'.$linkname.'"');
+               return $wpdb->get_var( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_name = %s", $linkname) );
        }
 }
 
        }
 }
 
index 92abc48bdfd0c7cdf1eb0f4bc84e1f477c723be5..58aa7577155270ba177a8067d04e4ed314f05bd9 100644 (file)
@@ -38,16 +38,16 @@ class GM_Import {
 <h3><?php _e('Second step: GreyMatter details:') ?></h3>
 <table class="form-table">
 <tr>
 <h3><?php _e('Second step: GreyMatter details:') ?></h3>
 <table class="form-table">
 <tr>
-<td><?php _e('Path to GM files:') ?></td>
-<td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
+<td><label for="gmpath"><?php _e('Path to GM files:') ?></label></td>
+<td><input type="text" style="width:300px" name="gmpath" id="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
 </tr>
 <tr>
 </tr>
 <tr>
-<td><?php _e('Path to GM entries:') ?></td>
-<td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
+<td><label for="archivespath"><?php _e('Path to GM entries:') ?></label></td>
+<td><input type="text" style="width:300px" name="archivespath" id="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
 </tr>
 <tr>
 </tr>
 <tr>
-<td><?php _e("Last entry's number:") ?></td>
-<td><input type="text" name="lastentry" value="00000001" /><br />
+<td><label for="lastentry"><?php _e("Last entry's number:") ?></label></td>
+<td><input type="text" name="lastentry" id="lastentry" value="00000001" /><br />
        <?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td>
 </tr>
 </table>
        <?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td>
 </tr>
 </table>
index 6ab2f79c08e5bafcc2ffbc6b7a209a3969827825..5968095ca375dc4b5cbf686cccbbc212843debe0 100644 (file)
@@ -166,9 +166,9 @@ class MT_Import {
                $j = -1;
                foreach ($authors as $author) {
                        ++ $j;
                $j = -1;
                foreach ($authors as $author) {
                        ++ $j;
-                       echo '<li>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
+                       echo '<li><label>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
                        $this->users_form($j);
                        $this->users_form($j);
-                       echo '</li>';
+                       echo '</label></li>';
                }
 
                echo '<input type="submit" value="'.__('Submit').'">'.'<br />';
                }
 
                echo '<input type="submit" value="'.__('Submit').'">'.'<br />';
@@ -179,7 +179,7 @@ class MT_Import {
 
        function select_authors() {
                if ( $_POST['upload_type'] === 'ftp' ) {
 
        function select_authors() {
                if ( $_POST['upload_type'] === 'ftp' ) {
-                       $file['file'] = ABSPATH . 'wp-content/mt-export.txt';
+                       $file['file'] = WP_CONTENT_DIR . '/mt-export.txt';
                        if ( !file_exists($file['file']) )
                                $file['error'] = __('<code>mt-export.txt</code> does not exist');
                } else {
                        if ( !file_exists($file['file']) )
                                $file['error'] = __('<code>mt-export.txt</code> does not exist');
                } else {
@@ -426,7 +426,7 @@ class MT_Import {
        function import() {
                $this->id = (int) $_GET['id'];
                if ( $this->id == 0 )
        function import() {
                $this->id = (int) $_GET['id'];
                if ( $this->id == 0 )
-                       $this->file = ABSPATH . 'wp-content/mt-export.txt';
+                       $this->file = WP_CONTENT_DIR . '/mt-export.txt';
                else
                        $this->file = get_attached_file($this->id);
                $this->get_authors_from_post();
                else
                        $this->file = get_attached_file($this->id);
                $this->get_authors_from_post();
index 1c10015f04c784a6b3ea71e9cd9f16c6f7905ee9..bbddc08d382d5947bc9b08c38b81e9103d16c201 100644 (file)
@@ -8,7 +8,7 @@ if(!function_exists('get_comment_count'))
        function get_comment_count($post_ID)
        {
                global $wpdb;
        function get_comment_count($post_ID)
        {
                global $wpdb;
-               return $wpdb->get_var('SELECT count(*) FROM '.$wpdb->comments.' WHERE comment_post_ID = '.$post_ID);
+               return $wpdb->get_var( $wpdb->prepare("SELECT count(*) FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
        }
 }
 
        }
 }
 
@@ -17,7 +17,7 @@ if(!function_exists('link_exists'))
        function link_exists($linkname)
        {
                global $wpdb;
        function link_exists($linkname)
        {
                global $wpdb;
-               return $wpdb->get_var('SELECT link_id FROM '.$wpdb->links.' WHERE link_name = "'.$wpdb->escape($linkname).'"');
+               return $wpdb->get_var( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_name = %s", $linkname) );
        }
 }
 
        }
 }
 
@@ -333,7 +333,7 @@ class Textpattern_Import {
                                $category1 = get_category_by_slug($Category1);
                                $category1 = $category1->term_id;
                                $category2 = get_category_by_slug($Category2);
                                $category1 = get_category_by_slug($Category1);
                                $category1 = $category1->term_id;
                                $category2 = get_category_by_slug($Category2);
-                               $category2 = $category1->term_id;
+                               $category2 = $category2->term_id;
                                if($cat1 = $category1) { $cats[1] = $cat1; }
                                if($cat2 = $category2) { $cats[2] = $cat2; }
 
                                if($cat1 = $category1) { $cats[1] = $cat1; }
                                if($cat2 = $category2) { $cats[2] = $cat2; }
 
index 03395bdba9b965736076e20181855c699f772fc9..5271abe008e082be035d17bcf74b0f88e25026e8 100644 (file)
@@ -218,7 +218,7 @@ class WP_Import {
        function users_form($n, $author) {
 
                if ( $this->allow_create_users() ) {
        function users_form($n, $author) {
 
                if ( $this->allow_create_users() ) {
-                       printf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30"> <br />');
+                       printf('<label>'.__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30"></label> <br />');
                }
                else {
                        echo __('Map to existing').'<br />';
                }
                else {
                        echo __('Map to existing').'<br />';
@@ -357,6 +357,11 @@ class WP_Import {
                $guid           = $this->get_tag( $post, 'guid' );
                $post_author    = $this->get_tag( $post, 'dc:creator' );
 
                $guid           = $this->get_tag( $post, 'guid' );
                $post_author    = $this->get_tag( $post, 'dc:creator' );
 
+               $post_excerpt = $this->get_tag( $post, 'excerpt:encoded' );
+               $post_excerpt = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_excerpt);
+               $post_excerpt = str_replace('<br>', '<br />', $post_excerpt);
+               $post_excerpt = str_replace('<hr>', '<hr />', $post_excerpt);
+
                $post_content = $this->get_tag( $post, 'content:encoded' );
                $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
                $post_content = str_replace('<br>', '<br />', $post_content);
                $post_content = $this->get_tag( $post, 'content:encoded' );
                $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
                $post_content = str_replace('<br>', '<br />', $post_content);
@@ -404,7 +409,7 @@ class WP_Import {
 
                        $post_author = $this->checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor
 
 
                        $post_author = $this->checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor
 
-                       $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent', 'menu_order', 'post_type', 'post_password');
+                       $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt', 'post_title', 'post_status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent', 'menu_order', 'post_type', 'post_password');
                        if ($post_type == 'attachment') {
                                $remote_url = $this->get_tag( $post, 'wp:attachment_url' );
                                if ( !$remote_url )
                        if ($post_type == 'attachment') {
                                $remote_url = $this->get_tag( $post, 'wp:attachment_url' );
                                if ( !$remote_url )
index 0f271cecafb0d924c5bd81314fbb665df393bc81..ff6da0d56cd6dcdaa3a9cc84cbd77e1ac0d200b1 100644 (file)
@@ -3,50 +3,71 @@
 class WP_Categories_to_Tags {
        var $categories_to_convert = array();
        var $all_categories = array();
 class WP_Categories_to_Tags {
        var $categories_to_convert = array();
        var $all_categories = array();
+       var $tags_to_convert = array();
+       var $all_tags = array();
+       var $hybrids_ids = array();
 
        function header() {
                echo '<div class="wrap">';
 
        function header() {
                echo '<div class="wrap">';
-               echo '<h2>' . __('Convert Categories to Tags') . '</h2>';
+               if ( ! current_user_can('manage_categories') ) {
+                       echo '<div class="narrow">';
+                       echo '<p>' . __('Cheatin&#8217; uh?') . '</p>';
+                       echo '</div>';
+               } else { ?>
+                       <div class="tablenav"><p style="margin:4px"><a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag"><?php _e( "Categories to Tags" ); ?></a>
+                       <a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag&amp;step=3"><?php _e( "Tags to Categories" ); ?></a></p></div>
+<?php  }
        }
 
        function footer() {
                echo '</div>';
        }
 
        }
 
        function footer() {
                echo '</div>';
        }
 
-       function populate_all_categories() {
-               global $wpdb;
+       function populate_cats() {
 
                $categories = get_categories('get=all');
                foreach ( $categories as $category ) {
 
                $categories = get_categories('get=all');
                foreach ( $categories as $category ) {
-                       if ( !tag_exists($wpdb->escape($category->name)) )
-                               $this->all_categories[] = $category;
+                       $this->all_categories[] = $category;
+                       if ( is_term( $category->slug, 'post_tag' ) )
+                               $this->hybrids_ids[] = $category->term_id;
+               }
+       }
+
+       function populate_tags() {
+
+               $tags = get_terms( array('post_tag'), 'get=all' );
+               foreach ( $tags as $tag ) {
+                       $this->all_tags[] = $tag;
+                       if ( is_term( $tag->slug, 'category' ) )
+                               $this->hybrids_ids[] = $tag->term_id;
                }
        }
 
                }
        }
 
-       function welcome() {
-               $this->populate_all_categories();
+       function categories_tab() {
+               $this->populate_cats();
+               $cat_num = count($this->all_categories);
 
 
-               echo '<div class="narrow">';
+               echo '<br class="clear" />';
 
 
-               if (count($this->all_categories) > 0) {
-                       echo '<p>' . __('Hey there. Here you can selectively converts existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>';
-                       echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p>';
+               if ( $cat_num > 0 ) {
+                       echo '<h2>' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>';
+                       echo '<div class="narrow">';
+                       echo '<p>' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>';
+                       echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p></div>';
 
                        $this->categories_form();
                } else {
                        echo '<p>'.__('You have no categories to convert!').'</p>';
                }
 
                        $this->categories_form();
                } else {
                        echo '<p>'.__('You have no categories to convert!').'</p>';
                }
-
-               echo '</div>';
        }
 
        }
 
-       function categories_form() {
-?>
+       function categories_form() { ?>
+
 <script type="text/javascript">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var checkflag = "false";
 function check_all_rows() {
 var checkflag = "false";
 function check_all_rows() {
-       field = document.formlist;
+       field = document.catlist;
        if ( 'false' == checkflag ) {
                for ( i = 0; i < field.length; i++ ) {
                        if ( 'cats_to_convert[]' == field[i].name )
        if ( 'false' == checkflag ) {
                for ( i = 0; i < field.length; i++ ) {
                        if ( 'cats_to_convert[]' == field[i].name )
@@ -63,54 +84,117 @@ function check_all_rows() {
                return '<?php _e('Check All') ?>';
        }
 }
                return '<?php _e('Check All') ?>';
        }
 }
-
-//  -->
+/* ]]> */
 </script>
 </script>
-<?php
-               echo '<form name="formlist" id="formlist" action="admin.php?import=wp-cat2tag&amp;step=2" method="post">
-               <p><input type="button" class="button-secondary" value="' . __('Check All') . '"' . ' onClick="this.value=check_all_rows()"></p>';
-               wp_nonce_field('import-cat2tag');
-               echo '<ul style="list-style:none">';
 
 
-               $hier = _get_term_hierarchy('category');
+<form name="catlist" id="catlist" action="admin.php?import=wp-cat2tag&amp;step=2" method="post">
+<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_rows()" />
+<?php wp_nonce_field('import-cat2tag'); ?></p>
+<ul style="list-style:none">
+
+<?php  $hier = _get_term_hierarchy('category');
 
                foreach ($this->all_categories as $category) {
                        $category = sanitize_term( $category, 'category', 'display' );
 
 
                foreach ($this->all_categories as $category) {
                        $category = sanitize_term( $category, 'category', 'display' );
 
-                       if ((int) $category->parent == 0) {
-                               echo '<li><label><input type="checkbox" name="cats_to_convert[]" value="' . intval($category->term_id) . '" /> ' . $category->name . ' (' . $category->count . ')</label>';
+                       if ( (int) $category->parent == 0 ) { ?>
 
 
-                               if (isset($hier[$category->term_id])) {
-                                       $this->_category_children($category, $hier);
-                               }
+       <li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($category->term_id); ?>" /> <?php echo $category->name . ' (' . $category->count . ')'; ?></label><?php
 
 
-                               echo '</li>';
-                       }
-               }
+                                if ( in_array( intval($category->term_id),  $this->hybrids_ids ) )
+                                       echo ' <a href="#note"> * </a>';
+                               
+                               if ( isset($hier[$category->term_id]) )
+                                       $this->_category_children($category, $hier); ?></li>
+<?php          }
+               } ?>
+</ul>
 
 
-               echo '</ul>';
+<?php  if ( ! empty($this->hybrids_ids) )
+                       echo '<p><a name="note"></a>' . __('* This category is also a tag. Converting it will add that tag to all posts that are currently in the category.') . '</p>'; ?>
 
 
-               echo '<p class="submit"><input type="submit" name="submit" class="button" value="' . __('Convert Tags') . '" /></p>';
+<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Convert Categories to Tags'); ?>" /></p>
+</form>
 
 
-               echo '</form>';
-       }
+<?php }
 
 
-       function _category_children($parent, $hier) {
-               echo '<ul style="list-style:none">';
+       function tags_tab() {
+               $this->populate_tags();
+               $tags_num = count($this->all_tags);
 
 
-               foreach ($hier[$parent->term_id] as $child_id) {
-                       $child =& get_category($child_id);
+               echo '<br class="clear" />';
 
 
-                       echo '<li><label><input type="checkbox" name="cats_to_convert[]" value="' . intval($child->term_id) . '" /> ' . $child->name . ' (' . $child->count . ')</label>';
+               if ( $tags_num > 0 ) {
+                       echo '<h2>' . sprintf( __ngettext( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '</h2>';
+                       echo '<div class="narrow">';
+                       echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>';
+                       echo '<p>' . __('The newly created categories will still be associated with the same posts.') . '</p></div>';
 
 
-                       if (isset($hier[$child->term_id])) {
-                               $this->_category_children($child, $hier);
-                       }
+                       $this->tags_form();
+               } else {
+                       echo '<p>'.__('You have no tags to convert!').'</p>';
+               }
+       }
+
+       function tags_form() { ?>
 
 
-                       echo '</li>';
+<script type="text/javascript">
+/* <![CDATA[ */
+var checktags = "false";
+function check_all_tagrows() {
+       field = document.taglist;
+       if ( 'false' == checktags ) {
+               for ( i = 0; i < field.length; i++ ) {
+                       if ( 'tags_to_convert[]' == field[i].name )
+                               field[i].checked = true;
                }
                }
+               checktags = 'true';
+               return '<?php _e('Uncheck All') ?>';
+       } else {
+               for ( i = 0; i < field.length; i++ ) {
+                       if ( 'tags_to_convert[]' == field[i].name )
+                               field[i].checked = false;
+               }
+               checktags = 'false';
+               return '<?php _e('Check All') ?>';
+       }
+}
+/* ]]> */
+</script>
 
 
-               echo '</ul>';
+<form name="taglist" id="taglist" action="admin.php?import=wp-cat2tag&amp;step=4" method="post">
+<p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_tagrows()" />
+<?php wp_nonce_field('import-cat2tag'); ?></p>
+<ul style="list-style:none">
+
+<?php  foreach ( $this->all_tags as $tag ) { ?>
+       <li><label><input type="checkbox" name="tags_to_convert[]" value="<?php echo intval($tag->term_id); ?>" /> <?php echo attribute_escape($tag->name) . ' (' . $tag->count . ')'; ?></label><?php if ( in_array( intval($tag->term_id),  $this->hybrids_ids ) ) echo ' <a href="#note"> * </a>'; ?></li>
+
+<?php  } ?>
+</ul>
+
+<?php  if ( ! empty($this->hybrids_ids) )
+                       echo '<p><a name="note"></a>' . __('* This tag is also a category. When converted, all posts associated with the tag will also be in the category.') . '</p>'; ?>
+
+<p class="submit"><input type="submit" name="submit_tags" class="button" value="<?php _e('Convert Tags to Categories'); ?>" /></p>
+</form>
+
+<?php }
+
+       function _category_children($parent, $hier) { ?>
+
+               <ul style="list-style:none">
+<?php  foreach ($hier[$parent->term_id] as $child_id) {
+                       $child =& get_category($child_id); ?>
+               <li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($child->term_id); ?>" /> <?php echo $child->name . ' (' . $child->count . ')'; ?></label><?php
+
+                       if ( in_array( intval($child->term_id), $this->hybrids_ids ) )
+                               echo ' <a href="#note"> * </a>';
+
+                       if ( isset($hier[$child->term_id]) )
+                               $this->_category_children($child, $hier); ?></li>
+<?php  } ?>
+               </ul><?php
        }
 
        function _category_exists($cat_id) {
        }
 
        function _category_exists($cat_id) {
@@ -125,101 +209,238 @@ function check_all_rows() {
                }
        }
 
                }
        }
 
-       function convert_them() {
+       function convert_categories() {
                global $wpdb;
 
                global $wpdb;
 
-               if ( (!isset($_POST['cats_to_convert']) || !is_array($_POST['cats_to_convert'])) && empty($this->categories_to_convert)) {
-                       echo '<div class="narrow">';
-                       echo '<p>' . sprintf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag') . '</p>';
-                       echo '</div>';
-                       return;
+               if ( (!isset($_POST['cats_to_convert']) || !is_array($_POST['cats_to_convert'])) && empty($this->categories_to_convert)) { ?>
+                       <div class="narrow">
+                       <p><?php printf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag'); ?></p>
+                       </div>
+<?php          return;
                }
 
                }
 
-
                if ( empty($this->categories_to_convert) )
                        $this->categories_to_convert = $_POST['cats_to_convert'];
                if ( empty($this->categories_to_convert) )
                        $this->categories_to_convert = $_POST['cats_to_convert'];
+
                $hier = _get_term_hierarchy('category');
                $hier = _get_term_hierarchy('category');
+               $hybrid_cats = $clear_parents = $parents = false;
+               $clean_term_cache = $clean_cat_cache = array();
+               $default_cat = get_option('default_category');
 
                echo '<ul>';
 
                foreach ( (array) $this->categories_to_convert as $cat_id) {
                        $cat_id = (int) $cat_id;
 
 
                echo '<ul>';
 
                foreach ( (array) $this->categories_to_convert as $cat_id) {
                        $cat_id = (int) $cat_id;
 
-                       echo '<li>' . sprintf(__('Converting category #%s ... '),  $cat_id);
-
-                       if (!$this->_category_exists($cat_id)) {
-                               _e('Category doesn\'t exist!');
+                       if ( ! $this->_category_exists($cat_id) ) {
+                               echo '<li>' . sprintf( __('Category %s doesn\'t exist!'),  $cat_id ) . "</li>\n";
                        } else {
                                $category =& get_category($cat_id);
                        } else {
                                $category =& get_category($cat_id);
-
-                               if ( tag_exists($wpdb->escape($category->name)) ) {
-                                       _e('Category is already a tag.');
-                                       echo '</li>';
-                                       continue;
-                               }
+                               echo '<li>' . sprintf(__('Converting category <strong>%s</strong> ... '),  $category->name);
 
                                // If the category is the default, leave category in place and create tag.
 
                                // If the category is the default, leave category in place and create tag.
-                               if ( get_option('default_category') == $category->term_id ) {
-                                       $id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug));
+                               if ( $default_cat == $category->term_id ) {
+
+                                       if ( ! ($id = is_term( $category->slug, 'post_tag' ) ) )
+                                               $id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug));
+                                       
                                        $id = $id['term_taxonomy_id'];
                                        $posts = get_objects_in_term($category->term_id, 'category');
                                        $id = $id['term_taxonomy_id'];