Changeset 6660

Timestamp:

01/25/2008 07:29:01 PM (17 years ago)

Author:

ryan

Message:

First cut at Manage->Tags. Props jhodgdon. see #5684

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (2 diffs)
• wp-admin/edit-tag-form.php (added)
• wp-admin/edit-tags.php (added)
• wp-admin/edit.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/js/tags.js (added)
• wp-admin/menu.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -60 +60 @@
 
     if ( wp_delete_category( $id ) )
+        die('1');
+    else    die('0');
+    break;
+case 'delete-tag' :
+    check_ajax_referer( "delete-tag_$id" );
+    if ( !current_user_can( 'manage_categories' ) )
+        die('-1');
+
+    if ( wp_delete_term($id, 'post_tag'))
         die('1');
     else    die('0');
@@ -300 +309 @@
         'id' => $term_id,
         'data' => $link_cat
+    ) );
+    $x->send();
+    break;
+case 'add-tag' : // From Manage->Tags
+    check_ajax_referer( 'add-tag' );
+    if ( !current_user_can( 'manage_categories' ) )
+        die('-1');
+
+    if ( '' === trim($_POST['name']) ) {
+        $x = new WP_Ajax_Response( array(
+            'what' => 'tag',
+            'id' => new WP_Error( 'name', __('You did not enter a tag name.') )
+        ) );
+        $x->send();
+    }
+
+    $tag = wp_insert_term($_POST['name'], 'post_tag', $_POST );
+
+    if ( is_wp_error($tag) ) {
+        $x = new WP_Ajax_Response( array(
+            'what' => 'tag',
+            'id' => $tag
+        ) );
+        $x->send();
+    }
+
+    if ( !$tag || (!$tag = get_term( $tag['term_id'], 'post_tag' )) )
+        die('0');
+
+    $tag_full_name = $tag->name;
+    $tag_full_name = attribute_escape($tag_full_name);
+
+    $x = new WP_Ajax_Response( array(
+        'what' => 'tag',
+        'id' => $tag->term_id,
+        '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))
     ) );
     $x->send();

trunk/wp-admin/edit.php

@@ -49 +49 @@
     $h2_search = isset($_GET['s'])   && $_GET['s']   ? ' ' . sprintf(__('matching “%s”'), wp_specialchars( get_search_query() ) ) : '';
     $h2_cat    = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in “%s”'), single_cat_title('', false) ) : '';
+    $h2_tag    = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with “%s”'), single_tag_title('', false) ) : '';
     $h2_month  = isset($_GET['m'])   && $_GET['m']   ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : '';
-    printf( _c( '%1$s%2$s%3$s%4$s%5$s|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_month );
+    printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month );
 }
 ?></h2>

trunk/wp-admin/includes/template.php

@@ -231 +231 @@
         echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', ($checked ? ' checked="checked"' : "" ), '/> ', $name, "</label></li>";
     }
+}
+
+// Tag stuff
+
+// Returns a single tag row (see tag_rows below)
+// Note: this is also used in admin-ajax.php!
+function _tag_row( $tag, $class = '' ) {
+        $count = number_format_i18n( $tag->count );
+        $count = ( $count > 0 ) ? "<a href='edit.php?tag=$tag->slug'>$count</a>" : $count;
+        
+        $out = '';
+        $out .= '<tr id="tag-' . $tag->term_id . '"' . $class . '>';
+        $out .= '<th scope="row">' . $tag->term_id . '</th>';
+
+        $out .= '<td>' . apply_filters( 'term_name', $tag->name ) . '</td>';
+
+        $out .= "<td>$count</td>";      
+        $out .= '<td><a href="edit-tags.php?action=edit&amp;tag_ID=' . $tag->term_id . '" class="edit">' .
+            __( 'Edit' ) . "</a></td>" .
+            '<td><a href="' . wp_nonce_url( "edit-tags.php?action=delete&amp;tag_ID=$tag->term_id", 
+                    'delete-tag_' . $tag->term_id ) . 
+                '" class="delete:the-list:tag-' . $tag->term_id . ' delete">' .
+                __( 'Delete' ) . "</a></td>";
+        $out .= '</tr>';
+        
+        return $out;
+}
+
+// Outputs appropriate rows for the Nth page of the Tag Management screen,
+// assuming M tags displayed at a time on the page 
+// Returns the number of tags displayed
+function tag_rows( $page = 0, $pagesize = 20 ) {
+    
+    // Get a page worth of tags
+    $start = $page * $pagesize;
+    $tags = get_terms( 'post_tag', "offset=$start&number=$pagesize&hide_empty=0"  );
+    
+    // convert it to table rows
+    $out = '';
+    $class = '';
+    $i = 0;
+    $count = 0;
+    foreach( $tags as $tag ) {
+        if( $i ) {
+            $i = 0;
+            $class = ' class="alternate"';
+        } else {
+            $i = 1;
+            $class = '';
+        }
+
+        $out .= _tag_row( $tag, $class );
+        $count++;
+    }
+    
+    // filter and send to screen
+    $out = apply_filters('tag_rows', $out);
+    echo $out;
+    return $count;
 }
 

trunk/wp-admin/menu.php

@@ -41 +41 @@
 $submenu['edit.php'][15] = array(__('Links'), 'manage_links', 'link-manager.php');
 $submenu['edit.php'][20] = array(__('Categories'), 'manage_categories', 'categories.php');
+$submenu['edit.php'][21] = array(__('Tags'), 'manage_categories', 'edit-tags.php');
 $submenu['edit.php'][25] = array(__('Media Library'), 'upload_files', 'upload.php');
 $submenu['edit.php'][30] = array(__('Import'), 'import', 'import.php');

trunk/wp-includes/script-loader.php

@@ -117 +117 @@
             ) );
             $this->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20071031' );
+            $this->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists'), '20071031' );
             $this->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20070823' );
             $this->add( 'password-strength-meter', '/wp-admin/js/password-strength-meter.js', array('jquery'), '20070405' ); 

trunk/wp-includes/taxonomy.php

@@ -526 +526 @@
         'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
         'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '',
-        'pad_counts' => false);
+        'pad_counts' => false, 'offset' => '');
     $args = wp_parse_args( $args, $defaults );
     $args['number'] = absint( $args['number'] );
+    $args['offset'] = absint( $args['offset'] );
     if ( !$single_taxonomy || !is_taxonomy_hierarchical($taxonomies[0]) ||
         '' != $args['parent'] ) {
@@ -626 +627 @@
         $where .= ' AND tt.count > 0';
 
-    if ( !empty($number) )
-        $number = 'LIMIT ' . $number;
-    else
+    if ( !empty($number) ) {
+        if( $offset )
+            $number = 'LIMIT ' . $offset . ',' . $number;
+        else 
+            $number = 'LIMIT ' . $number;
+        
+    } else
         $number = '';