Changeset 3135

Timestamp:

11/17/2005 10:23:35 AM (20 years ago)

Author:

matt

Message:

Slicker category adding, fixes #1882

Location:

trunk/wp-admin

Files:

• admin-header.php (modified) (6 diffs)
• edit-form-advanced.php (modified) (1 diff)
• edit-form-ajax-cat.php (modified) (1 diff)
• menu.php (modified) (1 diff)
• wp-admin.css (modified) (2 diffs)

trunk/wp-admin/admin-header.php

@@ -111 +111 @@
 
 <?php if ( current_user_can('manage_categories') ) : ?>
+<style type="text/css">
+#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;
+}
+</style>
 <script type="text/javascript">
 var ajaxCat = new sack();
@@ -130 +156 @@
     newcatSub.type = 'button';
     newcatSub.name = 'Button';
-    newcatSub.value = '+';
-    newcat.onkeypress = ajaxNewCatKeyPress;
+    newcatSub.id = 'catadd';
+    newcatSub.value = '<?php _e('Add'); ?>';
+    newcatSub.onclick = ajaxNewCat;
 
     ajaxcat.appendChild(newcat);
     ajaxcat.appendChild(newcatSub);
-    document.getElementById('categorychecklist').parentNode.appendChild(ajaxcat);
+    document.getElementById('jaxcat').appendChild(ajaxcat);
+
+    howto = document.createElement('span');
+    howto.innerHTML = '<?php _e('Separate multiple categories with commas.'); ?>';
+    howto.id = 'howto';
+    ajaxcat.appendChild(howto);
 }
 
@@ -144 +176 @@
     if (!p) {
         p = document.createElement('p');
-        document.getElementById('categorydiv').appendChild(p);
+        document.getElementById('jaxcat').appendChild(p);
         p.id = 'ajaxcatresponse';
     }
@@ -162 +194 @@
 function newCatInteractive() {
     var p = getResponseElement();
-    p.innerHTML = 'Processing Data...';
+    p.innerHTML = 'Processing Request...';
 }
 
 function newCatCompletion() {
     var p = getResponseElement();
-    var id = parseInt(ajaxCat.response, 10);
-    if ( id == '-1' ) {
-        p.innerHTML = "You don't have permission to do that.";
-        return;
-    }
-    if ( id == '0' ) {
-        p.innerHTML = "That category name is invalid.  Try something else.";
-        return;
+//  alert(ajaxCat.response);
+    var id    = 0;
+    var ids   = new Array();
+    var names = new Array();
+    
+    ids   = myPload( ajaxCat.response );
+    names = myPload( newcat.value );
+
+    for ( i = 0; i < ids.length; i++ ) {
+        id = ids[i];
+//      alert(id);
+        if ( id == '-1' ) {
+            p.innerHTML = "You don't have permission to do that.";
+            return;
+        }
+        if ( id == '0' ) {
+            p.innerHTML = "That category name is invalid.  Try something else.";
+            return;
+        }
+        
+        var exists = document.getElementById('category-' + id);
+        
+        if (exists) {
+            var moveIt = exists.parentNode;
+            var container = moveIt.parentNode;
+            container.removeChild(moveIt);
+            container.insertBefore(moveIt, container.firstChild);
+            moveIt.id = 'new-category-' + id;
+            exists.checked = 'checked';
+            var nowClass = moveIt.className;
+            moveIt.className = nowClass + ' fade';
+            Fat.fade_all();
+            moveIt.className = nowClass;
+        } else {
+            var catDiv = document.getElementById('categorychecklist');
+            var newLabel = document.createElement('label');
+            newLabel.setAttribute('for', 'category-' + id);
+            newLabel.id = 'new-category-' + id;
+            newLabel.className = 'selectit fade';
+    
+            var newCheck = document.createElement('input');
+            newCheck.type = 'checkbox';
+            newCheck.value = id;
+            newCheck.name = 'post_category[]';
+            newCheck.id = 'category-' + id;
+            newLabel.appendChild(newCheck);
+    
+            var newLabelText = document.createTextNode(' ' + names[i]);
+            newLabel.appendChild(newLabelText);
+    
+            catDiv.insertBefore(newLabel, catDiv.firstChild);
+            newCheck.checked = 'checked';
+    
+            Fat.fade_all();
+            newLabel.className = 'selectit';
+        }
+        newcat.value = '';
     }
     p.parentNode.removeChild(p);
-    var exists = document.getElementById('category-' + id);
-    if (exists) {
-        var moveIt = exists.parentNode;
-        var container = moveIt.parentNode;
-        container.removeChild(moveIt);
-        container.insertBefore(moveIt, container.firstChild);
-        moveIt.id = 'new-category-' + id;
-        exists.checked = 'checked';
-        var nowClass = moveIt.className;
-        moveIt.className = nowClass + ' fade';
-        Fat.fade_all();
-        moveIt.className = nowClass;
-    } else {
-        var catDiv = document.getElementById('categorychecklist');
-        var newLabel = document.createElement('label');
-        newLabel.setAttribute('for', 'category-' + id);
-        newLabel.id = 'new-category-' + id;
-        newLabel.className = 'selectit fade';
-
-        var newCheck = document.createElement('input');
-        newCheck.type = 'checkbox';
-        newCheck.value = id;
-        newCheck.name = 'post_category[]';
-        newCheck.id = 'category-' + id;
-        newLabel.appendChild(newCheck);
-
-        var newLabelText = document.createTextNode(' ' + newcat.value);
-        newLabel.appendChild(newLabelText);
-
-        catDiv.insertBefore(newLabel, catDiv.firstChild);
-        newCheck.checked = 'checked';
-
-        Fat.fade_all();
-        newLabel.className = 'selectit';
-    }
-    newcat.value = '';
+//  var id = parseInt(ajaxCat.response, 10);
+
+
 }
 
@@ -233 +281 @@
 function ajaxNewCat() {
     var newcat = document.getElementById('newcat');
-    var catString = 'ajaxnewcat=' + encodeURIComponent(newcat.value);
+    var split_cats = new Array(1);
+    var catString = '';
+
+    catString = 'ajaxnewcat=' + encodeURIComponent(newcat.value);
     ajaxCat.requestFile = 'edit-form-ajax-cat.php';
     ajaxCat.method = 'GET';
@@ -242 +293 @@
     ajaxCat.runAJAX(catString);
 }
+
+function myPload( str ) {
+    var fixedExplode = new Array();
+    var comma = new String(',');
+    var count = 0;
+    var currentElement = '';
+
+    for( x=0; x < str.length; x++) {
+        andy = str.charAt(x);
+        if ( comma.indexOf(andy) != -1 ) {
+            fixedExplode[count] = currentElement;
+            currentElement = "";
+            count++;
+        } else {
+            if ( ' ' != andy )
+                currentElement += andy;
+        }
+    }
+
+    if ( currentElement != "" )
+        fixedExplode[count] = currentElement;
+    return fixedExplode;
+}
+
 </script>
 <?php endif; ?>

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

@@ -90 +90 @@
 
 <fieldset id="categorydiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Categories') ?></h3> 
-<div class="dbx-content"><div id="categorychecklist"><?php dropdown_categories(get_settings('default_category')); ?></div></div>
+<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
+<div class="dbx-content">
+<p id="jaxcat"></p>
+<div id="categorychecklist"><?php dropdown_categories(get_settings('default_category')); ?></div></div>
 </fieldset>
 

trunk/wp-admin/edit-form-ajax-cat.php

@@ -13 +13 @@
 add_action('shutdown', 'get_out_now', -1);
 
-$cat_name = rawurldecode($_GET['ajaxnewcat']);
+$names = explode(',', rawurldecode($_GET['ajaxnewcat']) );
+$ids   = array();
 
-if ( !$category_nicename = sanitize_title($cat_name) )
-    die('0');
-if ( $already = category_exists($cat_name) )
-    die((string) $already);
+foreach ($names as $cat_name) {
+    $cat_name = trim( $cat_name );
+    
+    if ( !$category_nicename = sanitize_title($cat_name) )
+        continue;
+    if ( $already = category_exists($cat_name) ) {
+        $ids[] = (string) $already;
+        continue;
+    }
+    
+    $new_cat_id = wp_create_category($cat_name);
+    
+    $ids[] = (string) $new_cat_id;
+}
 
-$new_cat_id = wp_create_category($cat_name);
-die((string) $new_cat_id);
+$return = join(',', $ids);
+
+die( (string) $return );
+
 ?>

trunk/wp-admin/menu.php

@@ -17 +17 @@
 $menu[40] = array(__('Options'), 'read', 'options-general.php');
 $menu[45] = array(__('Import'), 'import', 'import.php');
-
-if ( get_option('use_fileupload') )
-    $menu[50] = array(__('Upload'), 'upload_files', 'upload.php');
 
 $submenu['post.php'][5] = array(__('Write Post'), 'edit_posts', 'post.php');

trunk/wp-admin/wp-admin.css

@@ -190 +190 @@
     width: 250px;
     height: 200px;
-    display: inline-block;
+    display: block;
     margin: auto;
     background: #f1f1f1;
@@ -818 +818 @@
     top: 10px;
     right: 14px;
-    background-repeat: none;
+    background-repeat: no-repeat;
     border-bottom: 0;
     background-position: 0 9px;