From 059492b3be73c75894c3f385d08b276d406c4e8b Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 14 Sep 2008 06:51:42 +0000
Subject: [PATCH] Column hiding for links. see #7725

git-svn-id: http://svn.automattic.com/wordpress/trunk@8888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/template.php | 16 ++++++++-
 wp-admin/js/links.js           | 24 ++++++++++++++
 wp-admin/link-manager.php      | 59 +++++++++++++++++++++++-----------
 wp-includes/script-loader.php  |  1 +
 4 files changed, 80 insertions(+), 20 deletions(-)
 create mode 100644 wp-admin/js/links.js

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 5235c3cf18..271ab7e605 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -406,6 +406,18 @@ function wp_manage_pages_columns() {
 	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);
+}
+
 function inline_edit_row( $type ) {
 	global $current_user;
 
@@ -1970,6 +1982,8 @@ function manage_columns_prefs($page) {
 		$columns = wp_manage_posts_columns();
 	elseif ( 'page' == $page )
 		$columns = wp_manage_pages_columns();
+	elseif ( 'link' == $page )
+		$columns = wp_manage_links_columns();
 	elseif ( 'media' == $page )
 		$columns = wp_manage_media_columns();
 	else return;
@@ -1978,7 +1992,7 @@ function manage_columns_prefs($page) {
 
 	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 )
 			$title = __('Comments');
diff --git a/wp-admin/js/links.js b/wp-admin/js/links.js
new file mode 100644
index 0000000000..6fccc4c734
--- /dev/null
+++ b/wp-admin/js/links.js
@@ -0,0 +1,24 @@
+jQuery(document).ready( function($) {
+	columns.init('link');
+
+	// Edit Settings
+	$('#show-settings-link').click(function () {
+		$('#edit-settings').slideDown('normal', function(){
+			$('#show-settings-link').hide();
+			$('#hide-settings-link').show();
+			
+		});
+		$('#show-settings').addClass('show-settings-opened');
+		return false;
+	});
+	
+	$('#hide-settings-link').click(function () {
+		$('#edit-settings').slideUp('normal', function(){
+			$('#hide-settings-link').hide();
+			$('#show-settings-link').show();
+			$('#show-settings').removeClass('show-settings-opened');
+		});
+		
+		return false;
+	});
+});
\ No newline at end of file
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 7bdd2b6d4b..689ebb7eed 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -34,6 +34,7 @@ if ( isset($_GET['action']) && isset($_GET['linkcheck']) ) {
 }
 
 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[]'));
 
@@ -94,6 +95,19 @@ if ( isset($_GET['deleted']) ) {
 <div class="wrap">
 
 <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>
 
 <br class="clear" />
@@ -134,17 +148,6 @@ echo $select_order;
 
 <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
 if ( 'all' == $cat_id )
 	$cat_id = '';
@@ -153,6 +156,8 @@ if ( !empty($_GET['s']) )
 	$args['search'] = $_GET['s'];
 $links = get_bookmarks( $args );
 if ( $links ) {
+	$link_columns = wp_manage_links_columns();
+	$hidden = (array) get_user_option( 'manage-link-columns-hidden' );
 ?>
 
 <?php wp_nonce_field('bulk-bookmarks') ?>
@@ -160,9 +165,16 @@ if ( $links ) {
 	<thead>
 	<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>
 	<tbody>
@@ -186,10 +198,19 @@ if ( $links ) {
 		?><tr id="link-<?php echo $link->link_id; ?>" valign="middle" <?php echo $style; ?>><?php
 		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>';
 					$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf( __("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
@@ -203,10 +224,10 @@ if ( $links ) {
 					echo '</td>';
 					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) {
 						$cat = get_term($category, 'link_category', OBJECT, 'display');
@@ -221,10 +242,10 @@ if ( $links ) {
 					?></td><?php
 					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:
 					?>
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index cf8542d505..774d1b66eb 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -262,6 +262,7 @@ function wp_default_scripts( &$scripts ) {
 
 		$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' );
 		$scripts->localize( 'columns', 'columnsL10n', array(