From 61ff5addcafc2d9489d264696803cc0ff7dc216c Mon Sep 17 00:00:00 2001 From: azaozz Date: Wed, 25 Mar 2009 14:29:22 +0000 Subject: [PATCH] jQuery 1.3.2 and UI 1.7.1, may still have some regressions, add screen columns setting to the write/edit post/page screen options, fixes #8867 git-svn-id: http://svn.automattic.com/wordpress/trunk@10834 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/colors-classic.css | 2 +- wp-admin/css/colors-fresh.css | 2 +- wp-admin/css/dashboard.css | 12 --- wp-admin/css/global.css | 17 +++-- wp-admin/css/ie.css | 25 ++++--- wp-admin/edit-form-advanced.php | 17 ++--- wp-admin/edit-form-comment.php | 7 +- wp-admin/edit-link-form.php | 8 +- wp-admin/edit-page-form.php | 18 ++--- wp-admin/includes/template.php | 101 ++++++++++++++----------- wp-admin/js/link.dev.js | 18 ++++- wp-admin/js/link.js | 2 +- wp-admin/js/post.dev.js | 27 ++++--- wp-admin/js/post.js | 2 +- wp-admin/js/postbox.dev.js | 104 +++++++++++--------------- wp-admin/js/postbox.js | 2 +- wp-admin/rtl.css | 2 +- wp-admin/wp-admin.css | 40 +++++----- wp-includes/js/jquery/jquery.js | 44 ++++------- wp-includes/js/jquery/ui.core.js | 11 ++- wp-includes/js/jquery/ui.dialog.js | 16 +++- wp-includes/js/jquery/ui.draggable.js | 14 +++- wp-includes/js/jquery/ui.resizable.js | 14 +++- wp-includes/js/jquery/ui.sortable.js | 14 +++- wp-includes/js/jquery/ui.tabs.js | 14 +++- wp-includes/script-loader.php | 20 ++--- 26 files changed, 307 insertions(+), 246 deletions(-) diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 2442dcfd3..c82978aa9 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -368,7 +368,7 @@ div.dashboard-widget-submit input:hover, color: #EAF2FA !important; } -#side-info-column #category-tabs .ui-tabs-selected a { +#side-sortables #category-tabs .ui-tabs-selected a { color: #333; } diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 93a2598ab..9a394207b 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -368,7 +368,7 @@ div.dashboard-widget-submit input:hover, color: #EAF2FA !important; } -#side-info-column #category-tabs .ui-tabs-selected a { +#side-sortables #category-tabs .ui-tabs-selected a { color: #333; } diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css index 119121a5f..49d338bb4 100644 --- a/wp-admin/css/dashboard.css +++ b/wp-admin/css/dashboard.css @@ -56,18 +56,6 @@ form .textarea-wrap { min-width: 0; } -#dashboard-widgets-wrap .has-sidebar { - margin-right: -51%; -} - -#dashboard-widgets-wrap .inner-sidebar { - width: 49%; -} - -#dashboard-widgets-wrap .has-sidebar .has-sidebar-content { - margin-right: 51%; -} - div.postbox div.inside { margin: 10px; position: relative; diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index 2207ee350..12b09c49c 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -116,19 +116,20 @@ table { .inner-sidebar { float: right; clear: right; + display: none; +} + +.inner-sidebar #side-sortables { width: 280px; - position: relative; + min-height: 300px; } -.has-sidebar { - float: left; - clear: left; - width: 100%; - margin-right: -340px; +.has-right-sidebar .inner-sidebar { + display: block; } -.has-sidebar .has-sidebar-content { - margin-right: 305px; +.has-right-sidebar #post-body { + margin-right: 300px; } /* 2 columns main area */ diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 2c1081931..6fc2cd3bf 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -22,8 +22,9 @@ input.button-highlighted { margin-bottom: -1px; } -* html #side-info-column { - height: auto; +* html .inner-sidebar #side-sortables, +* html .postbox-container .meta-box-sortables { + height: 300px; } * html #wpbody-content #screen-options-link-wrap { @@ -38,16 +39,6 @@ input.button-highlighted { text-align: center; } -/* -* html body.minwidth { - _width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%"); -} - -* html #wpbody { - _width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%"); -} -*/ - * html #adminmenu { margin-left: -80px; } @@ -62,6 +53,10 @@ input.button-highlighted { margin: 0; } +* html #footer { + margin: 0; +} + #wpcontent.folded #adminmenu li.menu-top { display: block; } @@ -347,3 +342,9 @@ table.ie-fixed { display: inline-block; padding: 2px 5px; } + +* html .stuffbox, +* html .stuffbox input, +* html .stuffbox textarea { + border: 1px solid #DFDFDF; +} diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 90ef6012c..50b5f4ca9 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -582,7 +582,7 @@ else -
+
@@ -591,8 +591,7 @@ else
-
-
+
@@ -613,9 +612,9 @@ endif; ?> post_content); ?> -
- - + + + +
  echo ''; } ?> - -
- +
@@ -653,7 +651,6 @@ do_action('dbx_post_sidebar'); ?> -

diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index b32d53b7d..c374994c1 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -69,7 +69,7 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
-comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete'); ?> +comment_ID&_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ){return true;}return false;\">" . __('Delete') . "\n"; ?>
@@ -81,9 +81,7 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
-
-
- +

@@ -138,7 +136,6 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
-