Ticket #21368: 21368.15.nopointers.diff
File 21368.15.nopointers.diff, 15.3 KB (added by , 12 years ago) |
---|
-
wp-includes/default-filters.php
287 287 // Automatically embed URLs 288 288 add_filter( 'default_option_autoembed_urls', '__return_true' ); 289 289 290 // Welcome Panel 291 add_action( 'welcome_panel', 'wp_welcome_panel' ); 292 290 293 unset($filter, $action); -
wp-admin/includes/dashboard.php
1231 1231 * 1232 1232 * @since 3.3.0 1233 1233 */ 1234 function wp_welcome_panel() { 1235 global $wp_version; 1236 1237 if ( ! current_user_can( 'edit_theme_options' ) ) 1238 return; 1239 1240 $classes = 'welcome-panel'; 1241 1242 $option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true ); 1243 // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner 1244 $hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) ); 1245 if ( $hide ) 1246 $classes .= ' hidden'; 1247 1248 list( $display_version ) = explode( '-', $wp_version ); 1249 ?> 1250 <div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>"> 1251 <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?> 1252 <a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>"><?php _e('Dismiss'); ?></a> 1253 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div> 1254 1234 function wp_welcome_panel() { ?> 1255 1235 <div class="welcome-panel-content"> 1256 <h3><?php _e( 'Welcome to your new WordPress site!' ); ?></h3>1257 <p class="about-description"><?php _e( 'If you need help getting started, check out our documentation on <a href="http://codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>. If you’d rather dive right in, here are a few things most people do first when they set up a new WordPress site. If you need help, use the Help tabs in the upper right corner to get information on how to use your current screen and where to go for more assistance.'); ?></p>1236 <h3><?php _e( 'Welcome to WordPress!' ); ?></h3> 1237 <p class="about-description"><?php _e( "We've assembled some links to get you started:" ); ?></p> 1258 1238 <div class="welcome-panel-column-container"> 1259 1239 <div class="welcome-panel-column"> 1260 <h4><span class="icon16 icon-settings"></span> <?php _e( 'Basic Settings' ); ?></h4> 1261 <p><?php _e( 'Here are a few easy things you can do to get your feet wet. Make sure to click Save on each Settings screen.' ); ?></p> 1262 <ul> 1263 <li><?php echo sprintf( __( '<a href="%s">Select your tagline and time zone</a>' ), esc_url( admin_url('options-general.php') ) ); ?></li> 1264 <li><?php echo sprintf( __( '<a href="%s">Turn comments on or off</a>' ), esc_url( admin_url('options-discussion.php') ) ); ?></li> 1265 <li><?php echo sprintf( __( '<a href="%s">Fill in your profile</a>' ), esc_url( get_edit_profile_url( get_current_user_id() ) ) ); ?></li> 1266 </ul> 1240 <h4><?php _e( 'Get Started' ); ?></h4> 1241 <p><?php _e( 'First, tweak the look of your site:' ); ?></p> 1242 <a class="button-primary welcome-button" href="<?php echo wp_customize_url() ?>?url=<?php echo esc_url( admin_url() ); ?>"><?php _e( 'Customize Your Site' ); ?></a> 1243 <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( $args = array('allowed' => 'true') ) ) > 1 ) ) : ?> 1244 <p><?php printf( __( 'or, ' ) . '<a href="%s">' . __( 'change your theme completely' ) . '</a>', esc_url( admin_url( 'themes.php' ) ) ); ?></p> 1245 <?php endif; ?> 1267 1246 </div> 1268 1247 <div class="welcome-panel-column"> 1269 <h4><span class="icon16 icon-page"></span> <?php _e( 'Add Real Content' ); ?></h4> 1270 <p><?php _e( 'Check out the sample page & post editors to see how it all works, then delete the default content and write your own!' ); ?></p> 1248 <h4><?php _e( 'Next Steps' ); ?></h4> 1271 1249 <ul> 1272 <li><?php echo sprintf( __( 'View the <a href="%1$s">sample page</a> and <a href="%2$s">post</a>' ), esc_url( get_permalink( 2 ) ), esc_url( get_permalink( 1 ) ) ); ?></li> 1273 <li><?php echo sprintf( __( 'Delete the <a href="%1$s">sample page</a> and <a href="%2$s">post</a>' ), esc_url( admin_url('edit.php?post_type=page') ), esc_url( admin_url('edit.php') ) ); ?></li> 1274 <li><?php echo sprintf( __( '<a href="%s">Create an About Me page</a>' ), esc_url( admin_url('edit.php?post_type=page') ) ); ?></li> 1275 <li><?php echo sprintf( __( '<a href="%s">Write your first post</a>' ), esc_url( admin_url('post-new.php') ) ); ?></li> 1250 <?php if ( ( 'page' == get_option( 'show_on_front' ) ) && '0' == get_option( 'page_for_posts' ) ) { ?> 1251 <li><?php printf( '<a href="%s">' . __( 'Edit your front page' ) . '</a>', esc_url( admin_url( 'post.php?post=' . get_option( 'page_on_front' ) . '&action=edit' ) ) ); ?></li> 1252 <li><?php printf( '<a href="%s">' . __( 'Add additional pages' ) . '</a>', esc_url( admin_url( 'post-new.php?post_type=page' ) ) ); ?></li> 1253 <?php } else if ( 'page' == get_option( 'show_on_front' ) ) { ?> 1254 <li><?php printf( '<a href="%s">' . __( 'Edit your front page' ) . '</a>', esc_url( admin_url( 'post.php?post=' . get_option( 'page_on_front' ) . '&action=edit' ) ) ); ?></li> 1255 <li><?php printf( '<a href="%s">' . __( 'Add additional pages' ) . '</a>', esc_url( admin_url( 'post-new.php?post_type=page' ) ) ); ?></li> 1256 <li><?php printf( '<a href="%s">' . __( 'Add a blog post' ) . '</a>', esc_url( admin_url( 'post-new.php' ) ) ); ?></li> 1257 <?php } else { ?> 1258 <li><?php printf( '<a href="%s">' . __( 'Write your first blog post' ) . '</a>', esc_url( admin_url( 'post-new.php' ) ) ); ?></li> 1259 <li><?php printf( '<a href="%s">' . __( 'Add an About page' ) . '</a>', esc_url( admin_url( 'post-new.php?post_type=page' ) ) ); ?></li> 1260 <?php } ?> 1261 <li><?php printf( '<a href="%s">' . __( 'View your site' ) . '</a>', esc_url( home_url() ) ); ?></li> 1276 1262 </ul> 1277 1263 </div> 1278 1264 <div class="welcome-panel-column welcome-panel-last"> 1279 <h4><span class="icon16 icon-appearance"></span> <?php _e( 'Customize Your Site' ); ?></h4> 1280 <?php 1281 $theme = wp_get_theme(); 1282 if ( $theme->errors() ) : 1283 echo '<p>'; 1284 printf( __( '<a href="%s">Install a theme</a> to get started customizing your site.' ), esc_url( admin_url( 'themes.php' ) ) ); 1285 echo '</p>'; 1286 else: 1287 $customize_links = array(); 1288 if ( 'twentyeleven' == $theme->get_stylesheet() ) 1289 $customize_links[] = sprintf( __( '<a href="%s">Choose light or dark</a>' ), esc_url( admin_url( 'themes.php?page=theme_options' ) ) ); 1290 1291 if ( current_theme_supports( 'custom-background' ) ) 1292 $customize_links[] = sprintf( __( '<a href="%s">Set a background color</a>' ), esc_url( admin_url( 'themes.php?page=custom-background' ) ) ); 1293 1294 if ( current_theme_supports( 'custom-header' ) ) 1295 $customize_links[] = sprintf( __( '<a href="%s">Select a new header image</a>' ), esc_url( admin_url( 'themes.php?page=custom-header' ) ) ); 1296 1297 if ( current_theme_supports( 'widgets' ) ) 1298 $customize_links[] = sprintf( __( '<a href="%s">Add some widgets</a>' ), esc_url( admin_url( 'widgets.php' ) ) ); 1299 1300 if ( ! empty( $customize_links ) ) { 1301 echo '<p>'; 1302 printf( __( 'Use the current theme — %1$s — or <a href="%2$s">choose a new one</a>. If you stick with %1$s, here are a few ways to make your site look unique.' ), $theme->display('Name'), esc_url( admin_url( 'themes.php' ) ) ); 1303 echo '</p>'; 1304 ?> 1305 <ul> 1306 <?php foreach ( $customize_links as $customize_link ) : ?> 1307 <li><?php echo $customize_link ?></li> 1308 <?php endforeach; ?> 1309 </ul> 1310 <?php 1311 } else { 1312 echo '<p>'; 1313 printf( __( 'Use the current theme — %1$s — or <a href="%2$s">choose a new one</a>.' ), $theme->display('Name'), esc_url( admin_url( 'themes.php' ) ) ); 1314 echo '</p>'; 1315 } 1316 endif; ?> 1265 <h4><?php _e( 'Learn How To' ); ?></h4> 1266 <ul> 1267 <li><?php printf( '<a id="wp350_add_images" href="%s">' . __( 'Add image/media' ) . '</a>', esc_url( admin_url( 'media-new.php' ) ) ); ?></li> 1268 <li><?php printf( '<a id="wp350_widgets" href="%s">' . __( 'Add/remove widgets' ) . '</a>', esc_url( admin_url( 'widgets.php' ) ) ); ?></li> 1269 <li><?php printf( '<a id="wp350_edit_menu" href="%s">' . __( 'Edit your navigation menu' ) . '</a>', esc_url( admin_url( 'nav-menus.php' ) ) ); ?></li> 1270 </ul> 1317 1271 </div> 1318 1272 </div> 1319 <p class="welcome-panel-dismiss"><?php printf( __( 'Already know what you’re doing? <a href="%s">Dismiss this message</a>.' ), esc_url( admin_url( '?welcome=0' ) ) ); ?></p>1320 1273 </div> 1321 </div>1322 1274 <?php 1323 1275 } -
wp-admin/includes/screen.php
937 937 <?php 938 938 meta_box_prefs( $this ); 939 939 940 if ( 'dashboard' === $this->id && current_user_can( 'edit_theme_options' ) ) {940 if ( 'dashboard' === $this->id && current_user_can( 'edit_theme_options' ) && has_action( 'welcome_panel' ) ) { 941 941 if ( isset( $_GET['welcome'] ) ) { 942 942 $welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1; 943 943 update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked ); -
wp-admin/index.php
106 106 <?php screen_icon(); ?> 107 107 <h2><?php echo esc_html( $title ); ?></h2> 108 108 109 <?php wp_welcome_panel(); ?>109 <?php if (has_action( 'welcome_panel' )) { 110 110 111 if ( ! current_user_can( 'edit_theme_options' ) ) 112 return; 113 114 $classes = 'welcome-panel'; 115 116 $option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true ); 117 // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner 118 $hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) ); 119 if ( $hide ) 120 $classes .= ' hidden'; ?> 121 122 <div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>"> 123 <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?> 124 <a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>"><?php _e( 'Dismiss' ); ?></a> 125 <?php do_action( 'welcome_panel' ); ?> 126 </div><?php } ?> 127 111 128 <div id="dashboard-widgets-wrap"> 112 129 113 130 <?php wp_dashboard(); ?> -
wp-admin/css/colors-fresh.css
845 845 } 846 846 847 847 .welcome-panel { 848 background: #f5f5f5; 849 background-image: -webkit-gradient(linear, left bottom, left top, from(#f5f5f5), to(#fafafa)); 850 background-image: -webkit-linear-gradient(bottom, #f5f5f5, #fafafa); 851 background-image: -moz-linear-gradient(bottom, #f5f5f5, #fafafa); 852 background-image: -o-linear-gradient(bottom, #f5f5f5, #fafafa); 853 background-image: linear-gradient(to top, #f5f5f5, #fafafa); 848 854 border-color: #dfdfdf; 849 855 } 850 856 .welcome-panel p { … … 854 860 color: #464646; 855 861 } 856 862 .welcome-panel h3 { 857 text-shadow: 1px 1px 1px white;863 text-shadow: 1px 1px 1px #fff; 858 864 } 859 865 860 866 .widget, -
wp-admin/css/wp-admin-rtl.css
590 590 float: right; 591 591 } 592 592 593 .welcome-panel-content .about-description, .welcome-panel h3 {594 margin-left: 0;595 margin-right: 190px;596 }597 598 593 .welcome-panel .welcome-panel-column { 599 594 margin: 0 -25px 0 5%; 600 595 padding-left: 0; -
wp-admin/css/wp-admin.css
1370 1370 position: absolute; 1371 1371 top: -1000em; 1372 1372 left: 146px; 1373 z-index: 999;1373 z-index: 10000; 1374 1374 overflow: visible; 1375 1375 border-width: 1px; 1376 1376 border-style: solid; … … 2176 2176 2177 2177 /* Welcome Panel */ 2178 2178 .welcome-panel { 2179 margin: 20px 8px; 2180 padding: 30px 10px 20px; 2181 border-width: 1px 0; 2179 position: relative; 2180 overflow: auto; 2181 margin: 20px 0; 2182 padding: 23px 10px 12px; 2183 border-width: 1px; 2182 2184 border-style: solid; 2183 position: relative; 2185 border-radius: 3px; 2186 font-size: 13px; 2184 2187 line-height: 1.6em; 2185 overflow: auto;2186 2188 } 2187 2189 2188 2190 .welcome-panel h3 { 2191 margin: 0; 2189 2192 font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif; 2190 2193 font-size: 32px; 2191 2194 font-weight: normal; 2192 2195 line-height: 1.2; 2193 margin: 0.1em 0 0.8em;2194 2196 } 2195 2197 .welcome-panel h4 { 2196 font-size: 14px; 2198 margin: 1.33em 0 0; 2199 font-size: 13px; 2197 2200 } 2198 2201 2202 .welcome-panel .about-description { 2203 font-size: 18px; 2204 margin: 0; 2205 } 2206 2199 2207 .welcome-panel .welcome-panel-close { 2200 2208 position: absolute; 2201 2209 top: 0; … … 2206 2214 } 2207 2215 2208 2216 .welcome-panel .welcome-panel-close:before { 2209 background: url('../images/xit.gif') 0 17% no-repeat;2210 2217 content: ' '; 2218 position: absolute; 2219 left: -12px; 2220 width: 10px; 2211 2221 height: 100%; 2212 width: 10px; 2213 left: -12px; 2214 position: absolute; 2222 background: url('../images/xit.gif') 0 17% no-repeat; 2215 2223 } 2216 2224 2217 2225 .welcome-panel .welcome-panel-close:hover:before { 2218 2226 background-position: 100% 17%; 2219 2227 } 2220 2228 2221 .welcome-panel .wp-badge { 2222 float: left; 2223 margin-bottom: 20px; 2229 .welcome-button { 2230 margin: -9px 0 3px; 2231 padding: 1em 3em; 2232 font: normal 15px/1 sans-serif; 2224 2233 } 2225 2234 2226 2235 .welcome-panel-content { 2236 margin-left: 13px; 2227 2237 max-width: 1500px; 2228 2238 } 2229 2239 2230 .welcome-panel-content .about-description,2231 .welcome-panel h3 {2232 margin-left: 190px;2233 }2234 2235 .welcome-panel p.welcome-panel-dismiss {2236 clear: both;2237 padding: 1em 0 0 0;2238 }2239 2240 2240 .welcome-panel .welcome-panel-column-container { 2241 2241 clear: both; 2242 2242 overflow: hidden; 2243 2243 position: relative; 2244 padding-left: 26px;2245 2244 } 2246 2245 2247 2246 .welcome-panel .welcome-panel-column { 2248 margin: 0 5% 0 -25px; 2249 padding-left: 25px; 2250 width: 30%; 2247 width: 32%; 2251 2248 min-width: 200px; 2252 2249 float: left; 2253 2250 } 2254 2251 2252 .welcome-panel .welcome-panel-column:first-child { 2253 width: 36%; 2254 } 2255 2255 2256 .welcome-panel .welcome-panel-column.welcome-panel-last { 2256 2257 margin-right: 0; 2257 2258 } … … 2260 2261 margin-left: -32px; 2261 2262 } 2262 2263 2264 .welcome-panel-column p { 2265 margin-top: 5px; 2266 } 2267 2263 2268 .welcome-panel .welcome-panel-column ul { 2264 margin: 1.6em 1em 1em 1.3em;2269 margin: 0.4em 1em 1em 1.3em; 2265 2270 } 2266 2271 2267 2272 .welcome-panel .welcome-panel-column li { … … 2269 2274 padding-left: 2px; 2270 2275 } 2271 2276 2277 @media screen and (max-width: 870px) { 2278 .welcome-button { 2279 font-size: 14px; 2280 padding: 1em 2.3em; 2281 } 2272 2282 2283 .welcome-panel .welcome-panel-column, .welcome-panel .welcome-panel-column:first-child { 2284 display: block; 2285 float: none; 2286 width: 100%; 2287 } 2288 .welcome-panel .welcome-panel-column li { 2289 display: inline-block; 2290 margin-right: 13px; 2291 } 2292 .welcome-panel .welcome-panel-column ul { 2293 margin: 0.4em 0 0; 2294 } 2295 } 2296 2273 2297 /*------------------------------------------------------------------------------ 2274 2298 10.0 - List Posts (/Pages/etc) 2275 2299 ------------------------------------------------------------------------------*/ -
wp-admin/css/colors-classic.css
854 854 } 855 855 856 856 .welcome-panel { 857 background: #f7fcfe; 857 858 border-color: #d1e5ee; 858 859 } 859 860 .welcome-panel p { … … 863 864 color: #464646; 864 865 } 865 866 .welcome-panel h3 { 866 text-shadow: 1px 1px 1px white;867 text-shadow: 1px 1px 1px #fff; 867 868 } 868 869 869 870 .widget,