From 737aa43879d60220c79db2ba6614099ec426ad50 Mon Sep 17 00:00:00 2001 From: Matt Mullenweg Date: Wed, 28 Apr 2004 19:49:27 +0000 Subject: [PATCH] Cosmetic fixes from forums. git-svn-id: https://develop.svn.wordpress.org/trunk@1205 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/admin-functions.php | 19 ++--- wp-admin/admin-header.php | 4 +- wp-admin/edit.php | 8 +- wp-admin/menu.php | 4 +- wp-admin/menu.txt | 21 ----- wp-admin/post.php | 2 +- wp-admin/wp-admin.css | 160 ++++++++++++++++------------------- 7 files changed, 94 insertions(+), 124 deletions(-) delete mode 100644 wp-admin/menu.txt diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index db866277cc..132bcd7247 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -218,7 +218,7 @@ function list_meta($meta) { // Exit if no meta if (!$meta) return; ?> - +
@@ -230,10 +230,10 @@ function list_meta($meta) { $style = ('class="alternate"' == $style) ? '' : 'class="alternate"'; echo " - - - - + + + + "; } @@ -265,23 +265,22 @@ function meta_form() { LIMIT 10"); ?>

-
+
- - + or + -
or
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index a88cad863b..4ae400145a 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -133,7 +133,9 @@ window.onload = blurry; -

+
- + "; @@ -67,7 +67,7 @@ if( isset( $_GET['m'] ) )
-
+
@@ -75,7 +75,7 @@ if( isset( $_GET['m'] ) )
-
+
diff --git a/wp-admin/menu.php b/wp-admin/menu.php index a404706a51..734dc42d80 100644 --- a/wp-admin/menu.php +++ b/wp-admin/menu.php @@ -19,12 +19,12 @@ $menu = array( array(__('Profile'), 0, 'profile.php') ); -$self = str_replace('/wp-admin/', '', $PHP_SELF); +$self = preg_replace('|.*/wp-admin/|i', '', $_SERVER['PHP_SELF']); foreach ($menu as $item) { $class = ''; // 0 = name, 1 = user_level, 2 = file - if ((substr($self, -20) == substr($item[1], -20) && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"'; + if ((substr($self, -10) == substr($item[2], -10) && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"'; if ($user_level >= $item[1]) { if (('upload.php' == $item[2] && get_settings('use_fileupload') && ($user_level >= get_settings('fileupload_minlevel')) diff --git a/wp-admin/menu.txt b/wp-admin/menu.txt deleted file mode 100644 index 533a0f2f29..0000000000 --- a/wp-admin/menu.txt +++ /dev/null @@ -1,21 +0,0 @@ -1 post.php Write -1 edit.php Edit -3 categories.php Categories -5 link-manager.php Links -3 users.php Users -6 options-general.php Options -8 plugins.php Plugins -4 templates.php Templates -5 upload.php Upload -0 profile.php My Profile -*** -(Everything after the '***' is a comment.) - - -To add sections to the menu, use this syntax: - - the minimum level the user needs to access the section: between 0 and 10 -+tab -+the URL of the section's file -+tab -+the title of this section \ No newline at end of file diff --git a/wp-admin/post.php b/wp-admin/post.php index da4be8a1f5..80e2496ed0 100644 --- a/wp-admin/post.php +++ b/wp-admin/post.php @@ -236,7 +236,7 @@ case 'edit':

">

-
— @
+
— @
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 8871431252..7549cbc06b 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -35,7 +35,7 @@ a:hover { } body { - background-color: #fff; + background: #fff; color: #000; margin: 0; padding: 0; @@ -50,14 +50,6 @@ fieldset { padding: 2px; } -fieldset.options { - padding: 1em; -} - -fieldset.options legend { - font-size: 16px; -} - fieldset label.selectit { background: #f0f0f0; display: block; @@ -73,11 +65,23 @@ fieldset legend { padding: .1em .3em; } +fieldset legend a { + border-bottom: none; +} + fieldset span.cat-nest { display: block; margin-left: 10px; } +fieldset.options { + padding: 1em; +} + +fieldset.options legend { + font-size: 16px; +} + form, label input { margin: 0; padding: 0; @@ -155,17 +159,10 @@ textarea, input, select { font: 12px Georgia, "Times New Roman", Times, serif; } -.submit { +.submit, #quicktags, .editform th, #postcustomsubmit { text-align: right; } -.updated { - background-color: #f0f8ff; - border: 1px solid #69c; - margin: 5px 5% 10px; - padding: 0 1em 0 1em; -} - .unapproved { color: #888; } @@ -182,6 +179,13 @@ textarea, input, select { color: #009ef0; } +.updated { + background: #f0f8ff; + border: 1px solid #69c; + margin: 5px 5% 10px; + padding: 0 1em 0 1em; +} + .wrap { border: 1px solid #ccc; margin: 15px 5%; @@ -192,6 +196,12 @@ textarea, input, select { margin: 6px 0; } +#adminmenu { + border-bottom: 2px solid #707070; + margin: 2px 2px 0 2px; + padding: 0 2px; +} + #adminmenu .current, #adminmenu2 .current { font-weight: bold; } @@ -206,24 +216,6 @@ textarea, input, select { text-decoration: none; } -#adminmenu2 a { - border: none; - color: #fff; - font-size: 16px; - font-weight: normal; - margin: 0; - padding: 3px 5px; - text-decoration: none; -} -#adminmenu2 a:hover { - background-color: #f0f0f0; - color: black; -} -#adminmenu2 .current { - background-color: #fff; - color: #000; -} - #adminmenu a:hover, .current { background: #eaeaea; border: 1px solid #9d9d9d; @@ -237,27 +229,42 @@ textarea, input, select { text-align: center; } -#adminmenu { - border-bottom: 2px solid #707070; - margin: 2px 2px 0 2px; - padding: 0 2px; -} - #adminmenu2 { + background: #707070; + border-bottom: none; + height: 20px; margin: 0 2px; padding: 0; - border-bottom: none; - background-color: #707070; - height: 20px; } -#adminmenu2 li { - line-height: 1.7em; + +#adminmenu2 .current { + background: #fff; + color: #000; +} + +#adminmenu2 a { + border: none; + color: #fff; + font-size: 16px; + font-weight: normal; + margin: 0; + padding: 3px 5px; + text-decoration: none; } #adminmenu2 a { font-size: 12px; } +#adminmenu2 a:hover { + background: #f0f0f0; + color: #000; +} + +#adminmenu2 li { + line-height: 1.7em; +} + #categorydiv { line-height: 130%; margin-right: 15px; @@ -327,9 +334,13 @@ textarea, input, select { #postcustom { border: 1px solid #aaa; - margin: 0.25em; - padding: 0.25em; - width: 98%; + padding: .5em; + width: 97%; +} + +#postcustom .updatemeta, #postcustom .deletemeta { + margin: auto; + width: 5em; } #postcustom p { @@ -339,35 +350,12 @@ textarea, input, select { #postcustom table { border: 1px solid #ccc; margin: .5em; - width: 100%; - + width: 98%; } + #postcustom table input, #postcustom table textarea { - width: 97%; -} - -#postcustom td, #postcustom th { - color: #000; - margin: 0.2em; - padding: .3em; -} - -#postcustom .updatemeta, #postcustom .deletemeta { - width: 90%; - margin: auto; -} - -fieldset legend a { - border-bottom: none; -} -#postcustomvals { - float: right; - width: 49%; -} - -#save { - width: 13em; + width: 95%; } #poststatusdiv { @@ -378,10 +366,9 @@ fieldset legend a { margin-right: 11em; } -#poststuff textarea { +#content { + margin-left: 1%; width: 97%; - margin-left:1%; - } #profile { @@ -406,14 +393,14 @@ fieldset legend a { margin: 0 0 4px 0; } -#quicktags, .editform th, #postcustomsubmit { - text-align: right; -} - #quicktags { margin-right: 1%; } +#save { + width: 13em; +} + #slugdiv { width: 9.4em; } @@ -426,13 +413,10 @@ fieldset legend a { #wphead { background: url(../wp-images/header-shadow.png) #f2f2f2 repeat-x bottom; - height: 44px; - margin: 0; padding: 4px 0 0 5px; } #wphead a { - background: url(../wp-images/wp-small.png) no-repeat; border-bottom: none; display: block; height: 44px; @@ -440,3 +424,9 @@ fieldset legend a { text-indent: -1000px; width: 200px; } + +#wphead h1 { + background: url(../wp-images/wp-small.png) no-repeat; + height: 44px; + margin: 0; +}