Changeset 9291
- Timestamp:
- 10/22/2008 10:08:58 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
-
wp-admin/admin-header.php (modified) (2 diffs)
-
wp-admin/css/global.css (modified) (4 diffs)
-
wp-admin/css/ie.css (modified) (6 diffs)
-
wp-admin/edit-form-advanced.php (modified) (1 diff)
-
wp-admin/includes/template.php (modified) (1 diff)
-
wp-admin/js/columns.js (modified) (1 diff)
-
wp-admin/js/menu.js (modified) (3 diffs)
-
wp-admin/js/postbox.js (modified) (2 diffs)
-
wp-admin/wp-admin.css (modified) (10 diffs)
-
wp-includes/script-loader.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/admin-header.php
r9240 r9291 89 89 90 90 <div id="wphead-info"> 91 <?php favorite_actions(); ?>92 93 91 <div id="user_info"> 94 92 <p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?> | … … 99 97 <a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p> 100 98 </div> 99 100 <?php favorite_actions(); ?> 101 101 </div> 102 102 -
trunk/wp-admin/css/global.css
r9260 r9291 1 1 /* 2 column liquid layout */ 2 div#wpbody { 3 float: right; 4 clear: right; 5 width: 100%; 6 margin-left: -155px; 7 } 8 9 div#wpbody-content { 10 margin-left: 140px; 2 #wpwrap { 3 height: auto; 4 min-height: 100%; 5 overflow: hidden; 6 width: 100%; 7 } 8 9 #wpcontent { 10 height: 100%; 11 margin-bottom: 50px; 12 } 13 14 #wpbody-content { 15 overflow: hidden; 11 16 padding-top: 10px; 12 17 } 13 18 14 div#sidemenu-bg { 15 border-right-style: solid; 16 border-right-width: 1px; 17 height: 100%; 18 left: 0; 19 position: absolute; 20 top: 0; 21 width: 135px; 22 } 23 24 ul#adminmenu { 19 #adminmenu { 25 20 float: left; 26 21 clear: left; 27 22 margin: 10px 8px; 28 width: 135px; /* + 10 padding */ 29 position: relative; 23 position: relative; 24 } 25 26 #footer { 27 clear: both; 28 position: relative; 29 width: 100%; 30 30 } 31 31 … … 78 78 } 79 79 80 .alignleft { float: left; } 81 .alignright { float: right; } 82 83 .textleft { text-align: left; } 84 .textright { text-align: right; } 85 86 .clear { clear: both; height: 2px; } 80 .alignleft { 81 float: left; 82 } 83 84 .alignright { 85 float: right; 86 } 87 88 .textleft { 89 text-align: left; 90 } 91 92 .textright { 93 text-align: right; 94 } 95 96 .clear { clear: both; } 87 97 88 98 .hidden { display: none; } … … 140 150 } 141 151 142 .subsubsub a { line-height: 200%; padding: 3px; text-decoration: none; } 143 144 .subsubsub a.current { font-weight: bold; background: none; border: none;} 145 146 .subsubsub li { display: inline; margin: 0; padding: 0; } 147 148 /* make it small? */ 152 .subsubsub a { 153 line-height: 200%; 154 padding: 3px; 155 text-decoration: none; 156 } 157 158 .subsubsub a.current { 159 font-weight: bold; 160 background: none; 161 border: none; 162 } 163 164 .subsubsub li { 165 display: inline; 166 margin: 0; 167 padding: 0; 168 } 169 149 170 .subsubsub li.spam { 150 171 font-size: .9em; … … 212 233 } 213 234 214 #wpbody .wrap {215 position: relative;216 }217 218 235 .wrap, .updated, .error { 219 236 margin: 0 15px; -
trunk/wp-admin/css/ie.css
r9262 r9291 1 1 /* Fixes for IE bugs */ 2 2 3 .metabox-holder .postbox h3, #poststuff .postbox h3 { 3 * html #wpbody-content { 4 margin-left: 140px; 5 } 6 7 * html #wpbody { 8 clear: right; 9 float: right; 10 margin-left: -185px; 11 width: 100%; 12 } 13 14 * html body { 15 background-color: #464646; 16 } 17 18 * html #wpwrap { 19 background-color: #fff; 20 } 21 22 #footer { 23 overflow: hidden; 24 } 25 26 .metabox-holder .postbox h3 { 4 27 padding-left: 23px; 5 28 } … … 8 31 padding: 0; 9 32 } 33 34 #side-info-column { 35 position: absolute; 36 right: 15px; 37 } 38 39 #wphead-info { 40 float: right; 41 } 42 10 43 /* 11 44 * html body.minwidth { … … 64 97 } 65 98 99 #template, #template div, #editcat, #addcat { 100 zoom: 100%; 101 } 66 102 67 103 68 104 * html #poststuff .postarea, * html #poststuff #titlediv { 69 width: 95%; 70 margin-left: 3%; 105 71 106 } 72 107 … … 80 115 } 81 116 82 #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 { 83 display: block; 84 zoom: 100%; 117 #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 { 118 display: block; 119 zoom: 100%; 120 } 121 122 #favorite-inside, #favorite-inside a, .favorite-action { 123 z-index: 11; 124 zoom: 100%; 125 } 126 127 #wphead-info { 128 width: 350px; 129 max-width: 350px; 130 } 131 132 p.search-box { 133 position: static; 134 float: right; 135 margin: -3px 0 4px; 136 } 137 138 #wpbody .wrap { 139 position: static; 85 140 } 86 141 … … 115 170 116 171 #bh { 117 padding-right: 15px; 172 margin: 3px 0 0 6px; 173 float: right; 118 174 } 119 175 … … 123 179 } 124 180 125 #tagchecklist {126 display: block;127 zoom: 100%;128 }129 130 181 #tagchecklist span, #tagchecklist span a { 131 182 display: inline-block; -
trunk/wp-admin/edit-form-advanced.php
r9261 r9291 581 581 </div> 582 582 </div> 583 <br class="clear" /> 583 584 </div><!-- /poststuff --> 584 585 </form> -
trunk/wp-admin/includes/template.php
r9277 r9291 2323 2323 $getit = __( 'WordPress recommends a better browser' ); 2324 2324 echo ' 2325 <span id="bh" class="alignright"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></span> 2326 '; 2327 } 2328 2329 if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) 2330 add_action( 'in_admin_footer', 'browse_happy' ); 2325 <div id="bh"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></div> 2326 '; 2327 } 2331 2328 2332 2329 /** -
trunk/wp-admin/js/columns.js
r8858 r9291 13 13 } ); 14 14 15 if ( $.browser.msie ) {16 $('#side-sortables').append( '<div id="make-it-tall"></div>' );17 } else {18 $('#side-sortables').append( '<div id="make-it-tall" style="margin-bottom: -2000px; padding-bottom: 2001px"></div>' );19 }20 $('#wpbody-content').css( 'overflow', 'hidden' );21 15 } 22 16 } -
trunk/wp-admin/js/menu.js
r9240 r9291 52 52 fold : function(off) { 53 53 if (off) { 54 $('#wpbody-content').css('marginLeft', '140px'); 54 if ( $.browser.msie && $.browser.version.charAt(0) == 6 ) 55 $('#wpbody-content').css('marginLeft', '140px'); 55 56 $('#adminmenu').removeClass('folded'); 56 57 $('#adminmenu li.wp-submenu-head').hide(); … … 61 62 $('#adminmenu a.wp-has-submenu, #adminmenu .wp-submenu').hide(); 62 63 $('#adminmenu li.wp-submenu-head').show(); 63 $('#wpbody-content').css('marginLeft', '38px'); 64 if ( $.browser.msie && $.browser.version.charAt(0) == 6 ) 65 $('#wpbody-content').css('marginLeft', '40px'); 64 66 $('#adminmenu li.wp-has-submenu').css({'width':'24px'}).hoverIntent({ 65 67 over: function(){ $(this).find('.wp-submenu').show(); }, … … 76 78 adminMenu.init(); 77 79 78 $('#favorite-inside').width($('#favorite- first').width()+24);80 $('#favorite-inside').width($('#favorite-actions').width()-4); 79 81 $('#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) } ); 80 82 -
trunk/wp-admin/js/postbox.js
r9277 r9291 23 23 } ); 24 24 25 if ( $.browser.msie ) { 26 $('#side-sortables').append( '<div id="make-it-tall"></div>' ); 27 } else { 28 $('#side-sortables').append( '<div id="make-it-tall" style="margin-bottom: -2000px; padding-bottom: 2001px"></div>' ); 29 } 25 this.makeItTall(); 26 this.init(page,args); 27 }, 28 29 makeItTall : function() { 30 var t = $('#make-it-tall').remove(); 31 32 if ( t.length < 1 ) 33 t = $.browser.mozilla ? '<div id="make-it-tall" style="margin-bottom: -2000px; padding-bottom: 2001px"></div>' : '<div id="make-it-tall"> <br /> <br /></div>'; 34 35 $('#side-sortables').append(t); 36 37 if ( $('#side-sortables').children().length > 1 ) 38 $('#side-sortables').css({'minHeight':'300px'}); 39 30 40 $('#wpbody-content').css( 'overflow', 'hidden' ); 31 32 this.init(page,args);33 41 }, 34 42 … … 51 59 handle: '.hndle', 52 60 distance: 2, 61 tolerance: 'pointer', 62 receive: function() { 63 postboxes.makeItTall(); 64 }, 53 65 stop: function() { 54 if ( 'side-sortables' == this.id ) { // doing this with jQuery doesn't work for some reason: make-it-tall gets duplicated 55 var makeItTall = document.getElementById( 'make-it-tall' ); 56 var sideSort = makeItTall.parentNode; 57 sideSort.removeChild( makeItTall ); 58 sideSort.appendChild( makeItTall ); 59 60 } 66 if ( $('#side-sortables').children().length < 2 ) 67 $('#side-sortables').css({'minHeight':''}); 68 61 69 var postVars = { 62 70 action: 'meta-box-order', -
trunk/wp-admin/wp-admin.css
r9284 r9291 462 462 } 463 463 464 #template, #template div, #editcat, #addcat {465 zoom: 1;466 }467 468 464 /* A handy div class for hiding controls. 469 465 Some browsers will disable them when you … … 631 627 632 628 #wphead-info { 633 float: right;634 629 margin: 0 15px; 635 630 } … … 931 926 } 932 927 933 #wpwrap {934 position: relative;935 min-height: 100%;936 overflow: hidden;937 }938 939 #wpcontent {940 padding-bottom: 80px;941 position: relative;942 }943 944 928 #footer { 945 929 word-spacing: .3em; 946 930 font-size: 11px; 947 clear: both;948 931 height: 45px; 949 932 margin-top: -45px; 950 position: relative; 933 } 934 935 #in-footer { 936 padding: 15px 0 0 15px; 937 float: left; 951 938 } 952 939 … … 1405 1392 } 1406 1393 1394 1395 1396 /* 1407 1397 #side-info-column #side-sortables { 1408 1398 height: 100%; 1409 1399 } 1400 */ 1401 1402 1403 1410 1404 1411 1405 .submitbox .submit { … … 1574 1568 1575 1569 p.search-box { 1576 position: absolute; 1577 right: 0; 1578 top: -5px; 1579 margin: 0; 1570 float: right; 1571 margin: -5px 0 0; 1580 1572 } 1581 1573 … … 1648 1640 1649 1641 .filter { 1650 left: 180px; 1651 position: absolute; 1652 top: 24px; 1642 float: left; 1643 margin: -5px 0 0 10px; 1653 1644 } 1654 1645 … … 1819 1810 .sortable-placeholder { 1820 1811 border: 1px #bbb dashed; 1821 background : #f5f5f5;1812 background-color: #f5f5f5; 1822 1813 z-index: -1; 1823 1814 } … … 2507 2498 /* favorite-actions */ 2508 2499 #favorite-actions { 2509 float: left;2500 float: right; 2510 2501 margin: 11px 12px 0; 2511 2502 min-width: 130px; … … 2532 2523 #favorite-inside { 2533 2524 margin: 0 0 0 1px; 2534 padding: 2px 8px 4px;2525 padding: 0 0 6px; 2535 2526 border-width: 1px; 2536 2527 border-style: solid; … … 2553 2544 2554 2545 .favorite-action { 2555 padding: 3px; 2546 2556 2547 } 2557 2548 2558 2549 #favorite-actions a { 2559 padding: 4px 5px 4px 0;2550 display: block; 2560 2551 text-decoration: none; 2561 2552 color: #eee; 2562 2553 font-size: 11px; 2554 } 2555 2556 #favorite-inside a { 2557 padding: 3px 5px 3px 10px; 2558 } 2559 2560 #favorite-inside a:hover { 2561 background-color: #8f8f8f; 2562 color: #fff; 2563 2563 } 2564 2564 -
trunk/wp-includes/script-loader.php
r9276 r9291 166 166 $scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' ); 167 167 $scripts->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' ); 168 $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '2008 0723' );168 $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20081022' ); 169 169 $scripts->localize( 'postbox', 'postboxL10n', array( 170 170 'requestFile' => admin_url('admin-ajax.php'), … … 279 279 280 280 $scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '20070327' ); 281 $scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '200810 18' );281 $scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081022' ); 282 282 283 283 } … … 310 310 $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' ); 311 311 312 $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '200810 18' );312 $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081022' ); 313 313 $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); 314 314
Note: See TracChangeset
for help on using the changeset viewer.