From 28f001214c718323a5f34e2d399b31e2b807fff4 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Sat, 25 Oct 2008 20:55:40 +0000
Subject: [PATCH] More styling for the Tags page, change the Options pages
 background color to light gray

git-svn-id: https://develop.svn.wordpress.org/trunk@9345 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/admin-ajax.php       |  1 +
 wp-admin/css/colors-fresh.css | 21 ++++++++++++++-------
 wp-admin/edit-tags.php        | 34 ++++++++++++++++++++--------------
 wp-admin/wp-admin.css         | 35 ++++++++++++++++++++++++-----------
 4 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index c3ebb7ff4b..32402c1fc2 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -414,6 +414,7 @@ case 'add-tag' : // From Manage->Tags
 	$x = new WP_Ajax_Response( array(
 		'what' => 'tag',
 		'id' => $tag->term_id,
+		'position' => '-1',
 		'data' => _tag_row( $tag ),
 		'supplemental' => array('name' => $tag_full_name, 'show-link' => sprintf(__( 'Tag <a href="#%s">%s</a> added' ), "tag-$tag->term_id", $tag_full_name))
 	) );
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 525698a63f..5d53e697e6 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -65,12 +65,17 @@ li.widget-list-control-item h4.widget-title a,
 }
 
 li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
-.form-table tr, #poststuff h3, .metabox-holder h3, #replyhandle,
+ #poststuff h3, .metabox-holder h3, #replyhandle,
 .login form, h3.info-box-title, #post-status-info, #screen-options-wrap,
 #wpbody-content .describe tr, #edithead, #replyhead  {
 	background-color: #eaf3fa;
 }
 
+.form-table tr,
+.form-wrap .form-field {
+	background-color: #f1f1f1;
+}
+
 select {
 	background-color: #fff;
 	border-color: #ddd;
@@ -151,8 +156,14 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	border-color: #c00 !important;
 }
 
-.form-table input, .form-table textarea, .search-input {
-	border-color: #c6d9e9;
+.form-table input,
+.form-table textarea,
+.search-input,
+.form-field input,
+.form-field textarea,
+.submit,
+.submit-top {
+	border-color: #DFDFDF;
 }
 
 .form-table td,
@@ -769,10 +780,6 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
 	color: #333;
 }
 
-.form-wrap .form-field {
-	background-color: #f5f5f5;
-}
-
 /* Diff */
 
 table.diff .diff-deletedline {
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 9d4a870788..797a60e6d3 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -113,9 +113,11 @@ if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
 	 exit;
 }
 
+$can_manage = current_user_can('manage_categories');
+
 wp_enqueue_script( 'admin-tags' );
 wp_enqueue_script('admin-forms');
-if ( current_user_can('manage_categories') )
+if ( $can_manage )
 	wp_enqueue_script('inline-edit-tax');
 
 require_once ('admin-header.php');
@@ -241,9 +243,21 @@ if ( $page_links )
 
 <div id="col-left">
 <div class="col-wrap">
-<?php if ( current_user_can('manage_categories') ) {
+
+<div class="tagcloud">
+<h3><?php _e('Popular Tags'); ?></h3>
+<?php 
+if ( $can_manage )
+	wp_tag_cloud(array('link' => 'edit')); 
+else
+	wp_tag_cloud(); 
+?>
+</div>
+
+<?php if ( $can_manage ) {
 	do_action('add_tag_form_pre', $tag); ?>
 
+<div class="form-wrap">
 <h3><?php _e('Add a New Tag'); ?></h3>
 <div id="ajax-response"></div>
 <form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">
@@ -251,7 +265,6 @@ if ( $page_links )
 <input type="hidden" name="tag_ID" value="<?php echo $tag->term_id ?>" />
 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-tag'); ?>
 
-<div class="form-wrap">
 <div class="form-field form-required">
 	<label for="name"><?php _e('Tag name') ?></label>
 	<input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo attribute_escape($tag->name); ?>" size="40" aria-required="true" />
@@ -262,19 +275,12 @@ if ( $page_links )
 	<label for="slug"><?php _e('Tag slug') ?></label>
 	<input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
     <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
-</div></div>
+</div>
 
 <p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Tag'); ?>" /></p>
-<?php
-do_action('edit_tag_form', $tag);
-
-} ?>
-</form>
-
-<div class="tagcloud">
-<h3><?php _e('Popular Tags'); ?></h3>
-<?php wp_tag_cloud(array('link' => 'edit')); ?>
-</div>
+<?php do_action('edit_tag_form', $tag); ?>
+</form></div>
+<?php } ?>
 
 </div>
 </div><!-- /col-left -->
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 8d33d719f7..4db372d0a0 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -188,7 +188,8 @@ table#availablethemes td.bottom {
 }
 
 .submit {
-	border-top: 1px solid #ccc;
+	border-top-style: solid;
+	border-top-width: 1px;
 	padding: 1.5em 0;
 	margin: 5px 0;
 	-moz-border-radius: 0 0 3px 3px;
@@ -201,8 +202,9 @@ table#availablethemes td.bottom {
 }
 
 .submit-top {
-	border-top: 0;
-	border-bottom: 1px solid #ccc;
+	border-top: 0 none;
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
 }
 
 #misc-publishing-actions {
@@ -1184,14 +1186,14 @@ table.form-table td .updated {
 
 /* divs for cats and tags pages */
 
-.col-wrap h3 {
-	margin: 12px 0;
+.form-wrap {
+	margin: 10px 0;
+	width: 90%;
 }
 
-.form-wrap {
-	margin: 8px 0 -8px;
+.form-wrap p,
+.form-wrap label {
 	font-size: 11px;
-	width: 90%;
 }
 
 .form-wrap label {
@@ -1200,7 +1202,9 @@ table.form-table td .updated {
 	font-weight: bold;
 }
 
-.form-wrap input {
+.form-field input {
+	border-style: solid;
+	border-width: 1px;
 	width: 95%;
 }
 
@@ -1214,13 +1218,22 @@ table.form-table td .updated {
 	padding: 8px;
 }
 
+.col-wrap h3 {
+	margin: 12px 0;
+	font-size: 1.1em;
+}
+
 .col-wrap p.submit {
-	width: 90%;
+	margin-top: -10px;
 }
 
 .tagcloud {
 	width: 90%;
-	margin: 20px 5px 5px;
+	margin: 10px 0 40px;
+}
+
+#col-left .col-wrap {
+	margin-left: 12px;
 }
 
 /* Post Screen */