Changeset 6713

Timestamp:

02/02/2008 08:31:56 PM (17 years ago)

Author:

ryan

Message:

Fix edit link form categories a bit. AJAX add still needs work.

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-link-form.php (modified) (2 diffs)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/js/link.js (modified) (3 diffs)
• wp-admin/js/postbox.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

@@ -211 +211 @@
 <div id="categories-pop" class="ui-tabs-panel" style="display: none;">
     <ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
-        <?php wp_popular_categories_checklist(); ?>
+        <?php wp_popular_terms_checklist('category'); ?>
     </ul>
 </div>

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

@@ -71 +71 @@
 <div id="category-adder" class="wp-hidden-children">
     <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
-    <p id="category-add" class="wp-hidden-child">
+    <p id="link-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' ); ?>" />
-        <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category') ) ); ?>
         <input type="button" id="category-add-sumbit" class="add:categorychecklist:linkcategorydiv button" value="<?php _e( 'Add' ); ?>" />
         <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
@@ -93 +92 @@
 <div id="categories-pop" class="ui-tabs-panel" style="display: none;">
     <ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
-        <?php wp_popular_categories_checklist(); ?>
+        <?php wp_popular_terms_checklist('link_category'); ?>
     </ul>
 </div>

trunk/wp-admin/includes/template.php

@@ -188 +188 @@
 }
 
-function wp_popular_categories_checklist( $default = 0, $number = 10 ) {
-    $categories = get_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number ) );
+function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10 ) {
+    $categories = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number ) );
 
     foreach ( (array) $categories as $category ) {

trunk/wp-admin/js/link.js

@@ -9 +9 @@
     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() {
@@ -23 +21 @@
     };
     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());
@@ -32 +28 @@
                 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 );
         } );
     };

trunk/wp-admin/js/postbox.js

@@ -6 +6 @@
 function save_postboxes_state() {
     var closed = jQuery('.postbox').filter('.closed').map(function() { return this.id; }).get().join(',');
-    jQuery.post(postL10n.requestFile, {
+    jQuery.post(postboxL10n.requestFile, {
         action: 'closed-postboxes',
         closed: closed,

trunk/wp-admin/wp-admin.css

@@ -1366 +1366 @@
 }
 
+#linkcategorydiv #category-adder {
+    margin-left: 120px;
+    padding: 4px 0;
+}
+
+#linkcategorydiv ul#category-tabs {
+    float: left;
+    width: 120px;
+    text-align: right;
+    /* Negative margin for the sake of those without JS: all tabs display */
+    margin: 0 -120px 0 0;
+    padding: 0;
+}
+
+#linkcategorydiv ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+
+#linkcategorydiv ul.categorychecklist ul {
+    margin-left: 18px;
+}
+
 /* Global classes */
 .wp-hidden-children .wp-hidden-child { display: none; }

trunk/wp-includes/script-loader.php

@@ -133 +133 @@
             $this->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );
             $this->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery'), '20080128' );
+            $this->localize( 'postbox', 'postboxL10n', array(
+                'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
+            ) );
             $this->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox'), '20080128' );
             $this->localize( 'post', 'postL10n', array(