Changeset 9339

Timestamp:

10/25/2008 08:01:37 AM (16 years ago)

Author:

azaozz

Message:

2 column Tags page, needs more styling

Location:

trunk/wp-admin

Files:

• css/colors-fresh.css (modified) (1 diff)
• css/global.css (modified) (1 diff)
• edit-tag-form.php (modified) (2 diffs)
• edit-tags.php (modified) (2 diffs)
• wp-admin.css (modified) (1 diff)

trunk/wp-admin/css/colors-fresh.css

@@ -770 +770 @@
 }
 
+.form-wrap .form-field {
+    background-color: #f5f5f5;
+}
+
 /* Diff */
 

trunk/wp-admin/css/global.css

@@ -50 +50 @@
 }
 
+/* 2 columns main area */
+
+#col-container {
+    overflow: hidden;
+    padding: 0;
+    margin: 0;
+}
+
+#col-left {
+    padding: 0;
+    margin: 0;
+    overflow: hidden;
+    width: 39%;
+}
+
+#col-right {
+    float: right;
+    clear: right;
+    overflow: hidden;
+    padding: 0;
+    margin: 0;
+    width: 59%;
+}
 
 /* styles for use by people extending the WordPress interface */

trunk/wp-admin/edit-tag-form.php

@@ -7 +7 @@
  */
 
-if ( ! empty($tag_ID) ) {
-    /**
-     * @var string
-     */
-    $heading = '';
-    $submit_text = __('Edit Tag');
-    $form = '<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">';
-    $action = 'editedtag';
-    $nonce_action = 'update-tag_' . $tag_ID;
-    do_action('edit_tag_form_pre', $tag);
-} else {
-    $heading = '<h2>' . __('Add Tag') . '</h2>';
-    $submit_text = __('Add Tag');
-    $form = '<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">';
-    $action = 'addtag';
-    $nonce_action = 'add-tag';
-    do_action('add_tag_form_pre', $tag);
+if ( empty($tag_ID) ) { ?>
+    <div id="message" class="updated fade"><p><strong><?php _e('A tag was not selected for editing.'); ?></strong></p></div>
+<?php
+    return;
 }
-?>
+
+do_action('edit_tag_form_pre', $tag); ?>
 
 <div class="wrap">
-<?php echo $heading ?>
+<h2><?php _e('Edit Tag'); ?></h2>
 <div id="ajax-response"></div>
-<?php echo $form ?>
-<input type="hidden" name="action" value="<?php echo $action ?>" />
+<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">
+<input type="hidden" name="action" value="editedtag" />
 <input type="hidden" name="tag_ID" value="<?php echo $tag->term_id ?>" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?>
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
     <table class="form-table">
         <tr class="form-field form-required">
@@ -46 +34 @@
         </tr>
     </table>
-<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Edit Tag'); ?>" /></p>
 <?php do_action('edit_tag_form', $tag); ?>
 </form>

trunk/wp-admin/edit-tags.php

@@ -155 +155 @@
 <br class="clear" />
 
+<div id="col-container">
+
+<div id="col-right">
+<div class="col-wrap">
 <form id="posts-filter" action="" method="get">
 <div class="tablenav">
-
 <?php
 $pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
@@ -234 +237 @@
 <br class="clear" />
 </form>
-
-</div>
-
-<?php if ( current_user_can('manage_categories') ) : ?>
-
-<br />
-<?php include('edit-tag-form.php'); ?>
+</div>
+</div><!-- /col-right -->
+
+<div id="col-left">
+<div class="col-wrap">
+<?php if ( current_user_can('manage_categories') ) {
+    do_action('add_tag_form_pre', $tag); ?>
+
+<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">
+<input type="hidden" name="action" value="addtag" />
+<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" />
+    <p><?php _e('The name is how the tag appears on your site.'); ?></p>
+</div>
+
+<div class="form-field">
+    <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>
+
+<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(); ?>
+</div>
+
+</div>
+</div><!-- /col-left -->
+
+</div><!-- /col-container -->
+</div><!-- /wrap -->
 <?php inline_edit_term_row('tag'); ?>
 
-<?php endif; ?>
-
 <?php
 break;

trunk/wp-admin/wp-admin.css

@@ -1181 +1181 @@
 table.form-table td .updated {
     font-size: 13px;
+}
+
+/* divs for cats and tags pages */
+
+.col-wrap h3 {
+    margin: 12px 0;
+}
+
+.form-wrap {
+    margin: 8px 0 -8px;
+    font-size: 11px;
+    width: 90%;
+}
+
+.form-wrap label {
+    display: block;
+    padding: 2px;
+    font-weight: bold;
+}
+
+.form-wrap input {
+    width: 95%;
+}
+
+.form-wrap p {
+    margin: 2px 0 5px;
+    font-style: italic;
+}
+
+.form-wrap .form-field {
+    margin: 0 0 10px;
+    padding: 8px;
+}
+
+.col-wrap p.submit {
+    width: 90%;
+}
+
+.tagcloud {
+    width: 90%;
+    margin: 20px 5px 5px;
 }