<!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" />
<title>[17880] trunk: Improve code for DFW buttons, fix colors in some rare TinyMCE popups, see #17136</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17880">17880</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-05-12 01:53:51 +0000 (Thu, 12 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve code for DFW buttons, fix colors in some rare TinyMCE popups, see <a href="http://trac.wordpress.org/ticket/17136">#17136</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludesjstinymcepluginsinlinepopupsskinsclearlooks2windowcss">trunk/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css</a></li>
<li><a href="#trunkwpincludesjstinymcewpmcehelpphp">trunk/wp-includes/js/tinymce/wp-mce-help.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (17879 => 17880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2011-05-12 01:45:42 UTC (rev 17879)
+++ trunk/wp-admin/includes/post.php 2011-05-12 01:53:51 UTC (rev 17880)
</span><span class="lines">@@ -1712,12 +1712,7 @@
</span><span class="cx">
</span><span class="cx"> // Distraction Free Writing mode
</span><span class="cx"> if ( in_array( 'wpfullscreen', $plugins, true ) ) {
</span><del>- $enable = array();
-
- if ( in_array( 'AtD', $plugins, true ) )
- $enable[] = 'AtD';
-
- wp_fullscreen_html($enable);
</del><ins>+ wp_fullscreen_html();
</ins><span class="cx"> wp_print_scripts('wp-fullscreen');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1739,7 +1734,7 @@
</span><span class="cx"> wp_print_scripts('editor');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function wp_fullscreen_html( $extra = array() ) {
</del><ins>+function wp_fullscreen_html() {
</ins><span class="cx"> global $content_width, $post;
</span><span class="cx">
</span><span class="cx"> $width = isset($content_width) && 800 > $content_width ? $content_width : 800;
</span><span class="lines">@@ -1759,83 +1754,41 @@
</span><span class="cx"> </div></div>
</span><span class="cx">
</span><span class="cx"> <div id="wp-fullscreen-button-bar"><div id="wp-fullscreen-buttons" class="wp_themeSkin">
</span><del>- <div>
- <a title="<?php _e('Bold (Ctrl + B)'); ?>" onclick="fullscreen.b();return false;" class="mceButton mceButtonEnabled mce_bold" href="#" id="wp_fs_bold" role="button" aria-pressed="false">
- <span class="mceIcon mce_bold"></span>
- </a>
- </div>
</del><ins>+<?php
</ins><span class="cx">
</span><del>- <div>
- <a title="<?php _e('Italic (Ctrl + I)'); ?>" onclick="fullscreen.i();return false;" class="mceButton mceButtonEnabled mce_italic" href="#" id="wp_fs_italic" role="button" aria-pressed="false">
- <span class="mceIcon mce_italic"></span>
- </a>
- </div>
</del><ins>+ $buttons = array(
+ // format: title, onclick, show in both editors
+ 'bold' => array( 'title' => __('Bold (Ctrl + B)'), 'onclick' => 'fullscreen.b();', 'both' => false ),
+ 'italic' => array( 'title' => __('Italic (Ctrl + I)'), 'onclick' => 'fullscreen.i();', 'both' => false ),
+ '0' => 'separator',
+ 'bullist' => array( 'title' => __('Unordered list (Alt + Shift + U)'), 'onclick' => 'fullscreen.ul();', 'both' => false ),
+ 'numlist' => array( 'title' => __('Ordered list (Alt + Shift + O)'), 'onclick' => 'fullscreen.ol();', 'both' => false ),
+ '1' => 'separator',
+ 'blockquote' => array( 'title' => __('Blockquote (Alt+Shift+Q)'), 'onclick' => 'fullscreen.blockquote();', 'both' => false ),
+ 'image' => array( 'title' => __('Insert/edit image (Alt + Shift + M)'), 'onclick' => "jQuery('#add_image').click();", 'both' => true ),
+ '2' => 'separator',
+ 'link' => array( 'title' => __('Insert/edit link (Alt + Shift + A)'), 'onclick' => 'fullscreen.link();', 'both' => true ),
+ 'unlink' => array( 'title' => __('Unlink (Alt + Shift + S)'), 'onclick' => 'fullscreen.unlink();', 'both' => false ),
+ '3' => 'separator',
+ 'help' => array( 'title' => __('Help (Alt + Shift + H)'), 'onclick' => 'fullscreen.help();', 'both' => false )
+ );
</ins><span class="cx">
</span><del>- <div>
- <span aria-orientation="vertical" role="separator" class="mceSeparator"></span>
- </div>
</del><ins>+ $buttons = apply_filters( 'wp_fullscreen_buttons', $buttons );
</ins><span class="cx">
</span><del>- <div>
- <a title="<?php _e('Unordered list (Alt + Shift + U)'); ?>" onclick="fullscreen.ul();return false;" onmousedown="return false;" class="mceButton mceButtonEnabled mce_bullist" href="#" id="wp_fs_bullist" role="button" aria-pressed="false">
- <span class="mceIcon mce_bullist"></span>
- </a>
- </div>
</del><ins>+ foreach ( $buttons as $button => $args ) {
+ if ( 'separator' == $args ) { ?>
+ <div><span aria-orientation="vertical" role="separator" class="mceSeparator"></span></div>
+<?php continue;
+ } ?>
</ins><span class="cx">
</span><del>- <div>
- <a title="<?php _e('Ordered list (Alt + Shift + O)'); ?>" onclick="fullscreen.ol();return false;" class="mceButton mceButtonEnabled mce_numlist" href="#" id="wp_fs_numlist" role="button" aria-pressed="false">
- <span class="mceIcon mce_numlist"></span>
- </a>
- </div>
</del><ins>+ <div<?php if ( $args['both'] ) { ?> class="wp-fullscreen-both"<?php } ?>>
+ <a title="<?php echo $args['title']; ?>" onclick="<?php echo $args['onclick']; ?>return false;" class="mceButton mceButtonEnabled mce_<?php echo $button; ?>" href="#" id="wp_fs_<?php echo $button; ?>" role="button" aria-pressed="false">
+ <span class="mceIcon mce_<?php echo $button; ?>"></span>
+ </a>
+ </div>
+<?php
+ } ?>
</ins><span class="cx">
</span><del>- <div>
- <span aria-orientation="vertical" role="separator" class="mceSeparator"></span>
- </div>
-
- <div>
- <a title="<?php _e('Blockquote (Alt+Shift+Q)'); ?>" onclick="fullscreen.blockquote();return false;" class="mceButton mceButtonEnabled mce_blockquote" href="#" id="wp_fs_blockquote" role="button" tabindex="-1">
- <span class="mceIcon mce_blockquote"></span>
- </a>
- </div>
-
- <div class="wp-fullscreen-both">
- <a title="<?php _e('Insert/edit image (Alt + Shift + M)'); ?>" onclick="jQuery('#add_image').click();return false;" class="mceButton mceButtonEnabled mce_image" href="#" id="wp_fs_image" role="button" tabindex="-1">
- <span class="mceIcon mce_image"></span>
- </a>
- </div>
-
- <div class="wp-fullscreen-both">
- <span aria-orientation="vertical" role="separator" class="mceSeparator"></span>
- </div>
-
- <div class="wp-fullscreen-both">
- <a title="<?php _e('Insert/edit link (Alt + Shift + A)'); ?>" onclick="fullscreen.link();return false;" class="mceButton mce_link mceButtonEnabled" href="#" id="wp_fs_link" role="button" aria-pressed="false">
- <span class="mceIcon mce_link"></span>
- </a>
- </div>
-
- <div>
- <a title="<?php _e('Unlink (Alt + Shift + S)'); ?>" onclick="fullscreen.unlink();return false;" class="mceButton mce_unlink mceButtonEnabled" href="#" id="wp_fs_unlink" role="button" aria-pressed="false">
- <span class="mceIcon mce_unlink"></span>
- </a>
- </div>
-
- <div>
- <span aria-orientation="vertical" role="separator" class="mceSeparator"></span>
- </div>
-
-<?php if ( in_array( 'AtD', $extra, true ) ) { ?>
- <div>
- <a title="<?php _e('Proofread Writing'); ?>" onclick="fullscreen.atd();return false;" class="mceButton mceButtonEnabled" href="#" id="wp_fs_spellchecker" role="button" aria-pressed="false">
- <span class="mceIcon mce_spellchecker"></span>
- </a>
- </div>
-<?php } ?>
-
- <div>
- <a title="<?php _e('Help (Alt + Shift + H)'); ?>" onclick="fullscreen.help();return false;" class="mceButton mce_help mceButtonEnabled" href="#" id="wp_fs_help" role="button" aria-pressed="false">
- <span class="mceIcon mce_help"></span>
- </a>
- </div>
</del><span class="cx"> </div></div>
</span><span class="cx">
</span><span class="cx"> <div id="wp-fullscreen-save">
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginsinlinepopupsskinsclearlooks2windowcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css (17879 => 17880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css 2011-05-12 01:45:42 UTC (rev 17879)
+++ trunk/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css 2011-05-12 01:53:51 UTC (rev 17880)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> .clearlooks2 .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px}
</span><span class="cx"> .clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal}
</span><span class="cx"> .clearlooks2 a:hover {font-weight:bold;}
</span><del>-.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#E4F2FD}
</del><ins>+.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#F9F9F9}
</ins><span class="cx"> .clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px}
</span><span class="cx"> .clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)}
</span><span class="cx"> .clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px}
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewpmcehelpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-help.php (17879 => 17880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-help.php 2011-05-12 01:45:42 UTC (rev 17879)
+++ trunk/wp-includes/js/tinymce/wp-mce-help.php 2011-05-12 01:53:51 UTC (rev 17880)
</span><span class="lines">@@ -168,8 +168,6 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx">
</span><del>-<div id="wphead"><h1><?php echo get_bloginfo('blogtitle'); ?></h1></div>
-
</del><span class="cx"> <ul id="tabs">
</span><span class="cx"> <li><a id="tab1" href="javascript:flipTab(1)" title="<?php _e('Basics of Rich Editing') ?>" accesskey="1" tabindex="1" class="current"><?php _e('Basics') ?></a></li>
</span><span class="cx"> <li><a id="tab2" href="javascript:flipTab(2)" title="<?php _e('Advanced use of the Rich Editor') ?>" accesskey="2" tabindex="2"><?php _e('Advanced') ?></a></li>
</span></span></pre>
</div>
</div>
</body>
</html>