Changeset 12702 for trunk/wp-admin/includes/template.php

Timestamp:

01/12/2010 12:14:27 AM (16 years ago)

Author:

ryan

Message:

Merge page-new.php into post-new.php. Start abstracting column headers and prefs. see #9674

File:

• trunk/wp-admin/includes/template.php (modified) (6 diffs)

trunk/wp-admin/includes/template.php

@@ -749 +749 @@
  */
 function wp_manage_posts_columns() {
+    global $typenow;
+
     $posts_columns = array();
     $posts_columns['cb'] = '<input type="checkbox" />';
@@ -754 +756 @@
     $posts_columns['title'] = _x('Post', 'column name');
     $posts_columns['author'] = __('Author');
-    $posts_columns['categories'] = __('Categories');
-    $posts_columns['tags'] = __('Tags');
+    if ( empty($typenow) || is_object_in_taxonomy($typenow, 'category') )
+        $posts_columns['categories'] = __('Categories');
+    if ( empty($typenow) || is_object_in_taxonomy($typenow, 'category') )
+        $posts_columns['tags'] = __('Tags');
     $post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
-    if ( !in_array( $post_status, array('pending', 'draft', 'future') ) )
+    if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($typenow) || post_type_supports($typenow, 'comments') ) )
         $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>';
     $posts_columns['date'] = __('Date');
@@ -827 +831 @@
         $_wp_column_headers = array();
 
+    $map_screen = $page;
+    $type = str_replace('edit-', '', $map_screen);
+    if ( in_array($type, get_post_types()) )
+        $map_screen = 'edit';
+
     // Store in static to avoid running filters on each call
     if ( isset($_wp_column_headers[$page]) )
         return $_wp_column_headers[$page];
 
-    switch ($page) {
+    switch ($map_screen) {
         case 'edit':
              $_wp_column_headers[$page] = wp_manage_posts_columns();
@@ -925 +934 @@
     $hidden = get_hidden_columns($type);
     $styles = array();
-//  $styles['tag']['posts'] = 'width: 90px;';
-//  $styles['link-category']['links'] = 'width: 90px;';
-//  $styles['category']['posts'] = 'width: 90px;';
-//  $styles['link']['visible'] = 'text-align: center;';
 
     foreach ( $columns as $column_key => $column_display_name ) {
@@ -3495 +3500 @@
             $screen = $typenow;
     }
+    if ( 'edit' == $screen ) {
+        if ( !empty($typenow) )
+            $screen = 'edit-' . $typenow;
+    }
 
     if ( isset($meta_screens[$screen]) )
@@ -3708 +3717 @@
 
 function screen_options($screen) {
-    switch ( $screen ) {
+    $map_screen = $screen;
+    $type = str_replace('edit-', '', $map_screen);
+    if ( in_array($type, get_post_types()) )
+        $map_screen = 'edit';
+
+    switch ( $map_screen ) {
         case 'edit':
             $per_page_label = __('Posts per page:');