<!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>[20774] trunk/wp-admin: First pass at 3.4 pointers.</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://core.trac.wordpress.org/changeset/20774">20774</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-05-11 20:29:08 +0000 (Fri, 11 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at 3.4 pointers. Add pointer to the customize link for the current theme on themes.php. Support multiple pointers per page. Props scribu. see <a href="http://core.trac.wordpress.org/ticket/20554">#20554</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (20773 => 20774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2012-05-11 19:58:22 UTC (rev 20773)
+++ trunk/wp-admin/includes/template.php 2012-05-11 20:29:08 UTC (rev 20774)
</span><span class="lines">@@ -1707,37 +1707,41 @@
</span><span class="cx"> 'index.php' => 'wp330_toolbar',
</span><span class="cx"> 'post-new.php' => 'wp330_media_uploader',
</span><span class="cx"> 'post.php' => 'wp330_media_uploader',
</span><del>- 'themes.php' => 'wp330_saving_widgets',
</del><ins>+ 'themes.php' => array( 'wp330_saving_widgets', 'wp340_customize_current_theme_link' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Check if screen related pointer is registered
</span><span class="cx"> if ( empty( $registered_pointers[ $hook_suffix ] ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- $pointer = $registered_pointers[ $hook_suffix ];
</del><ins>+ $pointers = (array) $registered_pointers[ $hook_suffix ];
</ins><span class="cx">
</span><span class="cx"> $caps_required = array(
</span><span class="cx"> 'wp330_media_uploader' => array( 'upload_files' ),
</span><span class="cx"> 'wp330_saving_widgets' => array( 'edit_theme_options', 'switch_themes' ),
</span><ins>+ 'wp340_customize_current_theme_link' => array( 'edit_theme_options' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><del>- if ( isset( $caps_required[ $pointer ] ) ) {
- foreach ( $caps_required[ $pointer ] as $cap ) {
- if ( ! current_user_can( $cap ) )
- return;
</del><ins>+ // Get dismissed pointers
+ $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+
+ $got_pointers = false;
+ foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
+ if ( isset( $caps_required[ $pointer ] ) ) {
+ foreach ( $caps_required[ $pointer ] as $cap ) {
+ if ( ! current_user_can( $cap ) )
+ continue 2;
+ }
</ins><span class="cx"> }
</span><ins>+
+ // Bind pointer print function
+ add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) );
+ $got_pointers = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Get dismissed pointers
- $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
-
- // Pointer has been dismissed
- if ( in_array( $pointer, $dismissed ) )
</del><ins>+ if ( ! $got_pointers )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- // Bind pointer print function
- add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) );
-
</del><span class="cx"> // Add pointers script and style to queue
</span><span class="cx"> wp_enqueue_style( 'wp-pointer' );
</span><span class="cx"> wp_enqueue_script( 'wp-pointer' );
</span><span class="lines">@@ -1825,6 +1829,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Print 'New Feature: Current Theme Customize Link' for 3.4.0.
+ *
+ * @since 3.4.0
+ */
+ public static function pointer_wp340_customize_current_theme_link() {
+ $content = '<h3>' . __( 'New Feature: Customizer' ) . '</h3>';
+ $content .= '<p>' . __( 'Click Customize to change the header, background, title and menus of the current theme, all in one place.' ) . '</p>';
+ $content .= '<p>' . __( 'Click the Customize links in the Available Themes list below to customize, preview, and optionally activate the selected theme.' ) . '</p>';
+
+ WP_Internal_Pointers::print_js( 'wp340_customize_current_theme_link', '#customize-current-theme-link', array(
+ 'content' => $content,
+ 'position' => array( 'edge' => 'top', 'align' => is_rtl() ? 'right' : 'left' ),
+ ) );
+ }
+
+ /**
</ins><span class="cx"> * Prevents new users from seeing existing 'new feature' pointers.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (20773 => 20774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2012-05-11 19:58:22 UTC (rev 20773)
+++ trunk/wp-admin/themes.php 2012-05-11 20:29:08 UTC (rev 20774)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="theme-options">
</span><del>- <a href="<?php echo wp_customize_url( $ct->get_stylesheet() ); ?>" class="load-customize hide-if-no-customize" title="<?php echo esc_attr( $customize_title ); ?>"><?php _e( 'Customize' )?></a>
</del><ins>+ <a id="customize-current-theme-link" href="<?php echo wp_customize_url( $ct->get_stylesheet() ); ?>" class="load-customize hide-if-no-customize" title="<?php echo esc_attr( $customize_title ); ?>"><?php _e( 'Customize' )?></a>
</ins><span class="cx"> <span><?php _e( 'Options:' )?></span>
</span><span class="cx"> <?php
</span><span class="cx"> // Pretend you didn't see this.
</span></span></pre>
</div>
</div>
</body>
</html>