Changeset 8691

trunk/wp-admin/admin-ajax.php

-              r8618
+              r8691
                 die('1');
         if ( 'unapproved' == $current ) {
+        if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
                 check_ajax_referer( "approve-comment_$id" );
                 if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
 …
         die(get_sample_permalink_html($post_id, $title, $slug));
 break;
+case 'meta-box-order':
+        check_ajax_referer( 'meta-box-order' );
+        update_user_option( $GLOBALS['current_user']->ID, "meta-box-order_$_POST[page]", $_POST['order'] );
+        die('1');
+        break;
 default :
         do_action( 'wp_ajax_' . $_POST['action'] );

trunk/wp-admin/admin-footer.php

-              r8618
+              r8691
  * @subpackage Administration
  */
+?>
+if ( ! $fixed_bar ) { ?>
+<br class="clear" /></div><!-- wpbody-content -->
+<?php } ?>
 </div><!-- wpbody -->
 </div><!-- wpcontent -->

trunk/wp-admin/admin-header.php

-              r8645
+              r8691
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 if (!isset($_GET["page"])) require_once('admin.php');
-if ( $editing ) {
-        if ( user_can_richedit() )
-                wp_enqueue_script( 'wp_tiny_mce' );
+}
 wp_enqueue_script( 'wp-gears' );
 …
                 add_filter( 'admin_body_class', 'add_minwidth' );
+}
+$fixed_bar_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php' );
+if ( ! isset($fixed_bar) ) $fixed_bar = in_array( $the_current_page, $fixed_bar_pages ) ? true : false;
 get_admin_page_title();
 …
 ?>
 <div id="wpbody">
+<?php if ( ! $fixed_bar ) { ?>
+<div id="wpbody-content">
+<?php } ?>

trunk/wp-admin/admin.php

r8618	r8691
106	106	}
107	107
108		$parent_file = '~~edit~~.php';
	108	$parent_file = 'users.php';
109	109	$submenu_file = 'import.php';
110	110	$title = __('Import');

trunk/wp-admin/comment.php

r8618	r8691
35	35
36	36	wp_enqueue_script('comment');
	37	$fixed_bar = true;
37	38
38	39	require_once('admin-header.php');

trunk/wp-admin/css/colors-classic.css

-              r8600
+              r8691
+#wpcontent, #wpbody {
+        background-color: #14568A;
+}
+#wpbody-content {
+        background-color: #fff;
+}
 a.page-numbers:hover {
         border-color: #999;
 …
+}
+div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat {
+div#current-widgets, #postcustomstuff table, #your-profile fieldset,
+a.page-numbers, #rightnow, div.dashboard-widget,
+#dashboard-widgets p.dashboard-widget-links, .widefat {
         border-color: #ccc;
+}
 …
+}
+div.ui-tabs-panel {
+        border-color: #F0F6FB;
+}
 input.disabled, textarea.disabled {
         background-color: #ccc;
+}
+#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a,
+#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover,
+#dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link,
+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, .login #backtoblog a:hover,
+#plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited {
+        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, h3.info-box-title {
+#draghelper li.widget-list-control-item h4.widget-title a:visited,
+.login #backtoblog a:hover, #plugin-information .action-button a,
+#plugin-information .action-button a:hover, #plugin-information .action-button a:visited {
+        color: #fff;
+}
+li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
+ul.view-switch li.current, .form-table tr, #poststuff h3,
+.login form, h3.info-box-title, #post-status-info {
         background-color: #cfebf7;
+}
-div.ui-tabs-panel {
-        border-color: #cfebf7;
+}
 …
+}
+.button-secondary, #login form .submit input {
+#post-body ul#category-tabs li.ui-tabs-selected, .button-secondary,
+#quicktags, #login form .submit input, #post-search .button,
+#post-search-prep .button {
         background-color: #8ebddc !important;
+}
 …
+}
 .howto, .nonessential, #sidemenu, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite {
+.howto, .nonessential, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite {
         color: #999;
+}
-#dashmenu a, #user_info a {
-        color: #88b4d7;
+}
 …
+}
-.tablenav .button-secondary {
-        border-color: #5396c5;
+}
 .submit input:hover, .button:hover, #edit-slug-buttons a.save:hover {
         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, #media-upload a.del-link:hover {
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover,
+#adminmenu a:hover, #adminmenu ul.wp-submenu 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;
+}
-#adminmenu a:hover, #sidemenu a:hover, .ui-tabs-nav a:hover {
-        color: #97c4d8;
+}
 …
+}
+h3.dashboard-widget-title small a {
+        color: #d7d7d7;
+}
+h3.dashboard-widget-title small a:hover {
+        color: #fff;
+}
 .widget-control-save, .widget-control-remove {
         background-color: #83b4d5;
 …
+}
-#submenu a {
-        color: #2782af
+}
 /* Because we don't want visited on these links */
 #adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
+#adminmenu li.current a, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
         background-color: #fff;
         border-color: #07273e;
 …
+}
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
+#adminmenu li.current {
+        background-color: #fff;
+        border-right-color: #fff;
+}
+#adminmenu li a #awaiting-mod {
         background-image: url(../images/comment-stalk-classic.gif);
+}
 …
+}
 #adminmenu, div#media-upload-header, div#plugin-information-header {
+div#media-upload-header, div#plugin-information-header {
         background-color: #14568a;
         border-bottom-color: #07273e;
 …
 input.readonly {
         background-color: #ddd;
+}
-#dashmenu a.current {
-        background-color: #14568a;
-        color: #cfebf6;
+}
 …
+}
+#poststuff #editor-toolbar {
+        background-color: #83b4d5;
+}
 #poststuff #editor-toolbar .active {
         background-color: #83b4d5;
+        background-color: #CFEBF7;
         color: #333;
+}
 …
 #rightnow a {
         color: #448abd;
+}
-#sidemenu a {
-        background-color: #14568a;
-        border-bottom-color: #07273e;
-        border-top-color: #14568a;
-        color: #cfebf6;
+}
 …
+}
+#wphead h1, #dashmenu a.current:hover {
+#wphead h1, #wphead h1 a, #login form input {
+        color: #555;
+}
+#wphead h1 {
         color: #cfebf6;
+}
+#media-upload a.delete {
+        color: #888;
+}
 …
+}
+#att-info {
+        background-color: #E4F2FD;
+}
 /* Diff */
 …
         background-color: #99ff99;
+}
+/* media popup 0819 */
+#sidemenu a {
+        background-color: #14568a;
+        border-bottom-color: #07273e;
+        border-top-color: #14568a;
+        color: #CFEBF6;
+}
+.submitbox .submitdelete {
+        color: #fff;
+}

trunk/wp-admin/css/colors-fresh.css

-              r8600
+              r8691
+#wpcontent, #wpbody {
+        background-color: #e4f2fd;
+}
+#wpbody-content {
+        background-color: #fff;
+}
 a.page-numbers:hover {
         border-color: #999;
 …
+}
+div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat {
+div#current-widgets, #postcustomstuff table, #your-profile fieldset,
+a.page-numbers, #rightnow, div.dashboard-widget,
+#dashboard-widgets p.dashboard-widget-links, .widefat {
         border-color: #ccc;
+}
 …
+}
+#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a,
+#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover,
+#dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link,
+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, .login #backtoblog a:hover,
+#plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited {
+        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, h3.info-box-title {
+#draghelper li.widget-list-control-item h4.widget-title a:visited,
+.login #backtoblog a:hover, #plugin-information .action-button a,
+#plugin-information .action-button a:hover, #plugin-information .action-button a:visited {
+        color: #fff;
+}
+li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
+ul.view-switch li.current, .form-table tr, #poststuff h3,
+.login form, h3.info-box-title, #post-status-info {
         background-color: #eaf3fa;
+}
 …
+}
+ul#category-tabs li.ui-tabs-selected, .button-secondary, #quicktags, #login form .submit input {
+#post-body ul#category-tabs li.ui-tabs-selected, .button-secondary,
+#quicktags, #login form .submit input, #post-search .button,
+#post-search-prep .button {
         background-color: #cee1ef !important;
+}
 …
+}
 .form-table input, .form-table textarea {
+.form-table input, .form-table textarea, #post-search-input {
         border-color: #c6d9e9;
+}
 …
+}
 #user_info, .howto, .nonessential, #dashmenu a, #sidemenu, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite {
+#user_info, .howto, .nonessential, #dashmenu a, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite {
         color: #999;
+}
 …
+}
+.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 {
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover,
+#adminmenu a:hover, #adminmenu ul.wp-submenu 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;
+}
 …
+}
 .submitbox #autosave .error, ul.view-switch li.current a {
+ul.view-switch li.current a {
         color: #333;
+}
+.submitbox #previewview {
+        background-color: #2683ae;
+}
+.submitbox #previewview a, #rightnow .rbutton {
+#rightnow .rbutton {
         background-color: #ebebeb;
         color: #264761;
 …
+}
 .widefat thead, .thead {
+.widefat thead, .thead, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small {
         background-color: #464646;
         color: #d7d7d7;
+}
+h3.dashboard-widget-title small a {
+        color: #d7d7d7;
+}
+h3.dashboard-widget-title small a:hover {
+        color: #fff;
+}
 …
+}
+#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 {
+#adminmenu li.wp-has-submenu a {
+        color: #333;
+}
+#adminmenu a, #adminmenu ul.wp-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 */
 #adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
+#adminmenu li.current a, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
         background-color: #fff;
         border-color: #c6d9e9;
 …
+}
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
+#adminmenu li.current {
+        background-color: #fff;
+        border-color: #c6d9e9;
+        border-right-color: #fff;
+}
+#adminmenu li a #awaiting-mod {
         background-image: url(../images/comment-stalk-fresh.gif);
+}
 …
+}
 #adminmenu, div#media-upload-header, div#plugin-information-header {
+div#media-upload-header, div#plugin-information-header {
         background-color: #e4f2fd;
         border-bottom-color: #c6d9e9;
 …
 input.readonly {
         background-color: #ddd;
+}
-#dashmenu a.current {
-        background-color: #e4f2fd;
-        color: #555;
+}
 …
+}
+#poststuff #editor-toolbar {
+        background-color: #cee1ef;
+}
 #poststuff #editor-toolbar .active {
         background-color: #cee1ef;
+        background-color: #EAF3FA;
         color: #333;
+}
 …
 #rightnow a {
         color: #448abd;
+}
-#sidemenu a {
-        background-color: #e4f2fd;
-        border-bottom-color: #c6d9e9;
-        border-top-color: #e4f2fd;
+}
 …
+}
 .login #backtoblog a, .curtime, #user_info a {
+.login #backtoblog a, #curtime, #user_info a, #dashmenu a {
         color: #ccc;
+}
 …
+}
 #wphead h1, #dashmenu a.current:hover, #login form input {
+#wphead h1, #wphead h1 a, #login form input {
         color: #555;
+}
+#wphead h1 a:hover {
+        text-decoration: underline;
+}
 …
+}
 #editorcontainer {
+#editorcontainer, #post-status-info {
         border-color: #ccc;
+}
 …
+}
 .curtime {
+#curtime {
         color: #666;
+}
 …
         background-color: #99ff99;
+}
+#adminmenu,
+#att-info {
+        background-color: #E4F2FD;
+}
+/* fixed tool bar */
+#fixedbar {
+        background-color:#464646;
+        color: #ccc;
+}
+#html-upload-help {
+        color: #328AB2;
+}
+#fixedbar #last-edit {
+}
+#fixedbar a,
+#fixedbar #curtime {
+        color: #ccc;
+}
+#fixedbar a:hover {
+        color: #fff;
+}
+#fixedbar a.button {
+        color: #246;
+}
+#fixedbar a.button:hover {
+        color: #d54e21;
+}
+#timestampdiv {
+        color: #ccc;
+}
+/* media popup 0819 */
+#sidemenu a {
+        background-color: #e4f2fd;
+        border-bottom-color: #c6d9e9;
+        border-top-color: #e4f2fd;
+}
+.submitbox .submitdelete {
+        color: #fff;
+}

trunk/wp-admin/css/dashboard.css

-              r8600
+              r8691
+/* Right Now */
+#rightnow {
+form .input-text-wrap {
+        border-style: solid;
         border-width: 1px;
+        padding: 2px 3px;
+        border-color: #CCCCCC;
+}
+form .input-text-wrap input {
+        border: 0pt none;
+        outline-color: -moz-use-text-color;
+        outline-style: none;
+        outline-width: medium;
+        padding: 0pt;
+        width: 99%;
         border-style: solid;
+        color: #333333;
+}
+form .textarea-wrap {
+        border-style: solid;
+        border-width: 1px;
         padding: 2px;
+        margin-top: 10px;
+        margin-right: 7px;
+}
+#rightnow .reallynow {
+        padding: 6px;
+        font-size: 15px;
+        line-height: 2;
+        margin: 0;
+}
+#rightnow .rbutton {
+        font-weight: normal;
+        padding: 6px;
+        border-bottom: none;
+        -moz-border-radius: 2px;
+        -khtml-border-radius: 2px;
+        -webkit-border-radius: 2px;
+        border-radius: 2px;
+        text-decoration: none;
+}
+#rightnow .reallynow span {
+        display: block;
+        text-align: left;
+        float: left;
+        padding: 0 6px;
+}
+#rightnow .reallynow a {
+        display: block;
+        text-align: right;
+        float: right;
+        padding: 0 6px;
+        font-size: 14px;
+        margin: 1px 6px 0 0;
+}
+#rightnow .youhave {
+        font-size:  14px;
+        padding: 10px;
+}
+#rightnow h3, #rightnow p {
+        padding: 0 10px;
+}
+#rightnow a {
+        font-weight: bold;
+}
+        border-color: #CCCCCC;
+}
+form .textarea-wrap textarea {
+        border: 0pt none;
+        padding: 0;
+        width: 99%;
+}
 /* Widgets */
 div#dashboard-widgets-wrap {
-        margin-top: -20px;
         margin-right: -13px; /* 20 (div.dashboard-widget margin-right) - 7 (#rightnow margin-right) */
+}
 …
 div.dashboard-widget-holder.double div.dashboard-widget {
         height: 54em;
         padding-bottom: 28px /* lame */
+        padding-bottom: 28px /* lame */
+}
 …
         border-width: 1px;
         border-style: solid;
-        padding: 2px;
         height: 27em;
         overflow: auto;
 …
+}
+#dashboard-widgets p.dashboard-widget-links {
+        padding: 2px;
+        font-size: 11px;
+        line-height: 2;
+        border-width: 1px;
+        margin: 0 20px 0 0;
+        padding: 0 7px;
+        border: 1px solid;
+        border-top: none;
+}
 h3.dashboard-widget-title  {
         margin: 0;
+        margin: 2px;
         padding: 0 7px;
         font-size: 14px;
 …
+}
 h3.dashboard-widget-title img.rss-icon {
+p.dashboard-widget-links img.rss-icon {
         vertical-align: middle;
-        margin: .5em 0;
+}
 …
+}
+.widget-loading {
+}
+#dashboard_inbox div.dashboard-widget, #dashboard_quick_press div.dashboard-widget {
+        height: 35em;
+        padding-bottom: 0;
+}
+#dashboard_quick_press div.dashboard-widget-content {
+        padding-bottom: 0;
+}
+#dashboard_inbox p.actions {
+        margin-bottom:0pt;
+        margin-top: 0;
+        float:left;
+}
+#dashboard_quick_press h3 {
+        margin-bottom: 3px;
+}
+#dashboard_quick_press h3#quick-post-title {
+        margin-top: 0;
+}
+#dashboard_quick_press p.field-tip {
+        margin-top: 0;
+        font-style: italic;
+}
+#dashboard_quick_press .submit {
+        padding: 0 0 1em 0;
+        border-top: none;
+        border-bottom: 1px solid #ccc;
+}
+#dashboard_quick_press p#recent-drafts {
+        margin: 0;
+}

trunk/wp-admin/css/global.css

-              r7907
+              r8691
+/* 2 column liquid layout */
+div#wpbody {
+        float: right;
+        clear: right;
+        width: 100%;
+        margin-left: -185px;
+}
+div#wpbody-content {
+        margin-left: 175px;
+        border-width: 1px 0 0 1px;
+        border-style: solid;
+        border-color: #c6d9e9;
+        padding-top: 10px;
+}
+ul#adminmenu {
+        float: left;
+        clear: left;
+        width: 165px; /* + 10 padding */
+        position: relative;
+}
+/* inner 2 column liquid layout */
+.inner-sidebar {
+        float: right;
+        clear: right;
+        width: 220px;
+        position: relative;
+}
+.has-sidebar {
+        float: left;
+        clear: left;
+        width: 100%;
+        margin-right: -240px;
+}
+.has-sidebar .has-sidebar-content {
+        margin-right: 245px;
+}
 /* styles for use by people extending the WordPress interface */
 body    {
 …
 .subsubsub li { display: inline; margin: 0; padding: 0; }
+/* make it small? */
+.subsubsub li.spam {
+        font-size: .9em;
+}
 .widefat {
 …
+}
+#wpbody .wrap {
+        position: relative;
+}
 .wrap, .updated, .error {
+        margin: 0;
+        margin-left: 15px;
+        margin-right: 15px;
+        padding: 0;
+        max-width: 980px;
+        margin: 0 15px;
+        padding: 0;
+}
 …
         border-style: solid;
         padding: 0 0.6em;
-        max-width: 950px;
         margin-bottom: 1em;
+}
 …
         clear: both;
         font: 24px Georgia, "Times New Roman", Times, serif;
         margin: 5px 0 0 -4px;
+        margin: 5px 0 10px -4px;
         padding: 0;
         padding-bottom: 7px;

trunk/wp-admin/edit-form-advanced.php

-              r8656
+              r8691
 $messages[3] = __('Custom field deleted.');
 $messages[4] = __('Post updated.');
+$messages[6] = __('Post published.');
+$messages[7] = __('Post saved.');
 if ( isset($_GET['revision']) )
 …
 ?>
-<?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="post.php" method="post" id="post">
+<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
+<input type="hidden" name="mode" value="bookmarklet" />
+<?php endif; ?>
+<div class="wrap">
+<h2><?php _e('Write Post') ?></h2>
+<?php
+if ( 0 == $post_ID)
+        wp_nonce_field('add-post');
+else
+        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 ) . '" />';
+$saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />';
+?>
+<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $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 ); ?>" />
+<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 echo clean_url(stripslashes(wp_get_referer())); ?>" />
+<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
+<?php echo $form_extra ?>
+<div id="poststuff">
+<div id="wpbody-content">
+<?php
+// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
+function post_submit_meta_box($post) {
+        global $action;
+?>
 <div class="submitbox" id="submitpost">
+<div id="previewview">
+<?php if ( 'publish' == $post->post_status ) { ?>
+<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Post'); ?></a>
+<?php } elseif ( 'edit' == $action ) { ?>
+<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank"  tabindex="4"><?php _e('Preview this Post'); ?></a>
+<?php } ?>
+</div>
+<div class="inside">
+<div class="inside-submitbox">
 <p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
 …
 <?php endif; ?>
 <?php
 if ( 0 != $post_ID ) {
+if ( 0 != $post->ID ) {
         if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
                 $stamp = __('Scheduled for:<br />%1$s at %2$s');
 …
 <input type="submit" name="save" id="save-post" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />
 <?php
 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
+if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) {
 ?>
 <?php if ( current_user_can('publish_posts') ) : ?>
 …
+}
 if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) )
         echo "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post_ID", 'delete-post_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;post') . "</a>";
+if ( ( 'edit' == $action) && current_user_can('delete_post', $post->ID) )
+        echo "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;post') . "</a>";
 ?>
 <br class="clear" />
+<?php if ( 0 != $post_ID ): ?>
+<?php if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
+<!-- moved under the editor
+<?php if ( 0 != $post->ID ): ?>
+<?php if ( $last_id = get_post_meta($post->ID, '_edit_last', true) ) {
         $last_user = get_userdata($last_id);
         printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
 …
 <br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
+<span id="wp-word-count"></span>
+-->
 </p>
+<div class="side-info">
+<h5><?php _e('Related') ?></h5>
+<ul>
+<?php if ( 0 != $post_ID ): ?>
+<li><a href="edit.php?p=<?php echo $post_ID ?>"><?php _e('See Comments on this Post') ?></a></li>
+<?php endif; ?>
+<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
+<li><a href="edit.php"><?php _e('Manage All Posts') ?></a></li>
+<li><a href="categories.php"><?php _e('Manage All Categories') ?></a></li>
+<li><a href="edit-tags.php"><?php _e('Manage All Tags') ?></a></li>
+<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>
+<div id="post-body">
+<div id="titlediv">
+<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 class="inside">
+<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
+        <div id="edit-slug-box">
+<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
+        echo $sample_permalink_html;
+endif; ?>
+        </div>
+</div>
+</div>
+<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
+<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 wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
+</div>
+<?php echo $form_pingback ?>
+<?php echo $form_prevstatus ?>
+<?php
+</div>
+<?php
+}
+add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', 'post', 'side', 'core');
 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>
+<?php
+}
+add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'normal', 'core');
+<p><a href='#'><?php _e( 'Choose from tags' ); ?></a></p>
+<?php
+}
+add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'side', 'core');
+function post_media_meta_box($post) {
+        echo "<p><small><em>This feature isn't fully functional in this prototype.</em></small></p>";
+        if ( empty( $post->ID ) )
+                return;
+        $atts = get_children( array(
+                'post_parent' => $post->ID,
+                'post_type' => 'attachment'
+        ) );
+        if ( !$atts ) {
+                _e( 'No media.' );
+                return;
+        }
+        foreach ( $atts as $att ) {
+                if ( $thumb = wp_get_attachment_image( $att->ID, array(60, 45), true ) ) {
+?>
+                        <a href="media.php?action=edit&amp;attachment_id=<?php echo $att->ID  ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att->post_title)); ?>">
+                                <?php echo $thumb; ?>
+                        </a>
+<?php
+                }
+                echo "<h4>$att->post_title</h4>";
+                echo "<a href='#' class='no-crazy'>Remove</a> | ";
+                echo "<a href='media.php?action=edit&amp;attachment_id=$att->ID'>Edit</a>";
+                echo "<br class='clear' />";
+        }
+}
+add_meta_box( 'mediadiv', __('Media added to this Post' ), 'post_media_meta_box', 'post', 'side', 'core' );
 function post_categories_meta_box($post) {
 ?>
+<ul id="category-tabs">
+        <li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
+        <li class="wp-no-js-hidden"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
+</ul>
+<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
+        <ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
+                <?php $popular_ids = wp_popular_terms_checklist('category'); ?>
+        </ul>
+</div>
+<div id="categories-all" class="ui-tabs-panel">
+        <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+                <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
+        </ul>
+</div>
 <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>
 …
 </div>
+<ul id="category-tabs">
+        <li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
+        <li class="wp-no-js-hidden"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
+</ul>
+<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
+        <ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
+                <?php $popular_ids = wp_popular_terms_checklist('category'); ?>
+        </ul>
+</div>
+<div id="categories-all" class="ui-tabs-panel">
+        <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+                <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
+        </ul>
+</div>
+<?php
+}
+add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'normal', 'core');
+?>
+<?php do_meta_boxes('post', 'normal', $post); ?>
+<?php do_action('edit_form_advanced'); ?>
+<h2><?php _e('Advanced Options'); ?></h2>
+<?php
+<?php
+}
+add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
 function post_excerpt_meta_box($post) {
 ?>
 …
 <?php
+}
 add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'advanced', 'core');
+add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core');
 function post_trackback_meta_box($post) {
 …
 ?>
+<p class="meta-options">
+        <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 <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a> on this post') ?></label>
+</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>
 …
         echo $pings;
+}
 add_meta_box('trackbacksdiv', __('Trackbacks'), 'post_trackback_meta_box', 'post', 'advanced', 'core');
+add_meta_box('trackbacksdiv', __('Trackbacks and Pings'), 'post_trackback_meta_box', 'post', 'normal', 'core');
 function post_custom_meta_box($post) {
 …
 <?php
+}
 add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'advanced', 'core');
+add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'normal', 'core');
 do_action('dbx_post_advanced');
 function post_comment_status_meta_box($post) {
+        global $wpdb, $post_ID;
 ?>
 <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>
+<?php
+}
+add_meta_box('commentstatusdiv', __('Comments &amp; Pings'), 'post_comment_status_meta_box', 'post', 'advanced', 'core');
+<p class="meta-options">
+        <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 on this post') ?></label>
+</p>
+<?php
+        if ( !$post_ID || $post_ID < 0 )
+                return;
+        if ( !$comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $post_ID) ) )
+                return;
+        // Make sure comments, post, and post_author are cached
+//      update_comment_cache($comments);
+?>
+<table class="widefat">
+<thead>
+        <tr>
+                <th scope="col"><?php _e('Comments') ?></th>
+                <th scope="col"><?php _e('Submitted') ?></th>
+        </tr>
+</thead>
+<tbody id="the-comment-list" class="list:comment">
+<?php
+        foreach ($comments as $comment)
+                _wp_comment_row( $comment, 'single', false, false );
+?>
+</tbody>
+</table>
+<?php
+}
+add_meta_box('commentstatusdiv', __('Comments on this Post'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
 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 if ( isset( $post->post_password ) ) : echo attribute_escape( $post->post_password ); endif; ?>" /></p>
+<p>
+        <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>
+<h4><?php _e( 'Post Password' ); ?></h4>
+<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>
 <?php
+}
 add_meta_box('passworddiv', __('Password Protect This Post'), 'post_password_meta_box', 'post', 'advanced', 'core');
+add_meta_box('passworddiv', __('Privacy Options'), 'post_password_meta_box', 'post', 'normal', 'core');
 function post_slug_meta_box($post) {
 …
 <?php
+}
 add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'advanced', 'core');
+add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'normal', 'core');
 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
 …
 <?php
+}
 add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'advanced', 'core');
+add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'normal', 'core');
 endif;
 …
         wp_list_post_revisions();
+}
 add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'advanced', 'core');
+add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'normal', 'core');
 endif;
+?>
+<?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($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
+<input type="hidden" name="mode" value="bookmarklet" />
+<?php endif; ?>
+<div class="wrap">
+<h2><?php
+        if ( !isset($post_ID) || 0 == $post_ID)
+                printf( __( '<a href="%s">Posts</a> / Write New Post' ), 'edit.php' );
+        else
+                printf( __( '<a href="%s">Posts</a> / Edit Post' ), 'edit.php' );
+?></h2>
+<div id="previewview">
+<?php if ( 'publish' == $post->post_status ) { ?>
+<a class="button" href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Post'); ?></a>
+<?php } elseif ( 'edit' == $action ) { ?>
+<a class="button" href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank"  tabindex="4"><?php _e('Preview this Post'); ?></a>
+<?php } ?>
+</div>
+<?php
+if ( 0 == $post_ID)
+        wp_nonce_field('add-post');
+else
+        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 ) . '" />';
+$saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />';
+?>
+<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $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 ); ?>" />
+<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 echo clean_url(stripslashes(wp_get_referer())); ?>" />
+<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
+<?php echo $form_extra ?>
+<div id="poststuff">
+<div id="side-info" style="display: none;"><?php // TODO ?>
+<h5><?php _e('Related') ?></h5>
+<ul>
+<?php if ($post_ID): ?>
+<li><a href="edit.php?p=<?php echo $post_ID ?>"><?php _e('See Comments on this Post') ?></a></li>
+<?php endif; ?>
+<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
+<li><a href="edit.php"><?php _e('Manage All Posts') ?></a></li>
+<li><a href="categories.php"><?php _e('Manage All Categories') ?></a></li>
+<li><a href="edit-tags.php"><?php _e('Manage All Tags') ?></a></li>
+<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>
+<div id="side-info-column" class="inner-sidebar">
+<?php do_action('submitpost_box'); ?>
+<?php $side_meta_boxes = do_meta_boxes('post', 'side', $post); ?>
+</div>
+<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
+<div id="post-body-content" class="has-sidebar-content">
+<div id="titlediv">
+<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 class="inside">
+<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
+        <div id="edit-slug-box">
+<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
+        echo $sample_permalink_html;
+endif; ?>
+        </div>
+</div>
+</div>
+<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
+<div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&amp;type=image&amp;TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
+<h3><?php _e('Post') ?></h3>
+<?php the_editor($post->post_content); ?>
+<div id="post-status-info">
+        <span id="wp-word-count" class="alignleft"></span>
+        <span class="alignright">
+        <span id="autosave">&nbsp;</span>
+<?php
+        if ( $post_ID ) {
+                echo '<span id="last-edit">';
+                if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
+                        $last_user = get_userdata($last_id);
+                        printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+                } else {
+                        printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+                }
+                echo '</span>';
+        }
+?>
+        </span>
+        <br class="clear" />
+</div>
+<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
+<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+</div>
+<?php
+echo $form_pingback;
+echo $form_prevstatus;
+do_meta_boxes('post', 'normal', $post);
+do_action('edit_form_advanced');
 do_meta_boxes('post', 'advanced', $post);
 do_action('dbx_post_sidebar');
+?>
+</div>
+</div>
+?>
+</div>
+</div>
+</div><!-- /poststuff -->
+</div>
+<br class="clear" />
 </div>

trunk/wp-admin/edit-form-comment.php

-              r8656
+              r8691
 <form name="post" action="comment.php" method="post" id="post">
+<div id="wpbody-content">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
 <h2><?php echo $toprow_title; ?></h2>
+<div id="previewview">
+<a class="button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a>
+</div>
 <input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
 <input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />
+<?php
+// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
+<div id="poststuff">
+function comment_submit_meta_box($comment) {
+?>
 <div class="submitbox" id="submitcomment">
+<div id="previewview">
+<a href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a>
+</div>
+<div class="inside">
+<div class="inside-submitbox">
 <p><strong><label for='comment_status'><?php _e('Approval Status') ?></label></strong></p>
 …
 ?>
 </p>
+</div>
+<?php
+}
+add_meta_box('submitdiv', __('Save'), 'comment_submit_meta_box', 'comment', 'side', 'core');
+?>
+<div class="side-info">
+<h5><?php _e('Related') ?></h5>
+<div id="side-info-column" class="inner-sidebar">
+<ul>
+<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
+<li><a href="edit-comments.php?comment_status=moderated"><?php _e('Moderate Comments') ?></a></li>
+<?php do_action('comment_relatedlinks_list'); ?>
+</ul>
+</div>
+<?php do_action('submitcomment_box'); ?>
+<?php $side_meta_boxes = do_meta_boxes('comment', 'side', $comment); ?>
 </div>
+<div id="post-body">
+<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
+<div id="post-body-content" class="has-sidebar-content">
 <div id="namediv" class="stuffbox">
 <h3><label for="name"><?php _e('Name') ?></label></h3>
 …
 <input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
 </div>
+</div>
+<div id="postdiv" class="postarea">
+<h3><?php _e('Comment') ?></h3>
+<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>
 …
 </div>
-<div id="postdiv" class="postarea">
-<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 do_meta_boxes('comment', 'normal', $comment); ?>
 …
 <?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />
+</div>
+</div>
 </div>
 </div>

trunk/wp-admin/edit-link-form.php

-              r8656
+              r8691
 if ( ! empty($link_id) ) {
+        /**
+         * @var string
+         */
+        $heading = __('Edit Link');
+        $heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
         $submit_text = __('Save Changes');
         $form = '<form name="editlink" id="editlink" method="post" action="link.php">';
         $nonce_action = 'update-bookmark_' . $link_id;
 } else {
         $heading = __('Add Link');
+        $heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
         $submit_text = __('Add Link');
         $form = '<form name="addlink" id="addlink" method="post" action="link.php">';
 …
 ?>
+<?php echo $form ?>
+<?php wp_nonce_field($nonce_action); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<div class="wrap">
+<h2><?php echo $heading; ?></h2>
+<div id="poststuff">
+<?php function link_submit_meta_box($link) { ?>
 <div class="submitbox" id="submitlink">
+<div id="previewview">
+<?php if ( !empty($link_id) ) { ?>
+<a href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
+<?php } ?>
+</div>
+<div class="inside">
+<div class="inside-submitbox">
 <p><label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label></p>
 </div>
 …
 <?php
 if ( ( 'edit' == $action) && current_user_can('manage_links') )
         echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link_id", 'delete-bookmark_' . $link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>";
+        echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>";
 ?>
 </p>
-<div class="side-info">
-<h5><?php _e('Related') ?></h5>
-<ul>
-<li><a href="link-manager.php"><?php _e('Manage All Links') ?></a></li>
-<li><a href="edit-link-categories.php"><?php _e('Manage All Link Categories') ?></a></li>
-<li><a href="link-import.php"><?php _e('Import Links') ?></a></li>
-<?php do_action('link_relatedlinks_list'); ?>
-</ul>
-</div>
 <?php do_action('submitlink_box'); ?>
 </div>
+<div id="post-body">
+<div id="namediv" class="stuffbox">
+<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>
+</div>
+<div id="addressdiv" class="stuffbox">
+<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>
+</div>
+<div id="descriptiondiv" class="stuffbox">
+<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 ( isset( $link->link_description ) ? $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>
+<?php function link_categories_meta_box($link) { ?>
+<?php
+}
+add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core');
+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>
 …
+}
 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 function link_target_meta_box($link) { ?>
+function link_target_meta_box($link) { ?>
 <fieldset><legend class="hidden"><?php _e('Target') ?></legend>
 <label for="link_target_blank" class="selectit">
 …
 <?php
+}
 add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'advanced', 'core');
+add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'normal', 'core');
 function link_xfn_meta_box($link) {
 …
 <?php
+}
 add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'advanced', 'core');
+add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'normal', 'core');
 function link_advanced_meta_box($link) {
 …
 <?php
+}
+add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'advanced', 'core');
+add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core');
+?>
+<?php echo $form ?>
+<div id="wpbody-content">
+<?php echo $link_added; ?>
+<?php wp_nonce_field($nonce_action); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+<div class="wrap">
+<h2><?php echo $heading; ?></h2>
+<?php if ( !empty($link->link_id) ) { ?>
+<div id="previewview">
+<a class="button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
+</div>
+<?php } ?>
+<!--
+<p id="big-add-button">
+<span id="previewview">
+<?php if ( !empty($link_id) ) { ?>
+<a class="button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
+<?php } ?>
+</span>
+</p>
+-->
+<!-- TODO
+<div class="inside">
+<p><label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label></p>
+</div>
+<div class="side-info">
+<h5><?php _e('Related') ?></h5>
+<ul>
+<li><a href="link-manager.php"><?php _e('Manage All Links') ?></a></li>
+<li><a href="edit-link-categories.php"><?php _e('Manage All Link Categories') ?></a></li>
+<li><a href="link-import.php"><?php _e('Import Links') ?></a></li>
+<?php do_action('link_relatedlinks_list'); ?>
+</ul>
+</div>
+-->
+<div id="poststuff">
+<div id="side-info-column" class="inner-sidebar">
+<?php
+do_action('submitlink_box');
+$side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
+?>
+</div>
+<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
+<div id="post-body-content" class="has-sidebar-content">
+<div id="namediv" class="stuffbox">
+<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>
+</div>
+<div id="addressdiv" class="stuffbox">
+<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>
+</div>
+<div id="descriptiondiv" class="stuffbox">
+<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>
+<?php
+do_meta_boxes('link', 'normal', $link);
 do_meta_boxes('link', 'advanced', $link);
 …
 </div>
 </div>
+</div>
+</div>
+<br class="clear" />
 </div>

trunk/wp-admin/edit-page-form.php

-              r8656
+              r8691
 $temp_ID = (int) $temp_ID;
 $user_ID = (int) $user_ID;
+?>
+?>
+<form name="post" action="page.php" method="post" id="post">
+<div id="wpbody-content">
 <?php if ( $notice ) : ?>
 …
 <?php endif; ?>
+<form name="post" action="page.php" method="post" id="post">
+<div class="wrap">
+<h2><?php _e('Write Page') ?></h2>
+<?php
+wp_nonce_field($nonce_action);
+if (isset($mode) && 'bookmarklet' == $mode)
+        echo '<input type="hidden" name="mode" value="bookmarklet" />';
+?>
+<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 ?>" />
+<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
+function page_submit_meta_box($post) {
+        global $action;
+?>
 <div class="submitbox" id="submitpage">
+<div id="previewview">
+<?php if ( 'publish' == $post->post_status ) { ?>
+<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank"  tabindex="4"><?php _e('View this Page'); ?></a>
+<?php } elseif ( 'edit' == $action ) { ?>
+<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview this Page'); ?></a>
+<?php } ?>
+</div>
+<div class="inside">
+<div class="inside-submitbox">
 <p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
 <p>
 …
 <?php
 if ( 0 != $post_ID ) {
+if ( 0 != $post->ID ) {
         if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
                 $stamp = __('Scheduled for:<br />%1$s at %2$s');
 …
 <input type="submit" name="save" class="button button-highlighted" value="<?php _e('Save'); ?>" tabindex="4" />
 <?php
 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
+if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) {
 ?>
 <?php if ( current_user_can('publish_pages') ) : ?>
 …
+}
 if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
         echo "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&amp;post=$post_ID", 'delete-page_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;page') . "</a>";
+if ( ('edit' == $action) && current_user_can('delete_page', $post->ID) )
+        echo "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&amp;post=$post->ID", 'delete-page_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;page') . "</a>";
 ?>
 <br class="clear" />
+<?php if ( 0 != $post_ID ) : ?>
+<?php if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
+<!-- moved under the editor
+<?php if ( 0 != $post->ID ) : ?>
+<?php if ( $last_id = get_post_meta($post->ID, '_edit_last', true) ) {
         $last_user = get_userdata($last_id);
         printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
 …
 <br class="clear" />
 <?php endif; ?>
 <span id="autosave"></span>
+<span id="wp-word-count"></span>
+-->
 </p>
+<div class="side-info">
+<h5><?php _e('Related') ?></h5>
+<ul>
+<?php if ( 0 != $post_ID ) : ?>
+<li><a href="edit-pages.php?page_id=<?php echo $post_ID ?>"><?php _e('See Comments on this Page') ?></a></li>
+<?php endif; ?>
+<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
+<li><a href="edit-pages.php"><?php _e('Manage All Pages') ?></a></li>
+<?php do_action('page_relatedlinks_list'); ?>
+</ul>
+</div>
+<?php do_action('submitpage_box'); ?>
+</div>
+<div id="post-body">
+<div id="titlediv">
+<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 class="inside">
+<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
+        <div id="edit-slug-box">
+<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
+        echo $sample_permalink_html;
+endif; ?>
+        </div>
+</div>
+</div>
+<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
+<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 wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
+</div>
+<?php do_meta_boxes('page', 'normal', $post); ?>
+<?php do_action('edit_page_form'); ?>
+<h2><?php _e('Advanced Options'); ?></h2>
+<?php
+</div>
+<?php
+}
+add_meta_box('pagesubmitdiv', __('Publish'), 'page_submit_meta_box', 'page', 'side', 'core');
 function page_custom_meta_box($post){
 ?>
 …
 <?php
+}
 add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'advanced', 'core');
+add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'normal', 'core');
 function page_comments_status_meta_box($post){
 …
 <?php
+}
 add_meta_box('pagecommentstatusdiv', __('Comments &amp; Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core');
+add_meta_box('pagecommentstatusdiv', __('Comments &amp; Pings'), 'page_comments_status_meta_box', 'page', 'normal', 'core');
 function page_password_meta_box($post){
 …
 <?php
+}
 add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'advanced', 'core');
+add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'normal', 'core');
 function page_slug_meta_box($post){
 …
 <?php
+}
 add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'advanced', 'core');
+add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'normal', 'core');
 function page_parent_meta_box($post){
 …
 <?php
+}
 add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'advanced', 'core');
+add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'normal', 'core');
 if ( 0 != count( get_page_templates() ) ) {
 …
 <?php
+        }
         add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'advanced', 'core');
+        add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'normal', 'core');
+}
 …
 <?php
+}
 add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'advanced', 'core');
+add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'normal', 'core');
 …
 <?php
+        }
         add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'advanced', 'core');
+        add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'normal', 'core');
+}
 …
         wp_list_post_revisions();
+}
 add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'advanced', 'core');
+add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'normal', 'core');
 endif;
+?>
+<div class="wrap">
+<h2><?php
+        if ( !isset($post_ID) || 0 == $post_ID )
+                printf( __( '<a href="%s">Pages</a> / Write New Page' ), 'edit-pages.php' );
+        else
+                printf( __( '<a href="%s">Pages</a> / Edit Page' ), 'edit-pages.php' );
+?></h2>
+<div id="previewview">
+<?php if ( 'publish' == $post->post_status ) { ?>
+<a class="button" href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank"  tabindex="4"><?php _e('View this Page'); ?></a>
+<?php } elseif ( 'edit' == $action ) { ?>
+<a class="button" href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview this Page'); ?></a>
+<?php } ?>
+</div>
+<?php
+wp_nonce_field($nonce_action);
+if (isset($mode) && 'bookmarklet' == $mode)
+        echo '<input type="hidden" name="mode" value="bookmarklet" />';
+?>
+<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 ?>" />
+<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'); ?>
+<!-- TODO
+<div class="inside">
+<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
+<p>
+<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>
+<?php endif; ?>
+<?php if ( 'future' == $post->post_status ) : ?>
+<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Pending') ?></option>
+<?php endif; ?>
+<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
+<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option>
+</select>
+</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 page private') ?></label></p>
+<?php endif; ?>
+<h5><?php _e('Related') ?></h5>
+<ul>
+<?php if ($post_ID): ?>
+<li><a href="edit-pages.php?page_id=<?php echo $post_ID ?>"><?php _e('See Comments on this Page') ?></a></li>
+<?php endif; ?>
+<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
+<li><a href="edit-pages.php"><?php _e('Manage All Pages') ?></a></li>
+<?php do_action('page_relatedlinks_list'); ?>
+</ul>
+-->
+<div id="poststuff">
+<div id="side-info-column" class="inner-sidebar">
+<?php
+do_action('submitpage_box');
+$side_meta_boxes = do_meta_boxes('page', 'side', $page);
+?>
+</div>
+<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
+<div id="post-body-content" class="has-sidebar-content">
+<div id="titlediv">
+<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 class="inside">
+<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
+        <div id="edit-slug-box">
+<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
+        echo $sample_permalink_html;
+endif; ?>
+        </div>
+</div>
+</div>
+<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
+<div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&amp;type=image&amp;TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
+<h3><?php _e('Page') ?></h3>
+<?php the_editor($post->post_content); ?>
+<div id="post-status-info">
+        <span id="wp-word-count" class="alignleft"></span>
+        <span class="alignright">
+        <span id="autosave">&nbsp;</span>
+<?php
+        if ($post_ID) {
+                if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
+                        $last_user = get_userdata($last_id);
+                        printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+                } else {
+                        printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
+                }
+        }
+?>
+        </span>
+        <br class="clear" />
+</div>
+<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
+<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+</div>
+<?php
+do_meta_boxes('page', 'normal', $post);
+do_action('edit_page_form');
 do_meta_boxes('page', 'advanced', $post);
+?>
+</div>
+</div>
+</div>
+?>
+</div>
+</div>
+</div>
+</div>
+<br class="clear" />
+</div>
 </form>

trunk/wp-admin/export.php

r8618	r8691
13	13	require_once('includes/export.php');
14	14	$title = __('Export');
15		~~$parent_file = 'edit.php';~~
16	15
17	16	if ( isset( $_GET['download'] ) ) {

trunk/wp-admin/import.php

r8618	r8691
10	10	require_once ('admin.php');
11	11	$title = __('Import');
12		~~$parent_file = 'edit.php';~~
13	12	require_once ('admin-header.php');
14	13	?>

trunk/wp-admin/includes/comment.php

-              r8645
+              r8691
+}
+function wp_get_inbox_items() {
+        $r = array();
+        $r[] = (object) array(
+                'text' => 'Your take on the evolution of Dr. Who is ridiculous. The fact that the actors are getting younger has nothing to do with Gallifrey lore, and everything to do with celebrity culture.',
+                'date' => '2008/09/07',
+                'time' => '4:19pm',
+                'from' => 'I. monroe',
+                'type' => 'comment',
+                'parent' => '1',
+                'href' => '#'
+        );
+        $r[] = (object) array(
+                'text' => 'Announcement: WordPress introduces new features for mobile blogging.',
+                'date' => '2008/09/06',
+                'time' => '3:24pm',
+                'from' => 'WordPress.org',
+                'type' => 'announcement',
+                'parent' => '0',
+                'href' => '#'
+        );
+        $r[] = (object) array(
+                'text' => 'Great review. You left out a few things, but maybe you were trying to avoid spoilers? Will check back later in a week.',
+                'date' => '2008/09/06',
+                'time' => '2:46pm',
+                'from' => 'matt',
+                'type' => 'comment',
+                'parent' => '2',
+                'href' => '#'
+        );
+        $r[] = (object) array(
+                'text' => 'nice picture!',
+                'date' => '2008/08/05',
+                'time' => '9:17am',
+                'from' => 'caped crusader',
+                'type' => 'comment',
+                'parent' => '3',
+                'href' => '#'
+        );
+        return $r;
+}
 ?>

trunk/wp-admin/includes/post.php

-              r8646
+              r8691
         return _wp_put_post_revision( $_POST, true );
+}
+/**
+ * wp_teeny_mce() - adds a trimmed down version of the tinyMCE editor used on the Write -> Post screen.
+ *
+ * @package WordPress
+ * @since 2.6
+ */
+function wp_teeny_mce( $args = null ) {
+        if ( !user_can_richedit() )
+                return;
+        $defaults = array(
+                'buttons1' => 'bold,italic,underline,blockquote,separator,strikethrough,bullist,numlist,undo,redo,link,unlink'
+        );
+        $args = wp_parse_args( $args, $defaults );
+        if ( is_array( $args['buttons1'] ) )
+                $args['buttons1'] = join( ',', $args['buttons1'] );
+        $language = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) );
+?>
+<script type="text/javascript" src="<?php echo clean_url( site_url( 'wp-includes/js/tinymce/tiny_mce.js' ) ); ?>"></script>
+<script type="text/javascript">
+/* <![CDATA[ */
+<?php
+        // Add TinyMCE languages
+        @include_once( ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php' );
+        if ( isset($strings) )
+                echo $strings;
+?>
+        (function() {
+                var base = tinymce.baseURL, sl = tinymce.ScriptLoader, ln = "<?php echo $language; ?>";
+                sl.markDone(base + '/langs/' + ln + '.js');
+                sl.markDone(base + '/themes/advanced/langs/' + ln + '.js');
+                sl.markDone(base + '/themes/advanced/langs/' + ln + '_dlg.js');
+        })();
+        var wpTeenyMCEInit = function() {
+        tinyMCE.init({
+                mode: "textareas",
+                editor_selector: "mceEditor",
+                language : "<?php echo $language; ?>",
+                width: "100%",
+                theme : "advanced",
+                theme_advanced_buttons1 : "<?php echo $args['buttons1']; ?>",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                theme_advanced_toolbar_location : "top",
+                theme_advanced_toolbar_align : "left",
+                theme_advanced_statusbar_location : "bottom",
+                theme_advanced_resizing : true,
+                theme_advanced_resize_horizontal : false,
+                skin : "wp_theme",
+                dialog_type : "modal",
+                relative_urls : false,
+                remove_script_host : false,
+                convert_urls : false,
+                apply_source_formatting : false,
+                remove_linebreaks : true,
+                accessibility_focus : false,
+                tab_focus : ":next",
+                plugins : "safari,inlinepopups",
+                entities : "38,amp,60,lt,62,gt",
+                force_p_newlines : true,
+                save_callback : 'switchEditors.saveCallback'
+        });
+        };
+        wpTeenyMCEInit();
+/* ]]> */
+</script>
+<?php
+}

trunk/wp-admin/includes/update.php

r8600	r8691
46	46	echo "<div id='update-nag'>$msg</div>";
47	47	}
48		add_action( 'admin_notices', 'update_nag', 3 );
	48	//add_action( 'admin_notices', 'update_nag', 3 ); // crazyhorse
49	49
50	50	// Called directly from dashboard

trunk/wp-admin/index.php

-              r8618
+              r8691
 <div class="wrap">
-<h2><?php _e('Dashboard'); ?></h2>
-<div id="rightnow">
-<h3 class="reallynow">
-        <span><?php _e('Right Now'); ?></span>
-<?php if ( $can_edit_posts = current_user_can( 'edit_posts' ) ) : ?>
-        <a href="post-new.php" class="rbutton"><strong><?php _e('Write a New Post'); ?></strong></a>
-<?php endif; if ( $can_edit_pages = current_user_can( 'edit_pages' ) ) : ?>
-        <a href="page-new.php" class="rbutton"><?php _e('Write a New Page'); ?></a>
-<?php endif; ?>
-        <br class="clear" />
-</h3>
-<?php
-$num_posts = wp_count_posts( 'post' );
-$num_pages = wp_count_posts( 'page' );
-$num_cats  = wp_count_terms('category');
-$num_tags = wp_count_terms('post_tag');
-$num_comm = get_comment_count( );
-$post_type_texts = array();
-if ( !empty($num_posts->publish) ) { // with feeds, anyone can tell how many posts there are.  Just unlink if !current_user_can
-        $post_text = sprintf( __ngettext( '%s post', '%s posts', $num_posts->publish ), number_format_i18n( $num_posts->publish ) );
-        $post_type_texts[] = $can_edit_posts ? "<a href='edit.php'>$post_text</a>" : $post_text;
+}
-if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds.  Don't show if !current_user_can
-        $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( __ngettext( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
+}
-if ( $can_edit_posts && !empty($num_posts->draft) ) {
-        $post_type_texts[] = '<a href="edit.php?post_status=draft">'.sprintf( __ngettext( '%s draft', '%s drafts', $num_posts->draft ), number_format_i18n( $num_posts->draft ) ).'</a>';
+}
-if ( $can_edit_posts && !empty($num_posts->future) ) {
-        $post_type_texts[] = '<a href="edit.php?post_status=future">'.sprintf( __ngettext( '%s scheduled post', '%s scheduled posts', $num_posts->future ), number_format_i18n( $num_posts->future ) ).'</a>';
+}
-if ( current_user_can('publish_posts') && !empty($num_posts->pending) ) {
-        $pending_text = sprintf( __ngettext( 'There is <a href="%1$s">%2$s post</a> pending your review.', 'There are <a href="%1$s">%2$s posts</a> pending your review.', $num_posts->pending ), 'edit.php?post_status=pending', number_format_i18n( $num_posts->pending ) );
-} else {
-        $pending_text = '';
+}
-$cats_text = sprintf( __ngettext( '%s category', '%s categories', $num_cats ), number_format_i18n( $num_cats ) );
-$tags_text = sprintf( __ngettext( '%s tag', '%s tags', $num_tags ), number_format_i18n( $num_tags ) );
-if ( current_user_can( 'manage_categories' ) ) {
-        $cats_text = "<a href='categories.php'>$cats_text</a>";
-        $tags_text = "<a href='edit-tags.php'>$tags_text</a>";
+}
-$total_comments = sprintf( __ngettext( '%1$s total', '%1$s total', $num_comm['total_comments'] ), number_format_i18n($num_comm['total_comments']) );
-$approved_comments = sprintf( __ngettext( '%1$s approved', '%1$s approved', $num_comm['approved'] ), number_format_i18n($num_comm['approved']) );
-$spam_comments = sprintf( __ngettext( '%1$s spam', '%1$s spam', $num_comm['spam'] ), number_format_i18n($num_comm['spam']) );
-$moderated_comments = sprintf( __ngettext( '%1$s awaiting moderation', '%1$s awaiting moderation', $num_comm['awaiting_moderation'] ), number_format_i18n($num_comm['awaiting_moderation']) );
-if( current_user_can( 'moderate_comments' ) ) {
-        $total_comments = "<a href='edit-comments.php'>{$total_comments}</a>";
-        $approved_comments = "<a href='edit-comments.php?comment_status=approved'>{$approved_comments}</a>";
-        $moderated_comments = "<a href='edit-comments.php?comment_status=moderated'>{$moderated_comments}</a>";
+}
-$comm_text = sprintf( __ngettext( 'You have %1$s comment, %2$s, %3$s and %4$s.', 'You have %1$s comments, %2$s, %3$s and %4$s.', $num_comm['total_comments'] ), $total_comments, $approved_comments, $spam_comments, $moderated_comments );
-$post_type_text = implode(', ', $post_type_texts);
-// There is always a category
-$sentence = sprintf( __( 'You have %1$s, contained within %2$s and %3$s. %4$s %5$s' ), $post_type_text, $cats_text, $tags_text, $pending_text, $comm_text );
-$sentence = apply_filters( 'dashboard_count_sentence', $sentence, $post_type_text, $cats_text, $tags_text, $pending_text, $comm_text );
-?>
-<p class="youhave"><?php echo $sentence; ?></p>
-<?php
-$ct = current_theme_info();
-$sidebars_widgets = wp_get_sidebars_widgets();
-$num_widgets = array_reduce( $sidebars_widgets, create_function( '$prev, $curr', 'return $prev+count($curr);' ), 0 );
-$widgets_text = sprintf( __ngettext( '%d widget', '%d widgets', $num_widgets ), $num_widgets );
-if ( $can_switch_themes = current_user_can( 'switch_themes' ) )
-        $widgets_text = "<a href='widgets.php'>$widgets_text</a>";
-?>
-<p class="youare">
-        <?php printf( __( 'You are using the %1$s theme with %2$s.' ), $ct->title, $widgets_text ); ?>
-        <?php if ( $can_switch_themes ) : ?>
-                <a href="themes.php" class="rbutton"><?php _e('Change Theme'); ?></a>
-        <?php endif; ?>
-        <?php update_right_now_message(); ?>
-</p>
-<?php do_action( 'rightnow_end' ); ?>
-<?php do_action( 'activity_box_end' ); ?>
-</div><!-- rightnow -->
-<br class="clear" />
 <div id="dashboard-widgets-wrap">

trunk/wp-admin/js/comment.js

-              r7529
+              r8691
 jQuery(document).ready( function() {
         add_postbox_toggles('comment');
+        postboxes.add_postbox_toggles('comment');
         // close postboxes that should be closed
 …
         jQuery('.edit-timestamp').click(function () {
                 if (jQuery('#timestampdiv').is(":hidden")) {
+                        jQuery('#curtime').slideUp("normal");
                         jQuery('#timestampdiv').slideDown("normal");
-                        jQuery('.edit-timestamp').text(commentL10n.cancel);
                 } else {
                         jQuery('#timestampdiv').hide();
+                        jQuery('#timestampdiv').slideUp("normal");
                         jQuery('#mm').val(jQuery('#hidden_mm').val());
                         jQuery('#jj').val(jQuery('#hidden_jj').val());
 …
                         jQuery('#hh').val(jQuery('#hidden_hh').val());
                         jQuery('#mn').val(jQuery('#hidden_mn').val());
                         jQuery('.edit-timestamp').text(commentL10n.edit);
+                        jQuery('#curtime').slideDown("normal");
+                }
                 return false;
+    });
+        });
+        jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
+                jQuery('#timestampdiv').hide();
+                var link = jQuery('.timestamp a').clone( true );
+                jQuery('.timestamp').show().html(
+                        jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
+                        jQuery('#jj').val() + ',' +
+                        jQuery('#aa').val() + '@' +
+                        jQuery('#hh').val() + ':' +
+                        jQuery('#mn').val() + ' '
+                ).append( link );
+                jQuery('#curtime').slideDown("normal");
+                return false;
+        });
 });

trunk/wp-admin/js/common.js

-              r8600
+              r8691
         // Reveal
         jQuery('.wp-no-js-hidden').removeClass( 'wp-no-js-hidden' );
+        // show things that should be visible, hide what should be hidden
+        jQuery('.hide-if-no-js').show();
+        jQuery('.hide-if-js').hide();
         // Basic form validation
 …
                 jQuery('form.validate').submit( function() { return wpAjax.validateForm( jQuery(this) ); } );
+        }
+        jQuery('a.no-crazy').click( function() {
+                alert( "This feature isn't enabled in this prototype." );
+                return false;
+        } );
 });
 …
                         el.mouseover(function(e) {
                                 txt = el.attr('tip'), o = el.offset();;
+                                txt = el.attr('tip'), o = el.offset();
                                 clearTimeout(TT.sD);
 …
 }(jQuery));
+jQuery( function($) {
+        var menuToggle = function(ul, effect) {
+                if ( !effect ) {
+                        effect = 'slideToggle';
+                }
+                ul[effect]().parent().toggleClass( 'wp-menu-open' );
+                return false;
+        };
+        jQuery('#adminmenu li.wp-has-submenu > a').click( function() { return menuToggle( jQuery(this).siblings('ul') ); } );
+        jQuery('#dashmenu li.wp-has-submenu').bind( 'mouseenter mouseleave', function() { return menuToggle( jQuery(this).children('ul'), 'toggle' ); } );
+        // Temp
+        if ( !$('#post-search, #widget-search').size() ) {
+                $('#wphead').append( '<p id="post-search-prep"><input id="post-search-input" type="text" /><input class="button" type="button" value="Search" /></p>' );
+        }
+        // Temp 2
+        var minH = $(window).height()-185+"px"
+        $('#wpbody-content').css("min-height", minH);
+} );
 jQuery(function(){jQuery('#media-buttons a').tTips();});

trunk/wp-admin/js/edit-comments.js

-              r7462
+              r8691
                 a.html( n.toString() );
         });
+        $('li span.spam-comment-count' ).each( function() {
+                var a = $(this);
+                var n = parseInt(a.html(),10);
+                if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
+                        n = n + 1;
+                } else if ( $('#' + settings.element).is('.spam') ) { // we approved or deleted a comment marked as spam
+                        n = n - 1;
+                }
+                if ( n < 0 ) { n = 0; }
+                a.html( n.toString() );
+        });
         if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) {

trunk/wp-admin/js/link.js

r8026	r8691
5	5	jQuery('#link_name').focus();
6	6	// postboxes
7		add_postbox_toggles('link');
	7	postboxes.add_postbox_toggles('link');
8	8
9	9	// category tabs

trunk/wp-admin/js/page.js

-              r7529
+              r8691
 jQuery(document).ready( function() {
         add_postbox_toggles('page');
+        postboxes.add_postbox_toggles('page');
         make_slugedit_clickable();
         // close postboxes that should be closed
         jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
-        // show things that should be visible, hide what should be hidden
-        jQuery('.hide-if-no-js').show();
-        jQuery('.hide-if-js').hide();
         jQuery('#title').blur( function() { if ( (jQuery("#post_ID").val() > 0) || (jQuery("#title").val().length == 0) ) return; autosave(); } );
 …
         jQuery('.edit-timestamp').click(function () {
                 if (jQuery('#timestampdiv').is(":hidden")) {
+                        jQuery('#curtime').slideUp("normal");
                         jQuery('#timestampdiv').slideDown("normal");
-                        jQuery('.edit-timestamp').text(postL10n.cancel);
                 } else {
                         jQuery('#timestampdiv').hide();
+                        jQuery('#timestampdiv').slideUp("normal");
                         jQuery('#mm').val(jQuery('#hidden_mm').val());
                         jQuery('#jj').val(jQuery('#hidden_jj').val());
 …
                         jQuery('#hh').val(jQuery('#hidden_hh').val());
                         jQuery('#mn').val(jQuery('#hidden_mn').val());
                         jQuery('.edit-timestamp').text(postL10n.edit);
+                        jQuery('#curtime').slideDown("normal");
+                }
                 return false;
+    });
+        });
+        jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
+                jQuery('#timestampdiv').hide();
+                var link = jQuery('.timestamp a').clone( true );
+                jQuery('.timestamp').show().html(
+                        jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
+                        jQuery('#jj').val() + ',' +
+                        jQuery('#aa').val() + '@' +
+                        jQuery('#hh').val() + ':' +
+                        jQuery('#mn').val() + ' '
+                ).append( link );
+                jQuery('#curtime').slideDown("normal");
+                return false;
+        });
 });

trunk/wp-admin/js/post.js

-              r8214
+              r8691
         jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
-        // show things that should be visible, hide what should be hidden
-        jQuery('.hide-if-no-js').show();
-        jQuery('.hide-if-js').hide();
         // postboxes
         add_postbox_toggles('post');
+        postboxes.add_postbox_toggles('post');
         // Editable slugs
 …
         jQuery('.edit-timestamp').click(function () {
                 if (jQuery('#timestampdiv').is(":hidden")) {
+                        jQuery('#curtime').slideUp("normal");
                         jQuery('#timestampdiv').slideDown("normal");
-                        jQuery('.edit-timestamp').text(postL10n.cancel);
                 } else {
                         jQuery('#timestampdiv').hide();
+                        jQuery('#timestampdiv').slideUp("normal");
                         jQuery('#mm').val(jQuery('#hidden_mm').val());
                         jQuery('#jj').val(jQuery('#hidden_jj').val());
 …
                         jQuery('#hh').val(jQuery('#hidden_hh').val());
                         jQuery('#mn').val(jQuery('#hidden_mn').val());
                         jQuery('.edit-timestamp').text(postL10n.edit);
+                        jQuery('#curtime').slideDown("normal");
+                }
                 return false;
+        });
+        jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
+                jQuery('#timestampdiv').hide();
+                var link = jQuery('.timestamp a').clone( true );
+                jQuery('.timestamp').show().html(
+                        jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
+                        jQuery('#jj').val() + ',' +
+                        jQuery('#aa').val() + '@' +
+                        jQuery('#hh').val() + ':' +
+                        jQuery('#mn').val() + ' '
+                ).append( link );
+                jQuery('#curtime').slideDown("normal");
+                return false;
         });

trunk/wp-admin/js/postbox.js

-              r7290
+              r8691
+function add_postbox_toggles(page) {
+        jQuery('.postbox h3').prepend('<a class="togbox">+</a> ');
+        jQuery('.postbox h3').click( function() { jQuery(jQuery(this).parent().get(0)).toggleClass('closed'); save_postboxes_state(page); } );
+}
+(function($) {
+        postboxes = {
+                add_postbox_toggles : function(page) {
+                        $('.postbox h3').before('<a class="togbox">+</a> ');
+                        $('.postbox a.togbox').click( function() { $($(this).parent().get(0)).toggleClass('closed'); save_postboxes_state(page); } );
+                        if ( $.browser.msie ) {
+                                $('#side-sortables').append( '<div id="make-it-tall"></div>' );
+                        } else {
+                                $('#side-sortables').append( '<div id="make-it-tall" style="margin-bottom: -2000px; padding-bottom: 2001px"></div>' );
+                        }
+                        $('#wpbody-content').css( 'overflow', 'hidden' );
+                        this.init(page);
+                },
+                expandSidebar : function( doIt ) {
+                        if ( doIt || $.trim( $( '#side-info-column' ).text() ) ) {
+                                $( '#post-body' ).addClass( 'has-sidebar' );
+                                $( '#side-sortables' ).css('z-index','0');
+                        } else {
+                                $( '#post-body' ).removeClass( 'has-sidebar' );
+                                $( '#side-sortables' ).css('z-index','-1');
+                        }
+                },
+                init : function(page) {
+                        jQuery('.meta-box-sortables').sortable( {
+                                connectWith: [ '.meta-box-sortables' ],
+                                items: '> .postbox',
+                                handle: 'h3',
+                                stop: function() {
+                                        if ( 'side-sortables' == this.id ) { // doing this with jQuery doesn't work for some reason: make-it-tall gets duplicated
+                                                var makeItTall = document.getElementById( 'make-it-tall' );
+                                                var sideSort = makeItTall.parentNode;
+                                                sideSort.removeChild( makeItTall );
+                                                sideSort.appendChild( makeItTall );
+                                        }
+                                        var postVars = {
+                                                action: 'meta-box-order',
+                                                _ajax_nonce: jQuery('#meta-box-order-nonce').val(),
+                                                page: page
+                                        }
+                                        jQuery('.meta-box-sortables').each( function() {
+                                                postVars["order[" + this.id.split('-')[0] + "]"] = jQuery(this).sortable( 'toArray' ).join(',');
+                                        } );
+                                        jQuery.post( postboxL10n.requestFile, postVars, function() {
+                                                postboxes.expandSidebar();
+                                        } );
+                                },
+                                over: function(e, ui) {
+                                        if ( !ui.element.is( '#side-sortables' ) )
+                                                return;
+                                        postboxes.expandSidebar( true );
+                                }
+                        } );
+                }
+        }
+}(jQuery));
+jQuery(document).ready(function(){postboxes.expandSidebar();});
 function save_postboxes_state(page) {

trunk/wp-admin/link-add.php

-              r8645
+              r8691
 $title = __('Add Link');
 $this_file = 'link-manager.php';
+$parent_file = 'post-new.php';
+$parent_file = 'edit.php';
+$submenu_file = 'link-manager.php';
 …
 wp_enqueue_script('xfn');
+$link_added = ( isset($_GET['added']) && '' != $_POST['link_name'] ) ?
+        '<div id="message" class="updated fade"><p>' . __('Link added.') . '</p></div>' : '';
+$fixed_bar = true;
 require('admin-header.php');
 ?>

trunk/wp-admin/link.php

r8645	r8691
107	107	wp_die(__('Link not found.'));
108	108
	109	$fixed_bar = true;
109	110	include_once ('admin-header.php');
110	111	include ('edit-link-form.php');

trunk/wp-admin/menu-header.php

-              r8645
+              r8691
 get_admin_page_parent();
+// We're going to do this loop three times
+?>
+function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
+        global $self, $parent_file, $submenu_file, $plugin_page;
+<ul id="dashmenu">
+<?php
+foreach ( $menu as $key => $item ) {
+        if ( 3 < $key ) // get each menu item before 3
+                continue;
+        $class = '';
+        // 0 = name, 1 = capability, 2 = file
+        if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
+        $first = true;
+        // 0 = name, 1 = capability, 2 = file, 3 = class
+        foreach ( $menu as $key => $item ) {
+                $class = array();
+                if ( $first ) {
+                        $class[] = 'wp-first-item';
+                        $first = false;
+                }
+                if ( !empty($submenu[$item[2]]) )
+                        $class[] = 'wp-has-submenu';
+        if ( !empty($submenu[$item[2]]) ) {
+                $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
+                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
+                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+                        echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+                else
+                        echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+        } else if ( current_user_can($item[1]) ) {
+                $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+                if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
+                        echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+                else
+                        echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
+        }
+}
+do_action( 'dashmenu' );
+?>
+</ul>
+                if ( ( $parent_file && $item[2] == $parent_file ) || strcmp($self, $item[2]) == 0 ) {
+                        if ( !empty($submenu[$item[2]]) )
+                                $class[] = 'wp-has-current-submenu wp-menu-open';
+                        else
+                                $class[] = 'current';
+                }
+<ul id="adminmenu">
+<?php
+foreach ( $menu as $key => $item ) {
+        if ( 5 > $key || $key > 25 ) // get each menu item before 3
+                continue;
+                if ( isset($item[3]) )
+                        $class[] = $item[3];
         $class = '';
+                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
+        // 0 = name, 1 = capability, 2 = file
+        if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
+                echo "\n\t<li$class>";
+        if ( !empty($submenu[$item[2]]) ) {
+                $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
+                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
+                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+                        echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+                else
+                        echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+        } else if ( current_user_can($item[1]) ) {
+                $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+                if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
+                        echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+                else
+                        echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
+                if ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
+                        $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
+                        $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
+                        if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+                                echo "<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
+                        else
+                                echo "\n\t<a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
+                } else if ( current_user_can($item[1]) ) {
+                        $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+                        if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
+                                echo "\n\t<a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
+                        else
+                                echo "\n\t<a href='{$item[2]}'$class>{$item[0]}</a>";
+                }
+                if ( !empty($submenu[$item[2]]) ) {
+                        echo "\n\t<ul class='wp-submenu'>";
+                        $first = true;
+                        foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) {
+                                if ( !current_user_can($sub_item[1]) )
+                                        continue;
+                                $class = array();
+                                if ( $first ) {
+                                        $class[] = 'wp-first-item';
+                                        $first = false;
+                                }
+                                if ( isset($submenu_file) ) {
+                                        if ( $submenu_file == $sub_item[2] )
+                                                $class[] = 'current';
+                                } else if ( (isset($plugin_page) && $plugin_page == $sub_item[2]) || (!isset($plugin_page) && $self == $sub_item[2]) ) {
+                                        $class[] = 'current';
+                                }
+                                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
+                                $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
+                                if ( file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") || ! empty($menu_hook) ) {
+                                        if ( 'admin.php' == $pagenow )
+                                                echo "\n\t\t<li$class><a href='admin.php?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
+                                        else
+                                                echo "\n\t\t<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
+                                } else {
+                                        echo "\n\t\t<li$class><a href='{$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
+                                }
+                        }
+                        echo "\n\t</ul>";
+                }
+                echo "</li>";
+        }
+}
+foreach ( $menu as $key => $item ) {
+        if ( $key < 41 ) // there is a more efficient way to do this!
+                continue;
+?>
+        $class = '';
+<ul id="dashmenu" class="wp-menu">
+        // 0 = name, 1 = capability, 2 = file
+        if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
+<?php
+        if ( !empty($submenu[$item[2]]) ) {
+                $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
+                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
+                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+                        echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+                else
+                        echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+        } else if ( current_user_can($item[1]) ) {
+                $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+                if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
+                        echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+                else
+                        echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
+        }
+}
+_wp_menu_output( $top_menu, $top_submenu, false );
+do_action( 'dashmenu' );
-do_action( 'adminmenu' );
 ?>
-</ul>
-<ul id="sidemenu">
-<?php
-$side_items = array();
-foreach ( $menu as $key => $item ) {
-        if ( 26 > $key || $key > 40 )
-                continue;
-        $class = '';
-        // 0 = name, 1 = capability, 2 = file
-        if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
-        if ( !empty($submenu[$item[2]]) ) {
-                $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
-                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
-                        $side_items[] = "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
-                else
-                        $side_items[] = "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
-        } else if ( current_user_can($item[1]) ) {
-                $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
-                if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) )
-                        $side_items[] = "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
-                else
-                        $side_items[] = "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a>";
+        }
+}
-echo implode(' </li>', $side_items) . '</li>';
-unset($side_items);
-do_action( 'sidemenu' );
-?>
 </ul>
+<ul id="adminmenu" class="wp-menu">
+<li class="write-new-button"><a class="button-secondary" href="post-new.php">Write New Post</a></li>
 <?php
-// Sub-menu
-if ( isset($submenu["$parent_file"]) ) :
-?>
-<ul id="submenu">
-<?php
-foreach ($submenu["$parent_file"] as $item) :
-         if ( !current_user_can($item[1]) )
-                 continue;
+if ( isset($submenu_file) ) {
+        if ( $submenu_file == $item[2] ) $class = ' class="current"';
+        else $class = '';
+} else if ( (isset($plugin_page) && $plugin_page == $item[2]) || (!isset($plugin_page) && $self == $item[2]) ) $class = ' class="current"';
+else $class = '';
+_wp_menu_output( $menu, $submenu );
+do_action( 'adminmenu' );
-$menu_hook = get_plugin_page_hook($item[2], $parent_file);
-if (file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || ! empty($menu_hook)) {
-        if ( 'admin.php' == $pagenow )
-                echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
-        else
-                echo "\n\t<li><a href='{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
- } else {
-        echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
+ }
-endforeach;
 ?>
 </ul>
 <?php
-else :
-?>
-<div id="minisub"></div>
-<?php
-endif;
 do_action('admin_notices');

trunk/wp-admin/menu.php

-              r8645
+              r8691
  * @var array
  */
-$menu[0] = array(__('Dashboard'), 'read', 'index.php');
-if (strpos($_SERVER['REQUEST_URI'], 'edit-pages.php') !== false)
-        $menu[5] = array(__('Write'), 'edit_pages', 'page-new.php');
-elseif (strpos($_SERVER['REQUEST_URI'], 'link-manager.php') !== false)
-        $menu[5] = array(__('Write'), 'manage_links', 'link-add.php');
-else
-        $menu[5] = array(__('Write'), 'edit_posts', 'post-new.php');
-if (strpos($_SERVER['REQUEST_URI'], 'page-new.php') !== false)
-        $menu[10] = array(__('Manage'), 'edit_pages', 'edit-pages.php');
-elseif (strpos($_SERVER['REQUEST_URI'], 'link-add.php') !== false)
-        $menu[10] = array(__('Manage'), 'manage_links', 'link-manager.php');
-else
-        $menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
 $awaiting_mod = wp_count_comments();
 $awaiting_mod = $awaiting_mod->moderated;
-$menu[15] = array(__('Design'), 'switch_themes', 'themes.php');
-$menu[20] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php');
-$menu[30] = array(__('Settings'), 'manage_options', 'options-general.php');
+$update_plugins = get_option( 'update_plugins' );
+$update_count = 0;
+if ( isset( $update_plugins->response ) )
+        $update_count = count( $update_plugins->response );
+$inbox_num = count( wp_get_inbox_items() );
+$awaiting_mod = wp_count_comments();
+$awaiting_mod = $awaiting_mod->moderated;
+$menu[35] = array( sprintf( __('Plugins %s'), "<span id='update-plugins' class='count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php');
+if ( current_user_can('edit_users') )
+        $menu[40] = array(__('Users'), 'edit_users', 'users.php');
+else
+        $menu[40] = array(__('Profile'), 'read', 'profile.php');
+$top_menu = $top_submenu = $menu = $submenu = array();
+$_wp_real_parent_file['post.php'] = 'post-new.php'; // Back-compat
+$submenu['post-new.php'][5] = array(__('Post'), 'edit_posts', 'post-new.php');
+$submenu['post-new.php'][10] = array(__('Page'), 'edit_pages', 'page-new.php');
+$submenu['post-new.php'][15] = array(__('Link'), 'manage_links', 'link-add.php');
+$top_menu[5]  = array( __('My Account'), 'read', 'profile.php' );
+$top_menu[10] = array( __('My Dashboard'), 'read', 'index.php' );
+$top_menu[15] = array( __('New Post'), 'edit_posts', 'post-new.php', 'highlighted' );
+//$top_menu[20] = array( sprintf( __('Inbox (%s)'), "<span id='inbox-num' class='count-$inbox_num'><span class='inbox-count'>" . number_format_i18n($inbox_num) . "</span></span>" ), 'edit_posts', 'inbox.php' );
+$top_menu[20] = array( sprintf( __('Comments (%s)'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php');
+$top_menu[25] = array( __('Help'), 'read', 'index.php?help' ); // place holder
+$submenu['edit-comments.php'][5] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
+$top_submenu['profile.php'][5]  = array( __('Profile'), 'read', 'profile.php' );
+$top_submenu['profile.php'][10] = array( __('Stats'), 'read', 'inbox.php?page=stats' ); // place holder
-$submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
-$submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
-$submenu['edit.php'][15] = array(__('Links'), 'manage_links', 'link-manager.php');
-$submenu['edit.php'][20] = array(__('Categories'), 'manage_categories', 'categories.php');
-$submenu['edit.php'][25] = array(__('Tags'), 'manage_categories', 'edit-tags.php');
-$submenu['edit.php'][30] = array(__('Link Categories'), 'manage_categories', 'edit-link-categories.php');
-$submenu['edit.php'][35] = array(__('Media Library'), 'upload_files', 'upload.php');
-$submenu['edit.php'][40] = array(__('Import'), 'import', 'import.php');
-$submenu['edit.php'][45] = array(__('Export'), 'import', 'export.php');
+if ( current_user_can('edit_users') ) {
+        $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
+        $submenu['users.php'][5] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
+        $submenu['users.php'][10] = array(__('Your Profile'), 'read', 'profile.php');
+} else {
+        $_wp_real_parent_file['users.php'] = 'profile.php';
+        $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
+}
+$menu[0] = array( __('Dashboard'), 'read', 'index.php' );
+$submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
+$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
+$submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
+$submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
+$submenu['options-general.php'][30] = array(__('Privacy'), 'manage_options', 'options-privacy.php');
+$submenu['options-general.php'][35] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
+$submenu['options-general.php'][40] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
+$menu[5] = array( __('Content'), 'edit_posts', 'edit.php', 'wp-menu-open' );
+        $submenu['edit.php'][5]  = array( __('Posts'), 'edit_posts', 'edit.php' );
+        $submenu['edit.php'][10] = array( __('Comments'), 'edit_posts', 'edit-comments.php' );
+        $submenu['edit.php'][15] = array( __('Media Library'), 'upload_files', 'upload.php' );
+        $submenu['edit.php'][20] = array( __('Links'), 'manage_links', 'link-manager.php' );
+        $submenu['edit.php'][25] = array( __('Pages'), 'edit_pages', 'edit-pages.php' );
+$submenu['plugins.php'][5] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
+$submenu['plugins.php'][10] = array(__('Plugin Editor'), 'edit_plugins', 'plugin-editor.php');
+$menu[10] = array( __('Templates'), 'switch_themes', 'themes.php' );
+        $submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
+        $submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php');
 $submenu['plugins.php'][15] = array(__('Install Plugins'), 'install_plugins', 'plugin-install.php');
+$submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
+$submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php');
+$menu[15] = array( __('Utilities'), 'read', 'users.php' ); // placeholder - should be inbox
+        $submenu['users.php'][5]  = array( __('Inbox'), 'read', 'inbox.php' );
+        $submenu['users.php'][10] = array( __('Tags'), 'manage_categories', 'edit-tags.php' );
+        $submenu['users.php'][15] = array( __('Categories'), 'manage_categories', 'categories.php' );
+        $submenu['users.php'][20] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
+        $submenu['users.php'][25] = array( __('Users'), 'edit_users', 'users.php' );
+        $submenu['users.php'][30] = array( __('Import'), 'import', 'import.php' );
+        $submenu['users.php'][35] = array( __('Export'), 'import', 'export.php' );
+        $submenu['users.php'][40] = array( __('Settings'), 'manage_options', 'options-general.php' );
+                $_wp_real_parent_file['options-general.php'] = 'users.php';
+                $submenu['options-general.php'][10] = array( __('General'), 'manage_options', 'options-general.php' );
+                $submenu['options-general.php'][15] = array( __('Writing'), 'manage_options', 'options-writing.php' );
+                $submenu['options-general.php'][20] = array( __('Reading'), 'manage_options', 'options-reading.php' );
+                $submenu['options-general.php'][25] = array( __('Discussion'), 'manage_options', 'options-discussion.php' );
+                $submenu['options-general.php'][30] = array( __('Privacy'), 'manage_options', 'options-privacy.php' );
+                $submenu['options-general.php'][35] = array( __('Permalinks'), 'manage_options', 'options-permalink.php' );
+                $submenu['options-general.php'][40] = array( __('Miscellaneous'), 'manage_options', 'options-misc.php' );
+$menu[20] = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
+        $submenu['plugins.php'][5]  = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
+        $submenu['plugins.php'][10] = array( __('Plugin Editor'), 'edit_plugins', 'plugin-editor.php' );
 do_action('_admin_menu');
 …
 $_wp_menu_nopriv = array();
 // Loop over submenus and remove pages for which the user does not have privs.
+foreach ($submenu as $parent => $sub) {
+        foreach ($sub as $index => $data) {
+                if ( ! current_user_can($data[1]) ) {
+                        unset($submenu[$parent][$index]);
+                        $_wp_submenu_nopriv[$parent][$data[2]] = true;
+foreach ( array( 'top_submenu', 'submenu' ) as $sub_loop ) {
+        foreach ($$sub_loop as $parent => $sub) {
+                foreach ($sub as $index => $data) {
+                        if ( ! current_user_can($data[1]) ) {
+                                unset(${$sub_loop}[$parent][$index]);
+                                $_wp_submenu_nopriv[$parent][$data[2]] = true;
+                        }
+                }
+                if ( empty(${$sub_loop}[$parent]) )
+                        unset(${$sub_loop}[$parent]);
+        }
-        if ( empty($submenu[$parent]) )
-                unset($submenu[$parent]);
+}

trunk/wp-admin/options-discussion.php

-              r8656
+              r8691
 <div class="wrap">
+<ul class="wp-menu">
+<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
+</ul>
 <h2><?php _e('Discussion Settings') ?></h2>
 <form method="post" action="options.php">

trunk/wp-admin/options-general.php

-              r8656
+              r8691
 $title = __('General Settings');
-$parent_file = 'options-general.php';
 include('./admin-header.php');
 …
 <div class="wrap">
+<ul class="wp-menu">
+<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
+</ul>
 <h2><?php _e('General Settings') ?></h2>
 <form method="post" action="options.php">

trunk/wp-admin/options-misc.php

-              r8656
+              r8691
 <div class="wrap">
+<ul class="wp-menu">
+<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
+</ul>
 <h2><?php _e('Miscellaneous Settings') ?></h2>
 <form method="post" action="options.php">

trunk/wp-admin/options-permalink.php

-              r8656
+              r8691
 <div class="wrap">
+<ul class="wp-menu">
+<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
+</ul>
   <h2><?php _e('Customize Permalink Structure') ?></h2>
 <form name="form" action="options-permalink.php" method="post">

trunk/wp-admin/options-privacy.php

-              r8645
+              r8691
 <div class="wrap">
+<ul class="wp-menu">
+<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
+</ul>
 <h2><?php _e('Privacy Settings') ?></h2>
 <form method="post" action="options.php">

trunk/wp-admin/options-reading.php

-              r8656
+              r8691
 <div class="wrap">
+<ul class="wp-menu">
+<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
+</ul>
 <h2><?php _e('Reading Settings') ?></h2>
 <form name="form1" method="post" action="options.php">

trunk/wp-admin/options-writing.php

-              r8656
+              r8691
 <div class="wrap">
+<ul class="wp-menu">
+<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
+</ul>
 <h2><?php _e('Writing Settings') ?></h2>
 <form method="post" action="options.php">

trunk/wp-admin/options.php

-              r8656
+              r8691
 <div class="wrap">
+<ul class="wp-menu">
+<?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?>
+</ul>
   <h2><?php _e('All Settings'); ?></h2>
   <form name="form" action="options.php" method="post" id="all-options">

trunk/wp-admin/page-new.php

-              r8656
+              r8691
 require_once('admin.php');
 $title = __('New Page');
+$parent_file = 'post-new.php';
+$parent_file = 'edit.php';
+$submenu_file = 'edit-pages.php';
 $editing = true;
 wp_enqueue_script('autosave');

trunk/wp-admin/plugins.php

-              r8656
+              r8691
+}
 if( isset($_GET['action']) )
         $action = $_GET['action'];
+if( isset($_REQUEST['action']) )
+        $action = $_REQUEST['action'];
 $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
 …
 <div class="tablenav">
         <div class="alignleft">
+                <input type="submit" name="deactivate-selected" value="<?php _e('Deactivate') ?>" class="button-secondary" />
+                <select name="action">
+                        <option value="" selected><?php _e('Actions'); ?></option>
+                        <option value="deactivate-selected"><?php _e('Deactivate'); ?></option>
+                </select>
+                <input type="submit" name="doaction" value="<?php _e('Apply'); ?>" class="button-secondary action" />
         </div>
 </div>
 …
 <div class="tablenav">
         <div class="alignleft">
+                <input type="submit" name="activate-selected" value="<?php _e('Activate') ?>" class="button-secondary" />
+                <select name="action">
+                        <option value="" selected><?php _e('Actions'); ?></option>
+                        <option value="activate-selected"><?php _e('Activate'); ?></option>
 <?php if( current_user_can('delete_plugins') ) : ?>
+                <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" />
+<?php endif; ?>
+                        <option value="delete-selected"><?php _e('Delete'); ?></option>
+<?php endif; ?>
+                </select>
+                <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
                 <input type="submit" name="clear-recent-list" value="<?php _e('Clear List') ?>" class="button-secondary" />
         </div>

trunk/wp-admin/post-new.php

-              r8645
+              r8691
 require_once('admin.php');
 $title = __('Create New Post');
+$parent_file = 'post-new.php';
+$parent_file = 'edit.php';
+$submenu_file = 'edit.php';
 $editing = true;
 wp_enqueue_script('autosave');

trunk/wp-admin/post.php

-              r8656
+              r8691
         } elseif ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
                 $location = 'sidebar.php?a=b';
         } elseif ( isset($_POST['save']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
+        } elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
                 if ( $_POST['_wp_original_http_referer'] && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post.php') === false && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post-new.php') === false )
                         $location = add_query_arg( array(
 …
                         ), get_edit_post_link( $post_ID, 'url' ) );
                 else
                         $location = add_query_arg( 'message', 4, get_edit_post_link( $post_ID, 'url' ) );
+                        $location = add_query_arg( 'message', 6, get_edit_post_link( $post_ID, 'url' ) );
         } elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
                 $location = add_query_arg( 'message', 2, wp_get_referer() );
 …
         } elseif ($action == 'editattachment') {
                 $location = 'attachments.php';
+        } elseif ( 'post-quickpress-save-cont' == $_POST['action'] ) {
+                $location = "post.php?action=edit&post=$post_ID&message=7";
         } else {
                 $location = add_query_arg( 'message', 4, get_edit_post_link( $post_ID, 'url' ) );
 …
 case 'postajaxpost':
 case 'post':
+case 'post-quickpress-publish':
+case 'post-quickpress-save':
+case 'post-quickpress-save-cont':
         check_admin_referer('add-post');
+        $post_ID = 'post' == $action ? write_post() : edit_post();
+        if ( 'post-quickpress-publish' == $action )
+                $_POST['publish'] = 'publish'; // tell write_post() to publish
+        if ( !empty( $_POST['quickpress_post_ID'] ) ) {
+                $_POST['post_ID'] = (int) $_POST['quickpress_post_ID'];
+                $post_ID = edit_post();
+        } else {
+                $post_ID = 'postajaxpost' == $action ? edit_post() : write_post();
+        }
+        if ( 'post-quickpress-save-cont' != $action && 0 === strpos( $action, 'post-quickpress' ) ) {
+                $_POST['post_ID'] = $post_ID;
+                // output the quickpress dashboard widget
+                require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+                add_filter( 'wp_dashboard_widgets', create_function( '$a', 'return array( "dashboard_quick_press" );' ) );
+                wp_dashboard_setup();
+                wp_dashboard();
+                exit;
+        }
         redirect_post($post_ID);

trunk/wp-admin/press-this.php

-              r8656
+              r8691
         wp_enqueue_style('press-this-ie');
         wp_enqueue_style( 'colors' );
         wp_enqueue_script('post');
+        wp_enqueue_script( 'post' );
         wp_enqueue_script('editor_functions');
+//      wp_teeny_mce();
         do_action('admin_print_styles');

trunk/wp-admin/rtl.css

-              r8663
+              r8691
         padding: 11px 12px 16px 170px;
+}
+#curtime
+{
+        background-position:right 2px;
+        padding-left:0;
+        padding-right: 9px;
+}
 #dashmenu {
         right:0;

trunk/wp-admin/users.php

-              r8656
+              r8691
 if ( empty($action) ) {
+        if ( isset($_GET['deleteit']) )
+                $action = 'delete';
+        elseif ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
+        if ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
                 $action = 'promote';
+}
 …
 <form id="posts-filter" action="" method="get">
         <?php if ( $wp_user_search->is_search() ) : ?>
                 <h2><?php printf(__('Users Matching "%s"'), wp_specialchars($wp_user_search->search_term)); ?></h2>
+                <h2><?php printf( current_user_can('create_users') ? __('Users Matching "%2$s" (<a href="%1$s">Add New</a>)') : __('Add New'), '#add-new-user', wp_specialchars($wp_user_search->search_term) ); ?></h2>
         <?php else : ?>
                 <h2><?php _e('Manage Users'); ?></h2>
+                <h2><?php printf( current_user_can('create_users') ? __('Users (<a href="%s">Add New</a>)') : __('Add New'), '#add-new-user' ); ?></h2>
         <?php endif; ?>
 …
 ?>
 </ul>
         <p id="post-search">
         <label class="hidden" for="post-search-input"><?php _e( 'Search Users' ); ?>:</label>
 …
 <div class="alignleft">
+<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
+<select name="action">
+<option value="" selected><?php _e('Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
 <label class="hidden" for="new_role"><?php _e('Change role to&hellip;') ?></label><select name="new_role" id="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option>"<?php wp_dropdown_roles(); ?></select>
 <input type="submit" value="<?php _e('Change'); ?>" name="changeit" class="button-secondary" />

trunk/wp-admin/wp-admin.css

-              r8682
+              r8691
+}
 .unapproved .approve {
+.unapproved .approve, .spam .approve {
         display: inline;
+}
 …
 #postdiv, #titlediv, #guiddiv, #poststuff .stuffbox {
         margin: 0 8px 0 0;
         padding: 0;
+}
 #titlediv, #namediv, #poststuff #namediv {
         margin-top: 10px;
+        margin: 0;
+        padding: 0;
+}
+#emaildiv input, #uridiv input {
+        width: 94%;
+}
 …
 #postcustomstuff table #addmetasub {
         width: auto;
+}
-#poststuff #post-body {
-        margin-right: 230px;
+}
 …
 .comment-column {
+        margin-left: 5px;
+        width: 50%;
+}
+.comment-column p {
+        margin-top: 0;
+}
+.author-column {
+        width: 20%;
+}
+.response-column {
+        width: 20%;
+}
+.author-column img {
+        float: left;
+        margin-right: 10px;
+        margin-top: 3px;
+}
 …
         position: absolute;
         right: 15px;
         top: 11px;
+        top: 0;
         font-size: 11px;
+        line-height: 31px;
+        height: 31px;
+}
 …
         margin: 0;
         padding: 0;
+        line-height: 31px;
+}
 #wphead {
         border-top-width: 30px;
         border-top-style: solid;
+}
 #wphead a, #dashmenu a, #adminmenu a, #submenu a, #sidemenu a, #taglist a, #catlist a {
+        border-width: 31px 0 0;
+        border-style: solid;
+}
+#wphead a, #dashmenu a, #adminmenu a, #sidemenu a, #taglist a, #catlist a {
         text-decoration: none;
+}
 …
+}
+ul#adminmenu li.write-new-button {
+        margin: -10px 18px 12px;
+}
+ul#adminmenu li.write-new-button a {
+        line-height: 1.2em;
+        font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+        padding: 6px 4px;
+        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-indent: 0;
+        text-align: center;
+        color: #246;
+}
 #wphead h1 {
         font: normal 36px Georgia, "Times New Roman", Times, serif;
 …
 /* menu stuff */
+#dashmenu .wp-submenu, #adminmenu .wp-submenu {
+        display: none;
+        list-style: none;
+        margin: 2px 0 0;
+        padding: 0;
+}
+#adminmenu li.wp-menu-open .wp-submenu {
+        display: block;
+}
 #dashmenu {
+        margin: 0;
+        margin: 0 0 0 12px;
+        background: url(images/logo-ghost.png) no-repeat center left;
         list-style: none;
         position: absolute;
         top: 7px;
+        top: 0;
         left: 0;
+        height: 31px;
         font-size: 11px;
+        padding-left: 9px;
+        padding: 0 0 0 30px;
+}
+#dashmenu li {
+        display: block;
+        float: left;
+        list-style: none;
+        white-space: nowrap;
+        margin: 0 5px 0 0;
+        padding: 0;
+        position: relative;
+}
+#dashmenu li.highlighted {
+        margin-left: 6px;
+        text-align: center;
+        padding: 1      px 0;
+}
+#dashmenu li.highlighted a {
+        background: #666;
+        border: 1px solid #888;
+        -webkit-border-radius: 3px;
+        -moz-border-radius: 3px;
+        -border-radius: 3px;
+        color: #ddd;
+        margin-top: 4px;
+        display: block;
+        padding: 5px 10px;
+        line-height: 1em;
+}
+#dashmenu li.highlighted a:hover {
+        color: #fff;
+        border-color: #aaa;
+}
+/* Temp */
+#dashmenu li.wp-has-submenu > a:after {
+        content: " \25BC";
+}
 #dashmenu a {
         padding: 5px 6px;
+        line-height: 220%;
+        margin-right: 8px;
+}
+#dashmenu a.current {
+        line-height: 31px;
+}
+#dashmenu ul {
+        position: absolute;
+        top: 29px;
+        left: 0;
+        min-width: 100%;
+}
+#dashmenu ul {
+        background: #fff;
+        border: 1px solid #c6d9e9;
+        -webkit-border-bottom-left-radius:7px;
+        -webkit-border-bottom-right-radius:7px;
+        -webkit-box-shadow:0 2px 6px rgba(0,0,0,0.2);
+        -moz-border-radius-bottomleft: 7px;
+        -moz-border-radius-bottomright: 7px;
+        -moz-box-shadow:0 2px 6px rgba(0,0,0,0.2);
+}
+#dashmenu ul a {
+        color: #2583ad;
+        display: block;
+        padding: 0 4px;
+}
+#dashmenu ul a:hover {
+        color: #d54e21;
+}
+#dashmenu ul li {
+        float: none;
+        margin-left: 5px;
+}
+#adminmenu {
+        margin: 0;
+        padding: 10px 0 0 10px;
+        list-style: none;
+}
+#adminmenu li {
+        margin-bottom: 10px;
+}
+#adminmenu li.current {
+        border-width: 1px;
+        border-style: solid;
+        position: relative;
+        right: -1px;
+        padding: 2px 0;
+}
+#adminmenu li .wp-submenu {
+        margin-top: 4px;
+}
+#adminmenu li .wp-submenu li {
+        padding: 3px 0 3px 1px;
+        margin-bottom: 0;
+}
+#adminmenu li .wp-submenu li.current {
+        padding: 2px 0;
+}
+#adminmenu li.wp-has-submenu > a {
+        background-image: url(images/menu-closed.png);
+        background-repeat: no-repeat;
+        background-position: left center;
+}
+#adminmenu li.wp-menu-open > a {
+        background-image: url(images/menu-open.png);
+}
+#adminmenu a {
+        font-size: 13px;
+        padding: 0px 7px 0px 36px;
+        line-height: 1.1;
+        display: block;
+        text-indent: -18px;
+}
+#adminmenu li.current a {
+        padding-left: 34px;
+}
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
+        position: absolute;
+        margin-top: 0.2em;
+        font-size: 0.7em;
+        background-repeat: no-repeat;
+        background-position: 0 bottom;
+        height: 0.9em;
+        width: 1em;
+}
+#adminmenu li a .count-0, #sidemenu li a .count-0 {
+        display: none;
+}
+.post-com-count-wrapper {
+        min-width: 22px;
+}
+.post-com-count {
+        height: 1.3em;
+        line-height: 1.1em;
+        display: block;
+        text-decoration: none;
+        padding: 0 0 6px;
+        cursor: pointer;
+        background-position: center -80px;
+        background-repeat: no-repeat;
+}
+.post-com-count span {
+        height: 1.3em;
+        line-height: 1.2em;
+        padding: 0 0.5em;
+        background-color: #bbb;
+        display: inline-block;
+        cursor: pointer;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+strong .post-com-count {
+        background-position: center -55px;
+}
+.post-com-count:hover {
+        background-position: center -3px;
+}
+#adminmenu li a:hover #awaiting-mod, #sidemenu li a:hover #update-plugins {
+        background-position: -80px bottom;
+}
+#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
+        top: -0.8em;
+        right: 0;
+        position: absolute;
+        display: block;
+        height: 1.3em;
+        line-height: 1.3em;
+        padding: 0 0.6em;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+#wpbody ul.wp-menu {
+        list-style: none;
+        margin: 10px 0;
+        padding: 0;
+        font-size: 16px;
+}
+#wpbody ul.wp-menu li {
+        display: inline;
+}
+#wpbody ul.wp-menu li:before {
+        content: " | ";
+}
+#wpbody ul.wp-menu li.wp-first-item:before {
+        content: "";
+}
+#wpbody ul.wp-menu li.current a {
+        text-decoration: none;
+        color: #666;
+}
+/* end menu stuff */
+/* Admin Footer */
+html, body {
+        height:100%;
+}
+#wpwrap {
+        position: relative;
+        min-height: 100%;
+}
+#footer {
+        clear: both;
+        height: 65px;
+        padding: 10px 0 0 60px;
+        margin: 0;
+        position: relative;
+        margin-top: -75px;
+        font-size: 12px;
+}
+#footer p {
+        margin: 0;
+        padding: 7px 0;
+}
+#footer p a {
+        text-decoration: none;
+}
+#footer p a:hover {
+        text-decoration: underline;
+}
+/* Tables used on comment.php and option/setting pages */
+.form-table {
+        border-collapse: collapse;
+        margin-top: 1em;
+        width: 100%;
+        margin-bottom: -8px;
+}
+.form-table td {
+        margin-bottom: 9px;
+        padding: 10px;
+        line-height: 20px;
+        border-bottom-width: 8px;
+        border-bottom-style: solid;
+        font-size: 11px;
+}
+.form-table th {
+        vertical-align: top;
+        text-align: left;
+        padding: 10px;
+        width: 150px;
+        border-bottom-width: 8px;
+        border-bottom-style: solid;
+}
+.form-table th.th-full {
+        width: auto;
+}
+.form-table input, .form-table textarea {
+        border-width: 1px;
+        border-style: solid;
+}
+.form-table div.color-option {
+        display: block;
+        clear: both;
+}
+.form-table input.tog {
+        margin-top: 2px;
+        margin-right: 2px;
+        float: left;
+}
+.form-table table.color-palette {
+        vertical-align: bottom;
+        float: left;
+        margin: -3px 3px 8px;
+}
+.form-table .color-palette td {
+        border-bottom: none;
+        border: 1px solid #fff;
+        font-size: 1px;
+        line-height: 1px;
+}
+#profile-page .form-table textarea {
+        width: 500px;
+        margin-bottom: 6px;
+}
+#profile-page .form-table input[type=text] {
+        width: 300px;
+}
+#pass-strength-result {
+        width: 197px;
+        float: left;
+        margin-right: 5px;
+        border: 1px solid #ccc !important;
+}
+#profile-page .form-table #rich_editing {
+        margin-right: 5px
+}
+.form-table .pre {
+        padding: 8px;
+        margin: 0;
+}
+.pre {
+        /* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
+        white-space: pre-wrap; /* css-3 */
+        white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
+        white-space: -pre-wrap; /* Opera 4-6 */
+        white-space: -o-pre-wrap; /* Opera 7 */
+        word-wrap: break-word; /* Internet Explorer 5.5+ */
+}
+table.form-table td .updated {
+        font-size: 13px;
+}
+/* Post Screen */
+#normal-sortables {
+        min-height: 50px;
+}
+.postbox {
+        position: relative;
+        min-width: 195px;
+}
+#mediadiv img {
+        float: left;
+        margin-right: 1em;
+}
+#mediadiv h4 {
+        margin: 0 0 .5em;
+}
+#post-body #tagsdiv #newtag {
+        margin-right: 5px;
+        width: 16em;
+}
+#side-info-column input#post_password {
+        width: 94%
+}
+#side-info-column #tagsdiv #newtag {
+        width: 68%;
+}
+#post-status-info {
+        font-size: 12px;
+        line-height: 2;
+        padding: 0 7px;
+        border: 1px solid;
+        border-top: none;
+}
+#editorcontent #post-status-info {
+        border: none;
+}
+#submitdiv div.inside {
+        padding: 0;
+        margin: 0;
+}
+.submitbox {
+/*      margin: 1em 0; */
+}
+.submitbox p {
+/*      padding: 0;
+        margin: 0; */
+}
+.submitbox .submit {
+        text-align: left;
+        padding: 12px 10px 10px;
+        font-size: 11px;
+}
+.submitbox .submitdelete {
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+        text-decoration: none;
+        margin-left: 8px;
+        padding-bottom: 1px;
+}
+.submitbox .submit a:hover {
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+}
+.submitbox .submit input {
+        margin-bottom: 8px;
+        margin-right: 3px;
+        padding: 6px 4px;
+        border: none;
+}
+#tagchecklist {
+        margin-left: 10px;
+        font-size: 12px;
+        overflow: auto;
+}
+#tagchecklist strong {
+        margin-left: -8px;
+        position: absolute;
+}
+#tagchecklist span {
+        margin-right: 25px;
+        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;
+}
+.howto {
+        font-style: italic;
+        display: block;
+}
+.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;
+}
+#poststuff h2 {
+        margin-top: 20px;
+        font-size: 1.5em;
+        margin-bottom: 15px;
+        padding: 0 0 3px;
+        clear: left;
+}
+#poststuff h3 {
+        font-size: 14px;
+        font-weight: bold;
+        padding: 7px;
+        margin: 0 0 10px;
+}
+#poststuff .postbox, #poststuff .stuffbox {
+        padding: 2px;
+        margin-bottom: 20px;
+        border-width: 1px;
+        border-style: solid;
+}
+#poststuff .inside {
+        font-size:11px;
+        margin:0 12px 12px;
+}
+#titlediv, #poststuff .postarea {
+        margin-bottom: 20px;
+}
+#titlediv {
+        margin-bottom: 20px;
+}
+#titlediv div.inside {
+        margin: 0;
+}
+#titlediv #title {
+        border: 0;
+        padding: 0;
+        font-size: 1.7em;
+        width: 100%;
+        outline: none;
+}
+#poststuff #titlewrap {
+        padding: 2px 3px;
+        border-width: 1px;
+        border-style: solid;
+}
+#poststuff .inside-submitbox {
+        margin: 0 12px 12px;
+        font-size: 11px;
+}
+#link_name, #link_url, #link_description {
+        font-size: 1.7em;
+        padding: 4px 3px;
+        width: 98%;
+}
+#edit-slug-box {
+        margin-top: 8px;
+}
+#editable-post-name-full {display: none;}
+#editable-post-name input {width: 16em;}
+#edit-slug-buttons a.save {
+        padding: 6px 4px;
+        margin-right: 4px;
+        text-decoration: none;
+        border-width: 1px;
+        border-style: solid;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+        font-weight: bold;
+}
+.postarea h3 label {
+        float: left;
+}
+.postarea #add-media-button {
+        float:right;
+        margin:7px 0pt 0pt;
+        position:relative;
+        right:10px;
+}
+#poststuff #editor-toolbar {
+        clear: both;
+        position: relative;
+        margin-top: -10px;
+}
+#poststuff #editor-toolbar #edButtonHTML, #poststuff #editor-toolbar #edButtonPreview {
+        position: relative;
+        top: -5px;
+}
+#poststuff #edButtonPreview, #poststuff #edButtonHTML {
+        display: block;
+        height: 20px;
+        padding: 5px 5px 1px;
+        margin: 5px 8px 0 0;
+        float: right;
+        cursor: pointer;
+}
+#poststuff #editor-toolbar .active {
+        font-weight: bold;
+        -moz-border-radius-bottomright: 3px;
+        -khtml-border-top-bottom-radius: 3px;
+        -webkit-border-bottom-right-radius: 3px;
+        border-bottom-right-radius: 3px;
+        -moz-border-radius-bottomleft: 3px;
+        -khtml-border-bottom-left-radius: 3px;
+        -webkit-border-bottom-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+}
+#poststuff #media-buttons {
+        float: right;
+        margin-right: 20px;
+        margin-top: 8px;
+        cursor: default;
+        line-height: 1;
+        height: 1.1em;
+}
+#poststuff #media-buttons a {
+        cursor: pointer;
+        padding: 0 5px 2px 2px;
+}
+#poststuff #media-buttons img {
+        vertical-align: middle;
+}
+#poststuff .togbox {
+        background-position: -10px 16px;
+        background-repeat: no-repeat;
+        display: block;
+        height: 37px;
+        margin-left: -14px;
+        margin-top: -3px;
+        overflow: hidden;
+        position: absolute;
+        text-indent: -9999px;
+        width: 12px;
+        -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-bottomleft: 3px;
+        -khtml-border-bottom-left-radius: 3px;
+        -webkit-border-bottom-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+}
+#poststuff .closed .inside {
+        display: none;
+}
+#poststuff .closed h3 {
+        margin: 0;
+}
+#poststuff .closed .togbox {
+        background-position: 4px 15px;
+}
+#side-info-column #side-sortables {
+        height: 100%;
+}
+.submitbox .submitdelete {
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+        text-decoration: none;
+        margin-left: 8px;
+        padding-bottom: 1px;
+}
+.submitbox .submit a:hover {
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+}
+.submitbox .submit input {
+        margin-bottom: 8px;
+        margin-right: 3px;
+        padding: 6px;
+}
+/* Categories */
+#category-adder {
+        margin-left: 120px;
+        padding: 4px 0;
+}
+#category-adder h4 {
+        margin: 0 0 8px;
+}
+#side-info-column #category-adder {
+        margin: 0;
+}
+#post-body #category-add input, #category-add select {
+        width: 30%;
+}
+#side-info-column #category-add input {
+        width: 94%;
+}
+#side-info-column #category-add select {
+        width: 100%;
+}
+#category-add input#category-add-sumbit {
+        width: auto;
+}
+#post-body ul#category-tabs {
+        float: left;
+        width: 120px;
+        text-align: right;
+        /* Negative margin for the sake of those without JS: all tabs display */
+        margin: 0 -120px 0 0;
+        padding: 0;
+}
+#post-body ul#category-tabs li {
+        padding: 8px;
+}
+#post-body ul#category-tabs li.ui-tabs-selected {
+        -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-bottomleft: 3px;
+        -khtml-border-bottom-left-radius: 3px;
+        -webkit-border-bottom-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+}
+#post-body ul#category-tabs li.ui-tabs-selected a {
+        color: #333;
+        font-weight: bold;
+        text-decoration: none;
+}
+#categorydiv div.ui-tabs-panel, #linkcategorydiv div.ui-tabs-panel {
+        padding: .5em .9em;
+}
+#post-body #categorydiv div.ui-tabs-panel, #post-body #linkcategorydiv div.ui-tabs-panel {
+        margin: 0 5px 0 120px;
+        height: 10em;
+        overflow: auto;
+        border-width: 4px;
+        border-style: solid;
+}
+#side-info-column #category-tabs, #side-info-column #categories-pop {
+        display: none;
+}
+#categorydiv ul, #linkcategorydiv ul {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+}
+#categorydiv ul.categorychecklist ul, #linkcategorydiv ul.categorychecklist ul {
+        margin-left: 18px;
+}
+ul.categorychecklist li {
+        margin: 0;
+        padding: 0;
+        line-height: 19px;
+}
+/* positioning etc. */
+form#tags-filter {
+        position: relative;
+}
+p#tag-search {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin: 0;
+}
+form#posts-filter {
+        position: relative;
+}
+p#big-add-button {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin: 0;
+}
+p#big-add-button .button {
+        font-size: 18px;
+        padding: 3px 30px;
+}
+p#post-search {
+    position: absolute;
+    right: 0;
+    top: -64px;
+    margin: 0;
+}
+#post-search .button, #widget-search .button {
+        padding: 3px;
+        font-size: 13px;
+}
+#post-search-input {
+        margin-right: 2px;
+        border-width: 1px;
+        border-style: solid;
+}
+#posts-filter fieldset {
+        float: left;
+        margin: 0 1.5ex 1em 0;
+        padding: 0;
+}
+#posts-filter fieldset legend {
+        padding: 0 0 .2em 1px;
+}
+.bordertitle {
+        padding-bottom: 5px;
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+}
+/* Edit posts */
+td.post-title strong {
+        display: block;
+        margin-bottom: .2em;
+}
+td.post-title p {
+        margin: 0;
+}
+/* Global classes */
+.wp-hidden-children .wp-hidden-child { display: none; }
+.wp-no-js-hidden { display: none; }
+.ui-tabs-hide { display: none; }
+.commentlist .avatar {
+        vertical-align:text-top;
+}
+.defaultavatarpicker .avatar {
+        margin: 2px 0;
+        vertical-align: middle;
+}
+body.minwidth {
+        min-width: 808px;
+}
+ul.view-switch {
+        float: right;
+        list-style: none;
+        margin: -23px 5px -2px 0;
+        position: relative;
+}
+ul.view-switch li {
+        float: left;
+        margin: 0;
+        font-size: 11px;
+        padding: 4px 6px;
+        font-weight: bold;
+}
+ul.view-switch a {
+        text-decoration: none;
+}
+ul.view-switch li.current {
         border: none;
         -moz-border-radius-topleft: 3px;
 …
+}
+#adminmenu {
+        margin: 0;
         list-style: none;
         padding-left: 11px;
+#the-comment-list .comment a {
+        padding-bottom: 1px;
+        text-decoration: none;
         border-bottom-width: 1px;
         border-bottom-style: solid;
+}
+#adminmenu a {
+        font-size: 16px;
+        padding: 5px 7px;
+        line-height: 30px;
+}
+#adminmenu a.current, #sidemenu a.current {
+#the-comment-list td.comment p.comment-author {
+        margin-top: 0;
+        margin-left: 0 ;
+}
+#the-comment-list p.comment-author img {
+        float: left;
+        margin-right: 8px;
+}
+#the-comment-list p.comment-author strong a {
+        border: none;
+}
+#the-comment-list td {
+        vertical-align: top;
+}
+#the-comment-list td.comment {
+        width: 65%;
+        max-width: 460px;
+        word-wrap: break-word;
+}
+#the-comment-list .check-column {
+        padding-top: 8px;
+}
+#templateside ul li a {
+        text-decoration: none;
+}
+#submitpost p.curtime {
+        background-image: url(images/date-button.gif);
+        background-repeat: no-repeat;
+        background-position: left 4px;
+        padding-left: 18px;
+        padding-top: 2px;
+}
+.tablenav .delete {
+        margin-right: 20px;
+}
+#tTips {
+        display: none;
+        position: absolute;
+        margin: 0;
+        padding: 0 0 8px 0;
+        background-image: url(images/tail.gif);
+        background-repeat: no-repeat;
+        background-position: 15px bottom;
+        background-color: transparent;
+}
+#tTips p#tTips_inside {
+        margin: 0;
+        padding: 8px 12px;
+        text-align: center;
+        -moz-border-radius: 8px;
+        -khtml-border-radius: 8px;
+        -webkit-border-radius: 8px;
+        border-radius: 8px;
+}
+td.action-links, th.action-links {
+        text-align: right;
+}
+.hide-if-no-js {
+        display: none;
+}
+/* Diff */
+table.diff {
+        width: 100%;
+}
+table.diff col.content {
+        width: 50%;
+}
+table.diff tr {
+        background-color: transparent;
+}
+table.diff td, table.diff th {
+        padding: .5em;
+        font-family: monospace;
+        border: none;
+}
+table.diff .diff-deletedline del, table.diff .diff-addedline ins {
+        text-decoration: none;
+}
+#wp-word-count {
+        display: block;
+}
+fieldset {
+        border: 0;
+        padding: 0;
+        margin: 0;
+}
+.info-box {
+        top: 100px;
+        left: 50%;
+        margin-left: -225px;
+        height: 300px;
+        width: 450px;
+        border: 5px solid #ddd;
+        background: #f8f8f8;
+        position: absolute;
+        padding: 15px 15px 10px;
+        z-index: 1000;
+        display: none;
+}
+.info-box .submit {
+        position: absolute;
+        bottom: 15px;
+        width: 450px;
+        padding: 15px 0 0;
+}
+.info-box .gears-img {
+        float: right;
+        margin: 10px;
+}
+.info-box-title {
+        line-height: 2;
+        margin: 0;
+        padding: 0 7px;
+}
+#wp_editbtns {
+        padding: 2px;
+        position: absolute;
+        display: none;
+        z-index: 999998;
+}
+#wp_editimgbtn, #wp_delimgbtn {
+        margin: 2px;
+        padding: 2px;
+        border: 1px solid #999;
+        background-color: #eee;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+#wp_editimgbtn:hover, #wp_delimgbtn:hover {
+        border-color: #555;
+        background-color: #ccc;
+}
+.settings-toggle {
+        text-align: right;
+        margin: 5px 7px 15px 0;
+        font-size: 12px;
+}
+.settings-toggle h3 {
+        margin: 0;
+}
+p.meta-options {
+        border: 1px solid;
+        padding: 1em .5em;
+}
+.ui-sortable .postbox h3 {
+        cursor:move;
+}
+a.togbox {
+        cursor: pointer;
+}
+/* fixed bottom bar */
+.postarea h3 label {
+}
+#footer {
+        z-index: -1;
+}
+#fixedbar {
+        bottom:0pt;
+        height:80px;
+        position:fixed;
+        width:100%;
+        z-index: 100;
+}
+#fixedbar #submitpost {
+}
+#fixedbar .submit {
+        padding-top: 10px;
+}
+#fixedbar .button {
+        border: none;
+        -moz-border-radius: 6px;
+        -khtml-border-radius: 6px;
+        -webkit-border-radius: 6px;
+        border-radius: 6px;
+}
+#fixedbar .button:hover {
+        background: #fff;
+}
+#fixedbar #publish {
+        font-weight:bold;
+        width:160px;
+}
+#fixedbar #save-post {
+        width:80px;
+        font-weight:normal;
+}
+#fixedbar .submitbox {
+        padding: 14px 18px;
+        border-left: 1px solid #aaa;
+        width: 690px;
+}
+#fixedbar #post-time-info,
+#fixedbar #comment-time-info {
+        margin-top: 16px;
+}
+#fixedbar #timestampdiv input,
+#fixedbar #timestampdiv select {
+        background-color:#464646;
+        border:1px solid #777777;
+        color:#CCCCCC;
+        padding:2px;
+}
+#fixedbar-wrap {
+        width: 100%;
+}
+#preview-link {
+        text-align: right;
+}
+#preview-link a {
+        padding-right:10px;
+}
+p#post-search-prep {
+        margin:0pt;
+        position:absolute;
+        right:20px;
+        top:50px;
+}
+#jj, #hh, #mn {
+        width: 1.5em;
+}
+#aa {
+        width: 2.7em;
+}
+#inbox-filter .actions {
+        margin-left: 6px;
+        background: url(images/archive-link.png) 0px 12px no-repeat;
+        padding-left: 16px;
+}
+#inbox-filter .actions .button {
+        font-size: 11px;
+        padding: 2px;
+}
+/* media popup 0819 */
+#sidemenu {
+        margin: -30px 15px 0 315px;
+        list-style: none;
+        position: relative;
+        float: right;
+        padding-left: 10px;
+        font-size:12px;
+}
+#sidemenu a {
+        padding: 0 7px;
+        display: block;
+        float: left;
+        line-height: 28px;
+        border-top-width: 1px;
+        border-top-style: solid;
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+}
+#sidemenu li {
+        display: inline;
+        line-height: 200%;
+        list-style: none;
+        text-align: center;
+        white-space: nowrap;
+        margin: 0;
+        padding: 0;
+}
+#sidemenu a.current {
         font-weight: normal;
         padding-left: 6px;
 …
+}
-#adminmenu a.current {
-        border-bottom-width: 2px;
+}
 #sidemenu {
         margin: -30px 15px 0 315px;
 …
+}
+#dashmenu li, #adminmenu li, #submenu li, #sidemenu li {
+        display: inline;
+        line-height: 200%;
+        list-style: none;
+        text-align: center;
+        white-space: nowrap;
+        margin: 0;
+        padding: 0;
+}
+#submenu li {
+        padding: 0 0 8px 17px;
+}
+#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
+        position: absolute;
+        margin-left: -0.4em;
+        margin-top: 0.2em;
+        font-size: 0.7em;
+        background-repeat: no-repeat;
+        background-position: 0 bottom;
+        height: 0.9em;
+        width: 1em;
+}
+#adminmenu li a .count-0, #sidemenu li a .count-0 {
+#sidemenu li a .count-0 {
         display: none;
+}
+.post-com-count-wrapper {
+        min-width: 22px;
+}
+.post-com-count {
+        height: 1.3em;
+        line-height: 1.1em;
+        display: block;
+        text-decoration: none;
+        padding: 0 0 6px;
+        cursor: pointer;
+        background-position: center -80px;
+        background-repeat: no-repeat;
+}
+.post-com-count span {
+        height: 1.3em;
+        line-height: 1.2em;
+        padding: 0 0.5em;
+        background-color: #bbb;
+        display: inline-block;
+        cursor: pointer;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+strong .post-com-count {
+        background-position: center -55px;
+}
+.post-com-count:hover {
+        background-position: center -3px;
+}
+#adminmenu li a:hover #awaiting-mod, #sidemenu li a:hover #update-plugins {
+        background-position: -80px bottom;
+}
+#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
+        top: -0.8em;
+        right: 0;
+        position: absolute;
+        display: block;
+        height: 1.3em;
+        line-height: 1.3em;
+        padding: 0 0.6em;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+#submenu {
+        margin: 0;
+        list-style: none;
+        padding: 6px 0 3px 0;
+}
+#submenu li {
+        font-size: 14px;
+}
+#minisub { /* for empty submenus */
+        height: 15px;
+}
+/* end menu stuff */
+/* Admin Footer */
+html, body {
+        height:100%;
+}
+#wpwrap {
+        position: relative;
+        min-height: 100%;
+}
+#wpcontent{
+        padding-bottom: 95px;
+}
+#footer {
+        clear: both;
+        height: 65px;
+        padding: 10px 0 0 60px;
+        margin: 0;
+        position: relative;
+        margin-top: -75px;
+        font-size: 12px;
+}
+#footer p {
+        margin: 0;
+        padding: 7px 0;
+}
+#footer p a {
+        text-decoration: none;
+}
+#footer p a:hover {
+        text-decoration: underline;
+}
+/* Tables used on comment.php and option/setting pages */
+.form-table {
+        border-collapse: collapse;
+        margin-top: 1em;
+        width: 100%;
+        margin-bottom: -8px;
+}
+.form-table td {
+        margin-bottom: 9px;
+        padding: 10px;
+        line-height: 20px;
+        border-bottom-width: 8px;
+        border-bottom-style: solid;
+        font-size: 11px;
+}
+.form-table th {
+        vertical-align: top;
+        text-align: left;
+        padding: 10px;
+        width: 150px;
+        border-bottom-width: 8px;
+        border-bottom-style: solid;
+}
+.form-table th.th-full {
+        width: auto;
+}
+.form-table input, .form-table textarea {
+        border-width: 1px;
+        border-style: solid;
+}
+.form-table div.color-option {
+        display: block;
+        clear: both;
+}
+.form-table input.tog {
+        margin-top: 2px;
+        margin-right: 2px;
+        float: left;
+}
+.form-table table.color-palette {
+        vertical-align: bottom;
+        float: left;
+        margin: -3px 3px 8px;
+}
+.form-table .color-palette td {
+        border-bottom: none;
+        border: 1px solid #fff;
+        font-size: 1px;
+        line-height: 1px;
+}
+#profile-page .form-table textarea {
+        width: 500px;
+        margin-bottom: 6px;
+}
+#profile-page .form-table input[type=text] {
+        width: 300px;
+}
+#pass-strength-result {
+        width: 197px;
+        float: left;
+        margin-right: 5px;
+        border: 1px solid #ccc !important;
+}
+#profile-page .form-table #rich_editing {
+        margin-right: 5px
+}
+.form-table .pre {
+        padding: 8px;
+        margin: 0;
+}
+.pre {
+        /* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
+        white-space: pre-wrap; /* css-3 */
+        white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
+        white-space: -pre-wrap; /* Opera 4-6 */
+        white-space: -o-pre-wrap; /* Opera 7 */
+        word-wrap: break-word; /* Internet Explorer 5.5+ */
+}
+table.form-table td .updated {
+        font-size: 13px;
+}
+/* Post Screen */
+#tagsdiv #newtag {
+        margin-right: 5px;
+        width: 16em;
+}
+#tagchecklist {
+        margin-left: 10px;
+        font-size: 12px;
+        overflow: auto;
+}
+#tagchecklist strong {
+        margin-left: -8px;
+        position: absolute;
+}
+#tagchecklist span {
+        margin-right: 25px;
+        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;
+}
+.howto {
+        font-style: italic;
+        display: block;
+}
+.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;
+}
+#poststuff h2 {
+        margin-top: 20px;
+        font-size: 1.5em;
+        margin-bottom: 15px;
+        padding: 0 0 3px;
+        clear: left;
+}
+#poststuff h3 {
+        font-size: 14px;
+        font-weight: bold;
+        padding: 7px;
+        margin: 0 0 10px;
+}
+#poststuff .postbox, #poststuff .stuffbox {
+        margin-left: 20px;
+        padding: 2px;
+        margin-bottom: 20px;
+        margin-right: 8px;
+        border-width: 1px;
+        border-style: solid;
+}
+#titlediv, #poststuff .postarea {
+        margin-left: 20px;
+        margin-bottom: 20px;
+        margin-right: 8px;
+}
+#titlediv {
+        margin-bottom: 20px;
+}
+#titlediv div.inside {
+        margin: 0;
+}
+#titlediv #title {
+        border: 0;
+        padding: 0;
+        font-size: 1.7em;
+        width: 100%;
+        outline: none;
+}
+#poststuff #titlewrap {
+        padding: 2px 3px;
+        border-width: 1px;
+        border-style: solid;
+}
+#poststuff .inside {
+        margin: 0 12px 12px;
+        font-size: 11px;
+}
+#link_name, #link_url, #link_description {
+        font-size: 1.7em;
+        padding: 4px 3px;
+        width: 98%;
+}
+#edit-slug-box {
+        margin-top: 8px;
+}
+#editable-post-name-full {display: none;}
+#editable-post-name input {width: 16em;}
+#edit-slug-buttons a.save {
+        padding: 6px 4px;
+        margin-right: 4px;
+        text-decoration: none;
+        border-width: 1px;
+        border-style: solid;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+        font-weight: bold;
+}
+#poststuff #editor-toolbar {
+        position: relative;
+        height: 30px;
+        margin-top: -41px;
+}
+#poststuff #edButtonPreview, #poststuff #edButtonHTML {
+        display: block;
+        height: 20px;
+        padding: 5px 5px 1px;
+        margin: 5px 8px 0 0;
+        float: right;
+        cursor: pointer;
+}
+#poststuff #editor-toolbar .active {
+        font-weight: bold;
+        -moz-border-radius-topright: 3px;
+        -khtml-border-top-right-radius: 3px;
+        -webkit-border-top-right-radius: 3px;
+        border-top-right-radius: 3px;
+        -moz-border-radius-topleft: 3px;
+        -khtml-border-top-left-radius: 3px;
+        -webkit-border-top-left-radius: 3px;
+        border-top-left-radius: 3px;
+}
+#poststuff #media-buttons {
+        float: right;
+        margin-right: 20px;
+        margin-top: 8px;
+        cursor: default;
+        line-height: 1;
+        height: 1.1em;
+}
+#poststuff #media-buttons a {
+        cursor: pointer;
+        padding: 0 5px 2px 2px;
+}
+#poststuff #media-buttons img {
+        vertical-align: middle;
+}
+#poststuff .togbox {
+        background-position: -10px 16px;
+        background-repeat: no-repeat;
+        display: block;
+        height: 37px;
+        margin-left: -21px;
+        margin-top: -10px;
+        overflow: hidden;
+        position: absolute;
+        text-indent: -9999px;
+        width: 12px;
+        -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-bottomleft: 3px;
+        -khtml-border-bottom-left-radius: 3px;
+        -webkit-border-bottom-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+}
+#poststuff .closed .inside {
+        display: none;
+}
+#poststuff .closed h3 {
+        margin: 0;
+}
+#poststuff .closed .togbox {
+        background-position: 4px 15px;
+}
+.submitbox {
+        width: 220px;
+        float: right;
+}
+.submitbox .inside strong {
+        font-size: 14px;
+}
+.submitbox .submitdelete {
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+        text-decoration: none;
+        margin-left: 8px;
+        padding-bottom: 1px;
+}
+.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;
+}
+.submitbox #previewview a {
+        padding: 6px;
+        text-decoration: none;
+        font-weight: normal;
+        border-bottom: none;
+        font-size: 14px;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+.submitbox .submit {
+        text-align: left;
+        padding: 12px 10px 10px 10px;
+        font-size: 11px;
+}
+.submitbox .submit a:hover {
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+}
+.submitbox .submit input {
+        margin-bottom: 8px;
+        margin-right: 3px;
+        padding: 6px 4px;
+        border: none;
+}
+.submitbox #autosave .error {
+        margin-top: 10px;
+}
+/* Categories */
+#categorydiv #category-adder {
+        margin-left: 120px;
+        padding: 4px 0;
+}
+#category-add input, #category-add select {
+        width: 30%;
+}
+#category-add input#category-add-sumbit {
+        width: auto;
+}
+#categorydiv ul#category-tabs {
+        float: left;
+        width: 120px;
+        text-align: right;
+        /* Negative margin for the sake of those without JS: all tabs display */
+        margin: 0 -120px 0 0;
+        padding: 0;
+}
+ul#category-tabs li {
+        padding: 8px;
+}
+ul#category-tabs li.ui-tabs-selected {
+        -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-bottomleft: 3px;
+        -khtml-border-bottom-left-radius: 3px;
+        -webkit-border-bottom-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+}
+ul#category-tabs li.ui-tabs-selected a {
+        color: #333;
+        font-weight: bold;
+        text-decoration: none;
+}
+div.ui-tabs-panel {
+        margin: 0 5px 0 120px;
+        padding: .5em .9em;
+        height: 10em;
+        overflow: auto;
+        border-width: 4px;
+        border-style: solid;
+}
+#categorydiv ul {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+}
+#categorydiv ul.categorychecklist ul {
+        margin-left: 18px;
+}
+ul.categorychecklist li {
+        margin: 0;
+        padding: 0;
+        line-height: 19px;
+}
+#linkcategorydiv #category-adder {
+        margin-left: 120px;
+        padding: 4px 0;
+}
+#category-adder h4 {
+        margin: 0;
+}
+#linkcategorydiv ul#category-tabs {
+        float: left;
+        width: 120px;
+        text-align: right;
+        /* Negative margin for the sake of those without JS: all tabs display */
+        margin: 0 -120px 0 0;
+        padding: 0;
+}
+#linkcategorydiv ul {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+}
+#linkcategorydiv ul.categorychecklist ul {
+        margin-left: 18px;
+}
+/* pasitioning etc. */
+form#tags-filter {
+        position: relative;
+}
+p#tag-search {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin: 0;
+}
+form#posts-filter {
+        position: relative;
+}
+p#post-search {
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin: 0;
+}
+#post-search .button, #widget-search .button {
+        padding: 3px;
+        font-size: 13px;
+}
+#posts-filter fieldset {
+        float: left;
+        margin: 0 1.5ex 1em 0;
+        padding: 0;
+}
+#posts-filter fieldset legend {
+        padding: 0 0 .2em 1px;
+}
+.bordertitle {
+        padding-bottom: 5px;
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+}
+/* Edit posts */
+td.post-title strong {
+        display: block;
+        margin-bottom: .2em;
+}
+td.post-title p {
+        margin: 0;
+}
+/* Global classes */
+.wp-hidden-children .wp-hidden-child { display: none; }
+.wp-no-js-hidden { display: none; }
+.ui-tabs-hide { display: none; }
+.commentlist .avatar {
+        vertical-align:text-top;
+}
+.defaultavatarpicker .avatar {
+        margin: 2px 0;
+        vertical-align: middle;
+}
+body.minwidth {
+        min-width: 808px;
+}
+ul.view-switch {
+        float: right;
+        list-style: none;
+        margin: -23px 5px -2px 0;
+        position: relative;
+}
+ul.view-switch li {
+        float: left;
+        margin: 0;
+        font-size: 11px;
+        padding: 4px 6px;
+        font-weight: bold;
+}
+ul.view-switch a {
+        text-decoration: none;
+}
+ul.view-switch li.current {
+        border: none;
+        -moz-border-radius-topleft: 3px;
+        -khtml-border-top-left-radius: 3px;
+        -webkit-border-top-left-radius: 3px;
+        border-top-left-radius: 3px;
+        -moz-border-radius-topright: 3px;
+        -khtml-border-top-right-radius: 3px;
+        -webkit-border-top-right-radius: 3px;
+        border-top-right-radius: 3px;
+}
+#the-comment-list .comment a {
+        padding-bottom: 1px;
+        text-decoration: none;
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+}
+#the-comment-list td.comment p.comment-author {
+        margin-top: 0;
+        margin-left: 0 ;
+}
+#the-comment-list p.comment-author img {
+        float: left;
+        margin-right: 8px;
+}
+#the-comment-list p.comment-author strong a {
+        border: none;
+}
+#the-comment-list td {
+        vertical-align: top;
+}
+#the-comment-list td.comment {
+        width: 65%;
+        max-width: 460px;
+        word-wrap: break-word;
+}
+#the-comment-list td.comment p {
+        margin-left: 8px;
+}
+#the-comment-list .check-column {
+        padding-top: 8px;
+}
+#templateside ul li a {
+        text-decoration: none;
+}
+.curtime {
+        background-image: url(images/date-button.gif);
+        background-repeat: no-repeat;
+        background-position: left 2px;
+        padding-left: 18px;
+}
+.tablenav .delete {
+        margin-right: 20px;
+}
+#tTips {
+        display: none;
+        position: absolute;
+        margin: 0;
+        padding: 0 0 8px 0;
+        background-image: url(images/tail.gif);
+        background-repeat: no-repeat;
+        background-position: 15px bottom;
+        background-color: transparent;
+}
+#tTips p#tTips_inside {
+        margin: 0;
+        padding: 8px 12px;
+        text-align: center;
+        -moz-border-radius: 8px;
+        -khtml-border-radius: 8px;
+        -webkit-border-radius: 8px;
+        border-radius: 8px;
+}
+td.action-links, th.action-links {
+        text-align: right;
+}
+#poststuff h3, #poststuff .closed h3 {
+        cursor: pointer;
+}
+.hide-if-no-js {
+        display: none;
+}
+/* Diff */
+table.diff {
+        width: 100%;
+}
+table.diff col.content {
+        width: 50%;
+}
+table.diff tr {
+        background-color: transparent;
+}
+table.diff td, table.diff th {
+        padding: .5em;
+        font-family: monospace;
+        border: none;
+}
+table.diff .diff-deletedline del, table.diff .diff-addedline ins {
+        text-decoration: none;
+}
+#wp-word-count {
+        display: block;
+}
+fieldset {
+        border: 0;
+        padding: 0;
+        margin: 0;
+}
+.info-box {
+        top: 100px;
+        left: 50%;
+        margin-left: -225px;
+        height: 300px;
+        width: 450px;
+        border: 5px solid #ddd;
+        background: #f8f8f8;
+        position: absolute;
+        padding: 15px 15px 10px;
+        z-index: 1000;
+        display: none;
+}
+.info-box .submit {
+        position: absolute;
+        bottom: 15px;
+        width: 450px;
+        padding: 15px 0 0;
+}
+.info-box .gears-img {
+        float: right;
+        margin: 10px;
+}
+.info-box-title {
+        line-height: 2;
+        margin: 0;
+        padding: 0 7px;
+}
+#wp_editbtns {
+        padding: 2px;
+        position: absolute;
+        display: none;
+        z-index: 999998;
+}
+#wp_editimgbtn, #wp_delimgbtn {
+        margin: 2px;
+        padding: 2px;
+        border: 1px solid #999;
+        background-color: #eee;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+#wp_editimgbtn:hover, #wp_delimgbtn:hover {
+        border-color: #555;
+        background-color: #ccc;
+}
+#previewview {
+        float:right;
+        margin-top:-53px;
+}
+#previewview a {
+        display:block;
+        font-size:16px;
+        font-weight:normal;
+        padding:4px 8px;
+        text-align:center;
+        text-decoration:none;
+        width:200px;
+}

trunk/wp-includes/general-template.php

-              r8673
+              r8691
+        }
         if ( $media_buttons ) { ?>
+/*      if ( $media_buttons ) { ?>
                 <div id="media-buttons" class="hide-if-no-js">
                 <?php do_action( 'media_buttons' ); ?>
                 </div>
         <?php } ?>
+        <?php } */ ?>
         </div>

trunk/wp-includes/js/autosave.js

r8600	r8691
108	108	getpermalinknonce: jQuery('#getpermalinknonce').val()
109	109	}, function(permalink) {
110		jQuery('#previewview').html('<a target="_blank" href="'+permalink+'" tabindex="4">'+previewText+'</a>');
	110	jQuery('#previewview').html('<a class="button" target="_blank" href="'+permalink+'" tabindex="4">'+previewText+'</a>');
111	111
112	112	// Autosave when the preview button is clicked.

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

-              r8517
+              r8691
 <script type="text/javascript" src="../../utils/form_utils.js?ver=311b"></script>
+<link rel="stylesheet" href="css/media26.css?ver=2.6" type="text/css" media="all" />
 <link rel="stylesheet" href="css/editimage.css?ver=311f" type="text/css" media="all" />
+<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=20080709" type="text/css" media="all" />
 <script type="text/javascript">
 if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

-              r8517
+              r8691
                         // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
                         ed.addCommand('WP_EditImage', function() {
                                 var el = ed.selection.getNode();
+                                var el = ed.selection.getNode(), vp = tinymce.DOM.getViewPort(), H = vp.h, W = ( 720 < vp.w ) ? 720 : vp.w;
                                 if ( ed.dom.getAttrib(el, 'class').indexOf('mceItem') != -1 || el.nodeName != 'IMG' )
 …
                                 tb_show('', url + '/editimage.html?ver=311f&TB_iframe=true');
+                                tinymce.DOM.setStyles('TB_window', {
+                                        'top':'20px',
+                                        'marginTop':'0',
+                                        'width':( W - 50 )+'px',
+                                        'height':( H - 45 )+'px',
+                                        'margin-left':'-'+parseInt((( W - 50 ) / 2),10) + 'px'
+                                });
+                                tinymce.DOM.setStyles('TB_iframeContent', {
+                                        'width':( W - 50 )+'px',
+                                        'height':( H - 75 )+'px'
+                                });
                                 tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
                         });

trunk/wp-includes/script-loader.php

-              r8601
+              r8691
         ) );
         $scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20080622' );
+        $scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20080701' );
         $scripts->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('wp-ajax-response'), '20080729' );
 …
                 $scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
                 $scripts->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );
                 $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery'), '20080128' );
+                $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20080723' );
                 $scripts->localize( 'postbox', 'postboxL10n', array(
                         'requestFile' => admin_url('admin-ajax.php'),
 …
                         'cancel' => __('Cancel'),
                 ) );
                 $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080629' );
+                $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080701' );
                 $scripts->localize( 'post', 'postL10n', array(
                         'tagsUsed' =>  __('Tags used on this post:'),
 …
                 ) );
                 $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080709' );
                 $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080710' );
+                $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080723' );
                 $scripts->localize( 'upload', 'uploadL10n', array(
                         'browseTitle' => attribute_escape(__('Browse your files')),

trunk/wp-includes/version.php

r8653	r8691
9	9	* @global string $wp_version
10	10	*/
11		$wp_version = '2.7-~~bleeding~~';
	11	$wp_version = '2.7-hemorrhage';
12	12
13	13	/**

Context Navigation

Legend:

Download in other formats: