Changeset 8888

Timestamp:

09/14/2008 06:51:42 AM (17 years ago)

Author:

ryan

Message:

Column hiding for links. see #7725

Location:

trunk

Files:

• wp-admin/includes/template.php (modified) (3 diffs)
• wp-admin/js/links.js (added)
• wp-admin/link-manager.php (modified) (8 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/includes/template.php

@@ -405 +405 @@
 
     return $posts_columns;
+}
+
+function wp_manage_links_columns() {
+    $link_columns = array(
+        'name'       => __('Name'),
+        'url'       => __('URL'),
+        'categories' => __('Categories'),
+        'rel'      => __('rel'),
+        'visible'   => __('Visible'),
+    );
+
+    return apply_filters('manage_link_columns', $link_columns);
 }
 
@@ -1971 +1983 @@
     elseif ( 'page' == $page )
         $columns = wp_manage_pages_columns();
+    elseif ( 'link' == $page )
+        $columns = wp_manage_links_columns();
     elseif ( 'media' == $page )
         $columns = wp_manage_media_columns();
@@ -1979 +1993 @@
     foreach ( $columns as $column => $title ) {
         // Can't hide these
-        if ( 'cb' == $column || 'title' == $column )
+        if ( 'cb' == $column || 'title' == $column || 'name' == $column )
             continue;
         if ( 'comments' == $column )

trunk/wp-admin/link-manager.php

@@ -35 +35 @@
 
 wp_enqueue_script('admin-forms');
+wp_enqueue_script('links');
 
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
@@ -95 +96 @@
 
 <form id="links-filter" action="" method="get">
+
+<div id="show-settings"><a href="#edit_settings" id="show-settings-link" class="hide-if-no-js"><?php _e('Advanced Options') ?></a>
+<a href="#edit_settings" id="hide-settings-link" class="hide-if-js hide-if-no-js"><?php _e('Hide Options') ?></a></div>
+
+<div id="edit-settings" class="hide-if-js hide-if-no-js">
+<div id="edit-settings-wrap">
+<h5><?php _e('Show on screen') ?></h5>
+<div class="metabox-prefs">
+<?php manage_columns_prefs('link') ?>
+<br class="clear" />
+</div></div>
+</div>
+
 <h2><?php printf( __('Links (<a href="%s">Add New</a>)' ), 'link-add.php' ); ?></h2>
 
@@ -134 +148 @@
 
 <br class="clear" />
-
-<?php
-$link_columns = array(
-    'name'       => '<th style="width: 15%;">' . __('Name') . '</th>',
-    'url'       => '<th>' . __('URL') . '</th>',
-    'categories' => '<th>' . __('Categories') . '</th>',
-    'rel'      => '<th style="text-align: center">' . __('rel') . '</th>',
-    'visible'   => '<th style="text-align: center">' . __('Visible') . '</th>',
-);
-$link_columns = apply_filters('manage_link_columns', $link_columns);
-?>
 
 <?php
@@ -154 +157 @@
 $links = get_bookmarks( $args );
 if ( $links ) {
+    $link_columns = wp_manage_links_columns();
+    $hidden = (array) get_user_option( 'manage-link-columns-hidden' );
 ?>
 
@@ -161 +166 @@
     <tr>
     <th scope="col" class="check-column"><input type="checkbox" /></th>
-<?php foreach($link_columns as $column_display_name) {
-    echo $column_display_name;
-} ?>
+<?php foreach($link_columns as $column_name => $column_display_name) {
+    $class = " class=\"manage-column column-$column_name\"";
+    $style = '';
+    if ( in_array($column_name, $hidden) )
+        $style = ' style="display:none;"';
+    if ( 'visible' == $column_name )
+        $style = empty($style) ? ' style="text-align: center;"' : ' style="text-align: center; display: none;"';
+?>
+    <th scope="col"<?php echo "id=\"$column_name\""; echo $class; echo $style ?>><?php echo $column_display_name; ?></th>
+<?php } ?>
     </tr>
     </thead>
@@ -187 +199 @@
         echo '<th scope="row" class="check-column"><input type="checkbox" name="linkcheck[]" value="'.$link->link_id.'" /></th>';
         foreach($link_columns as $column_name=>$column_display_name) {
+            $class = "class=\"column-$column_name\"";
+
+            $style = '';
+            if ( in_array($column_name, $hidden) )
+                $style = ' style="display:none;"';
+            if ( 'visible' == $column_name )
+                $style = empty($style) ? ' style="text-align: center;"' : ' style="text-align: center; display: none;"';
+            $attributes = "$class$style";
+
             switch($column_name) {
                 case 'name':
 
-                    echo "<td><strong><a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $link->link_name)) . "'>$link->link_name</a></strong><br />";
+                    echo "<td $attributes><strong><a class='row-title' href='$edit_link' title='" . attribute_escape(sprintf(__('Edit "%s"'), $link->link_name)) . "'>$link->link_name</a></strong><br />";
                     $actions = array();
                     $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
@@ -204 +225 @@
                     break;
                 case 'url':
-                    echo "<td><a href='$link->link_url' title='".sprintf(__('Visit %s'), $link->link_name)."'>$short_url</a></td>";
+                    echo "<td $attributes><a href='$link->link_url' title='".sprintf(__('Visit %s'), $link->link_name)."'>$short_url</a></td>";
                     break;
                 case 'categories':
-                    ?><td><?php
+                    ?><td <?php echo $attributes ?>><?php
                     $cat_names = array();
                     foreach ($link->link_category as $category) {
@@ -222 +243 @@
                     break;
                 case 'rel':
-                    ?><td><?php echo $link->link_rel; ?></td><?php
+                    ?><td <?php echo $attributes ?>><?php echo $link->link_rel; ?></td><?php
                     break;
                 case 'visible':
-                    ?><td style='text-align: center;'><?php echo $visible; ?></td><?php
+                    ?><td <?php echo $attributes ?>><?php echo $visible; ?></td><?php
                     break;
                 default:

trunk/wp-includes/script-loader.php

@@ -263 +263 @@
         $scripts->add( 'posts', '/wp-admin/js/posts.js', array('columns'), '20080910' );
         $scripts->add( 'pages', '/wp-admin/js/pages.js', array('columns'), '20080910' );
+        $scripts->add( 'links', '/wp-admin/js/links.js', array('columns'), '20080913' );
 
         $scripts->add( 'columns', '/wp-admin/js/columns.js', false, '20080910' );