<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16398] trunk/wp-includes/js/tinymce/wp-mce-link.php:
Internal linking UI updates.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16398">16398</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-16 04:25:14 +0000 (Tue, 16 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Internal linking UI updates. see <a href="http://trac.wordpress.org/ticket/11420">#11420</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcewpmcelinkphp">trunk/wp-includes/js/tinymce/wp-mce-link.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcewpmcelinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-link.php (16397 => 16398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-link.php 2010-11-16 01:21:18 UTC (rev 16397)
+++ trunk/wp-includes/js/tinymce/wp-mce-link.php 2010-11-16 04:25:14 UTC (rev 16398)
</span><span class="lines">@@ -3,30 +3,28 @@
</span><span class="cx"> require_once '../../../wp-load.php';
</span><span class="cx"> include './wp-mce-link-includes.php';
</span><span class="cx">
</span><del>-header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
</del><ins>+header( 'Content-Type: text/html; charset=' . get_bloginfo( 'charset' ) );
</ins><span class="cx"> ?>
</span><span class="cx"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><span class="cx"> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_bloginfo('charset'); ?>" />
</span><del>-<title><?php _e('Insert/edit link') ?></title>
</del><ins>+<title><?php _e( 'Insert/edit link' ); ?></title>
</ins><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><del>-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
</del><ins>+var ajaxurl = '<?php echo admin_url( 'admin-ajax.php' ); ?>',
</ins><span class="cx"> wpLinkL10n = {
</span><span class="cx"> untitled : '<?php _e('Untitled'); ?>',
</span><del>- noMatchesFound : '<?php _e('No matches found.'); ?>'
</del><ins>+ noMatchesFound : '<?php _e( 'No matches found.' ); ?>'
</ins><span class="cx"> };
</span><span class="cx"> //]]>
</span><span class="cx"> </script>
</span><span class="cx"> <script type="text/javascript" src="tiny_mce_popup.js?ver=3223"></script>
</span><span class="cx"> <?php
</span><del>-wp_print_scripts( array('jquery', 'jquery-ui-widget') );
</del><ins>+wp_print_scripts( array( 'jquery', 'jquery-ui-widget' ) );
+$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.dev' : '';
+$src = "plugins/wplink/js/wplink$suffix.js?ver=20101115";
</ins><span class="cx"> ?>
</span><del>-<?php
- $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
- $src = "plugins/wplink/js/wplink$suffix.js?ver=20101115";
-?>
</del><span class="cx"> <script type="text/javascript" src="<?php echo $src; ?>"></script>
</span><span class="cx"> <?php
</span><span class="cx"> wp_admin_css( 'global', true );
</span><span class="lines">@@ -35,119 +33,100 @@
</span><span class="cx"> wp_admin_css( 'colors', true );
</span><span class="cx"> ?>
</span><span class="cx"> <style>
</span><del>-html, body {
</del><ins>+html {
</ins><span class="cx"> background: #f1f1f1;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> a:link, a:visited {
</span><del>- color: #21759B;
</del><ins>+ color: #21759b;
</ins><span class="cx"> }
</span><del>-
-select {
- height: 2em;
</del><ins>+p.howto {
+ margin: 3px;
</ins><span class="cx"> }
</span><del>-
-#link-options,
-#link-advanced-options {
- padding: 5px;
</del><ins>+#link-options {
+ padding: 10px 0 14px;
</ins><span class="cx"> border-bottom: 1px solid #dfdfdf;
</span><ins>+ margin: 0 6px 14px;
</ins><span class="cx"> }
</span><del>-
-#link-type {
- width: 140px;
-}
-
-.link-panel {
- padding: 5px 5px 0;
- display: none;
-}
- .link-panel-active {
- display: block;
- }
-
</del><span class="cx"> label input[type="text"] {
</span><span class="cx"> width: 360px;
</span><span class="cx"> margin-top: 5px;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> label span {
</span><span class="cx"> display: inline-block;
</span><span class="cx"> width: 80px;
</span><span class="cx"> text-align: right;
</span><span class="cx"> padding-right: 5px;
</span><span class="cx"> }
</span><del>- .link-search-wrapper {
- padding: 5px;
- display: block;
- overflow: hidden;
- }
- .link-search-wrapper span {
- float: left;
- margin-top: 6px;
- }
- .link-search-wrapper input[type="text"] {
- float: left;
- width: 220px;
- }
- .link-search-wrapper img.waiting {
- margin: 8px 1px 0 4px;
- float: left;
- display: none;
- }
-
</del><ins>+.link-search-wrapper {
+ margin: 5px 5px 9px;
+ display: block;
+ overflow: hidden;
+}
+.link-search-wrapper span {
+ float: left;
+ margin-top: 6px;
+}
+.link-search-wrapper input[type="text"] {
+ float: left;
+ width: 220px;
+}
+img.waiting {
+ margin: 8px 1px 0 4px;
+ float: left;
+ display: none;
+}
</ins><span class="cx"> #open-in-new-tab {
</span><del>- padding-left: 87px;
</del><ins>+ display: inline-block;
+ padding: 3px 0 0;
+ margin: 0 0 0 87px;
</ins><span class="cx"> }
</span><del>- #open-in-new-tab span {
- width: auto;
- margin-left: 10px;
- font-size: 11px;
- }
-
</del><ins>+#open-in-new-tab span {
+ width: auto;
+ margin-left: 6px;
+ font-size: 11px;
+}
</ins><span class="cx"> .query-results {
</span><del>- border: #dfdfdf solid;
- border-width: 1px 0;
- margin: 5px 0;
</del><ins>+ border: 1px #dfdfdf solid;
+ margin: 0 5px 5px;
</ins><span class="cx"> background: #fff;
</span><del>- height: 220px;
</del><ins>+ height: 185px;
</ins><span class="cx"> overflow: auto;
</span><span class="cx"> }
</span><del>- .query-results li {
- margin-bottom: 0;
- border-bottom: 1px solid #dfdfdf;
- color: #555;
- padding: 4px 6px;
- cursor: pointer;
- }
- .query-results li:hover {
- background: #EAF2FA;
- color: #333;
- }
- .query-results li.selected {
- background: #f1f1f1;
- font-weight: bold;
- color: #333;
- }
</del><ins>+.query-results li {
+ margin-bottom: 0;
+ border-bottom: 1px solid #f1f1f1;
+ color: #555;
+ padding: 4px 6px;
+ cursor: pointer;
+}
+.query-results li:hover {
+ background: #eaf2fa;
+ color: #333;
+}
+.query-results li.unselectable:hover {
+ background: #fff;
+ cursor: auto;
+ color: #555;
+}
+.query-results li.unselectable {
+ border-bottom: 1px solid #dfdfdf;
+}
+.query-results li.selected {
+ background: #f1f1f1;
+ color: #333;
+}
+.query-results li.selected .item-title {
+ font-weight: bold;
+}
</ins><span class="cx"> .item-info {
</span><span class="cx"> text-transform: uppercase;
</span><span class="cx"> color: #aaa;
</span><del>- font-weight: bold;
</del><span class="cx"> font-size: 11px;
</span><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx"> #search-results {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>-
-.wp-results-pagelinks {
- padding:4px 0;
- margin:0 auto;
- text-align:center;
-}
- .wp-results-pagelinks-top {
- border-bottom: 1px solid #dfdfdf;
- }
-
</del><span class="cx"> .submitbox {
</span><span class="cx"> padding: 5px 5px 0;
</span><span class="cx"> font-size: 11px;
</span><span class="lines">@@ -167,45 +146,42 @@
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span><del>-<?php
-
-
-?>
</del><span class="cx"> <body id="post-body">
</span><span class="cx"> <div id="link-selector">
</span><span class="cx"> <div id="link-options">
</span><ins>+ <p class="howto"><?php _e( 'Enter the destination URL:' ); ?></p>
</ins><span class="cx"> <label for="url-field">
</span><del>- <span><?php _e('URL:'); ?></span><input id="url-field" type="text" />
</del><ins>+ <span><?php _e( 'URL' ); ?></span><input id="url-field" type="text" />
</ins><span class="cx"> </label>
</span><span class="cx"> <label for="link-title-field">
</span><del>- <span><?php _e('Description:'); ?></span><input id="link-title-field" type="text" />
</del><ins>+ <span><?php _e( 'Title' ); ?></span><input id="link-title-field" type="text" />
</ins><span class="cx"> </label>
</span><span class="cx"> <label for="link-target-checkbox" id="open-in-new-tab">
</span><del>- <input type="checkbox" id="link-target-checkbox" /><span><?php _e('Open in new tab'); ?></span>
</del><ins>+ <input type="checkbox" id="link-target-checkbox" /><span><?php _e( 'Open in new tab' ); ?></span>
</ins><span class="cx"> </label>
</span><span class="cx"> </div>
</span><span class="cx"> <div id="search-panel">
</span><del>- <label for="search-field" class="link-search-wrapper">
- <span><?php _e('Search:'); ?></span>
- <input type="text" id="search-field" class="link-search-field" />
- <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
- </label>
-
</del><ins>+ <div class="link-search-wrapper">
+ <p class="howto"><?php _e( 'Or, link to existing site content:' ); ?></p>
+ <label for="search-field">
+ <span><?php _e( 'Search' ); ?></span>
+ <input type="text" id="search-field" class="link-search-field" />
+ <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+ </label>
+ </div>
</ins><span class="cx"> <div id="search-results" class="query-results">
</span><del>- <div class="wp-results-pagelinks wp-results-pagelinks-top"></div>
</del><span class="cx"> <ul>
</span><del>- <li class="wp-results-loading unselectable"><em><?php _e('Loading...'); ?></em></li>
</del><ins>+ <li class="wp-results-loading unselectable"><em><?php _e( 'Loading...' ); ?></em></li>
</ins><span class="cx"> </ul>
</span><del>- <div class="wp-results-pagelinks wp-results-pagelinks-bottom"></div>
</del><ins>+ <div class="river-waiting">
+ <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+ </div>
</ins><span class="cx"> </div>
</span><del>-
</del><span class="cx"> <?php $most_recent = wp_link_query(); ?>
</span><span class="cx"> <div id="most-recent-results" class="query-results">
</span><del>- <div class="wp-results-pagelinks wp-results-pagelinks-top">
- <?php echo $most_recent['pages']['page_links']; ?>
- </div>
</del><span class="cx"> <ul>
</span><del>- <?php foreach ( $most_recent['results'] as $item ): ?>
</del><ins>+ <li class="unselectable"><em><?php _e( 'No search term specified. Showing recent items.' ); ?></em></li>
+ <?php foreach ( $most_recent['results'] as $item ) : ?>
</ins><span class="cx"> <li>
</span><span class="cx"> <input type="hidden" class="item-permalink" value="<?php echo esc_url( $item['permalink'] ); ?>" />
</span><span class="cx"> <span class="item-title"><?php echo $item['title']; ?></span>
</span><span class="lines">@@ -213,19 +189,19 @@
</span><span class="cx"> </li>
</span><span class="cx"> <?php endforeach; ?>
</span><span class="cx"> </ul>
</span><del>- <div class="wp-results-pagelinks wp-results-pagelinks-bottom">
- <?php echo $most_recent['pages']['page_links']; ?>
</del><ins>+ <div class="river-waiting">
+ <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="submitbox">
</span><span class="cx"> <div id="wp-cancel">
</span><del>- <a class="submitdelete deletion"><?php _e('Cancel'); ?></a>
</del><ins>+ <a class="submitdelete deletion"><?php _e( 'Cancel' ); ?></a>
</ins><span class="cx"> </div>
</span><span class="cx"> <div id="wp-update">
</span><del>- <a class="button-primary"><?php _e('Update'); ?></a>
</del><ins>+ <a class="button-primary"><?php _e( 'Update' ); ?></a>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </body>
</span><del>-</html>
</del><ins>+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>