Changeset 8943

Timestamp:

09/21/08 19:45:45 (2 months ago)

Author:

azaozz

Message:

Sytling and improvements to inline editing, see #6815

Files:

• trunk/wp-admin/admin-ajax.php (modified) (3 diffs)
• trunk/wp-admin/css/colors-classic.css (modified) (3 diffs)
• trunk/wp-admin/css/colors-fresh.css (modified) (3 diffs)
• trunk/wp-admin/edit-pages.php (modified) (1 diff)
• trunk/wp-admin/edit-post-rows.php (modified) (1 diff)
• trunk/wp-admin/edit.php (modified) (1 diff)
• trunk/wp-admin/includes/template.php (modified) (52 diffs)
• trunk/wp-admin/js/inline-edit.js (modified) (1 diff)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -716 +716 @@
-    if ( is_array($hidden) )
-        update_usermeta($current_user->ID, "manage-$page-columns-hidden", $hidden);
+break;
-case 'get-permalink':
-    check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
@@ -728 +729 @@
-    die(get_sample_permalink_html($post_id, $title, $slug));
-break;
-case 'inline-data':
-    check_ajax_referer( 'inlineeditnonce', 'inline_edit_nonce' );
-
-    if ( isset($_POST['posts']) )
-        get_inline_data( explode(',', $_POST['posts']) );
-
-    die();
-break;
-case 'inline-save':
-inline_edit_nonce
+_inline_edit
-    
-    if ( ! isset($_POST['post_ID']) )
@@ -754 +747 @@
-    }
-    die();
-
+   
-case 'meta-box-order':
-    check_ajax_referer( 'meta-box-order' );

trunk/wp-admin/css/colors-classic.css

@@ -807 +807 @@
-}
-
-
+
+
-    border-color: #EBEBEB #CCC #CCC #EBEBEB;
-    background-color: #fff;
@@ -822 +823 @@
-}
-
-
+t
-.vim-current {
-    background-color: #CFEBF7 !important;
@@ -844 +845 @@
-    background-color: #cee1ef;
-}
+
+/* inline editor */
+.inline-editor input,
+.inline-editor textarea {
+    border-color: #ddd;
+}
+
+.inline-editor div.title {
+    background-color: #CFEBF7;
+}
+
+.inline-editor ul.cat-checklist {
+    background-color: #FFFFFF;
+}
+
+.inline-editor .categories .catshow,
+.inline-editor .categories .cathide {
+    color: #2583AD;
+}
+
+.inline-editor .quick-edit-save {
+    background-color: #CFEBF7;
+}

trunk/wp-admin/css/colors-fresh.css

@@ -790 +790 @@
-}
-
-
+
+
-    border-color: #EBEBEB #CCC #CCC #EBEBEB;
-    background-color: #fff;
@@ -805 +806 @@
-}
-
-
+t
-.vim-current {
-    background-color: #E4F2FD !important;
@@ -827 +828 @@
-    background-color: #cee1ef;
-}
+
+/* inline editor */
+.inline-editor input,
+.inline-editor textarea {
+    border-color: #ddd;
+}
+
+.inline-editor div.title {
+    background-color: #EAF3FA;
+}
+
+.inline-editor ul.cat-checklist {
+    background-color: #FFFFFF;
+}
+
+.inline-editor .categories .catshow,
+.inline-editor .categories .cathide {
+    color: #2583AD;
+}
+
+.inline-editor .quick-edit-save {
+    background-color: #EAF3FA;
+}

trunk/wp-admin/edit-pages.php

@@ -190 +190 @@
-if ($posts) {
-?>
-
+ page
-  <thead>
-  <tr>

trunk/wp-admin/edit-post-rows.php

@@ -9 +9 @@
-if ( ! defined('ABSPATH') ) die();
-?>
-
+ post
-    <thead>
-    <tr>

trunk/wp-admin/edit.php

@@ -186 +186 @@
-<div class="alignleft">
-<select name="action">
-
+="selected"
-<option value="edit"><?php _e('Edit'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>

trunk/wp-admin/includes/template.php

@@ -87 +87 @@
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-        if ( $default_cat_id != $category->term_id )
- 
+
-        $action_count = count($actions);
-        $i = 0;
@@ -158 +158 @@
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-        if ( $default_cat_id != $category->term_id )
- 
+
-        $action_count = count($actions);
-        $i = 0;
@@ -188 +188 @@
-        switch ($column_name) {
-            case 'cb':
-   
-   
-   
-   
-   
-   
-   
-   
+   
+   
+   
+   
+   
+   
+   
+   
-            case 'name':
-                $output .= "<td $attributes>$edit</td>";
@@ -250 +250 @@
-
-        $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : '';
-for="in-category-' . $category->term_id . '" 
+
-    }
-
@@ -316 +316 @@
-
-        <li id="<?php echo $id; ?>" class="popular-category">
- for="in-<?php echo $id; ?>"
+
-            <input id="in-<?php echo $id; ?>" type="checkbox" value="<?php echo (int) $category->term_id; ?>" />
-                <?php echo wp_specialchars( apply_filters( 'the_category', $category->name ) ); ?>
@@ -370 +370 @@
-
-        $name = apply_filters( 'term_name', $tag->name );
- 
+
-        $out = '';
-        $out .= '<tr id="tag-' . $tag->term_id . '"' . $class . '>';
@@ -389 +389 @@
-                    break;
-                case 'name':
- 
+
-                    $actions = array();
-                    $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
- 
+
-                    $action_count = count($actions);
-                    $i = 0;
@@ -572 +572 @@
-
-function print_column_headers( $type ) {
- 
+
-    $hidden = (array) get_user_option( "manage-$type-columns-hidden" );
-    $styles = array();
@@ -603 +603 @@
-        $style = ' style="' . $style . '"';
-?>
-
+ 
-<?php }
-}
-
-function inline_edit_row( $type ) {
-
-
-if ( 'post' == $type ) 
-   $post = get_default_post_to_edit(); 
-else 
-   $post = get_default_page_to_edit();  
-
-
-type == 'post' ? wp_manage_posts_columns() : wp_manage_page
+, $mode
+
+$is_page = 'page' == $type;
+if ( $is_page )
+   $post = get_default_page_to_edit();
+else
+
+
+is_page ? wp_manage_pages_columns() : wp_manage_post
-    $hidden = (array) get_user_option( "manage-$type-columns-hidden" );
+    $hidden_count = empty($hidden[0]) ? 0 : count($hidden);
+    $col_count = count($columns) - $hidden_count;
+    $m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
+    ?>
+    <tr title="<?php _e('Double-click to cancel'); ?>" id="inline-edit" style="display: none"><td colspan="<?php echo $col_count; ?>">
+    <?php
-    foreach($columns as $column_name=>$column_display_name) {
-
+ quick-edit-div
-
-        $style = '';
@@ -628 +634 @@
-
-        switch($column_name) {
-
-
-
-
-
+
+
-
-            case 'modified':
-            case 'date':
-                $attributes = 'class="date column-date"' . $style;
-            ?>
-
+
+
+
-                    <?php touch_time(1, 1, 4, 1); ?>
-
+
+
-                <?php
-                break;
-
-            case 'title':
-\"" . $style;
-?
-<td <?php echo $attributes ?>
-?php wp_nonce_field( 'inlineeditnonce', 'inline_edit_nonce', false ) ?
-div class="title"
-   <input type="text" name="post_title" class="title" value="" /><br /
-   <label><?php _e('Slug'); ?></label><input type="text" name="post_name" value="" class="slug" /
+ quick-edit-div\"" . $style; ?>
+   <div <?php echo $attributes ?>
+   <div class="title"><?php _e('Title'); ?></div
+div class="in"
+label title="<?php _e('Title'); ?>"><input type="text" name="post_title" class="ptitle" value="" /></label><br /
+<div class="slug"
+<label title="<?php _e('Slug'); ?>"><?php _e('Slug'); ?><input type="text" name="post_name" value="" /></label></div
-                    </div>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    </div>
-
-
-
+
+
+
+
+
+
+
+
-                    </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                    </div>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                <?php
-                break;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                <?php
-                break;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                <?php
-                break;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                <?php
-                break;
-
-            case 'author': ?>
-                <td <?php echo $attributes ?>>
-                    <?php
-                    $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
-                    if ( $authors && count( $authors ) > 1 ) {
-                        wp_dropdown_users( array('include' => $authors, 'name' => 'post_author', 'class'=> 'author', 'selected' => $post->post_author) ); 
-                    } else {
-                        echo $current_user->user_nicename.'<input type="hidden" value="'.$post->post_author.'" class="author" />';
-                    }
-                    ?>
-                </td>
-                <?php
-                break;
-
-            case 'status': ?>
-
+
+
+
-                    <select name="post_status">
-:
+{
-                        <option value='publish'><?php _e('Published') ?></option>
-                        <option value='future'><?php _e('Scheduled') ?></option>
-endif;
+}
-                        <option value='pending'><?php _e('Pending Review') ?></option>
-                        <option value='draft'><?php _e('Unpublished') ?></option>
-                    </select>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                <?php
-                break;
-
-view
-td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></td
+edit
+div><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></div
-                <?php
-                break;
-
-edit
-td><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td
+delete
+div><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></div
-                <?php
-                break;
-
-case 'control_delete'
-td><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></td
+default
+div><?php do_action('manage_posts_custom_column', $column_name, $post->ID); ?></div
-                <?php
-                break;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // get the original post content
-    $post = get_post( $data['post_ID'], ARRAY_A );
@@ -782 +811 @@
-
-    // statuses
-age' == $data['post_type'] && 'private' == $data['page
+rivate' == $data['keep
-        $data['post_status'] = 'private';
- 
+
-        $data['comment_status'] = 'closed';
-    if ( empty($data['ping_status']) )
@@ -800 +829 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -875 +897 @@
-function _post_row($a_post, $pending_comments, $mode) {
-    global $post;
-
+row
-
-    $global_post = $post;
@@ -881 +903 @@
-    setup_postdata($post);
-
-class = 'alternate' == $
+rowclass = 'alternate' == $row
-    global $current_user;
-    $post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
@@ -889 +911 @@
-        $title = __('(no title)');
-?>
-class . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>
+rowclass . ' author-' . $post_owner . ' status-' . $post->post_status ); ?> iedit
-<?php
-    $posts_columns = wp_manage_posts_columns();
@@ -935 +957 @@
-            }
-
-
-
-
-
-
+
+
+
+
+
+
+
-        break;
-
@@ -955 +979 @@
-            $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
-            $actions['inline'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
- 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 
+'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n
-            if ( in_array($post->post_status, array('pending', 'draft')) )
-                $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . attribute_escape(sprintf(__('Preview "%s"'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
@@ -967 +991 @@
-                echo "<span class='$action'>$link$sep</span>";
-            }
+
+            get_inline_data($post);
-        ?>
-        </td>
@@ -1089 +1115 @@
-function display_page_row( $page, $level = 0 ) {
-    global $post;
-
+row
-
-    $post = $page;
@@ -1097 +1123 @@
-    $pad = str_repeat( '&#8212; ', $level );
-    $id = (int) $page->ID;
-class = ('alternate' == $class )
+rowclass = 'alternate' == $rowclass
-    $posts_columns = wp_manage_pages_columns();
-    $hidden = (array) get_user_option( 'manage-page-columns-hidden' );
@@ -1104 +1130 @@
-        $title = __('(no title)');
-?>
-
-
-
-
+
+
-
-foreach ($posts_columns as $column_name=>$column_display_name) {
@@ -1164 +1188 @@
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-        $actions['inline'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
- 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 
+'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n
-        if ( in_array($post->post_status, array('pending', 'draft')) )
-            $actions['view'] = '<a href="' . get_permalink($page->ID) . '" title="' . attribute_escape(sprintf(__('Preview "%s"'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
@@ -1176 +1200 @@
-            echo "<span class='$action'>$link$sep</span>";
-        }
-?>
-</td>
-<?php
+
+get_inline_data($post);
+echo '</td>';
-        break;
-
@@ -1237 +1261 @@
-    }
-}
- 
-
-   
+
+
+
-
-<?php
@@ -1266 +1290 @@
-     * If searching, ignore hierarchy and treat everything as top level
-     */
- 
+
-
-        $top_level_pages = array();
- 
+
-
-        foreach ( $pages as $page ) {
@@ -1380 +1404 @@
-        $short_url = substr( $short_url, 0, -1 );
-    if ( strlen( $short_url ) > 35 )
- 
+
-    $numposts = get_usernumposts( $user_object->ID );
-    if ( current_user_can( 'edit_user', $user_object->ID ) ) {
@@ -1391 +1415 @@
-        $actions = array();
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
- 
+
-        $action_count = count($actions);
-        $i = 0;
@@ -1512 +1536 @@
-        $ptime = mysql2date(__('Y/m/d \a\t g:i A'), $comment->comment_date );
-
-   
-  
+
+
-    $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) );
-     
+
-
-?>
-  
+
-<?php if ( $checkbox ) : ?>
-