' . __('The modules on this screen can be arranged in several columns. You can select the number of columns from the Screen Options tab.') . "
\n";
+ $help .= drag_drop_help();
+ $_wp_contextual_help['dashboard'] = $help;
+ }
+ break;
+ case 'link':
+ if ( !isset($_wp_contextual_help['link']) ) {
+ $help = drag_drop_help();
+ $_wp_contextual_help['link'] = $help;
+ }
+ break;
+ case 'options-general':
+ if ( !isset($_wp_contextual_help['options-general']) )
+ $_wp_contextual_help['options-general'] = __('
@@ -3398,6 +3408,36 @@ function drag_drop_help() {
';
}
+
+function screen_layout($screen) {
+ global $screen_layout_columns;
+
+ if ( 'dashboard' == $screen ) {
+ $screen_layout_columns = get_user_option('screen_layout_dashboard');
+ $num = 4;
+/* add to the write pages?
+ } elseif ( in_array( $screen, array('post', 'page', 'link') ) ) {
+ $screen_layout_columns = get_user_option('screen_layout_write');
+ $num = 2;
+*/
+ } else {
+ $screen_layout_columns = 0;
+ return '';
+ }
+
+ if ( ! $screen_layout_columns )
+ $screen_layout_columns = 2;
+
+ $i = 1;
+ $return = '
' . __('Screen Layout') . "
\n
" . __('Number of Columns:') . "\n";
+ while ( $i <= $num ) {
+ $return .= "\n";
+ ++$i;
+ }
+ $return .= "
\n";
+ return $return;
+}
+
function screen_icon($name = '') {
global $parent_file, $hook_suffix;
diff --git a/wp-admin/js/postbox.dev.js b/wp-admin/js/postbox.dev.js
index 7dfbe36569..972f337922 100644
--- a/wp-admin/js/postbox.dev.js
+++ b/wp-admin/js/postbox.dev.js
@@ -25,12 +25,52 @@ var postboxes;
}
postboxes.save_state(page);
} );
+
+ $('.columns-prefs input[type="radio"]').click(function(){
+ var num = $(this).val(), i, el;
+
+ if ( num ) {
+ for ( i = 4; ( i > num && i > 1 ); i-- ) {
+ $('#' + colname(i-1) + '-sortables').append($('#' + colname(i) + '-sortables').children('.postbox'));
+ $('#' + colname(i) + '-sortables').parent().hide();
+ }
+ for ( i = 1; i <= num; i++ ) {
+ el = $('#' + colname(i) + '-sortables')
+ if ( el.parent().is(':hidden') )
+ el.addClass('temp-border').parent().show();
+ }
+ }
+ $('.postbox-container:visible').css('width', 98/num + '%');
+ postboxes.save_order(page);
+ });
+
+ function colname(n) {
+ switch (n) {
+ case 1:
+ return 'normal';
+ break
+ case 2:
+ return 'side';
+ break
+ case 3:
+ return 'column3';
+ break
+ case 4:
+ return 'column4';
+ break
+ default:
+ return '';
+ }
+ }
this.expandSidebar();
this.init(page,args);
},
expandSidebar : function(doIt) {
+ if ( ! $('#side-info-column').length )
+ return;
+
if ( doIt || $('#side-sortables > .postbox:visible').length ) {
if ( ! $('#post-body').hasClass('has-sidebar') ) {
$('#post-body').addClass('has-sidebar');
@@ -46,6 +86,8 @@ var postboxes;
},
init : function(page, args) {
+ var fixed = $('#dashboard-widgets').length;
+
$.extend( this, args || {} );
$('#wpbody-content').css('overflow','hidden');
$('.meta-box-sortables').sortable( {
@@ -57,6 +99,9 @@ var postboxes;
tolerance: 'pointer',
toleranceMove: 'tolerance',
sort: function(e,ui) {
+ if ( fixed )
+ return;
+
if ( $(document).width() - e.clientX < 300 ) {
if ( ! $('#post-body').hasClass('has-sidebar') ) {
var pos = $('#side-sortables').offset();
@@ -67,18 +112,10 @@ var postboxes;
}
}
},
- stop: function() {
- var postVars = {
- action: 'meta-box-order',
- _ajax_nonce: $('#meta-box-order-nonce').val(),
- page: page
- }
- $('.meta-box-sortables').each( function() {
- postVars["order[" + this.id.split('-')[0] + "]"] = $(this).sortable( 'toArray' ).join(',');
- } );
- $.post( postboxL10n.requestFile, postVars, function() {
- postboxes.expandSidebar();
- } );
+ stop: function(e,ui) {
+ postboxes.save_order(page);
+ ui.item.parent().removeClass('temp-border');
+ postboxes.expandSidebar();
}
} );
},
@@ -95,6 +132,20 @@ var postboxes;
});
postboxes.expandSidebar();
},
+
+ save_order : function(page) {
+ var postVars, page_columns = $('.columns-prefs input:checked').val() || 0;
+ postVars = {
+ action: 'meta-box-order',
+ _ajax_nonce: $('#meta-box-order-nonce').val(),
+ page_columns: page_columns,
+ page: page
+ }
+ $('.meta-box-sortables').each( function() {
+ postVars["order[" + this.id.split('-')[0] + "]"] = $(this).sortable( 'toArray' ).join(',');
+ } );
+ $.post( postboxL10n.requestFile, postVars );
+ },
/* Callbacks */
pbshow : false,
diff --git a/wp-admin/js/postbox.js b/wp-admin/js/postbox.js
index 6bdfabfb32..9f02387d57 100644
--- a/wp-admin/js/postbox.js
+++ b/wp-admin/js/postbox.js
@@ -1 +1 @@
-var postboxes;(function(a){postboxes={add_postbox_toggles:function(c,b){a(".postbox h3, .postbox .handlediv").click(function(){a(a(this).parent().get(0)).toggleClass("closed");postboxes.save_state(c)});a(".postbox h3 a").click(function(d){d.stopPropagation()});a(".hide-postbox-tog").click(function(){var d=jQuery(this).val();if(jQuery(this).attr("checked")){jQuery("#"+d).show();if(a.isFunction(postboxes.pbshow)){postboxes.pbshow(d)}}else{jQuery("#"+d).hide();if(a.isFunction(postboxes.pbhide)){postboxes.pbhide(d)}}postboxes.save_state(c)});this.expandSidebar();this.init(c,b)},expandSidebar:function(b){if(b||a("#side-sortables > .postbox:visible").length){if(!a("#post-body").hasClass("has-sidebar")){a("#post-body").addClass("has-sidebar");var c=Math.min(a("#post-body").height(),300);a("#side-sortables").css({minHeight:c+"px",height:"auto"})}}else{a("#post-body").removeClass("has-sidebar");a("#side-sortables").css({minHeight:"0"});if(a.browser.msie&&a.browser.version.charAt(0)==7){a("#side-sortables").css({height:"0"})}}},init:function(c,b){a.extend(this,b||{});a("#wpbody-content").css("overflow","hidden");a(".meta-box-sortables").sortable({placeholder:"sortable-placeholder",connectWith:[".meta-box-sortables"],items:"> .postbox",handle:".hndle",distance:2,tolerance:"pointer",toleranceMove:"tolerance",sort:function(f,d){if(a(document).width()-f.clientX<300){if(!a("#post-body").hasClass("has-sidebar")){var g=a("#side-sortables").offset();a("#side-sortables").append(d.item);a(d.placeholder).css({top:g.top,left:g.left}).width(a(d.item).width());postboxes.expandSidebar(1)}}},stop:function(){var d={action:"meta-box-order",_ajax_nonce:a("#meta-box-order-nonce").val(),page:c};a(".meta-box-sortables").each(function(){d["order["+this.id.split("-")[0]+"]"]=a(this).sortable("toArray").join(",")});a.post(postboxL10n.requestFile,d,function(){postboxes.expandSidebar()})}})},save_state:function(d){var b=a(".postbox").filter(".closed").map(function(){return this.id}).get().join(","),c=a(".postbox").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(postboxL10n.requestFile,{action:"closed-postboxes",closed:b,hidden:c,closedpostboxesnonce:jQuery("#closedpostboxesnonce").val(),page:d});postboxes.expandSidebar()},pbshow:false,pbhide:false}}(jQuery));
\ No newline at end of file
+var postboxes;(function(a){postboxes={add_postbox_toggles:function(c,b){a(".postbox h3, .postbox .handlediv").click(function(){a(a(this).parent().get(0)).toggleClass("closed");postboxes.save_state(c)});a(".postbox h3 a").click(function(f){f.stopPropagation()});a(".hide-postbox-tog").click(function(){var e=jQuery(this).val();if(jQuery(this).attr("checked")){jQuery("#"+e).show();if(a.isFunction(postboxes.pbshow)){postboxes.pbshow(e)}}else{jQuery("#"+e).hide();if(a.isFunction(postboxes.pbhide)){postboxes.pbhide(e)}}postboxes.save_state(c)});a('.columns-prefs input[type="radio"]').click(function(){var e=a(this).val(),f,g;if(e){for(f=4;(f>e&&f>1);f--){a("#"+d(f-1)+"-sortables").append(a("#"+d(f)+"-sortables").children(".postbox"));a("#"+d(f)+"-sortables").parent().hide()}for(f=1;f<=e;f++){g=a("#"+d(f)+"-sortables");if(g.parent().is(":hidden")){g.addClass("temp-border").parent().show()}}}a(".postbox-container:visible").css("width",98/e+"%");postboxes.save_order(c)});function d(e){switch(e){case 1:return"normal";break;case 2:return"side";break;case 3:return"column3";break;case 4:return"column4";break;default:return""}}this.expandSidebar();this.init(c,b)},expandSidebar:function(b){if(!a("#side-info-column").length){return}if(b||a("#side-sortables > .postbox:visible").length){if(!a("#post-body").hasClass("has-sidebar")){a("#post-body").addClass("has-sidebar");var c=Math.min(a("#post-body").height(),300);a("#side-sortables").css({minHeight:c+"px",height:"auto"})}}else{a("#post-body").removeClass("has-sidebar");a("#side-sortables").css({minHeight:"0"});if(a.browser.msie&&a.browser.version.charAt(0)==7){a("#side-sortables").css({height:"0"})}}},init:function(d,b){var c=a("#dashboard-widgets").length;a.extend(this,b||{});a("#wpbody-content").css("overflow","hidden");a(".meta-box-sortables").sortable({placeholder:"sortable-placeholder",connectWith:[".meta-box-sortables"],items:"> .postbox",handle:".hndle",distance:2,tolerance:"pointer",toleranceMove:"tolerance",sort:function(g,f){if(c){return}if(a(document).width()-g.clientX<300){if(!a("#post-body").hasClass("has-sidebar")){var h=a("#side-sortables").offset();a("#side-sortables").append(f.item);a(f.placeholder).css({top:h.top,left:h.left}).width(a(f.item).width());postboxes.expandSidebar(1)}}},stop:function(g,f){postboxes.save_order(d);f.item.parent().removeClass("temp-border");postboxes.expandSidebar()}})},save_state:function(d){var b=a(".postbox").filter(".closed").map(function(){return this.id}).get().join(","),c=a(".postbox").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(postboxL10n.requestFile,{action:"closed-postboxes",closed:b,hidden:c,closedpostboxesnonce:jQuery("#closedpostboxesnonce").val(),page:d});postboxes.expandSidebar()},save_order:function(c){var b,d=a(".columns-prefs input:checked").val()||0;b={action:"meta-box-order",_ajax_nonce:a("#meta-box-order-nonce").val(),page_columns:d,page:c};a(".meta-box-sortables").each(function(){b["order["+this.id.split("-")[0]+"]"]=a(this).sortable("toArray").join(",")});a.post(postboxL10n.requestFile,b)},pbshow:false,pbhide:false}}(jQuery));
\ No newline at end of file
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 71de234758..62dad9f972 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1320,7 +1320,7 @@ table.form-table td .updated {
}
/* Post Screen */
-#normal-sortables {
+#post-body-content #normal-sortables {
min-height: 50px;
}
@@ -1539,6 +1539,10 @@ table.form-table td .updated {
font-weight: normal;
}
+#dashboard-widgets .meta-box-sortables {
+ margin: 0 5px;
+}
+
.meta-box-sortables .postbox .handlediv {
float: right;
width: 23px;
@@ -2968,3 +2972,20 @@ ol {
list-style-type: decimal;
margin-left: 2em;
}
+
+.postbox-container {
+ float: left;
+ padding-right: 0.5%;
+}
+
+.postbox-container .meta-box-sortables {
+ min-height: 300px;
+}
+
+.temp-border {
+ border: 1px dotted #ccc;
+}
+
+.columns-prefs label {
+ padding: 0 5px;
+}
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 1ccd600621..e5abbf5b1e 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -245,7 +245,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", false, '3517m' );
- $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20090102' );
+ $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20090223' );
$scripts->add_data( 'postbox', 'group', 1 );
$scripts->localize( 'postbox', 'postboxL10n', array(
'requestFile' => admin_url('admin-ajax.php')