Big UI style update. props koopersmith. see #17324

git-svn-id: https://develop.svn.wordpress.org/trunk@17800 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith 2011-05-04 20:15:05 +00:00
parent db6f86d7bb
commit e897910b75
34 changed files with 357 additions and 455 deletions

View File

@ -20,7 +20,7 @@ if ( !defined('ABSPATH') )
<p id="footer-left" class="alignleft"><?php
do_action( 'in_admin_footer' );
$upgrade = apply_filters( 'update_footer', '' );
echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.').'</span> | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>') ); ?>
echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.').'</span> &bull; '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' &bull; '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>') ); ?>
</p>
<p id="footer-upgrade" class="alignright"><?php echo $upgrade; ?></p>
<div class="clear"></div>

View File

@ -101,6 +101,7 @@ document.body.className = c;
</script>
<div id="wpwrap">
<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
<div id="wpcontent">
<div id="wphead">
<?php
@ -130,7 +131,7 @@ if ( function_exists('mb_strlen') ) {
}
?>
<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="32" height="32" />
<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="16" height="16" />
<h1 id="site-heading" <?php echo $title_class ?>>
<a href="<?php echo trailingslashit( get_bloginfo( 'url' ) ); ?>" title="<?php esc_attr_e('Visit Site') ?>">
<span id="site-title"><?php echo $blog_name ?></span>
@ -161,8 +162,6 @@ ksort($links);
echo implode(' ', $links);
?></p>
</div>
<?php favorite_actions($current_screen); ?>
</div>
</div>
@ -170,8 +169,6 @@ echo implode(' ', $links);
<?php
unset($title_class, $blog_name, $total_update_count, $update_title);
require(ABSPATH . 'wp-admin/menu-header.php');
$current_screen->parent_file = $parent_file;
$current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
$current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base);

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
html,
.wp-dialog {
background-color: #fcfcfb;
background-color: #fff;
}
* html input,
@ -570,9 +570,6 @@ input.readonly, textarea.readonly {
#footer {
color: #777;
border-color: #b0c8d7;
background: #cfdfe9; /* fallback color */
background:-moz-linear-gradient(bottom, #cfdfe9, #eff8ff);
background:-webkit-gradient(linear, left bottom, left top, from(#cfdfe9), to(#eff8ff));
}
#media-items,
@ -696,9 +693,6 @@ table.widefat span.spam a,
#wphead {
border-bottom:#b0c8d7 1px solid;
background: #cfdfe9; /* fallback color */
background:-moz-linear-gradient(bottom, #cfdfe9, #eff8ff);
background:-webkit-gradient(linear, left bottom, left top, from(#cfdfe9), to(#eff8ff));
}
#wphead h1 a {

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
html,
.wp-dialog {
background-color: #f9f9f9;
background-color: #fff;
}
* html input,
@ -138,8 +138,11 @@ textarea.disabled {
.widget .widget-top,
.postbox h3,
.stuffbox h3 {
background: #dfdfdf url("../images/gray-grad.png") repeat-x left top;
border-bottom-color: #dfdfdf;
text-shadow: #fff 0 1px 0;
-moz-box-shadow: 0 1px 0 #fff;
-webkit-box-shadow: 0 1px 0 #fff;
box-shadow: 0 1px 0 #fff;
}
.form-table th,
@ -569,10 +572,7 @@ input.readonly, textarea.readonly {
#footer {
color: #777;
border-color: #d1d1d1;
background: #d9d9d9; /* fallback color */
background:-moz-linear-gradient(bottom, #d7d7d7, #e4e4e4);
background:-webkit-gradient(linear, left bottom, left top, from(#d7d7d7), to(#e4e4e4));
border-color: #dfdfdf;
}
#media-items,
@ -642,11 +642,15 @@ table.widefat span.spam a,
#poststuff .postarea,
.stuffbox {
border-color: #dfdfdf;
-moz-box-shadow: inset 0 1px 0 #fff;
-webkit-box-shadow: inset 0 1px 0 #fff;
box-shadow: inset 0 1px 0 #fff;
}
.widget,
#widget-list .widget-top,
.postbox {
background-color: #fff;
background-color: #f9f9f9;
}
.ui-sortable .postbox h3 {
@ -695,10 +699,7 @@ table.widefat span.spam a,
}
#wphead {
border-bottom:#c6c6c6 1px solid;
background: #d9d9d9; /* fallback color */
background:-moz-linear-gradient(bottom, #d7d7d7, #e4e4e4);
background:-webkit-gradient(linear, left bottom, left top, from(#d7d7d7), to(#e4e4e4));
border-bottom:#dfdfdf 1px solid;
}
#wphead h1 a {
@ -713,7 +714,6 @@ table.widefat span.spam a,
#user_info a:visited,
#footer a:link,
#footer a:visited {
color: #222;
text-decoration: none;
}
@ -1083,21 +1083,32 @@ table.widefat .spam a:hover,
}
/* menu */
#adminmenu * {
border-color: #e3e3e3;
#adminmenuback,
#adminmenuwrap {
background-color: #ececec;
border-color: #dfdfdf;
}
#adminmenushadow,
#adminmenuback {
background-image: url(../images/menu-shadow.png);
background-position: top right;
background-repeat: repeat-y;
}
#adminmenu li.wp-menu-separator {
background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;
background: #cfcfcf;
border-color: #b7b7b7;
}
.folded #adminmenu li.wp-menu-separator {
background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
#adminmenu a.separator {
border-color: #e1e1e1;
}
#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -207px;
/* background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -207px;*/
background: transparent;
}
#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
@ -1105,53 +1116,38 @@ table.widefat .spam a:hover,
background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;
}
#adminmenu a.menu-top {
background: #f1f1f1 url(../images/menu-bits.gif?ver=20100610) repeat-x scroll left -379px;
#adminmenu a.menu-top,
.folded #adminmenu li.menu-top {
border-top-color: #f9f9f9;
border-bottom-color: #dfdfdf;
}
#adminmenu .wp-submenu a {
background: #fff url(../images/menu-bits.gif?ver=20100610) no-repeat scroll 0 -310px;
#adminmenu li.wp-menu-open {
border-color: #dfdfdf;
}
#adminmenu .wp-has-current-submenu ul li a {
background: none;
}
#adminmenu .wp-has-current-submenu ul li a.current {
background: url(../images/menu-dark.gif) top left no-repeat !important;
}
.wp-has-current-submenu .wp-submenu {
border-top: none !important;
}
#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu {
border-bottom: #aaa 1px solid;
#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
#adminmenu li.current a.menu-top,
.folded #adminmenu li.wp-has-current-submenu,
.folded #adminmenu li.current.menu-top,
#adminmenu .wp-menu-arrow {
background: #777; /* fallback color */
background:-moz-linear-gradient(bottom, #6d6d6d, #808080);
background:-webkit-gradient(linear, left bottom, left top, from(#6d6d6d), to(#808080));
}
#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
#adminmenu li.current a.menu-top {
background: #e0e0e0 url(../images/menu-bits.gif?ver=20100610) top left repeat-x;
border: #aaa 1px solid;
color: #000;
text-shadow: 0 -1px 0 #333;
color: #fff;
border-top-color: #808080;
border-bottom-color: #6d6d6d;
}
#adminmenu li.wp-has-current-submenu .wp-submenu,
#adminmenu li.wp-has-current-submenu ul li a {
border-right-color: #aaa !important;
border-left-color: #aaa !important;
}
#adminmenu li.wp-has-current-submenu ul li a {
background: url(../images/menu-dark.gif) bottom left no-repeat !important;
}
#adminmenu li.wp-has-current-submenu ul {
border-bottom-color: #aaa;
}
#adminmenu .wp-submenu .current a.current {
background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll 0 -289px;
.folded #adminmenu li.wp-has-current-submenu,
.folded #adminmenu li.current.menu-top {
border-top-color: #808080;
border-bottom-color: #6d6d6d;
}
#adminmenu .wp-submenu a:hover {
@ -1163,9 +1159,6 @@ table.widefat .spam a:hover,
#adminmenu .wp-submenu li.current a,
#adminmenu .wp-submenu li.current a:hover {
color: #333;
background-color: #f5f5f5;
background-image: none;
border-color: #e3e3e3;
}
#adminmenu .wp-submenu ul {
@ -1184,7 +1177,6 @@ table.widefat .spam a:hover,
#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head {
background-color: #EAEAEA;
border-color: #aaa;
}
#adminmenu div.wp-submenu {
@ -1344,8 +1336,15 @@ table.diff .diff-addedline ins {
border-color: #dfdfdf;
}
#screen-options-link-wrap,
#contextual-help-link-wrap {
background-color: #e3e3e3;
background-image: -moz-linear-gradient(bottom, #dfdfdf, #f1f1f1);
background-image: -webkit-gradient(linear, left bottom, left top, from(#dfdfdf), to(#f1f1f1));
}
#screen-meta-links a.show-settings {
color: #606060;
color: #777;
}
#screen-meta-links a.show-settings:hover {
@ -1448,10 +1447,6 @@ fieldset.inline-edit-col-right .inline-edit-col {
background: transparent url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -111px;
}
#major-publishing-actions {
background: #eaf2fa;
}
.tablenav .tablenav-pages {
color: #555;
}
@ -1556,7 +1551,7 @@ body.press-this ul.category-tabs li.tabs a {
}
#favorite-toggle {
background: transparent url(../images/fav-arrow.gif?ver=20100531) no-repeat 0 -4px;
background: transparent url(../images/fav-arrow.gif?ver=20100531) no-repeat 0 -6px;
}
#favorite-actions a {
@ -1746,11 +1741,17 @@ div.widgets-sortables,
background-color: #f1f1f1;
}
#nav-menu-header, #nav-menu-footer, .menu-item-handle {
background: url("../images/gray-grad.png") repeat-x scroll left top #dfdfdf;
#nav-menu-header, #nav-menu-footer {
background: #f9f9f9;
}
.menu-item-handle {
background-color: #e3e3e3;
background-image: -moz-linear-gradient(bottom, #dfdfdf, #f1f1f1);
background-image: -webkit-gradient(linear, left bottom, left top, from(#dfdfdf), to(#f1f1f1));
}
#menu-management .nav-tab-active {
background: #ececec;
border-bottom-color: #ececec;
background: #f9f9f9;
border-bottom-color: #f9f9f9;
}

File diff suppressed because one or more lines are too long

View File

@ -9,6 +9,7 @@ h3:hover .edit-box {
}
form .input-text-wrap {
background: #fff;
border-style: solid;
border-width: 1px;
padding: 2px 3px;
@ -25,6 +26,7 @@ form .input-text-wrap {
}
form .textarea-wrap {
background: #fff;
border-style: solid;
border-width: 1px;
padding: 2px;
@ -57,7 +59,7 @@ form .textarea-wrap {
}
div.postbox div.inside {
margin: 10px;
margin: 10px 0;
position: relative;
}
@ -95,19 +97,17 @@ div.postbox div.inside {
}
#dashboard_right_now p.sub {
font-style: italic;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
padding: 5px 10px 15px;
color: #777;
font-size: 13px;
padding: 5px 0 15px;
color: #8f8f8f;
font-size: 14px;
position: absolute;
top: -17px;
left: 15px;
}
#dashboard_right_now .table {
margin: 0 -9px;
padding: 0 10px;
margin: 0;
padding: 0;
position: relative;
}
@ -199,7 +199,7 @@ div.postbox div.inside {
#dashboard_recent_comments .comment-meta .approve {
font-style: italic;
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
font-size: 10px;
}
@ -267,7 +267,7 @@ div.postbox div.inside {
/* QuickPress */
#dashboard_quick_press h4 {
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
float: left;
width: 5.5em;
clear: both;
@ -335,7 +335,7 @@ div.postbox div.inside {
}
#dashboard_recent_drafts h4 abbr {
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
font-size: 11px;
color: #999;
margin-left: 3px;
@ -383,7 +383,7 @@ a.rsswidget {
/* Plugins */
#dashboard_plugins h4 {
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
}
#dashboard_plugins h5 {

File diff suppressed because one or more lines are too long

View File

@ -62,20 +62,25 @@ table {
height: auto;
min-height: 100%;
width: 100%;
position: relative;
}
#wpcontent {
height: 100%;
}
#wpcontent,
#footer {
margin-left: 160px;
}
#wpbody-content {
padding-bottom: 50px;
}
#wpbody {
clear: both;
margin-left: 175px;
}
.folded #wpbody {
margin-left: 60px;
.folded #wpcontent,
.folded #footer {
margin-left: 47px;
}
#wpbody-content {
@ -83,32 +88,39 @@ table {
width: 100%;
}
#adminmenu {
float: left;
clear: left;
#adminmenuback,
#adminmenuwrap,
#adminmenu,
#adminmenu .wp-submenu ul {
width: 145px;
margin-top: 15px;
margin-right: 5px;
margin-bottom: 15px;
margin-left: -160px;
position: relative;
}
#adminmenuback {
position: absolute;
top: 0;
bottom: 0;
z-index: -1;
}
#adminmenuwrap {
float: left;
}
#adminmenu {
clear: left;
padding: 0;
list-style: none;
}
.folded #adminmenu {
margin-left: -45px;
}
.folded #adminmenuback,
.folded #adminmenuwrap,
.folded #adminmenu,
.folded #adminmenu li.menu-top {
width: 28px;
width: 32px;
}
#footer {
clear: both;
position: relative;
width: 100%;
}
/* inner 2 column liquid layout */
@ -228,7 +240,7 @@ td,
textarea,
input,
select {
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
font-size: 13px;
}
@ -502,7 +514,9 @@ div.error p {
}
.wrap h2 {
font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 200;
font-size: 24px;
margin: 0;
padding: 14px 15px 3px 0;
line-height: 35px;

File diff suppressed because one or more lines are too long

View File

@ -31,7 +31,6 @@ body {
#menu-settings-column .inside {
clear: both;
padding:0 10px;
}
.metabox-holder-disabled .postbox {
@ -57,55 +56,34 @@ body {
margin-top: -3px;
width: 100%;
}
#menu-management .menu-edit {
margin-bottom: 20px;
}
#nav-menu-header, #post-body, #nav-menu-footer {
border-color: #ccc;
border-style: solid;
}
#nav-menu-header {
border-width: 1px 1px 0 1px;
-moz-border-radius-topleft: 6px;
-webkit-border-top-left-radius: 6px;
-khtml-border-top-left-radius: 6px;
border-top-left-radius: 6px;
-moz-border-radius-topright: 6px;
-webkit-border-top-right-radius: 6px;
-khtml-border-top-right-radius: 6px;
border-top-right-radius: 6px;
}
#post-body {
background: #fff;
padding: 10px;
border-width: 0 1px;
}
#post-body div.updated {
margin: 0;
}
#post-body-content {
position: relative;
}
#menu-management .menu-add-new abbr {
font-weight:bold;
}
#menu-management .menu-edit {
background: #f9f9f9;
padding: 0 10px;
border: 1px solid #dfdfdf;
margin-bottom: 20px;
}
#post-body {
padding: 10px 0;
border-top: 1px solid #fff;
border-bottom: 1px solid #dfdfdf;
}
#nav-menu-header {
border-bottom: 1px solid #dfdfdf;
}
#nav-menu-footer {
border-width: 0 1px 1px 1px;
-moz-border-radius-bottomleft: 6px;
-webkit-border-bottom-left-radius: 6px;
-khtml-border-bottom-left-radius: 6px;
border-bottom-left-radius: 6px;
-moz-border-radius-bottomright: 6px;
-webkit-border-bottom-right-radius: 6px;
-khtml-border-bottom-right-radius: 6px;
border-bottom-right-radius: 6px;
border-top: 1px solid #fff;
}
#post-body div.updated {
margin: 0;
}
#post-body-content {
position: relative;
}
#menu-management .menu-add-new abbr {
font-weight:bold;
}
/* Menu Tabs */
@ -155,13 +133,14 @@ body {
#menu-management .nav-tab {
margin-bottom: 0;
background: #f4f4f4;
font-weight: bold;
background: #fff;
border-color: #dfdfdf;
font-size: 14px;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
}
#menu-management .nav-tab-active {
border-color:#ccc;
border-color: #dfdfdf;
}
#select-nav-menu-container {
@ -199,7 +178,7 @@ body {
float: right;
}
.customlinkdiv .howto input {
width: 210px;
width: 200px;
}
#nav-menu-theme-locations .howto select {
width: 100%;
@ -298,20 +277,19 @@ body {
margin-top: 13px;
}
.menu-item-handle {
border: 1px solid #E6E6E6;
border: 1px solid #dfdfdf;
position: relative;
padding-left: 10px;
height: auto;
width: 400px;
line-height: 35px;
text-shadow: 0 1px 0 #FFFFFF;
font-weight:bold;
overflow: hidden;
word-wrap: break-word;
border-radius: 6px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
-khtml-border-radius: 6px;
word-wrap: break-word;
}
.menu-item-edit-active .menu-item-handle {
-moz-border-radius: 6px 6px 0 0;
@ -335,6 +313,8 @@ body {
}
.menu-item-handle .item-title {
font-size: 12px;
font-weight: bold;
padding: 7px 0;
line-height: 20px;
display:block;
@ -395,7 +375,11 @@ body.menu-max-depth-10 { min-width: 1250px !important; }
body.menu-max-depth-11 { min-width: 1280px !important; }
/* Menu item controls */
.item-type { text-transform: uppercase; font-size: 11px; color: #999999; padding-right: 10px; }
.item-type {
font-size: 11px;
color: #999999;
padding-right: 10px;
}
.item-controls { font-size: 11px; position: absolute; right: 20px; top: -1px; }
.item-controls a { text-decoration: none; }
.item-controls a:hover { cursor: pointer; }
@ -436,7 +420,7 @@ body.js .item-order {
display:block;
width: 400px;
padding: 10px 0 10px 10px;
border: solid #E6E6E6;
border: solid #dfdfdf;
border-width: 0 1px 1px 1px;
-moz-border-radius: 0 0 6px 6px;
-webkit-border-bottom-right-radius: 6px;
@ -506,7 +490,7 @@ body.js .item-order {
/* Major/minor publishing actions (classes) */
.major-publishing-actions {
clear:both;
padding: 5px 10px;
padding: 5px 0;
}
.major-publishing-actions .publishing-action {
text-align: right;
@ -547,12 +531,12 @@ body.js .item-order {
}
.major-publishing-actions .form-invalid {
padding-left: 4px;
margin-left: -4px;
border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
padding-left: 4px;
margin-left: -4px;
}
/* Clearfix */

View File

@ -1 +1 @@
.alignleft h3{margin:0;}h3 span{font-weight:normal;}#template textarea{font-family:Consolas,Monaco,Courier,monospace;font-size:12px;width:97%;}#template p{width:97%;}#templateside{float:right;width:190px;word-wrap:break-word;}#templateside h3,#postcustomstuff p.submit{margin:0;}#templateside h4{margin:1em 0 0;}#templateside ol,#templateside ul{margin:.5em;padding:0;}#templateside li{margin:4px 0;}#templateside ul li a span.highlight{display:block;}.nonessential{font-size:11px;font-style:italic;padding-left:12px;}.highlight{padding:3px 3px 3px 12px;margin-left:-12px;font-weight:bold;-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;}div.tablenav{margin-right:210px;}#documentation{margin-top:10px;}#documentation label{line-height:22px;vertical-align:top;font-weight:bold;}.fileedit-sub{padding:10px 0 8px;line-height:180%;}
.alignleft h3{margin:0;}h3 span{font-weight:normal;}#template textarea{font-family:Consolas,Monaco,Courier,monospace;font-size:12px;width:97%;background:#f9f9f9;outline:none;}#template p{width:97%;}#templateside{float:right;width:190px;word-wrap:break-word;}#templateside h3,#postcustomstuff p.submit{margin:0;}#templateside h4{margin:1em 0 0;}#templateside ol,#templateside ul{margin:.5em;padding:0;}#templateside li{margin:4px 0;}#templateside ul li a span.highlight{display:block;}.nonessential{font-size:11px;font-style:italic;padding-left:12px;}.highlight{padding:3px 3px 3px 12px;margin-left:-12px;font-weight:bold;-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;}div.tablenav{margin-right:210px;}#documentation{margin-top:10px;}#documentation label{line-height:22px;vertical-align:top;font-weight:bold;}.fileedit-sub{padding:10px 0 8px;line-height:180%;}

View File

@ -10,6 +10,8 @@ h3 span {
font-family: Consolas, Monaco, Courier, monospace;
font-size: 12px;
width: 97%;
background: #f9f9f9;
outline: none;
}
#template p {

File diff suppressed because one or more lines are too long

View File

@ -116,6 +116,7 @@ div.sidebar-name {
width: 250px;
margin: 0 10px 15px;
border: 0 none;
background: transparent;
float: left;
}

File diff suppressed because one or more lines are too long

View File

@ -108,7 +108,7 @@ kbd, code {
.howto {
font-style: italic;
display: block;
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
}
p.install-help {
@ -408,13 +408,6 @@ a.button-secondary {
display: none;
}
.add-new-h2 {
font-style: normal;
margin: 0 6px;
position: relative;
top: -3px;
}
td.action-links,
th.action-links {
text-align: right;
@ -712,7 +705,7 @@ form.upgrade .hint {
#wp-fullscreen-info {
float: right;
padding: 3px 10px;
display: none;
}
@ -842,24 +835,24 @@ form.upgrade .hint {
------------------------------------------------------------------------------*/
#wphead-info {
margin: 0 0 0 15px;
padding-right: 15px;
}
#user_info {
float: right;
font-size: 12px;
line-height: 46px;
height: 46px;
line-height: 32px;
height: 32px;
}
#user_info p {
margin: 0;
padding: 0;
line-height: 46px;
line-height: 32px;
}
#wphead {
height: 46px;
height: 32px;
margin-right: 15px;
}
#wphead a,
@ -873,12 +866,12 @@ form.upgrade .hint {
#header-logo {
float: left;
margin: 7px 0 0 15px;
margin: 7px 0;
}
#wphead h1 {
font: normal 22px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
padding: 10px 8px 5px;
font: normal 15px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
padding: 7px 8px 5px;
margin: 0;
float: left;
}
@ -910,10 +903,11 @@ form.upgrade .hint {
------------------------------------------------------------------------------*/
#favorite-actions {
float: right;
margin: 11px 12px 0;
margin: 6px 12px 0;
min-width: 130px;
position: relative;
display: inline-block;
top: -3px;
}
#favorite-first {
@ -922,13 +916,13 @@ form.upgrade .hint {
-webkit-border-radius: 12px;
border-radius: 12px;
line-height: 15px;
padding: 3px 30px 4px 12px;
padding: 2px 30px 2px 12px;
border-width: 1px;
border-style: solid;
}
#favorite-inside {
margin: 0 0 0 0px;
margin: 0;
padding: 2px 1px;
border-width: 1px;
border-style: solid;
@ -952,10 +946,11 @@ form.upgrade .hint {
#favorite-inside a {
padding: 3px 5px 3px 10px;
line-height: 20px;
}
#favorite-toggle {
height: 22px;
height: 18px;
position: absolute;
right: 0;
top: 1px;
@ -984,7 +979,7 @@ form.upgrade .hint {
}
#screen-meta-links {
margin: 0 18px 0 0;
margin: 0 15px 0 0;
}
#screen-meta .screen-reader-text {
@ -996,9 +991,8 @@ form.upgrade .hint {
float: right;
height: 22px;
padding: 0;
margin: 0 6px 0 0;
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
background: #e3e3e3;
margin: 0 0 0 6px;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
-moz-border-radius-bottomleft: 3px;
-moz-border-radius-bottomright: 3px;
-webkit-border-bottom-left-radius: 3px;
@ -1028,7 +1022,7 @@ form.upgrade .hint {
padding: 0 16px 0 6px;
height: 22px;
line-height: 22px;
font-size: 10px;
font-size: 11px;
display: block;
background-repeat: no-repeat;
background-position: top right;
@ -1079,6 +1073,24 @@ form.upgrade .hint {
7.0 - Main Navigation (Left Menu)
------------------------------------------------------------------------------*/
#adminmenuback,
#adminmenuwrap {
border-width: 0 1px 0 0;
border-style: solid;
}
#adminmenuwrap {
position: relative;
}
#adminmenushadow {
position: absolute;
top: 0;
right: 0;
bottom: 0;
width: 6px;
z-index: 20;
}
/* side admin menu */
#adminmenu * {
-webkit-user-select: none;
@ -1094,12 +1106,11 @@ form.upgrade .hint {
margin: 0;
position: relative;
z-index: 2;
border-width: 1px 0 0;
border-style: solid none none;
}
#adminmenu .wp-submenu a {
font: normal 11px/18px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-size: 12px;
line-height: 18px;
}
#adminmenu .wp-submenu li.current,
@ -1110,7 +1121,8 @@ form.upgrade .hint {
#adminmenu a.menu-top,
#adminmenu .wp-submenu-head {
font: normal 13px/18px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-size: 13px;
line-height: 18px;
}
#adminmenu div.wp-submenu-head {
@ -1143,6 +1155,9 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
width: 28px;
height: 28px;
}
.folded #adminmenu div.wp-menu-image {
width: 32px;
}
#adminmenu li {
margin: 0;
@ -1153,31 +1168,48 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
#adminmenu a {
display: block;
line-height: 18px;
padding: 1px 5px 3px;
padding: 2px 5px;
}
#adminmenu li.menu-top {
min-height: 26px;
position: relative;
}
#adminmenu a.menu-top {
line-height: 18px;
min-width: 10em;
padding: 5px 5px;
border-width: 1px 1px 0;
border-style: solid solid none;
border-width: 1px 0 1px;
border-style: solid;
}
#adminmenu li.wp-menu-open {
border-width: 0 0 1px;
border-style: solid;
}
#adminmenu .wp-submenu a {
margin: 0;
padding-left: 12px;
border-width: 0 1px 0 0;
border-style: none solid none none;
padding-left: 28px;
}
#adminmenu .menu-top-last ul.wp-submenu {
border-width: 0 0 1px;
border-style: none none solid;
.wp-menu-arrow {
display: none;
}
#adminmenu li.wp-has-current-submenu .wp-menu-arrow,
#adminmenu li.menu-top.current .wp-menu-arrow {
display: block;
position: absolute;
right: -9px;
top: 0;
cursor: auto;
z-index: 25;
}
#adminmenu .wp-menu-arrow div {
width: 15px;
height: 30px;
background: url(../images/menu-arrow-frame.png) top right no-repeat;
}
#adminmenu .wp-submenu li {
@ -1186,52 +1218,10 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
}
.folded #adminmenu li.menu-top {
width: 28px;
height: 30px;
overflow: hidden;
border-width: 1px 1px 0;
border-style: solid solid none;
}
#adminmenu .menu-top-first a.menu-top,
.folded #adminmenu li.menu-top-first,
#adminmenu .wp-submenu .wp-submenu-head {
border-width: 1px 1px 0;
border-style: solid solid none;
-moz-border-radius-topleft :6px;
-moz-border-radius-topright: 6px;
-webkit-border-top-right-radius: 6px;
-webkit-border-top-left-radius: 6px;
-khtml-border-top-right-radius: 6px;
-khtml-border-top-left-radius: 6px;
border-top-right-radius: 6px;
border-top-left-radius: 6px;
}
#adminmenu .menu-top-last a.menu-top,
.folded #adminmenu li.menu-top-last {
border-width: 1px;
width: 32px;
height: 29px;
border-width: 1px 0;
border-style: solid;
-moz-border-radius-bottomleft: 6px;
-moz-border-radius-bottomright: 6px;
-webkit-border-bottom-right-radius: 6px;
-webkit-border-bottom-left-radius: 6px;
-khtml-border-bottom-right-radius: 6px;
-khtml-border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
border-bottom-left-radius: 6px;
}
#adminmenu li.wp-menu-open a.menu-top-last {
border-bottom: 0 none;
-moz-border-radius-bottomright: 0;
-moz-border-radius-bottomleft: 0;
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0;
-khtml-border-bottom-right-radius: 0;
-khtml-border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
#adminmenu .wp-menu-image img {
@ -1248,29 +1238,26 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
}
#adminmenu li.wp-menu-separator {
height: 21px;
height: 2px;
padding: 0;
margin: 0;
border-width: 1px 0;
border-style: solid;
}
#adminmenu a.separator {
cursor: w-resize;
height: 20px;
height: 1px;
padding: 0;
border-width: 1px 0 0 0;
border-style: solid;
}
.folded #adminmenu a.separator {
cursor: e-resize;
}
#adminmenu .wp-menu-separator-last {
height: 10px;
width: 1px;
}
#adminmenu .wp-submenu .wp-submenu-head {
border-width: 1px;
border-style: solid;
padding: 6px 4px 6px 10px;
cursor: default;
}
@ -1280,17 +1267,6 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
margin: -1px 0 0 28px;
padding: 0 8px 8px;
z-index: 999;
border: 0 none;
}
.folded #adminmenu .wp-submenu ul {
width: 140px;
border-width: 0 0 1px;
border-style: none none solid;
}
.folded #adminmenu .wp-submenu li.wp-first-item {
border-top: 0 none;
}
.folded #adminmenu .wp-submenu a {
@ -1301,11 +1277,6 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
margin-left: 40px;
}
#adminmenu li.menu-top-last .wp-submenu ul {
border-width: 0 0 1px;
border-style: none none solid;
}
#adminmenu .wp-menu-toggle {
width: 22px;
clear: right;
@ -1316,11 +1287,6 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
cursor: default;
}
#adminmenu li.wp-has-current-submenu ul {
border-bottom-width: 1px;
border-bottom-style: solid;
}
#adminmenu .wp-menu-image a {
height: 24px;
}
@ -1333,7 +1299,7 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
#adminmenu span.update-plugins,
#sidemenu li a span.update-plugins {
position: absolute;
font-family: Helvetica, Arial, sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
font-size: 9px;
line-height: 17px;
font-weight: bold;
@ -1359,7 +1325,7 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
.post-com-count-wrapper {
min-width: 22px;
font-family: Helvetica, Arial, sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
}
.post-com-count {
@ -1419,7 +1385,8 @@ body.wp-admin {
min-width: 785px;
}
body.admin-bar #wphead {
body.admin-bar #wphead,
body.admin-bar #adminmenu {
padding-top: 28px;
}
@ -1492,37 +1459,24 @@ body.admin-bar #wphead {
.postbox,
.stuffbox {
margin-bottom: 20px;
padding: 0 10px;
border-width: 1px;
border-style: solid;
line-height: 1;
-moz-border-radius: 6px;
-khtml-border-radius: 6px;
-webkit-border-radius: 6px;
border-radius: 6px;
}
.widget .widget-top,
.postbox h3,
.postbox h3,
.stuffbox h3 {
-moz-border-radius: 6px 6px 0 0;
-webkit-border-top-right-radius: 6px;
-webkit-border-top-left-radius: 6px;
-khtml-border-top-right-radius: 6px;
-khtml-border-top-left-radius: 6px;
border-top-right-radius: 6px;
border-top-left-radius: 6px;
border-bottom-width: 1px;
border-style: solid;
}
.postbox.closed h3 {
-moz-border-radius-bottomleft: 4px;
-webkit-border-bottom-left-radius: 4px;
-khtml-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-moz-border-radius-bottomright: 4px;
-webkit-border-bottom-right-radius: 4px;
-khtml-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
border: none;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}
.postbox table.form-table {
@ -2053,7 +2007,7 @@ ul.cat-checklist {
.inline-edit-row .catshow,
.inline-edit-row .cathide,
.inline-edit-row #bulk-titles div {
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
font-style: normal;
font-size: 11px;
}
@ -2936,7 +2890,7 @@ span.description,
.form-wrap p {
font-size: 12px;
font-style: italic;
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
}
.form-wrap .form-field {
@ -3281,71 +3235,6 @@ abbr.required {
bottom: 1px;
}
/* favorite-actions */
#favorite-actions {
float: right;
margin: 11px 12px 0;
min-width: 130px;
position: relative;
}
#favorite-first {
-moz-border-radius: 12px;
-khtml-border-radius: 12px;
-webkit-border-radius: 12px;
border-radius: 12px;
line-height: 15px;
padding: 3px 30px 4px 12px;
border-width: 1px;
border-style: solid;
}
#favorite-inside {
margin: 0 0 0 0px;
padding: 2px 1px;
border-width: 1px;
border-style: solid;
position: absolute;
z-index: 11;
display: none;
-moz-border-radius: 0 0 12px 12px;
-webkit-border-bottom-right-radius: 12px;
-webkit-border-bottom-left-radius: 12px;
-khtml-border-bottom-right-radius: 12px;
-khtml-border-bottom-left-radius: 12px;
border-bottom-right-radius: 12px;
border-bottom-left-radius: 12px;
}
#favorite-actions a {
display: block;
text-decoration: none;
font-size: 11px;
}
#favorite-inside a {
padding: 3px 5px 3px 10px;
}
#favorite-toggle {
height: 22px;
position: absolute;
right: 0;
top: 1px;
width: 28px;
}
#favorite-actions .slide-down {
-moz-border-radius: 12px 12px 0 0;
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0;
-khtml-border-bottom-right-radius: 0;
-khtml-border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-bottom: none;
}
ul#dismissed-updates {
display: none;
}
@ -4019,7 +3908,7 @@ div#custom-background-image img {
.nav-tab {
border-style: solid;
border-color: #ccc #ccc #f9f9f9;
border-color: #ccc #ccc #fff;
border-width: 1px 1px 0;
color: #c1c1c1;
text-shadow: rgba(255,255,255,1) 0 1px 0;
@ -4050,7 +3939,11 @@ h2.nav-tab-wrapper, h3.nav-tab-wrapper {
h2 .nav-tab {
padding: 4px 20px 6px;
font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 200;
font-size: 24px;
line-height: 35px;
}
@ -4259,7 +4152,7 @@ input.button-highlighted,
#utc-time, #local-time {
padding-left: 25px;
font-style: italic;
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
}
.defaultavatarpicker .avatar {
@ -4274,6 +4167,7 @@ input.button-highlighted,
#footer {
margin-top: -46px;
margin-right: 15px;
border-top: 1px;
border-style: solid;
}
@ -4281,13 +4175,11 @@ input.button-highlighted,
#footer,
#footer a {
font-size: 12px;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-style: italic;
}
#footer p {
margin: 0;
padding: 15px;
padding: 15px 0;
line-height: 15px;
}
@ -4399,16 +4291,17 @@ table.form-table td .updated {
}
#poststuff h3,
.metabox-holder h3 {
font-size: 12px;
font-weight: bold;
padding: 7px 9px;
font-size: 14px;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-weight: normal;
padding: 7px 0;
margin: 0;
line-height: 1;
}
#poststuff .inside,
#poststuff .inside p {
font-size: 11px;
margin: 6px 6px 8px;
margin: 6px 0 8px;
}
#poststuff .inside .submitbox p {
margin: 1em 0;

View File

@ -190,7 +190,9 @@ require_once('./admin-header.php');
?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="button add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
<h2><?php
echo esc_html( $post_type_object->labels->name );
favorite_actions( $current_screen );
if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
</h2>

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 958 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 849 B

View File

@ -56,7 +56,10 @@ $today = current_time('mysql', 1);
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $title ); ?></h2>
<h2><?php
echo esc_html( $title );
favorite_actions( $current_screen ); ?>
</h2>
<div id="dashboard-widgets-wrap">

View File

@ -59,7 +59,9 @@ if ( ! current_user_can('manage_links') )
<div class="wrap nosubsub">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
<h2><?php
echo esc_html( $title );
favorite_actions( $current_screen );
if ( !empty($_REQUEST['s']) )
printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
</h2>

View File

@ -76,6 +76,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$img = '<img src="' . $item[6] . '" alt="" />';
}
$toggle = '<div class="wp-menu-toggle"><br /></div>';
$arrow = '<div class="wp-menu-arrow"><div></div></div>';
$title = wptexturize($item[0]);
@ -91,9 +92,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$menu_file = substr($menu_file, 0, $pos);
if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") ) || !empty($menu_hook)) {
$admin_is_parent = true;
echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$arrow$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
} else {
echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$arrow$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
}
} else if ( current_user_can($item[1]) ) {
$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
@ -102,9 +103,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$menu_file = substr($menu_file, 0, $pos);
if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") || !empty($menu_hook) ) {
$admin_is_parent = true;
echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$toggle<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$arrow$toggle<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
} else {
echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$toggle<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$arrow$toggle<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
}
}
@ -170,6 +171,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
?>
<div id="adminmenuback"></div>
<div id="adminmenuwrap">
<div id="adminmenushadow"></div>
<ul id="adminmenu">
<?php
@ -179,3 +183,4 @@ do_action( 'adminmenu' );
?>
</ul>
</div>

View File

@ -99,13 +99,13 @@ require_once( '../admin-header.php' );
<div class="wrap">
<?php screen_icon('ms-admin'); ?>
<h2><?php _e('Sites') ?>
<?php echo $msg; ?>
<?php if ( current_user_can( 'create_sites') ) : ?>
<a href="<?php echo network_admin_url('site-new.php'); ?>" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
<?php endif; ?>
<?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
<h2><?php
_e('Sites');
echo $msg;
if ( current_user_can( 'create_sites') ) {
favorite_actions( $current_screen );
}
if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
} ?>
</h2>

View File

@ -34,7 +34,7 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI']
$referer = remove_query_arg( $temp_args, wp_get_referer() );
if ( $action ) {
$allowed_themes = get_site_option( 'allowedthemes' );
$allowed_themes = get_site_option( 'allowedthemes' );
switch ( $action ) {
case 'enable':
check_admin_referer('enable-theme_' . $_GET['theme']);
@ -100,11 +100,11 @@ if ( $action ) {
if ( $data['Name'] == $main_theme ) {
unset( $themes[$key] );
} else {
$files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) );
$files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) );
$theme_info[ $theme ] = $data;
}
}
if ( empty( $themes ) ) {
wp_redirect( add_query_arg( 'error', 'main', $referer ) );
exit;
@ -162,7 +162,7 @@ if ( $action ) {
foreach ( $themes as $theme )
$delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) );
$paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
$paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
wp_redirect( network_admin_url( "themes.php?deleted=".count( $themes )."&paged=$paged&s=$s" ) );
exit;
break;
@ -199,9 +199,13 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
<div class="wrap">
<?php screen_icon('themes'); ?>
<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
if ( $s )
printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
<h2><?php
echo esc_html( $title );
if ( current_user_can('install_themes') ) {
favorite_actions( $current_screen );
}
if ( $s )
printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
</h2>
<?php

View File

@ -72,13 +72,14 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php esc_html_e( 'Users' );
if ( current_user_can( 'create_users') ) : ?>
<a href="<?php echo network_admin_url('user-new.php'); ?>" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
endif;
if ( !empty( $usersearch ) )
printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
<h2><?php
esc_html_e( 'Users' );
if ( current_user_can( 'create_users' ) ) {
favorite_actions( $current_screen );
}
if ( !empty( $usersearch ) ) {
printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
}
?>
</h2>

View File

@ -385,10 +385,11 @@ if ( !empty($invalid) )
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $title );
if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
<a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
<?php }
<h2><?php
echo esc_html( $title );
if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) {
favorite_actions( $current_screen );
}
if ( $s )
printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
</h2>

View File

@ -71,15 +71,16 @@ require_once('./admin-header.php');
<div class="wrap"><?php
screen_icon();
if ( !is_multisite() ) : ?>
<h2 class="nav-tab-wrapper">
<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a>
<?php if ( current_user_can('install_themes') ) : ?>
<a href="<?php echo admin_url( 'theme-install.php'); ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a>
<?php endif;
<h2 class="nav-tab-wrapper">
<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><?php
if ( current_user_can('install_themes') ) :
?><a href="<?php echo admin_url( 'theme-install.php'); ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php
endif;
else : ?>
<h2>
<?php echo esc_html( $title ); ?>
<h2>
<?php echo esc_html( $title ); ?>
<?php endif; ?>
</h2>

View File

@ -160,7 +160,9 @@ require_once('./admin-header.php');
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a> <?php
<h2><?php
echo esc_html( $title );
favorite_actions( $current_screen );
if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
</h2>

View File

@ -359,12 +359,7 @@ if ( ! empty($messages) ) {
<h2>
<?php
echo esc_html( $title );
if ( current_user_can( 'create_users' ) ) { ?>
<a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
<a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
<?php }
favorite_actions( $current_screen );
if ( $usersearch )
printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
</h2>

View File

@ -485,13 +485,13 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110504' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110504b' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101102' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20110429';
$colors_version = '20110504';
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
$styles->add( 'colors', true, array(), $colors_version );
@ -501,12 +501,12 @@ function wp_default_styles( &$styles ) {
$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version );
$styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20101213' );
$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20110424' );
$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20110504' );
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110121' );
$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20110104' );
$styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20110504' );
$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20110504' );
$styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20110504b' );
$styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110121' ); // Readme as well
$styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20101203' );
$styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20110504' );
$styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20110121' );
$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );
$styles->add( 'login', "/wp-admin/css/login$suffix.css", array(), '20110121' );
@ -515,7 +515,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u' );
$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
$styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100907' );
$styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20110504' );
$styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20110419' );
$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101224' );
$styles->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/css/wplink$suffix.css", array(), '20101224' );