Ticket #6387: post-taxonomy-ui-r7493-2.patch

wp-admin/js/post.js

@@ -2 +2 @@
 
 function new_tag_remove_tag() {
         var id = jQuery( this ).attr( 'id' );
-        var num = id.substr( 10 );
-        var current_tags = jQuery( '#tags-input' ).val().split(',');
+        var num = id.split('-check-num-')[1];
+        var obj = jQuery(this).parents('.tagsdiv');
+        var current_tags = jQuery(obj).find( '.tags-input' ).val().split(',');
         delete current_tags[num];
         var new_tags = [];
         jQuery.each( current_tags, function( key, val ) {
@@ -11 +12 @@
                         new_tags = new_tags.concat( val );
                 }
         });
-        jQuery( '#tags-input' ).val( new_tags.join( ',' ).replace( /\s*,+\s*/, ',' ).replace( /,+/, ',' ).replace( /,+\s+,+/, ',' ).replace( /,+\s*$/, '' ).replace( /^\s*,+/, '' ) );
-        tag_update_quickclicks();
-        jQuery('#newtag').focus();
+        jQuery( obj ).find( '.tags-input' ).val( new_tags.join( ',' ).replace( /\s*,+\s*/, ',' ).replace( /,+/, ',' ).replace( /,+\s+,+/, ',' ).replace( /,+\s*$/, '' ).replace( /^\s*,+/, '' ) );
+        tag_update_quickclicks(obj);
+        jQuery( obj ).find('input.newtag').focus();
         return false;
 }
 
-function tag_update_quickclicks() {
-        var current_tags = jQuery( '#tags-input' ).val().split(',');
-        jQuery( '#tagchecklist' ).empty();
+function tag_update_quickclicks(obj) {
+        var current_tags = jQuery(obj).find('.tags-input').val().split(',');
+        jQuery(obj).find( '.tagchecklist' ).empty();
         shown = false;
 //      jQuery.merge( current_tags, current_tags ); // this doesn't work anymore, need something to array_unique
         jQuery.each( current_tags, function( key, val ) {
                 val = val.replace( /^\s+/, '' ).replace( /\s+$/, '' ); // trim
                 if ( !val.match(/^\s+$/) && '' != val ) {
-                        txt = '<span><a id="tag-check-' + key + '" class="ntdelbutton">X</a>&nbsp;' + val + '</span> ';
-                        jQuery( '#tagchecklist' ).append( txt );
-                        jQuery( '#tag-check-' + key ).click( new_tag_remove_tag );
+                        var button_id = jQuery(obj).attr('id') + '-check-num-' + key;
+                        txt = '<span><a id="' + button_id + '" class="ntdelbutton">X</a>&nbsp;' + val + '</span> ';
+                        jQuery(obj).find( '.tagchecklist' ).append( txt );
+                        jQuery( '#' + button_id ).click( new_tag_remove_tag );
                         shown = true;
                 }
         });
         if ( shown )
-                jQuery( '#tagchecklist' ).prepend( '<strong>'+postL10n.tagsUsed+'</strong><br />' );
+                jQuery(obj).find( '.tagchecklist' ).prepend( '<strong>'+postL10n.tagsUsed+'</strong><br />' );
 }
 
 function tag_flush_to_text() {
-        var newtags = jQuery('#tags-input').val() + ',' + jQuery('#newtag').val();
+        obj = jQuery(this).parents('.tagsdiv');
+        
+        var newtags = jQuery(obj).find('.tags-input').val() + ',' + jQuery(obj).find('input.newtag').val();
         // massage
         newtags = newtags.replace( /\s+,+\s*/g, ',' ).replace( /,+/g, ',' ).replace( /,+\s+,+/g, ',' ).replace( /,+\s*$/g, '' ).replace( /^\s*,+/g, '' );
-        jQuery('#tags-input').val( newtags );
-        tag_update_quickclicks();
-        jQuery('#newtag').val('');
-        jQuery('#newtag').focus();
+        jQuery(obj).find('.tags-input').val( newtags );
+        tag_update_quickclicks(obj);
+        jQuery(obj).find('input.newtag').val('');
+        jQuery(obj).find('input.newtag').focus();
         return false;
 }
 
 function tag_save_on_publish() {
-        if ( jQuery('#newtag').val() != postL10n.addTag )
-                tag_flush_to_text();
+        jQuery('.tagsdiv').each( function(i) {
+                if ( jQuery(this).find('input.newtag').val() != postL10n.addTag )
+                        tag_flush_to_text();
+                } );
 }
 
 function tag_press_key( e ) {
@@ -58 +64 @@
         }
 }
 
-jQuery(document).ready( function() {
-        // postboxes
-        add_postbox_toggles('post');
-
-        // Editable slugs
-        make_slugedit_clickable();
-
-        // hide advanced slug field
-        jQuery('#slugdiv').hide();
-
-        jQuery('#tags-input').hide();
-        tag_update_quickclicks();
+function tag_init() {
+        jQuery('.ajaxtag').show();
+        jQuery('.tags-input').hide();
+        jQuery('.tagsdiv').each( function(i) {
+                        tag_update_quickclicks(this);
+                } );
+                
         // add the quickadd form
-        jQuery('#jaxtag').prepend('<span id="ajaxtag"><input type="text" name="newtag" id="newtag" class="form-input-tip" size="16" autocomplete="off" value="'+postL10n.addTag+'" /><input type="button" class="button" id="tagadd" value="' + postL10n.add + '" tabindex="3" /><input type="hidden"/><input type="hidden"/><span class="howto">'+postL10n.separate+'</span></span>');
-        jQuery('#tagadd').click( tag_flush_to_text );
-        jQuery('#newtag').focus(function() {
+        jQuery('.ajaxtag input.tagadd').click( tag_flush_to_text );
+        jQuery('.ajaxtag input.newtag').focus(function() {
                 if ( this.value == postL10n.addTag )
                         jQuery(this).val( '' ).removeClass( 'form-input-tip' );
         });
-        jQuery('#newtag').blur(function() {
+        jQuery('.ajaxtag input.newtag').blur(function() {
                 if ( this.value == '' )
                         jQuery(this).val( postL10n.addTag ).addClass( 'form-input-tip' );
         });
@@ -86 +86 @@
         jQuery('#publish').click( tag_save_on_publish );
         jQuery('#save-post').click( tag_save_on_publish );
 
+}
+
+
+jQuery(document).ready( function() {
+        // postboxes
+        add_postbox_toggles('post');
+
+        // Editable slugs
+        make_slugedit_clickable();
+
+        // hide advanced slug field
+        jQuery('#slugdiv').hide();
+        
+        // prepare the tag UI
+        tag_init();
+
         jQuery('#title').blur( function() { if ( (jQuery("#post_ID").val() > 0) || (jQuery("#title").val().length == 0) ) return; autosave(); } );
 
         // auto-suggest stuff

wp-admin/edit-form-advanced.php

@@ -204 +204 @@
 <?php echo $form_pingback ?>
 <?php echo $form_prevstatus ?>
 
-<div id="tagsdiv" class="postbox <?php echo postbox_classes('tagsdiv', 'post'); ?>">
-<h3><?php _e('Tags'); ?></h3>
+<?php
+
+register_taxonomy( 'post_keyword', 'post' );
+register_taxonomy( 'post_place', 'post' );
+
+// all tag-style post taxonomies
+foreach ( get_object_taxonomies('post') as $_tax ) {
+        if ( !is_taxonomy_hierarchical($_tax) ) {
+                // TODO: this requires plugins to supply their own get_foo_to_edit() function.
+                // It'd probably be neater to fetch them all automatically.
+                if ( $_tax == 'post_tag' ) {
+                        $tags_to_edit = get_tags_to_edit( $post_ID );
+                        $input_name = 'tags_input';
+                }
+                else {
+                        $tags_to_edit = apply_filters('get_tax_to_edit', '', $post_ID, $_tax);
+                        $input_name = "tax_input[{$_tax}]";
+                }
+
+                ?>
+<div id="tagsdiv-<?php echo $_tax; ?>" class="postbox tagsdiv <?php echo postbox_classes('tagsdiv-'.$_tax, 'post'); ?>">
+<h3><?php _e($_tax); ?></h3>
 <div class="inside">
-<p id="jaxtag"><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" /></p>
-<div id="tagchecklist"></div>
+<p class="jaxtag"><input type="text" name="<?php echo $input_name; ?>" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo $tags_to_edit; ?>" />
+
+<span class="ajaxtag" style="display:none;"><input type="text" name="newtag[]" class="newtag form-input-tip" size="16" autocomplete="off" value="<?php _e('Add new tag'); ?>" /><input type="button" class="button tagadd" value="<?php _e('Add'); ?>" tabindex="3" /><input type="hidden"/><input type="hidden"/><span class="howto"><?php _e('Separate tags with commas'); ?></span></span>
+        
+        </p>
+<div class="tagchecklist"></div>
 </div>
 </div>
+                <?
+        }
+}
 
+?>
+
 <div id="categorydiv" class="postbox <?php echo postbox_classes('categorydiv', 'post'); ?>">
 <h3><?php _e('Categories') ?></h3>
 <div class="inside">