Changeset 7720

Timestamp:

04/17/2008 07:32:38 PM (18 years ago)

Author:

ryan

Message:

Revert [7689], gonna try another approach. see #6677

Location:

trunk

Files:

• wp-admin/edit-form-advanced-tabs.php (deleted)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/images/loading.gif (deleted)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/js/post.js (modified) (1 diff)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -220 +220 @@
 <div id="category-adder" class="wp-hidden-children">
     <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4>
-    <p id="category-add" class="wp-hidden-child"></p>
+    <p id="category-add" class="wp-hidden-child">
+        <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" />
+        <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
+        <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" />
+        <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
+        <span id="category-ajax-response"></span>
+    </p>
 </div>
 
 <ul id="category-tabs">
-    <li class="ui-tabs-selected"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
-    <li class="wp-no-js-hidden"><a id="category-tabs-all" href="edit-form-advanced-tabs.php?post=<?php echo $post_ID; ?>" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
+    <li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
+    <li class="wp-no-js-hidden"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
 </ul>
 
 <div id="categories-pop" class="ui-tabs-panel" style="display: none;">
     <ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
-        <?php $popular_ids = wp_popular_terms_checklist('category'); // If we up the # here we have to do so in edit-form-advanced-tabs.php too ?>
+        <?php $popular_ids = wp_popular_terms_checklist('category'); ?>
+    </ul>
+</div>
+
+<div id="categories-all" class="ui-tabs-panel">
+    <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+        <?php dropdown_categories( 0, 0, $popular_ids ); ?>
     </ul>
 </div>

trunk/wp-admin/includes/template.php

@@ -195 +195 @@
 
 function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10 ) {
-    global $checked_categories;
-    wp_set_checked_post_categories( $default );
     $categories = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number ) );
 
@@ -207 +205 @@
         <li id="<?php echo $id; ?>" class="popular-category">
             <label class="selectit" for="in-<?php echo $id; ?>">
-            <input id="in-<?php echo $id; ?>" type="checkbox" value="<?php echo (int) $category->term_id; ?>" name="post_category[]" <?php checked( in_array( $category->term_id, $checked_categories ), true ); ?> />
+            <input id="in-<?php echo $id; ?>" type="checkbox" value="<?php echo (int) $category->term_id; ?>" />
                 <?php echo wp_specialchars( apply_filters( 'the_category', $category->name ) ); ?>
             </label>

trunk/wp-admin/js/post.js

@@ -101 +101 @@
 
     // category tabs
-    var newCatFocus = false;
-    var categoryTabs =jQuery('#category-tabs').tabs( {
-        cache: true,
-        show: function(ui) {
-            if ( 'category-tabs-all' != ui.id ) { return; } // only do this for the all tab
-            var adder = jQuery('#category-add-hidden');
+    var categoryTabs =jQuery('#category-tabs').tabs();
 
-            if ( !adder.size() ) { return; } // we're already done
-
-            // Put HTML in proper place and set up the wp-lists etc
-            jQuery('#category-add').html( adder.remove().html() );
-
-            // Ajax Cat
-            var newCat = jQuery('#newcat').one( 'focus', function() { jQuery(this).val( '' ).removeClass( 'form-input-tip' ) } );
-            jQuery('#category-add-sumbit').click( function() { newCat.focus(); } );
-            var newCatParent = false;
-            var newCatParentOption = false;
-            var noSyncChecks = false; // prophylactic. necessary?
-            var syncChecks = function() {
-                if ( noSyncChecks )
+    // Ajax Cat
+    var newCat = jQuery('#newcat').one( 'focus', function() { jQuery(this).val( '' ).removeClass( 'form-input-tip' ) } );
+    jQuery('#category-add-sumbit').click( function() { newCat.focus(); } );
+    var newCatParent = false;
+    var newCatParentOption = false;
+    var noSyncChecks = false; // prophylactic. necessary?
+    var syncChecks = function() {
+        if ( noSyncChecks )
+            return;
+        noSyncChecks = true;
+        var th = jQuery(this);
+        var c = th.is(':checked');
+        var id = th.val().toString();
+        jQuery('#in-category-' + id + ', #in-popular-category-' + id).attr( 'checked', c );
+        noSyncChecks = false;
+    };
+    var catAddBefore = function( s ) {
+        s.data += '&' + jQuery( '#categorychecklist :checked' ).serialize();
+        return s;
+    };
+    var catAddAfter = function( r, s ) {
+        if ( !newCatParent ) newCatParent = jQuery('#newcat_parent');
+        if ( !newCatParentOption ) newCatParentOption = newCatParent.find( 'option[value=-1]' );
+        jQuery(s.what + ' response_data', r).each( function() {
+            var t = jQuery(jQuery(this).text());
+            t.find( 'label' ).each( function() {
+                var th = jQuery(this);
+                var val = th.find('input').val();
+                var id = th.find('input')[0].id
+                jQuery('#' + id).change( syncChecks );
+                if ( newCatParent.find( 'option[value=' + val + ']' ).size() )
                     return;
-                noSyncChecks = true;
-                var th = jQuery(this);
-                var c = th.is(':checked');
-                var id = th.val().toString();
-                jQuery('#in-category-' + id + ', #in-popular-category-' + id).attr( 'checked', c );
-                noSyncChecks = false;
-            };
-            var catAddBefore = function( s ) {
-                s.data += '&' + jQuery( '#categorychecklist :checked' ).serialize();
-                return s;
-            };
-            var catAddAfter = function( r, s ) {
-                if ( !newCatParent ) newCatParent = jQuery('#newcat_parent');
-                if ( !newCatParentOption ) newCatParentOption = newCatParent.find( 'option[value=-1]' );
-                jQuery(s.what + ' response_data', r).each( function() {
-                    var t = jQuery(jQuery(this).text());
-                    t.find( 'label' ).each( function() {
-                        var th = jQuery(this);
-                        var val = th.find('input').val();
-                        var id = th.find('input')[0].id
-                        jQuery('#' + id).change( syncChecks );
-                        if ( newCatParent.find( 'option[value=' + val + ']' ).size() )
-                            return;
-                        var name = jQuery.trim( th.text() );
-                        var o = jQuery( '<option value="' +  parseInt( val, 10 ) + '"></option>' ).text( name );
-                        newCatParent.prepend( o );
-                    } );
-                    newCatParentOption.attr( 'selected', true );
-                } );
-            };
-            jQuery('#categorychecklist').wpList( {
-                alt: '',
-                response: 'category-ajax-response',
-                addBefore: catAddBefore,
-                addAfter: catAddAfter
+                var name = jQuery.trim( th.text() );
+                var o = jQuery( '<option value="' +  parseInt( val, 10 ) + '"></option>' ).text( name );
+                newCatParent.prepend( o );
             } );
-            jQuery('.categorychecklist .popular-category :checkbox').change( syncChecks ).filter( ':checked' ).change();
-        
-            if ( newCatFocus ) {
-                jQuery('#newcat').focus();
-                newCatFocus = false;
-            }
-        }
+            newCatParentOption.attr( 'selected', true );
+        } );
+    };
+    jQuery('#categorychecklist').wpList( {
+        alt: '',
+        response: 'category-ajax-response',
+        addBefore: catAddBefore,
+        addAfter: catAddAfter
     } );
-
     jQuery('#category-add-toggle').click( function() {
         jQuery(this).parents('div:first').toggleClass( 'wp-hidden-children' );
-        categoryTabs.tabsClick( 2 );
+        categoryTabs.tabsClick( 1 );
         jQuery('#newcat').focus();
-        newCatFocus = true;
         return false;
     } );
+    jQuery('.categorychecklist .popular-category :checkbox').change( syncChecks ).filter( ':checked' ).change();
 
     jQuery('.edit-timestamp').click(function () {

trunk/wp-admin/wp-admin.css

@@ -1270 +1270 @@
 }
 
-ul#category-tabs a {
-    width: 100%;
-    display: block;
-}
-
-.ui-tabs-loading {
-    outline: none;
-    background: url(../images/loading.gif) no-repeat 0 50%;
-}
-
 #linkcategorydiv ul#category-tabs {
     float: left;

trunk/wp-includes/script-loader.php

@@ -145 +145 @@
                 'cancel' => __('Cancel'),
             ) );
-            $this->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080412' );
+            $this->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080411' );
             $this->localize( 'post', 'postL10n', array(
                 'tagsUsed' =>  __('Tags used on this post:'),