Changeset 9162

Timestamp:

10/14/08 10:33:18 (2 months ago)

Author:

azaozz

Message:

Quick Edit: remove action links, remove row titles, add hint in footer

Files:

• trunk/wp-admin/admin-footer.php (modified) (1 diff)
• trunk/wp-admin/includes/template.php (modified) (8 diffs)
• trunk/wp-admin/js/edit-comments.js (modified) (3 diffs)
• trunk/wp-admin/js/inline-edit-post.js (modified) (4 diffs)
• trunk/wp-admin/js/inline-edit-tax.js (modified) (3 diffs)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/admin-footer.php

@@ -18 +18 @@
-$upgrade = apply_filters( 'update_footer', '' );
-echo __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>').' | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' '.$upgrade;
+
+$quick_edit_help = array( 'edit.php', 'edit-pages.php', 'edit-comments.php', 'edit-tags.php', 'categories.php', 'edit-link-categories.php' );
+if ( in_array($pagenow, $quick_edit_help) )
+    echo '<br />' . __('Hint: double-click on a row to open Quick Edit.');
-?></p>
-</div>

trunk/wp-admin/includes/template.php

@@ -124 +124 @@
-        $actions = array();
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-        $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
-        if ( $default_cat_id != $category->term_id )
-            $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("categories.php?action=delete&amp;cat_ID=$category->term_id", 'delete-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
@@ -208 +207 @@
-
-<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
-title="<?php _e('Double-click to cancel'); ?>" 
+
-    <?php
-
@@ -293 +292 @@
-        $actions = array();
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-        $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
-        if ( $default_cat_id != $category->term_id )
-            $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
@@ -609 +607 @@
-                    $actions = array();
-                    $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-                    $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
-                    $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this tag '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
-                    $action_count = count($actions);
@@ -897 +894 @@
-    while ( $bulk < 2 ) { ?>
-
-title="<?php _e('Double-click to cancel'); ?>" 
+
-    <?php
-    foreach($columns as $column_name=>$column_display_name) {
@@ -1268 +1265 @@
-            if ( current_user_can('edit_post', $post->ID) ) {
-                $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '" title="' . attribute_escape(__('Edit this post')) . '">' . __('Edit') . '</a>';
-                $actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . attribute_escape(__('Edit this post inline')) . '">' . __('Quick Edit') . '</a>';
-                $actions['delete'] = "<a class='submitdelete' title='" . attribute_escape(__('Delete this post')) . "' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
-            }
@@ -1448 +1444 @@
-        $actions = array();
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-        $actions['inline'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
-        $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&amp;post=$page->ID", 'delete-page_' . $page->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
-        if ( in_array($post->post_status, array('pending', 'draft')) )
@@ -1894 +1889 @@
-                    $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
-                    $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
-                    $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick Edit') . '</a>';
-                    if ( 'spam' != $the_comment_status )
-                        $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';

trunk/wp-admin/js/edit-comments.js

@@ -108 +108 @@
-        r.each(function() {
-            $(this).dblclick(function(){
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    },
-
-    revert : function() {
-
-
-
-
-
-
-
+
+
+
+
+
-
-        return false;
@@ -145 +146 @@
-    open : function(id, p, a) {
-        var t = this;
-
+
+
+
+
-        t.o = '#comment-'+id;
-
@@ -315 +319 @@
-            }
-        };
-'q', 
+
-                ['shift+a', make_bulk('approve')], ['shift+s', make_bulk('markspam')],
-                ['shift+d', make_bulk('delete')], ['shift+x', toggle_all]],

trunk/wp-admin/js/inline-edit-post.js

@@ -27 +27 @@
-        // add events
-        t.rows.dblclick(function() { inlineEditPost.toggle(this); });
-        t.addEvents(t.rows);
-
-        $('#bulk-title-div').after(
@@ -80 +79 @@
-    },
-
-    addEvents : function(r) {
-        r.each(function() {
-            var row = $(this);
-            $('a.editinline', row).click(function() { inlineEditPost.edit(this); return false; });
-            row.attr('title', inlineEditL10n.edit);
-        });
-    },
-
-    setBulk : function() {
-        var te = '', c = '';
@@ -99 +90 @@
-                var id = $(this).val();
-                c = c == '' ? ' class="alternate"' : '';
-
+title="'+inlineEditL10n.rem_title+'" 
-            }
-        });
@@ -209 +200 @@
-                        .animate( { backgroundColor: '#CCEEBB' }, 500)
-                        .animate( { backgroundColor: '#eefee7' }, 500);
-                    inlineEditPost.addEvents(row);
-                } else {
-                    $('#edit-'+id+' .quick-edit-save').append('<span class="error">'+inlineEditL10n.error+'</span>');

trunk/wp-admin/js/inline-edit-tax.js

@@ -21 +21 @@
-        // add events
-        t.rows.dblclick(function() { inlineEditTax.toggle(this); });
-        t.addEvents(t.rows);
-
-        $('#doaction, #doaction2, #post-query-submit').click(function(e){
@@ -33 +32 @@
-
-        $(t.what+t.getId(el)).css('display') == 'none' ? t.revert() : t.edit(el);
-    },
-
-    addEvents : function(r) {
-        r.each(function() {
-            var row = $(this);
-            $('a.editinline', row).click(function() { inlineEditTax.edit(this); return false; });
-            row.attr('title', inlineEditL10n.edit);
-        });
-    },
-
@@ -113 +104 @@
-                            .animate( { backgroundColor: '#CCEEBB' }, 500)
-                            .animate( { backgroundColor: '#eefee7' }, 500);
-                        inlineEditTax.addEvents(row);
-                    } else
-                        $('#edit-'+id+' .quick-edit-save .error').html(r).show();

trunk/wp-includes/script-loader.php

@@ -159 +159 @@
-            'strong' => __('Strong')
-        ) );
-07
+14
-        $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
-            'pending' => __('%i% pending'), // must look like: "# blah blah"
@@ -245 +245 @@
-        $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
-
-07
+14
-        $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
-dit' => __('Double-click to edit
-error' => __('Error while saving the changes.
-
-
-07
+rror' => __('Error while saving the changes.
+rem_title' => __('Remove from batch edit
+
+
+14
-        $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
-            'edit' => __('Double-click to edit'),
-            'error' => __('Error while saving the changes.')
-        ) );