WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Standardize on Links instead of Bookmarks until we change our minds again. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-11-20 02:17:07 +00:00
parent 9952fe0bc4
commit ca40a96b1f
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/categories.php
View File

@ -37,7 +37,7 @@ case 'delete':
wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name)); wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
if ( $cat_ID == get_option('default_link_category') ) if ( $cat_ID == get_option('default_link_category') )
wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for bookmarks"), $cat_name)); wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for links"), $cat_name));
wp_delete_category($cat_ID); wp_delete_category($cat_ID);
@ -99,7 +99,7 @@ $messages[5] = __('Category not updated.');
<th scope="col"><?php _e('Name') ?></th> <th scope="col"><?php _e('Name') ?></th>
<th scope="col"><?php _e('Description') ?></th> <th scope="col"><?php _e('Description') ?></th>
<th scope="col" width="90" style="text-align: center"><?php _e('Posts') ?></th> <th scope="col" width="90" style="text-align: center"><?php _e('Posts') ?></th>
<th scope="col" width="90" style="text-align: center"><?php _e('Bookmarks') ?></th> <th scope="col" width="90" style="text-align: center"><?php _e('Links') ?></th>
<th colspan="2" style="text-align: center"><?php _e('Action') ?></th> <th colspan="2" style="text-align: center"><?php _e('Action') ?></th>
</tr> </tr>
</thead> </thead>
@ -114,7 +114,7 @@ cat_rows();
<?php if ( current_user_can('manage_categories') ) : ?> <?php if ( current_user_can('manage_categories') ) : ?>
<div class="wrap"> <div class="wrap">
<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and bookmarks in that category. Instead, posts in the deleted category are set to the category <strong>%s</strong> and bookmarks are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p> <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and links in that category. Instead, posts in the deleted category are set to the category <strong>%s</strong> and links are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p>
</div> </div>
<?php include('edit-category-form.php'); ?> <?php include('edit-category-form.php'); ?>

2
wp-admin/link-add.php
View File

@ -1,7 +1,7 @@
<?php <?php
require_once('admin.php'); require_once('admin.php');
$title = __('Add Bookmark'); $title = __('Add Link');
$this_file = 'link-manager.php'; $this_file = 'link-manager.php';
$parent_file = 'link-manager.php'; $parent_file = 'link-manager.php';

15
wp-admin/link-manager.php
View File

@ -6,8 +6,6 @@
require_once ('admin.php'); require_once ('admin.php');
$title = __('Manage Bookmarks');
$this_file = $parent_file = 'link-manager.php';
wp_enqueue_script( 'listman' ); wp_enqueue_script( 'listman' );
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[]')); 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[]'));
@ -18,11 +16,12 @@ if (empty ($cat_id))
if (empty ($order_by)) if (empty ($order_by))
$order_by = 'order_name'; $order_by = 'order_name';
$title = __('Manage Bookmarks'); $title = __('Manage Blogroll');
$this_file = $parent_file = 'link-manager.php';
include_once ("./admin-header.php"); include_once ("./admin-header.php");
if (!current_user_can('manage_links')) if (!current_user_can('manage_links'))
wp_die(__("You do not have sufficient permissions to edit the bookmarks for this blog.")); wp_die(__("You do not have sufficient permissions to edit the links for this blog."));
switch ($order_by) { switch ($order_by) {
case 'order_id' : case 'order_id' :
@ -66,7 +65,7 @@ function checkAll(form)
if ( isset($_GET['deleted']) ) { if ( isset($_GET['deleted']) ) {
echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>'; echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>';
$deleted = (int) $_GET['deleted']; $deleted = (int) $_GET['deleted'];
printf(__('%s bookmarks deleted.'), $deleted); printf(__('%s links deleted.'), $deleted);
echo '</p></div>'; echo '</p></div>';
} }
?> ?>
@ -85,7 +84,7 @@ foreach ((array) $categories as $cat)
$select_cat .= "</select>\n"; $select_cat .= "</select>\n";
$select_order = "<select name=\"order_by\">\n"; $select_order = "<select name=\"order_by\">\n";
$select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' . __('Bookmark ID') . "</option>\n"; $select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' . __('Link ID') . "</option>\n";
$select_order .= '<option value="order_name"' . (($order_by == 'order_name') ? " selected='selected'" : '') . '>' . __('Name') . "</option>\n"; $select_order .= '<option value="order_name"' . (($order_by == 'order_name') ? " selected='selected'" : '') . '>' . __('Name') . "</option>\n";
$select_order .= '<option value="order_url"' . (($order_by == 'order_url') ? " selected='selected'" : '') . '>' . __('Address') . "</option>\n"; $select_order .= '<option value="order_url"' . (($order_by == 'order_url') ? " selected='selected'" : '') . '>' . __('Address') . "</option>\n";
$select_order .= "</select>\n"; $select_order .= "</select>\n";
@ -162,7 +161,7 @@ if ($links)
<?php <?php
echo '<td><a href="link.php?link_id='.$link->link_id.'&amp;action=edit" class="edit">'.__('Edit').'</a></td>'; echo '<td><a href="link.php?link_id='.$link->link_id.'&amp;action=edit" class="edit">'.__('Edit').'</a></td>';
echo '<td><a href="' . wp_nonce_url('link.php?link_id='.$link->link_id.'&amp;action=delete', 'delete-bookmark_' . $link->link_id ) . '"'." onclick=\"return deleteSomething( 'link', $link->link_id , '".sprintf(__("You are about to delete the &quot;%s&quot; bookmark to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($link->link_name), js_escape($link->link_url)).'\' );" class="delete">'.__('Delete').'</a></td>'; echo '<td><a href="' . wp_nonce_url('link.php?link_id='.$link->link_id.'&amp;action=delete', 'delete-bookmark_' . $link->link_id ) . '"'." onclick=\"return deleteSomething( 'link', $link->link_id , '".sprintf(__("You are about to delete the &quot;%s&quot; link to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($link->link_name), js_escape($link->link_url)).'\' );" class="delete">'.__('Delete').'</a></td>';
echo '<td align="center"><input type="checkbox" name="linkcheck[]" value="'.$link->link_id.'" /></td>'; echo '<td align="center"><input type="checkbox" name="linkcheck[]" value="'.$link->link_id.'" /></td>';
echo "\n </tr>\n"; echo "\n </tr>\n";
} }
@ -172,7 +171,7 @@ if ($links)
<div id="ajax-response"></div> <div id="ajax-response"></div>
<p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Bookmarks') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these bookmarks permanently \\n \'Cancel\' to stop, \'OK\' to delete.") ?>')" /></p> <p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Links') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these links permanently \\n \'Cancel\' to stop, \'OK\' to delete.") ?>')" /></p>
</form> </form>
</div> </div>

4
wp-admin/link.php
View File

@ -96,10 +96,10 @@ switch ($action) {
wp_enqueue_script( 'ajaxcat' ); wp_enqueue_script( 'ajaxcat' );
$parent_file = 'link-manager.php'; $parent_file = 'link-manager.php';
$submenu_file = 'link-manager.php'; $submenu_file = 'link-manager.php';
$title = __('Edit Bookmark'); $title = __('Edit Link');
include_once ('admin-header.php'); include_once ('admin-header.php');
if (!current_user_can('manage_links')) if (!current_user_can('manage_links'))
wp_die(__('You do not have sufficient permissions to edit the bookmarks for this blog.')); wp_die(__('You do not have sufficient permissions to edit the links for this blog.'));
$link_id = (int) $_GET['link_id']; $link_id = (int) $_GET['link_id'];