Changeset 4583

Timestamp:

12/01/2006 11:00:04 PM (19 years ago)

Author:

ryan

Message:

Better AJAX feedback messages and markup fixes. Props mdawaffe. fixes #3208

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (2 diffs)
• wp-admin/admin-functions.php (modified) (1 diff)
• wp-admin/edit-category-form.php (modified) (2 diffs)
• wp-admin/users.js (modified) (1 diff)
• wp-admin/users.php (modified) (4 diffs)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/js/list-manipulation-js.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -148 +148 @@
         'id' => $cat->cat_ID,
         'data' => _cat_row( $cat, $level, $cat_full_name ),
-        'supplemental' => array('name' => $cat_full_name)
+        'supplemental' => array('name' => $cat_full_name, 'show-link' => sprintf(__( 'Category <a href="#%s">%s</a> added' ), "cat-$cat->cat_ID", $cat_full_name))
     ) );
     $x->send();
@@ -212 +212 @@
         exit;
     }
+    $user_object = new WP_User( $user_id );
     $x = new WP_Ajax_Response( array(
         'what' => 'user',
         'id' => $user_id,
-        'data' => user_row( $user_id )
+        'data' => user_row( $user_object ),
+        'supplemental' => array('show-link' => sprintf(__( 'User <a href="#%s">%s</a> added' ), "user-$user_id", $user_object->user_login))
     ) );
     $x->send();

trunk/wp-admin/admin-functions.php

@@ -815 +815 @@
         $r .= "<a href='edit.php?author=$user_object->ID' title='" . __( 'View posts by this author' ) . "' class='edit'>";
         $r .= sprintf( __('View %1$s %2$s' ), $numposts, __ngettext( 'post', 'posts', $numposts ));
+        $r .= '</a>';
     }
     $r .= "</td>\n\t\t<td>";
-    $edit_link = add_query_arg( 'wp_http_referer', wp_specialchars( urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" );
-    if ( current_user_can( 'edit_user', $user_object->ID ) )
+    if ( current_user_can( 'edit_user', $user_object->ID ) ) {
+        $edit_link = wp_specialchars( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), "user-edit.php?user_id=$user_object->ID" ) );
         $r .= "<a href='$edit_link' class='edit'>".__( 'Edit' )."</a>";
+    }
     $r .= "</td>\n\t</tr>";
     return $r;

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

@@ -17 +17 @@
 <div class="wrap">
 <h2><?php echo $heading ?></h2>
+<div id="ajax-response"></div>
 <?php echo $form ?>
 <input type="hidden" name="action" value="<?php echo $action ?>" />
@@ -42 +43 @@
     </table>
 <p class="submit"><input type="submit" name="submit" value="<?php echo $submit_text ?>" /></p>
-<div id="ajax-response"></div>
 <?php do_action('edit_category_form', $category); ?>
 </form>

trunk/wp-admin/users.js

@@ -3 +3 @@
     theUserLists = new Array();
     for ( var l = 0; l < theListEls.length; l++ ) {
-        theUserLists[theListEls[l].id] = new listMan(theListEls[l].id);
+        if ( theListEls[l].id )
+            theUserLists[theListEls[l].id] = new listMan(theListEls[l].id);
     }
     addUserInputs = document.getElementById('adduser').getElementsByTagName('input');

trunk/wp-admin/users.php

@@ -377 +377 @@
     uksort($roleclass, "strnatcasecmp");
 ?>
-
+<tbody>
 <tr>
 <?php if ( !empty($role) ) : ?>
@@ -393 +393 @@
     <th colspan="2" style="text-align: center"><?php _e('Actions') ?></th>
 </tr>
-</thead>
+</tbody>
 <tbody id="role-<?php echo $role; ?>"><?php
 $style = '';
@@ -438 +438 @@
 <div class="wrap">
 <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
+
+<?php if ( is_wp_error( $add_user_errors ) ) : ?>
+    <div class="error">
+        <?php
+            foreach ( $add_user_errors->get_error_messages() as $message )
+                echo "<p>$message</p>";
+        ?>
+    </div>
+<?php endif; ?>
+<div id="ajax-response"></div>
+
 <div class="narrow">
+
 <?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php').'</p>'; ?>
 <form action="#add-new-user" method="post" name="adduser" id="adduser">
@@ -489 +501 @@
     <input name="adduser" type="submit" id="addusersub" value="<?php _e('Add User &raquo;') ?>" />
 </p>
+</form>
+
 </div>
-</form>
-
-<?php if ( is_wp_error( $add_user_errors ) ) : ?>
-    <div class="error">
-        <?php
-            foreach ( $add_user_errors->get_error_messages() as $message )
-                echo "<p>$message</p>";
-        ?>
-    </div>
-<?php endif; ?>
-<div id="ajax-response"></div>
 </div>
 

trunk/wp-includes/category-template.php

@@ -181 +181 @@
     $output = '';
     if ( ! empty($categories) ) {
-        $output = "<select name='$name' class='$class'>\n";
+        $output = "<select name='$name' id='$name' class='$class'>\n";
 
         if ( $show_option_all ) {

trunk/wp-includes/js/list-manipulation-js.php

@@ -38 +38 @@
             var newItems = $A(transport.responseXML.getElementsByTagName(what));
             if ( newItems ) {
+                var showLinkMessage = '';
+                var m = '';
                 newItems.each( function(i) {
                     var id = i.getAttribute('id');
@@ -45 +47 @@
                     else
                         tempObj.addListItem( getNodeValue(i, 'response_data') );
-                    if ( tempObj.showLink )
-                        tempObj.showLink = id;
+                    m = getNodeValue(i, 'show-link');
+                    showLinkMessage += showLinkMessage ? "<br />\n" : '';
+                    if ( m )
+                        showLinkMessage += m;
+                    else
+                        showLinkMessage += "<a href='#" + what + '-' + id + "'><?php echo js_escape(__('Jump to new item')); ?>";
                 });
-                ajaxAdd.myResponseElement.update(tempObj.showLink ? ( "<div id='jumplink' class='updated fade'><p><a href='#" + what + '-' + tempObj.showLink + "'><?php js_escape(__('Jump to new item')); ?></a></p></div>" ) : '');
+                if ( tempObj.showLink && showLinkMessage )
+                    ajaxAdd.myResponseElement.update("<div id='jumplink' class='updated fade'><p>" + showLinkMessage + "</p></div>");
             }
             if ( tempObj.addComplete && typeof tempObj.addComplete == 'function' )

trunk/wp-includes/script-loader.php

@@ -22 +22 @@
         $this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4508');
         $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '4459');
-        $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4459');
+        $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4583');
         if ( is_admin() ) {
             $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );
@@ -29 +29 @@
             $this->add( 'admin-custom-fields', '/wp-admin/custom-fields.js', array('listman'), '3733' );
             $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '3847' );
-            $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '3684' );
+            $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '4583' );
             $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' );
-            $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '####' );
+            $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '4535' );
         }
     }