Changeset 9735
- Timestamp:
- 11/17/2008 07:16:26 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/categories.php
r9733 r9735 193 193 <thead> 194 194 <tr> 195 <?php print_column_headers('categor y'); ?>195 <?php print_column_headers('categories'); ?> 196 196 </tr> 197 197 </thead> … … 199 199 <tfoot> 200 200 <tr> 201 <?php print_column_headers('categor y', false); ?>201 <?php print_column_headers('categories', false); ?> 202 202 </tr> 203 203 </tfoot> -
trunk/wp-admin/edit-comments.php
r9733 r9735 252 252 <thead> 253 253 <tr> 254 <?php print_column_headers(' comment'); ?>254 <?php print_column_headers('edit-comments'); ?> 255 255 </tr> 256 256 </thead> … … 258 258 <tfoot> 259 259 <tr> 260 <?php print_column_headers(' comment', false); ?>260 <?php print_column_headers('edit-comments', false); ?> 261 261 </tr> 262 262 </tfoot> -
trunk/wp-admin/edit-link-categories.php
r9733 r9735 70 70 <form class="search-form" action="" method="get"> 71 71 <p class="search-box"> 72 <label class="hidden" for=" category-search-input"><?php _e( 'Search Categories' ); ?>:</label>73 <input type="text" class="search-input" id=" category-search-input" name="s" value="<?php _admin_search_query(); ?>" />72 <label class="hidden" for="link-category-search-input"><?php _e( 'Search Categories' ); ?>:</label> 73 <input type="text" class="search-input" id="link-category-search-input" name="s" value="<?php _admin_search_query(); ?>" /> 74 74 <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" /> 75 75 </p> … … 121 121 <thead> 122 122 <tr> 123 <?php print_column_headers(' link-category'); ?>123 <?php print_column_headers('edit-link-categories'); ?> 124 124 </tr> 125 125 </thead> … … 127 127 <tfoot> 128 128 <tr> 129 <?php print_column_headers(' link-category', false); ?>129 <?php print_column_headers('edit-link-categories', false); ?> 130 130 </tr> 131 131 </tfoot> -
trunk/wp-admin/edit-pages.php
r9733 r9735 217 217 <thead> 218 218 <tr> 219 <?php print_column_headers(' page'); ?>219 <?php print_column_headers('edit-pages'); ?> 220 220 </tr> 221 221 </thead> … … 223 223 <tfoot> 224 224 <tr> 225 <?php print_column_headers(' page', false); ?>225 <?php print_column_headers('edit-pages', false); ?> 226 226 </tr> 227 227 </tfoot> … … 317 317 }); 318 318 })(jQuery); 319 columns.init(' page');319 columns.init('edit-pages'); 320 320 /* ]]> */ 321 321 </script> -
trunk/wp-admin/edit-post-rows.php
r9733 r9735 12 12 <thead> 13 13 <tr> 14 <?php print_column_headers(' post'); ?>14 <?php print_column_headers('edit'); ?> 15 15 </tr> 16 16 </thead> … … 18 18 <tfoot> 19 19 <tr> 20 <?php print_column_headers(' post', false); ?>20 <?php print_column_headers('edit', false); ?> 21 21 </tr> 22 22 </tfoot> -
trunk/wp-admin/edit-tags.php
r9733 r9735 189 189 <thead> 190 190 <tr> 191 <?php print_column_headers(' tag'); ?>191 <?php print_column_headers('edit-tags'); ?> 192 192 </tr> 193 193 </thead> … … 195 195 <tfoot> 196 196 <tr> 197 <?php print_column_headers(' tag', false); ?>197 <?php print_column_headers('edit-tags', false); ?> 198 198 </tr> 199 199 </tfoot> -
trunk/wp-admin/edit.php
r9733 r9735 331 331 }); 332 332 })(jQuery); 333 columns.init(' post');333 columns.init('edit'); 334 334 /* ]]> */ 335 335 </script> -
trunk/wp-admin/includes/template.php
r9733 r9735 145 145 $output = "<tr id='cat-$category->term_id' class='iedit $row_class'>"; 146 146 147 $columns = get_column_headers('categor y');148 $hidden = (array) get_user_option( 'manage-category-columns-hidden');147 $columns = get_column_headers('categories'); 148 $hidden = get_hidden_columns('categories'); 149 149 foreach ( $columns as $column_name => $column_display_name ) { 150 150 $class = "class=\"$column_name column-$column_name\""; … … 306 306 $count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count; 307 307 $output = "<tr id='link-cat-$category->term_id' class='iedit $class'>"; 308 $columns = get_column_headers(' link-category');309 $hidden = (array) get_user_option( 'manage-link-category-columns-hidden');308 $columns = get_column_headers('edit-link-categories'); 309 $hidden = get_hidden_columns('edit-link-categories'); 310 310 foreach ( $columns as $column_name => $column_display_name ) { 311 311 $class = "class=\"$column_name column-$column_name\""; … … 585 585 $out = ''; 586 586 $out .= '<tr id="tag-' . $tag->term_id . '"' . $class . '>'; 587 $columns = get_column_headers(' tag');588 $hidden = (array) get_user_option( 'manage-tag-columns-hidden');587 $columns = get_column_headers('edit-tags'); 588 $hidden = get_hidden_columns('edit-tags'); 589 589 foreach ( $columns as $column_name => $column_display_name ) { 590 590 $class = "class=\"$column_name column-$column_name\""; … … 749 749 */ 750 750 function get_column_headers($page) { 751 static $columns = array(); 752 753 // Store in static to avoid running filters on each call 754 if ( isset($columns[$page]) ) 755 return $columns[$page]; 756 751 757 switch ($page) { 752 case 'post': 753 return wp_manage_posts_columns(); 754 case 'page': 755 return wp_manage_pages_columns(); 756 case 'comment': 757 $columns = array( 758 case 'edit': 759 $columns[$page] = wp_manage_posts_columns(); 760 break; 761 case 'edit-pages': 762 $columns[$page] = wp_manage_pages_columns(); 763 break; 764 case 'edit-comments': 765 $columns[$page] = array( 758 766 'cb' => '<input type="checkbox" />', 759 767 'comment' => __('Comment'), … … 763 771 ); 764 772 765 return apply_filters('manage_comments_columns', $columns);766 case 'link ':767 $columns = array(773 break; 774 case 'link-manager': 775 $columns[$page] = array( 768 776 'cb' => '<input type="checkbox" />', 769 777 'name' => __('Name'), … … 774 782 ); 775 783 776 return apply_filters('manage_link_columns', $columns); 777 case 'media': 778 return wp_manage_media_columns(); 779 case 'category': 780 $columns = array( 784 break; 785 case 'upload': 786 $columns[$page] = wp_manage_media_columns(); 787 break; 788 case 'categories': 789 $columns[$page] = array( 781 790 'cb' => '<input type="checkbox" />', 782 791 'name' => __('Name'), … … 786 795 ); 787 796 788 return apply_filters('manage_categories_columns', $columns);789 case ' link-category':790 $columns = array(797 break; 798 case 'edit-link-categories': 799 $columns[$page] = array( 791 800 'cb' => '<input type="checkbox" />', 792 801 'name' => __('Name'), … … 795 804 ); 796 805 797 return apply_filters('manage_link_categories_columns', $columns);798 case ' tag':799 $columns = array(806 break; 807 case 'edit-tags': 808 $columns[$page] = array( 800 809 'cb' => '<input type="checkbox" />', 801 810 'name' => __('Name'), … … 804 813 ); 805 814 806 return apply_filters('manage_link_categories_columns', $columns);807 case 'user ':808 $columns = array(815 break; 816 case 'users': 817 $columns[$page] = array( 809 818 'cb' => '<input type="checkbox" />', 810 819 'username' => __('Username'), … … 814 823 'posts' => __('Posts') 815 824 ); 816 return apply_filters('manage_users_columns', $columns);825 break; 817 826 default : 818 return apply_filters('manage_' . $page . '_columns', array()); 819 } 827 $columns[$page] = array(); 828 } 829 830 $columns[$page] = apply_filters('manage_' . $page . '_columns', $columns[$page]); 831 return $columns[$page]; 820 832 } 821 833 … … 829 841 */ 830 842 function print_column_headers( $type, $id = true ) { 843 $type = str_replace('.php', '', $type); 831 844 $columns = get_column_headers( $type ); 832 $hidden = (array) get_user_option( "manage-$type-columns-hidden");845 $hidden = get_hidden_columns($type); 833 846 $styles = array(); 834 847 // $styles['tag']['posts'] = 'width: 90px;'; … … 859 872 <th scope="col" <?php echo $id ? "id=\"$column_key\"" : ""; echo $class; echo $style; ?>><?php echo $column_display_name; ?></th> 860 873 <?php } 874 } 875 876 /** 877 * {@internal Missing Short Description}} 878 * 879 * @since unknown 880 * 881 * @param unknown_type $page 882 */ 883 function get_hidden_columns($page) { 884 $page = str_replace('.php', '', $page); 885 return (array) get_user_option( 'manage-' . $page . '-columns-hidden' ); 861 886 } 862 887 … … 1246 1271 <tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status ); ?> iedit' valign="top"> 1247 1272 <?php 1248 $posts_columns = wp_manage_posts_columns();1249 $hidden = (array) get_user_option( 'manage-post-columns-hidden');1273 $posts_columns = get_column_headers('edit'); 1274 $hidden = get_hidden_columns('edit'); 1250 1275 foreach ( $posts_columns as $column_name=>$column_display_name ) { 1251 1276 $class = "class=\"$column_name column-$column_name\""; … … 1449 1474 $id = (int) $page->ID; 1450 1475 $rowclass = 'alternate' == $rowclass ? '' : 'alternate'; 1451 $posts_columns = wp_manage_pages_columns();1452 $hidden = (array) get_user_option( 'manage-page-columns-hidden');1476 $posts_columns = get_column_headers('edit-pages'); 1477 $hidden = get_hidden_columns('edit-pages'); 1453 1478 $title = _draft_or_post_title(); 1454 1479 ?> … … 1752 1777 $role_name = isset($wp_roles->role_names[$role]) ? translate_with_context($wp_roles->role_names[$role]) : __('None'); 1753 1778 $r = "<tr id='user-$user_object->ID'$style>"; 1754 $columns = get_column_headers('user ');1755 $hidden = (array) get_user_option( 'manage-user-columns-hidden');1779 $columns = get_column_headers('users'); 1780 $hidden = get_hidden_columns('users'); 1756 1781 $avatar = get_avatar( $user_object->user_email, 32 ); 1757 1782 foreach ( $columns as $column_name => $column_display_name ) { … … 1907 1932 1908 1933 echo "<tr id='comment-$comment->comment_ID' class='$the_comment_status'>"; 1909 $columns = get_column_headers(' comment');1910 $hidden = (array) get_user_option( 'manage-comment-columns-hidden');1934 $columns = get_column_headers('edit-comments'); 1935 $hidden = get_hidden_columns('edit-comments'); 1911 1936 foreach ( $columns as $column_name => $column_display_name ) { 1912 1937 $class = "class=\"$column_name column-$column_name\""; … … 2863 2888 $columns = get_column_headers($page); 2864 2889 2865 $hidden = (array) get_user_option( "manage-$page-columns-hidden");2890 $hidden = get_hidden_columns($page); 2866 2891 2867 2892 foreach ( $columns as $column => $title ) { … … 3181 3206 3182 3207 $screen = str_replace('.php', '', $screen); 3183 3184 $column_screens = array('edit' => 'post', 'edit-pages' => 'page', 'edit-tags' => 'tag', 'categories' => 'category',3185 'edit-link-categories' => 'link-category', 'link-manager' => 'link', 'users' => 'user', 'upload' => 'media',3186 'edit-comments' => 'comment');3187 3188 3208 $screen = str_replace('-new', '', $screen); 3189 3209 $screen = str_replace('-add', '', $screen); 3210 3211 $column_screens = get_column_headers($screen); 3190 3212 $meta_screens = array('index' => 'dashboard'); 3191 3213 … … 3193 3215 $screen = $meta_screens[$screen]; 3194 3216 $show_screen = false; 3195 if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens [$screen]) )3217 if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) ) 3196 3218 $show_screen = true; 3197 3219 ?> … … 3205 3227 <div class="metabox-prefs"> 3206 3228 <?php 3207 if ( !meta_box_prefs($screen) && isset($column_screens [$screen]) ) {3208 manage_columns_prefs($ column_screens[$screen]);3229 if ( !meta_box_prefs($screen) && isset($column_screens) ) { 3230 manage_columns_prefs($screen); 3209 3231 wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); 3210 3232 } -
trunk/wp-admin/js/categories.js
r9606 r9735 30 30 $('#the-list').wpList({ addAfter: addAfter2 }); 31 31 32 if ( jQuery('#link-category-search ').size() ) {33 columns.init(' link-category');32 if ( jQuery('#link-category-search-input').size() ) { 33 columns.init('edit-link-categories'); 34 34 } else { 35 columns.init('categor y');35 columns.init('categories'); 36 36 } 37 37 }); -
trunk/wp-admin/js/edit-comments.js
r9726 r9735 284 284 285 285 $(document).ready(function(){ 286 columns.init(' comment');286 columns.init('edit-comments'); 287 287 commentReply.init(); 288 288 -
trunk/wp-admin/js/tags.js
r9606 r9735 27 27 $('#the-list').wpList({ addAfter: addAfter2 }); 28 28 29 columns.init(' tag');29 columns.init('edit-tags'); 30 30 }); -
trunk/wp-admin/js/users.js
r8988 r9735 2 2 $('#users').wpList(); 3 3 4 columns.init('user ');4 columns.init('users'); 5 5 }); -
trunk/wp-admin/link-manager.php
r9733 r9735 140 140 $links = get_bookmarks( $args ); 141 141 if ( $links ) { 142 $link_columns = get_column_headers('link ');143 $hidden = (array) get_user_option( 'manage-link- columns-hidden' );142 $link_columns = get_column_headers('link-manager'); 143 $hidden = (array) get_user_option( 'manage-link-manager-columns-hidden' ); 144 144 ?> 145 145 … … 148 148 <thead> 149 149 <tr> 150 <?php print_column_headers('link '); ?>150 <?php print_column_headers('link-manager'); ?> 151 151 </tr> 152 152 </thead> … … 154 154 <tfoot> 155 155 <tr> 156 <?php print_column_headers('link ', false); ?>156 <?php print_column_headers('link-manager', false); ?> 157 157 </tr> 158 158 </tfoot> … … 279 279 }); 280 280 })(jQuery); 281 columns.init('link ');281 columns.init('link-manager'); 282 282 /* ]]> */ 283 283 </script> -
trunk/wp-admin/upload.php
r9733 r9735 464 464 }); 465 465 })(jQuery); 466 columns.init(' media');466 columns.init('upload'); 467 467 /* ]]> */ 468 468 </script> -
trunk/wp-admin/users.php
r9733 r9735 332 332 <thead> 333 333 <tr class="thead"> 334 <?php print_column_headers('user ') ?>334 <?php print_column_headers('users') ?> 335 335 </tr> 336 336 </thead> … … 338 338 <tfoot> 339 339 <tr class="thead"> 340 <?php print_column_headers('user ', false) ?>340 <?php print_column_headers('users', false) ?> 341 341 </tr> 342 342 </tfoot> -
trunk/wp-includes/script-loader.php
r9730 r9735 146 146 'how' => __('Separate multiple categories with commas.') 147 147 ) ); 148 $scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '2008 0925' );149 $scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists'), '2008 0925' );148 $scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20081117' ); 149 $scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists'), '20081117' ); 150 150 $scripts->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20070823' ); 151 151 $scripts->add( 'password-strength-meter', '/wp-admin/js/password-strength-meter.js', array('jquery'), '20081021' ); … … 157 157 'strong' => __('Strong') 158 158 ) ); 159 $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '2008111 5b' );159 $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081117' ); 160 160 $scripts->localize( 'admin-comments', 'adminCommentsL10n', array( 161 161 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']), 162 162 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']) 163 163 ) ); 164 $scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '2008 0925' );164 $scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20081117' ); 165 165 $scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' ); 166 166 $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20081109' );
Note: See TracChangeset
for help on using the changeset viewer.