Changeset 6588

Timestamp:

01/10/08 09:39:35 (11 months ago)

Author:

matt

Message:

New experimental category interface, fixes #5618. Hat tip: mdawaffe.

Files:

• trunk/wp-admin/admin-ajax.php (modified) (2 diffs)
• trunk/wp-admin/admin-header.php (modified) (1 diff)
• trunk/wp-admin/edit-form-advanced.php (modified) (1 diff)
• trunk/wp-admin/includes/taxonomy.php (modified) (1 diff)
• trunk/wp-admin/includes/template.php (modified) (3 diffs)
• trunk/wp-admin/js/post.js (modified) (1 diff)
• trunk/wp-admin/wp-admin.css (modified) (3 diffs)
• trunk/wp-includes/js/jquery/ui.tabs.js (added)
• trunk/wp-includes/js/wp-lists.js (modified) (2 diffs)
• trunk/wp-includes/script-loader.php (modified) (4 diffs)

trunk/wp-admin/admin-ajax.php

@@ -158 +158 @@
-        die('-1');
-    $names = explode(',', $_POST['newcat']);
+    if ( 0 > $parent = (int) $_POST['newcat_parent'] )
+        $parent = 0;
+
+    $checked_categories = array_map( 'absint', (array) $_POST['post_category'] );
+
-    $x = new WP_Ajax_Response();
-    foreach ( $names as $cat_name ) {
@@ -164 +169 @@
-        if ( '' === $category_nicename )
-            continue;
-
-
+
+
+
+
+
+
+
+
+
+
-        $x->add( array(
-            'what' => 'category',
-            'id' => $cat_id,
-"<li id='category-$cat_id'><label for='in-category-$cat_id' class='selectit'><input value='$cat_id' type='checkbox' checked='checked' name='post_category[]' id='in-category-$cat_id'/> $cat_name</label></li>"
+$data
-            'position' => -1
-        ) );
+    }
+    if ( $parent ) { // Foncy - replace the parent and all its children
+        $parent = get_category( $parent );
+        ob_start();
+            dropdown_categories( 0, $parent );
+        $data = ob_get_contents();
+        ob_end_clean();
+        $x->add( array(
+            'what' => 'category',
+            'id' => $parent->term_id,
+            'old_id' => $parent->term_id,
+            'data' => $data,
+            'position' => -1
+        ) );
+
-    }
-    $x->send();

trunk/wp-admin/admin-header.php

@@ -3 +3 @@
-if (!isset($_GET["page"])) require_once('admin.php');
-if ( $editing ) {
-    if ( current_user_can('manage_categories') )
-        wp_enqueue_script( 'ajaxcat' );
-    if ( user_can_richedit() )
-        wp_enqueue_script( 'wp_tiny_mce' );

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

@@ -122 +122 @@
-<h3><?php _e('Categories') ?></h3>
-<div class="inside">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-</div>

trunk/wp-admin/includes/taxonomy.php

@@ -17 +17 @@
-}
-
-$cat_name
+ $cat_name, $parent = 0 
-    if ( $id = category_exists($cat_name) )
-        return $id;
-
-
+, 'category_parent' => $parent
-}
-

trunk/wp-admin/includes/template.php

@@ -119 +119 @@
-}
-
-get_nested_categories( $default = 0, $paren
+wp_set_checked_post_categories( $defaul
-    global $post_ID, $checked_categories;
-
@@ -135 +135 @@
-    }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -166 +184 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/wp-admin/js/post.js

@@ -91 +91 @@
-    // postboxes
-    add_postbox_toggles();
+
+    // category tabs
+    var categoryTabs =jQuery('#category-tabs').tabs();
+
+    // Ajax Cat
+    var newCat = jQuery('#newcat').one( 'focus', function() { jQuery(this).val( '' ) } );
+    jQuery('#category-add-sumbit').click( function() { newCat.focus(); } );
+    var catAddAfter = function( r, s ) {
+        jQuery(s.what + ' response_data', r).each( function() {
+            var t = jQuery(jQuery(this).text());
+            var o = jQuery( '<option value="' +  parseInt( t.find(':input').val(), 10 ) + '"></option>' );
+            o.text( jQuery.trim( t.text() ) );
+            jQuery('#newcat_parent').prepend( o );
+        } );
+    };
+    jQuery('#categorychecklist').wpList( {
+        alt: '',
+        response: 'category-ajax-response',
+        addAfter: catAddAfter
+    } );
+    jQuery('#category-add-toggle').click( function() {
+        jQuery(this).parents('div:first').toggleClass( 'wp-hidden-children' );
+        categoryTabs.tabsClick( 1 );
+        return false;
+    } );
-});

trunk/wp-admin/wp-admin.css

@@ -688 +688 @@
-}
-
-#categorydiv ul {
-    list-style: none;
-    padding: 0;
-    margin-left: 10px;
-}
-
-#categorychecklist {
-    height: 12em;
-    overflow: auto;
-    margin-top: 8px;
-}
-
-#categorychecklist li {
-    margin: 0;
-    padding: 0;
-}
-
-#ajaxcat input {
-    border: 1px solid #ccc;
-}
-
-#your-profile #rich_editing {
-    border: none;
@@ -738 +717 @@
-}
-
-
-
-#newcat {
-    width: 120px;
-    margin-right: 5px;
-}
-
-input #catadd {
-    background: #a4a4a4;
-    border-bottom: 1px solid #898989;
-    border-left: 1px solid #bcbcbc;
-    border-right: 1px solid #898989;
-    border-top: 1px solid #bcbcbc;
-    color: #fff;
-    font-size: 10px;
-    padding: 0;
-    margin: 0;
-    font-weight: bold;
-    height: 20px;
-    margin-bottom: 2px;
-    text-align: center;
-    width: 37px;
-}
-
-#howto {
-    font-size: 11px;
-    margin: 0 5px;
-    display: block;
-}
-
-#jaxcat {
-    margin: 0;
-    padding: 0;
-}
-
@@ -1280 +1230 @@
-    background-position: 4px 18px;
-}
+
+/* Categories */
+
+#categorydiv #category-adder {
+    margin-left: 120px;
+    padding: 4px 0;
+}
+
+#category-add input, #category-add select {
+    width: 30%;
+}
+
+#categorydiv 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;
+}
+
+ul#category-tabs li {
+    padding: 8px;
+}
+
+ul#category-tabs li.ui-tabs-selected {
+    background-color: #CEE1EF;
+}
+
+div.ui-tabs-panel {
+    margin: 0 0 0 120px;
+    padding: .5em .9em;
+    height: 12em;
+    overflow: auto;
+    border: 4px solid #CEE1EF;
+}
+
+#categorydiv ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+
+#categorydiv ul.categorychecklist ul {
+    margin-left: 18px;
+}
+
+ul.categorychecklist li {
+    margin: 0;
+    padding: 0;
+}
+
+/* Global classes */
+.wp-hidden-children .wp-hidden-child { display: none; }
+.ui-tabs-hide { display: none; }

trunk/wp-includes/js/wp-lists.js

@@ -310 +310 @@
-            var b = e.css( 'background-color' );
-            if ( b == 'transparent' ) { b = ''; }
-
-
+
-        }
-        list.each( function() { this.wpList.process( e ); } );
@@ -322 +321 @@
-        if ( list.wpList && e.parents( '#' + list.id ).size() ) { return; }
-        e.find(':input').each( function() {
+            if ( $(this).parents('.form-no-clear').size() )
+                return;
-            var t = this.type.toLowerCase(); var tag = this.tagName.toLowerCase();
-            if ( 'text' == t || 'password' == t || 'textarea' == tag ) { this.value = ''; }

trunk/wp-includes/script-loader.php

@@ -61 +61 @@
-        ) );
-
-71101
+80109
-        $this->localize( 'wp-lists', 'wpListL10n', array(
-            'url' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php'
@@ -85 +85 @@
-        $this->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20');
-        $this->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array('jquery'), '3.1');
+
+        $this->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui.tabs.js', array('jquery'), '3' );
-
-        if ( is_admin() ) {
@@ -107 +109 @@
-            $this->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
-            $this->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );
-), '20080102
+, 'jquery-ui-tabs', 'wp-lists'), '20080109
-            $this->localize( 'post', 'postL10n', array(
-                'tagsUsed' =>  __('Tags used on this post:'),
@@ -138 +140 @@
-                'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.")
-            ) );
-mt_rand()
+'20080109'
-        }
-    }