diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 5c0000dd76..3eef8b6041 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -2,7 +2,6 @@ @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); if (!isset($_GET["page"])) require_once('admin.php'); if ( $editing ) { - wp_enqueue_script( array('dbx-admin-key?pagenow=' . attribute_escape($pagenow),'admin-custom-fields') ); if ( current_user_can('manage_categories') ) wp_enqueue_script( 'ajaxcat' ); if ( user_can_richedit() ) diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index bcef8b9be0..3fd4d94fbc 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -68,96 +68,25 @@ addLoadEvent(focusit);
-
-
- -
-

-
-

-
-
- -
-

-
- - - -
-
- -
-

-
-
- -
-

-
-
- -
-

-
- - - - - -
-
- - -
-

-
-
- - -id ); // TODO: ROLE SYSTEM -if ( $post->post_author && !in_array($post->post_author, $authors) ) - $authors[] = $post->post_author; -if ( $authors && count( $authors ) > 1 ) : -?> -
-

-
- $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?> -
-
- - - - -
+
+

+
-
- -
-
- -
- - -post_status ) { ?> - - - - - - - post_content); ?> -
+
+

+post_content); ?> +

+post_status ) { ?> + + + + @@ -181,10 +110,26 @@ else echo clean_url(stripslashes(wp_get_referer())); ?>" />

+
+

+
+

+

+
+
+ +
+

+
+

+
+
+
+ -
+

-
-
-
-

-
-
-
-

- -

-

-
-
+
+

+
-
-
-
-

-
-
-
-
-
-
- -
-
-
-

-
-
-
() +
+

+
+ ()
-
-
-
-
-
-

-
-
-
+
+

+
+
- +
+

+
+ + + +
+
+ +
+

+
+ +
+
+ +
+

+
+ +
+
+ +
+

+
+ + + + + + +
+
+ + +
+

+
+
+ + +id ); // TODO: ROLE SYSTEM +if ( $post->post_author && !in_array($post->post_author, $authors) ) + $authors[] = $post->post_author; +if ( $authors && count( $authors ) > 1 ) : +?> +
+

+
+ $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?> +
+
+ + + + diff --git a/wp-admin/images/media-buttons.gif b/wp-admin/images/media-buttons.gif new file mode 100644 index 0000000000..9fdb895140 Binary files /dev/null and b/wp-admin/images/media-buttons.gif differ diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php index 5542473e77..853b4e2a7b 100644 --- a/wp-admin/includes/image.php +++ b/wp-admin/includes/image.php @@ -317,4 +317,11 @@ function wp_read_image_metadata( $file ) { } +function media_buttons() { // just a placeholder for now ?> + + \ No newline at end of file diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 06daaa1704..d9a294dc06 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -505,7 +505,7 @@ function meta_form() { if ( $keys ) natcasesort($keys); ?> -

+

diff --git a/wp-admin/js/dbx-admin-key.js b/wp-admin/js/dbx-admin-key.js deleted file mode 100644 index 3b3f7af156..0000000000 --- a/wp-admin/js/dbx-admin-key.js +++ /dev/null @@ -1,47 +0,0 @@ -addLoadEvent( function() {var manager = new dbxManager( dbxL10n.manager );} ); - -addLoadEvent( function() -{ - //create new docking boxes group - var meta = new dbxGroup( - 'grabit', // container ID [/-_a-zA-Z0-9/] - 'vertical', // orientation ['vertical'|'horizontal'] - '10', // drag threshold ['n' pixels] - 'no', // restrict drag movement to container axis ['yes'|'no'] - '10', // animate re-ordering [frames per transition, or '0' for no effect] - 'yes', // include open/close toggle buttons ['yes'|'no'] - 'closed', // default state ['open'|'closed'] - dbxL10n.open, // word for "open", as in "open this box" - dbxL10n.close, // word for "close", as in "close this box" - dbxL10n.moveMouse, // sentence for "move this box" by mouse - dbxL10n.toggleMouse, // pattern-match sentence for "(open|close) this box" by mouse - dbxL10n.moveKey, // sentence for "move this box" by keyboard - dbxL10n.toggleKey, // pattern-match sentence-fragment for "(open|close) this box" by keyboard - '%mytitle% [%dbxtitle%]' // pattern-match syntax for title-attribute conflicts - ); - - // Boxes are closed by default. Open the Category box if the cookie isn't already set. - var catdiv = document.getElementById('categorydiv'); - if ( catdiv ) { - var button = catdiv.getElementsByTagName('A')[0]; - if ( dbx.cookiestate == null && /dbx\-toggle\-closed/.test(button.className) ) - meta.toggleBoxState(button, true); - } - - var advanced = new dbxGroup( - 'advancedstuff', - 'vertical', - '10', - 'yes', // restrict drag movement to container axis ['yes'|'no'] - '10', - 'yes', - 'closed', - dbxL10n.open, - dbxL10n.close, - dbxL10n.moveMouse, - dbxL10n.toggleMouse, - dbxL10n.moveKey, - dbxL10n.toggleKey, - '%mytitle% [%dbxtitle%]' // pattern-match syntax for title-attribute conflicts - ); -}); diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php index 1e48fe8547..89a838171a 100644 --- a/wp-admin/link-add.php +++ b/wp-admin/link-add.php @@ -11,7 +11,6 @@ wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]')); -wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') ); if ( current_user_can( 'manage_categories' ) ) wp_enqueue_script( 'ajaxcat' ); require('admin-header.php'); diff --git a/wp-admin/link.php b/wp-admin/link.php index 1d7e4d6a6f..043b3f9e44 100644 --- a/wp-admin/link.php +++ b/wp-admin/link.php @@ -83,7 +83,6 @@ switch ($action) { break; case 'edit' : - wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') ); if ( current_user_can( 'manage_categories' ) ) wp_enqueue_script( 'ajaxlinkcat' ); $parent_file = 'link-manager.php'; diff --git a/wp-admin/rtl.css b/wp-admin/rtl.css index 07612a66cd..ddc2285ae9 100644 --- a/wp-admin/rtl.css +++ b/wp-admin/rtl.css @@ -1,5 +1,4 @@ html, -.dbx-handle, #post_name, input[name=link_url], input[name=link_image], @@ -30,9 +29,6 @@ body.login, direction: rtl; } p.submit, -.dbx-handle { - text-align: left; - } html *, select, input, @@ -79,9 +75,7 @@ table * { border-right: 0; border-left: 2px solid #045290; } -.dbx-content input, .dbx-content select { - margin-right: 8px; - } + #newcat { width: 100px; } diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 5f651b0c8b..875c498dcf 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -99,25 +99,6 @@ body, td { font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; } -fieldset { - border: none; - padding: 3px; -} - -fieldset label.selectit { - display: block; - font-size: 11px; - padding: 0 2px; -} - -fieldset label.selectit:hover { - background: #e9e9e9; -} - -fieldset legend { - padding: .1em .3em; -} - fieldset.options { padding: 1em; } @@ -372,11 +353,6 @@ input.disabled, textarea.disabled { background: #ccc; } - -#categorydiv input, #poststatusdiv input, #commentstatusdiv input, #pingstatusdiv input { - border: none; -} - #postdiv, #titlediv, #guiddiv { margin: 0 8px 0 0; padding: 0; @@ -397,11 +373,6 @@ input.disabled, textarea.disabled { line-height: 140%; } -#titlediv input, #guiddiv input { - margin: 0; - width: 100%; -} - #currenttheme img { float: left; border: 1px solid #666; @@ -466,14 +437,6 @@ input.delete:hover { margin-bottom: 3px; } -#title { - font-size: 1.7em; - padding: 4px 3px; -} - -#postexcerpt div, #attachmentlinks div { - margin-right: 8px; -} #attachmentlinks textarea { width: 100%; @@ -481,10 +444,6 @@ input.delete:hover { margin-bottom: 6px; } -* html #postexcerpt .dbx-toggle-open, * html #postexcerpt .dbx-toggle-open { - padding-right: 8px; -} - #excerpt, .attachmentlinks { margin: 0; height: 4em; @@ -691,46 +650,6 @@ input.delete:hover { padding: 0; } -#zeitgeist { - background: #eee; - border: 1px solid #c5c5c5; - float: right; - font-size: 90%; - margin-bottom: .5em; - margin-left: 1em; - margin-top: .5em; - padding: 1em; - width: 40%; -} - -#zeitgeist h2, fieldset legend a { - background: none; -} - -* html #zeitgeist h2 { - padding-top: 10px; -} - -#zeitgeist h3 { - border-bottom: 1px solid #ccc; - font-size: 16px; - margin: 1em 0 0; -} - -#zeitgeist h3 cite { - font-size: 12px; - font-style: normal; -} - -#zeitgeist li, #zeitgeist p { - margin: .2em 0; -} - -#zeitgeist ul { - margin: 0 0 .3em .6em; - padding: 0 0 0 .6em; -} - .active td { background: #BEB; } @@ -765,79 +684,11 @@ set display:none; */ position: absolute; } -/* Box stuff */ -.dbx-clone { - position: absolute; - visibility: hidden; -} -.dbx-clone, .dbx-clone .dbx-handle-cursor { - cursor: move !important; -} -.dbx-dummy { - display: block; - width: 0; - height: 0; - overflow: hidden; -} -.dbx-group, .dbx-box, .dbx-handle { - position: relative; - display: block; -} - -#grabit { - width: 188px; -} - * html #themeselect { padding: 0 3px; height: 22px; } -/**************************************************************** -avoid padding, margins or borders on dbx-box, -to reduce visual discrepancies between it and the clone. -overall, dbx-box is best left as visually unstyled as possible -*****************************************************************/ -.dbx-box { - margin: 0; - padding: 0; - border: none; -} - -/* Can change this */ -#moremeta fieldset, #advancedstuff fieldset { - margin-bottom: 1em; -} -#moremeta fieldset div { - margin: 2px 0 0 0; - padding: 7px; -} -#moremeta { - line-height: 130%; - margin-right: 15px; - position: absolute; - right: 5%; - width: 14.5em; -} -#moremeta select { - width: 96%; -} - -#slugdiv input, #passworddiv input, #authordiv select, #thumbdiv input, #parentdiv input { - margin-top: .5em; - width: 90%; -} - -#moremeta h3, #advancedstuff h3 { - padding: 3px; - font-weight: normal; - font-size: 13px; -} - -#advancedstuff div { - margin-top: .5em; -} - #categorydiv ul { list-style: none; padding: 0; @@ -888,155 +739,7 @@ overall, dbx-box is best left as visually unstyled as possible font-size: 22px; } -/* default box styles */ -/* toggle state of inner content area */ -.dbx-box-open .dbx-content { - display: block; -} -.dbx-box-closed .dbx-content { - display: none; -} - -#moremeta .dbx-content { - background: url(images/box-butt.gif) no-repeat bottom right; - padding-bottom: 15px; - padding-right: 2px; -} - -#moremeta fieldset.dbx-box-closed { - background: url(images/box-butt.gif) no-repeat bottom; - padding-bottom: 9px; -} - -/* handles */ - -.dbx-handle { - background: #2685af; - padding: 6px 1em 2px; - font-size: 12px; - margin: 0; - color: #E3EFF5; -} - -#moremeta .dbx-handle { - padding: 6px 1em 2px; - font-size: 12px; - background: #2685af url(images/box-head.gif) no-repeat right; -} - -#moremeta .dbx-box { - background: url(images/box-bg.gif) repeat-y right; -} - -#advancedstuff h3.dbx-handle { - margin-left: 7px; - margin-bottom: -7px; - padding: 6px 1em 0 3px; - height: 19px; - font-size: 12px; - background: #2685af url(images/box-head-right.gif) no-repeat top right; -} - -#advancedstuff div.dbx-h-andle-wrapper { - margin: 0 0 0 -7px; - background: #fff url(images/box-head-left.gif) no-repeat top left; -} - -#advancedstuff div.dbx-content { - margin-left: 8px; - background: url(images/box-bg-right.gif) repeat-y right; - padding: 10px 10px 15px 0; -} - -#postexcerpt div.dbx-content { - margin-right: 0; - padding-right: 17px; -} - -#advancedstuff div.dbx-c-ontent-wrapper { - margin-left: -7px; - margin-right: 0; - background: url(images/box-bg-left.gif) repeat-y left; -} - -#advancedstuff fieldset.dbx-box { - padding-bottom: 9px; - margin-left: 6px; - background: url(images/box-butt-right.gif) no-repeat bottom right; -} - -#advancedstuff div.dbx-b-ox-wrapper { - background: url(images/box-butt-left.gif) no-repeat bottom left; -} - -#advancedstuff .dbx-box-closed div.dbx-c-ontent-wrapper { - padding-bottom: 2px; - background: url(images/box-butt-left.gif) no-repeat bottom left; -} - -#advancedstuff .dbx-box { - background: url(images/box-butt-right.gif) no-repeat bottom right; -} - -/* handle cursors */ -.dbx-handle-cursor { - cursor: move; -} - -/* toggle images */ -a.dbx-toggle, a.dbx-toggle:visited { - display: block; - overflow: hidden; - background-image: url( images/toggle.gif ); - position: absolute; - top: 0; - right: 0; - background-repeat: no-repeat; - border: 0; - margin: 0; - padding: 0; -} - -#moremeta a.dbx-toggle, #moremeta a.dbx-toggle-open:visited { - height: 25px; - width: 27px; - background-position: 0 0; -} - -#moremeta a.dbx-toggle-open, #moremeta a.dbx-toggle-open:visited { - height: 25px; - width: 27px; - background-position: 0 -25px; -} - -#advancedstuff a.dbx-toggle, #advancedstuff a.dbx-toggle-open:visited { - height: 22px; - width: 22px; - top: 3px; - right: 5px; - background-position: 0 -3px; -} - -#advancedstuff a.dbx-toggle-open, #advancedstuff a.dbx-toggle-open:visited { - height: 22px; - width: 22px; - top: 3px; - right: 5px; - background-position: 0 -28px; -} - -#categorychecklist { - margin-right: 6px; -} - -/* additional clone styles */ -.dbx-clone { - opacity: 0.8; - -moz-opacity: 0.8; - -khtml-opacity: 0.8; - filter: alpha(opacity=80); -} #newcat { width: 120px; @@ -1075,27 +778,6 @@ input #catadd { margin-left: 2em; } -#postdivrich #edButtons { - padding-left: 3px; -} - -#postdivrich #content, #postdivrich #content:active { - border: 1px solid #ccc; -} - -#edButtons input, #edButtons input:active { - margin: 0 2px -1px; -} - -#edButtons input.edButtonFore, #edButtons input.edButtonFore:active { - background: #f0f0ee; - border-bottom: 1px solid #f0f0ee; -} - -#edButtons input.edButtonBack, #edButtons input.edButtonBack:active { - background: #fff url( images/fade-butt.png ) repeat-x 0 15px; - border-bottom: 1px solid #ccc; -} .page-numbers { padding: 4px 7px; @@ -1121,13 +803,6 @@ a.page-numbers:hover { margin: 0 6px; } -a.view-link { - position: absolute; - right: 5%; - margin-right: 220px; - text-decoration:underline; -} - #update-nag, .plugin-update { border-bottom: 1px solid #ccc; border-top: 1px solid #ccc; @@ -1453,3 +1128,70 @@ a.view-comment-post-link { text-decoration: underline; color: black; } + +#poststuff h3 { + background: #eaf3fa; + font-size: 15px; + font-weight: bold; + padding: 10px 5px; + margin: 0 0 10px; +} + +#poststuff fieldset { + border: 1px solid #ccc;pa + padding: 2px; +} + +#poststuff .postbox, #titlediv { + margin-left: 20px; + border: 1px solid #ebebeb; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + padding: 2px; + margin-bottom: 10px; +} + +#poststuff .postarea { + margin-left: 20px; + margin-right: 8px; +} + +#poststuff .inside { + margin: 0 12px 15px; +} + +#poststuff #title { + font-size: 1.7em; + padding: 4px 3px; + width: 98%; +} + +#poststuff #editor-toolbar { + position: relative; + height: 30px; + margin-top: -40px; +} + +#poststuff #edButtonPreview, #poststuff #edButtonHTML { + display: block; + height: 18px; + padding: 5px; + margin-right: 8px; + float: right; + cursor: pointer; + color: #2583ad; +} + +#poststuff #editor-toolbar .active { + background: #cee1ef; + color: #333; + font-weight: bold; + -moz-border-radius: 2px; +} + +#poststuff #media-buttons { + float: right; + margin-right: 20px; + margin-top: 5px; +} + diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index d735c9efac..c0c6a1f465 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -922,17 +922,20 @@ function the_editor($content, $id = 'content', $prev_id = 'title') { -