Postboxes drag/drop for all browsers, some base css fixes
git-svn-id: http://svn.automattic.com/wordpress/trunk@9291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz
parent
e59d369976
commit
408600ce58
|
|
@ -88,8 +88,6 @@ if ( '' == $blog_name )
|
|||
<?php } ?></h1>
|
||||
|
||||
<div id="wphead-info">
|
||||
<?php favorite_actions(); ?>
|
||||
|
||||
<div id="user_info">
|
||||
<p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?> |
|
||||
<!--
|
||||
|
|
@ -98,6 +96,8 @@ if ( '' == $blog_name )
|
|||
-->
|
||||
<a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
|
||||
</div>
|
||||
|
||||
<?php favorite_actions(); ?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
/* 2 column liquid layout */
|
||||
div#wpbody {
|
||||
float: right;
|
||||
clear: right;
|
||||
#wpwrap {
|
||||
height: auto;
|
||||
min-height: 100%;
|
||||
overflow: hidden;
|
||||
width: 100%;
|
||||
margin-left: -155px;
|
||||
}
|
||||
|
||||
div#wpbody-content {
|
||||
margin-left: 140px;
|
||||
#wpcontent {
|
||||
height: 100%;
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
|
||||
#wpbody-content {
|
||||
overflow: hidden;
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
div#sidemenu-bg {
|
||||
border-right-style: solid;
|
||||
border-right-width: 1px;
|
||||
height: 100%;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: 135px;
|
||||
}
|
||||
|
||||
ul#adminmenu {
|
||||
#adminmenu {
|
||||
float: left;
|
||||
clear: left;
|
||||
margin: 10px 8px;
|
||||
width: 135px; /* + 10 padding */
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#footer {
|
||||
clear: both;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* inner 2 column liquid layout */
|
||||
|
||||
.inner-sidebar {
|
||||
|
|
@ -77,13 +77,23 @@ textarea, input, select {
|
|||
padding: 3px;
|
||||
}
|
||||
|
||||
.alignleft { float: left; }
|
||||
.alignright { float: right; }
|
||||
.alignleft {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.textleft { text-align: left; }
|
||||
.textright { text-align: right; }
|
||||
.alignright {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.clear { clear: both; height: 2px; }
|
||||
.textleft {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.textright {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.clear { clear: both; }
|
||||
|
||||
.hidden { display: none; }
|
||||
|
||||
|
|
@ -139,13 +149,24 @@ h6 {
|
|||
float: left;
|
||||
}
|
||||
|
||||
.subsubsub a { line-height: 200%; padding: 3px; text-decoration: none; }
|
||||
.subsubsub a {
|
||||
line-height: 200%;
|
||||
padding: 3px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.subsubsub a.current { font-weight: bold; background: none; border: none;}
|
||||
.subsubsub a.current {
|
||||
font-weight: bold;
|
||||
background: none;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.subsubsub li { display: inline; margin: 0; padding: 0; }
|
||||
.subsubsub li {
|
||||
display: inline;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* make it small? */
|
||||
.subsubsub li.spam {
|
||||
font-size: .9em;
|
||||
}
|
||||
|
|
@ -211,10 +232,6 @@ th.check-column + th, th.check-column + td {
|
|||
text-align: center;
|
||||
}
|
||||
|
||||
#wpbody .wrap {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.wrap, .updated, .error {
|
||||
margin: 0 15px;
|
||||
padding: 0;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,45 @@
|
|||
/* Fixes for IE bugs */
|
||||
|
||||
.metabox-holder .postbox h3, #poststuff .postbox h3 {
|
||||
* html #wpbody-content {
|
||||
margin-left: 140px;
|
||||
}
|
||||
|
||||
* html #wpbody {
|
||||
clear: right;
|
||||
float: right;
|
||||
margin-left: -185px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
* html body {
|
||||
background-color: #464646;
|
||||
}
|
||||
|
||||
* html #wpwrap {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
#footer {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.metabox-holder .postbox h3 {
|
||||
padding-left: 23px;
|
||||
}
|
||||
|
||||
input.button, input.button-secondary, input.button-highlighted {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#side-info-column {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
}
|
||||
|
||||
#wphead-info {
|
||||
float: right;
|
||||
}
|
||||
|
||||
/*
|
||||
* html body.minwidth {
|
||||
_width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%");
|
||||
|
|
@ -63,11 +96,13 @@ ul#adminmenu li.wp-menu-separator {
|
|||
font-size: 3px;
|
||||
}
|
||||
|
||||
#template, #template div, #editcat, #addcat {
|
||||
zoom: 100%;
|
||||
}
|
||||
|
||||
|
||||
* html #poststuff .postarea, * html #poststuff #titlediv {
|
||||
width: 95%;
|
||||
margin-left: 3%;
|
||||
|
||||
}
|
||||
|
||||
.submitbox {
|
||||
|
|
@ -79,11 +114,31 @@ ul#adminmenu li.wp-menu-separator {
|
|||
position: relative;
|
||||
}
|
||||
|
||||
#wpwrap, #wpcontent, #post, #wrap, #postdivrich, #postdiv, #poststuff, .metabox-holder, #titlediv, #post-body, #editorcontainer, .tablenav, .widget-control-list, li.widget-list-control-item, #dragHelper, li.widget-list-control-item h4, .widget-sortable, .widget-control-actions {
|
||||
#wpwrap, #wpcontent, #post, #wrap, #postdivrich, #postdiv, #poststuff, .metabox-holder, #titlediv, #post-body, #editorcontainer, .tablenav, .widget-control-list, li.widget-list-control-item, #dragHelper, li.widget-list-control-item h4, .widget-sortable, .widget-control-actions, #tagchecklist {
|
||||
display: block;
|
||||
zoom: 100%;
|
||||
}
|
||||
|
||||
#favorite-inside, #favorite-inside a, .favorite-action {
|
||||
z-index: 11;
|
||||
zoom: 100%;
|
||||
}
|
||||
|
||||
#wphead-info {
|
||||
width: 350px;
|
||||
max-width: 350px;
|
||||
}
|
||||
|
||||
p.search-box {
|
||||
position: static;
|
||||
float: right;
|
||||
margin: -3px 0 4px;
|
||||
}
|
||||
|
||||
#wpbody .wrap {
|
||||
position: static;
|
||||
}
|
||||
|
||||
* html #editorcontainer {
|
||||
padding: 0;
|
||||
}
|
||||
|
|
@ -114,7 +169,8 @@ form#template div {
|
|||
}
|
||||
|
||||
#bh {
|
||||
padding-right: 15px;
|
||||
margin: 3px 0 0 6px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
/* without this dashboard widgets appear in one column for some screen widths */
|
||||
|
|
@ -122,11 +178,6 @@ div#dashboard-widgets {
|
|||
padding-right: 1px;
|
||||
}
|
||||
|
||||
#tagchecklist {
|
||||
display: block;
|
||||
zoom: 100%;
|
||||
}
|
||||
|
||||
#tagchecklist span, #tagchecklist span a {
|
||||
display: inline-block;
|
||||
display: block;
|
||||
|
|
|
|||
|
|
@ -580,6 +580,7 @@ do_action('dbx_post_sidebar');
|
|||
|
||||
</div>
|
||||
</div>
|
||||
<br class="clear" />
|
||||
</div><!-- /poststuff -->
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2322,13 +2322,10 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
|
|||
function browse_happy() {
|
||||
$getit = __( 'WordPress recommends a better browser' );
|
||||
echo '
|
||||
<span id="bh" class="alignright"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></span>
|
||||
';
|
||||
<div id="bh"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></div>
|
||||
';
|
||||
}
|
||||
|
||||
if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)
|
||||
add_action( 'in_admin_footer', 'browse_happy' );
|
||||
|
||||
/**
|
||||
* {@internal Missing Short Description}}
|
||||
*
|
||||
|
|
|
|||
|
|
@ -12,12 +12,6 @@
|
|||
save_manage_columns_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' );
|
||||
}
|
||||
}
|
||||
}(jQuery));
|
||||
|
|
|
|||
|
|
@ -51,7 +51,8 @@ adminMenu = {
|
|||
|
||||
fold : function(off) {
|
||||
if (off) {
|
||||
$('#wpbody-content').css('marginLeft', '140px');
|
||||
if ( $.browser.msie && $.browser.version.charAt(0) == 6 )
|
||||
$('#wpbody-content').css('marginLeft', '140px');
|
||||
$('#adminmenu').removeClass('folded');
|
||||
$('#adminmenu li.wp-submenu-head').hide();
|
||||
$('#adminmenu a.wp-has-submenu').show();
|
||||
|
|
@ -60,7 +61,8 @@ adminMenu = {
|
|||
$('#adminmenu').addClass('folded');
|
||||
$('#adminmenu a.wp-has-submenu, #adminmenu .wp-submenu').hide();
|
||||
$('#adminmenu li.wp-submenu-head').show();
|
||||
$('#wpbody-content').css('marginLeft', '38px');
|
||||
if ( $.browser.msie && $.browser.version.charAt(0) == 6 )
|
||||
$('#wpbody-content').css('marginLeft', '40px');
|
||||
$('#adminmenu li.wp-has-submenu').css({'width':'24px'}).hoverIntent({
|
||||
over: function(){ $(this).find('.wp-submenu').show(); },
|
||||
out: function(){ $(this).find('.wp-submenu').hide(); },
|
||||
|
|
@ -75,7 +77,7 @@ adminMenu = {
|
|||
$(document).ready(function(){
|
||||
adminMenu.init();
|
||||
|
||||
$('#favorite-inside').width($('#favorite-first').width()+24);
|
||||
$('#favorite-inside').width($('#favorite-actions').width()-4);
|
||||
$('#favorite-toggle, #favorite-inside').bind( 'mouseenter', function(){$('#favorite-inside').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideDown') ) { $('#favorite-inside').slideDown(100); $('#favorite-first').addClass('slide-down'); }}, 200) } );
|
||||
|
||||
$('#favorite-toggle, #favorite-inside').bind( 'mouseleave', function(){$('#favorite-inside').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideUp') ) { $('#favorite-inside').slideUp(100, function(){ $('#favorite-first').removeClass('slide-down'); } ); }}, 300) } );
|
||||
|
|
|
|||
|
|
@ -22,15 +22,23 @@
|
|||
postboxes.save_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.makeItTall();
|
||||
this.init(page,args);
|
||||
},
|
||||
|
||||
makeItTall : function() {
|
||||
var t = $('#make-it-tall').remove();
|
||||
|
||||
if ( t.length < 1 )
|
||||
t = $.browser.mozilla ? '<div id="make-it-tall" style="margin-bottom: -2000px; padding-bottom: 2001px"></div>' : '<div id="make-it-tall"> <br /> <br /></div>';
|
||||
|
||||
$('#side-sortables').append(t);
|
||||
|
||||
if ( $('#side-sortables').children().length > 1 )
|
||||
$('#side-sortables').css({'minHeight':'300px'});
|
||||
|
||||
$('#wpbody-content').css( 'overflow', 'hidden' );
|
||||
},
|
||||
|
||||
expandSidebar : function( doIt ) {
|
||||
if ( doIt || $.trim( $( '#side-info-column' ).text() ) ) {
|
||||
|
|
@ -50,14 +58,14 @@
|
|||
items: '> .postbox',
|
||||
handle: '.hndle',
|
||||
distance: 2,
|
||||
tolerance: 'pointer',
|
||||
receive: function() {
|
||||
postboxes.makeItTall();
|
||||
},
|
||||
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 );
|
||||
|
||||
}
|
||||
if ( $('#side-sortables').children().length < 2 )
|
||||
$('#side-sortables').css({'minHeight':''});
|
||||
|
||||
var postVars = {
|
||||
action: 'meta-box-order',
|
||||
_ajax_nonce: jQuery('#meta-box-order-nonce').val(),
|
||||
|
|
|
|||
|
|
@ -461,10 +461,6 @@ textarea.all-options, input.all-options {
|
|||
margin-right: 0;
|
||||
}
|
||||
|
||||
#template, #template div, #editcat, #addcat {
|
||||
zoom: 1;
|
||||
}
|
||||
|
||||
/* A handy div class for hiding controls.
|
||||
Some browsers will disable them when you
|
||||
set display: none; */
|
||||
|
|
@ -630,7 +626,6 @@ a.view-comment-post-link {
|
|||
/* Admin Header */
|
||||
|
||||
#wphead-info {
|
||||
float: right;
|
||||
margin: 0 15px;
|
||||
}
|
||||
|
||||
|
|
@ -930,24 +925,16 @@ html, body {
|
|||
height: 100%;
|
||||
}
|
||||
|
||||
#wpwrap {
|
||||
position: relative;
|
||||
min-height: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#wpcontent {
|
||||
padding-bottom: 80px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#footer {
|
||||
word-spacing: .3em;
|
||||
font-size: 11px;
|
||||
clear: both;
|
||||
height: 45px;
|
||||
margin-top: -45px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#in-footer {
|
||||
padding: 15px 0 0 15px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
#footer #footer-thankyou, #footer #footer-upgrade {
|
||||
|
|
@ -1404,9 +1391,16 @@ table.form-table td .updated {
|
|||
margin: 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
#side-info-column #side-sortables {
|
||||
height: 100%;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
.submitbox .submit {
|
||||
text-align: left;
|
||||
|
|
@ -1573,10 +1567,8 @@ p#big-add-button .button {
|
|||
}
|
||||
|
||||
p.search-box {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: -5px;
|
||||
margin: 0;
|
||||
float: right;
|
||||
margin: -5px 0 0;
|
||||
}
|
||||
|
||||
.search-input {
|
||||
|
|
@ -1647,9 +1639,8 @@ body.wp-admin {
|
|||
}
|
||||
|
||||
.filter {
|
||||
left: 180px;
|
||||
position: absolute;
|
||||
top: 24px;
|
||||
float: left;
|
||||
margin: -5px 0 0 10px;
|
||||
}
|
||||
|
||||
#the-comment-list td.comment p.comment-author {
|
||||
|
|
@ -1818,7 +1809,7 @@ fieldset {
|
|||
|
||||
.sortable-placeholder {
|
||||
border: 1px #bbb dashed;
|
||||
background: #f5f5f5;
|
||||
background-color: #f5f5f5;
|
||||
z-index: -1;
|
||||
}
|
||||
|
||||
|
|
@ -2506,7 +2497,7 @@ abbr.required {
|
|||
|
||||
/* favorite-actions */
|
||||
#favorite-actions {
|
||||
float: left;
|
||||
float: right;
|
||||
margin: 11px 12px 0;
|
||||
min-width: 130px;
|
||||
position: relative;
|
||||
|
|
@ -2531,7 +2522,7 @@ abbr.required {
|
|||
|
||||
#favorite-inside {
|
||||
margin: 0 0 0 1px;
|
||||
padding: 2px 8px 4px;
|
||||
padding: 0 0 6px;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
position: absolute;
|
||||
|
|
@ -2552,16 +2543,25 @@ abbr.required {
|
|||
}
|
||||
|
||||
.favorite-action {
|
||||
padding: 3px;
|
||||
|
||||
}
|
||||
|
||||
#favorite-actions a {
|
||||
padding: 4px 5px 4px 0;
|
||||
display: block;
|
||||
text-decoration: none;
|
||||
color: #eee;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
#favorite-inside a {
|
||||
padding: 3px 5px 3px 10px;
|
||||
}
|
||||
|
||||
#favorite-inside a:hover {
|
||||
background-color: #8f8f8f;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
#favorite-toggle {
|
||||
height: 22px;
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ function wp_default_scripts( &$scripts ) {
|
|||
$scripts->add( 'admin-forms', '/wp-admin/js/forms.js', array('jquery'), '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-ui-sortable'), '20080723' );
|
||||
$scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20081022' );
|
||||
$scripts->localize( 'postbox', 'postboxL10n', array(
|
||||
'requestFile' => admin_url('admin-ajax.php'),
|
||||
) );
|
||||
|
|
@ -278,7 +278,7 @@ function wp_default_scripts( &$scripts ) {
|
|||
$scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox', 'settings-box' ), '20081016' );
|
||||
|
||||
$scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '20070327' );
|
||||
$scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081018' );
|
||||
$scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081022' );
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -309,7 +309,7 @@ function wp_default_styles( &$styles ) {
|
|||
|
||||
$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' );
|
||||
|
||||
$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081018' );
|
||||
$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081022' );
|
||||
$styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
|
||||
|
||||
$styles->add( 'ie', '/wp-admin/css/ie.css' );
|
||||
|
|
|
|||
Loading…
Reference in New Issue