<!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>[BuddyPress][4458] trunk/bp-core: Fix broken images on the Setup 'theme' screen.</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>4458</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-06-05 10:18:53 +0000 (Sun, 05 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix broken images on the Setup 'theme' screen.
Update options and improve descriptive text.
Add missing i18n gettext calls.
Fixes #3054</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorecssadmindevcss">trunk/bp-core/css/admin.dev.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (4457 => 4458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2011-06-04 23:30:13 UTC (rev 4457)
+++ trunk/bp-core/admin/bp-core-update.php 2011-06-05 10:18:53 UTC (rev 4458)
</span><span class="lines">@@ -589,6 +589,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ // Get theme screenshot
+ $current_theme = get_current_theme();
+ $screenshot = '';
+ $themes = get_themes();
+
+ if ( !empty( $themes[$current_theme]['Screenshot'] ) )
+ $screenshot = trailingslashit( get_stylesheet_directory_uri() ) . $themes[$current_theme]['Screenshot'];
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <script type="text/javascript">
</span><span class="lines">@@ -599,34 +607,58 @@
</span><span class="cx"> });
</span><span class="cx"> </script>
</span><span class="cx">
</span><del>- <p><?php _e( "BuddyPress introduces a whole range of new screens to display content. To display these screens you will need to decide how you want to handle them in your active theme. There are a few different options, please choose the option that best suits your demands and needs.", 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( "BuddyPress introduces a whole range of new screens to display content. To display these screens, you need to decide how you want to handle them in your current theme.", 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="cx"> <th>
</span><del>- <h5><?php _e( 'Use the Default Theme', 'buddypress' ); ?></h5>
- <img src="<?php echo plugins_url( '/buddypress/bp-core/images/default.jpg' ); ?>" alt="bp-default" />
</del><ins>+ <h5><?php _e( 'Use BuddyPress Default', 'buddypress' ); ?></h5>
+ <img src="<?php echo plugins_url( '/buddypress/bp-core/images/default.jpg' ); ?>" alt="<?php _e( 'BuddyPress Default', 'buddypress' ); ?>" />
</ins><span class="cx"> </th>
</span><span class="cx"> <td>
</span><del>- <p><?php _e( 'The default theme contains everything you need to get up and running out of the box. It supports all features and is highly customizable.', 'buddypress' ); ?></p>
- <p><strong><?php _e( 'This is the best choice if you do not have an existing WordPress theme or want to create a child theme from a solid starting point.', 'buddypress' ); ?></strong></p>
- <p><label><input type="radio" name="theme" value="bp_default" checked="checked" /> <?php _e( 'Choose this option', 'buddypress' ); ?></label></p>
</del><ins>+ <p><?php _e( 'BuddyPress Default contains everything you need to get up and running out of the box. It supports all features and is highly customizable.', 'buddypress' ); ?></p>
+ <p><strong><?php _e( 'This is the best choice if you do not have an existing WordPress theme, or want to start using BuddyPress immediately.', 'buddypress' ); ?></strong></p>
+ <p><label><input type="radio" name="theme" value="bp_default" checked="checked" /> <?php _e( 'Yes, please!', 'buddypress' ); ?></label></p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><ins>+ <?php if ( $bp_theme_installed ) : ?>
+ <tr>
+ <th>
+ <h5><?php _e( 'Other themes', 'buddypress' ); ?></h5>
+ <img src="<?php echo plugins_url( '/buddypress/bp-core/images/find.jpg' ); ?>" alt="<?php _e( 'A BuddyPress theme', 'buddypress' ); ?>" />
+ </th>
+ <td>
+ <p><?php _e( "We've found that you already have some other BuddyPress-compatible themes available. To use one of those, pick it from this list.", 'buddypress' ); ?></p>
+ <p>
+ <label>
+ <input type="radio" name="theme" value="3rd_party" /> <?php _e( 'Use this theme', 'buddypress' ); ?>
+ </label>
+ <select name="3rd_party_theme">
+
+ <?php foreach( (array) $bp_themes as $theme ) : ?>
+ <option value="<?php echo $theme['Template'] . ',' . $theme['Stylesheet']; ?>"><?php echo $theme['Name']; ?></option>
+ <?php endforeach; ?>
+
+ </select>
+ </p>
+ </td>
+ </tr>
+ <?php endif; ?>
+
</ins><span class="cx"> <tr>
</span><span class="cx"> <th>
</span><del>- <h5><?php _e( 'Manually Update My WordPress Theme', 'buddypress' ); ?>'</h5>
- <img src="<?php echo plugins_url( '/buddypress/bp-core/images/manual_theme.jpg' ); ?>" alt="bp-default" />
</del><ins>+ <h5><?php _e( 'Manually update current theme', 'buddypress' ); ?></h5>
+ <?php if ( !empty( $screenshot ) ) : ?>
+ <img src="<?php echo esc_url( $screenshot ); ?>" alt="<?php _e( 'Your existing theme', 'buddypress' ); ?>" />
+ <?php endif; ?>
</ins><span class="cx"> </th>
</span><span class="cx"> <td>
</span><del>- <p><?php _e( 'The BuddyPress Template Pack plugin will run you through the process of manually upgrading your existing WordPress theme. This usually involves following the step by step instructions and copying the BuddyPress template files into your theme then tweaking the HTML to match.', 'buddypress' ); ?></p>
- <p><strong><?php _e( 'This is the best choice if you have an existing WordPress theme and want complete control over template layout and design.', 'buddypress' ); ?></strong></p>
</del><ins>+ <p><?php _e( 'The BuddyPress Template Pack plugin will guide you through the process of manually upgrading your existing WordPress theme. This usually involves following the step-by-step instructions and copying the BuddyPress template files into your theme. This option requires a working knowledge of CSS and HTML, as you will need to tweak the new templates to match your existing theme.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php if ( empty( $template_pack_installed ) ) : ?>
</span><span class="cx">
</span><del>- <p><label><input type="radio" name="theme" value="manual_wp" disabled="disabled" /> <?php _e( 'You must first install the BuddyPress Template Pack before choosing this option', 'buddypress' ); ?></label></p>
- <p><a id="bp-template-pack" class="thickbox onclick button" href="<?php echo network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=bp-template-pack&TB_iframe=true&width=640&height=500' ); ?>"><?php _e( 'Install Now', 'buddypress' ); ?></a></p>
</del><ins>+ <p><a id="bp-template-pack" class="thickbox onclick button" href="<?php echo network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=bp-template-pack&TB_iframe=true&width=640&height=500' ); ?>"><?php _e( 'Install BuddyPress Template Pack', 'buddypress' ); ?></a></p>
</ins><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><span class="lines">@@ -640,52 +672,16 @@
</span><span class="cx">
</span><span class="cx"> <tr>
</span><span class="cx"> <th>
</span><del>- <h5><?php _e( 'Find a BuddyPress Theme', 'buddypress' ); ?></h5>
- <img src="<?php echo plugins_url( '/buddypress/bp-core/images/find.jpg' ); ?>" alt="bp-default" />
</del><ins>+ <h5><?php _e( 'Do not change theme', 'buddypress' ) ?></h5>
</ins><span class="cx"> </th>
</span><span class="cx"> <td>
</span><del>- <p><?php _e( "There's growing number of BuddyPress themes available for you to download and use. Browse through the list of available themes to see if there is one that matches your needs.", 'buddypress' ); ?></p>
- <p><strong><?php _e( 'This is the best choice if want to use a theme other than the default and get started straight out of the box.', 'buddypress' ); ?></strong></p>
</del><ins>+ <p><?php _e( "You are happy with your current theme and plan on changing it later.", 'buddypress' ); ?></p>
+ <p><strong><?php _e( 'This is the best choice if you have a highly customized theme on your site already, and want to later manually integrate BuddyPress into your site.', 'buddypress' ); ?></strong></p>
</ins><span class="cx">
</span><del>- <?php if ( empty( $bp_theme_installed ) ) : ?>
</del><ins>+ <p><label><input type="radio" name="theme" value="do_not_change" /> <?php _e( "Don't change my current theme", 'buddypress' ); ?></label></p>
</ins><span class="cx">
</span><del>- <p><label><input type="radio" name="theme" value="third_party" disabled="disabled" /> <?php _e( 'You must first install at least one BuddyPress theme before choosing this option', 'buddypress' ); ?></label></p>
- <p><a id="bp-themes" class="thickbox onclick button" href="<?php echo network_admin_url( 'theme-install.php?type=tag&s=buddypress&tab=search' ); ?>&TB_iframe=true&width=860&height=500"><?php _e( 'Add Themes', 'buddypress' ); ?></a></p>
-
- <?php else : ?>
-
- <p><label>
- <input type="radio" name="theme" value="3rd_party" /> <?php _e( 'Choose this option and use the theme:', 'buddypress' ); ?>
- </label>
- <select name="3rd_party_theme">
-
- <?php foreach( (array)$bp_themes as $theme ) : ?>
-
- <option value="<?php echo $theme['Template'] . ',' . $theme['Stylesheet']; ?>"><?php echo $theme['Name']; ?></option>
-
- <?php endforeach; ?>
-
- </select>
- </p>
-
- <?php endif; ?>
-
</del><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><del>-
- <tr>
- <th>
- <h5><?php _e( 'Do Not Change Theme', 'buddypress' ) ?></h5>
- <img src="<?php echo plugins_url( '/buddypress/bp-core/images/existing.jpg' ) ?>" alt="bp-default" />
- </th>
- <td>
- <p><?php _e( "You are happy with your current theme and plan on changing it later.", 'buddypress' ) ?></p>
- <p><strong><?php _e( 'This is the best choice if you have a highly customized theme on your site already, and want to manually integrate BuddyPress into your site over time.', 'buddypress' ) ?></strong></p>
-
- <p><label><input type="radio" name="theme" value="do_not_change" /> <?php _e( 'Choose this option', 'buddypress' ) ?></label></p>
-
- </td>
- </tr>
</del><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx"> <div class="submit clear">
</span></span></pre></div>
<a id="trunkbpcorecssadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/css/admin.dev.css (4457 => 4458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/css/admin.dev.css 2011-06-04 23:30:13 UTC (rev 4457)
+++ trunk/bp-core/css/admin.dev.css 2011-06-05 10:18:53 UTC (rev 4458)
</span><span class="lines">@@ -111,7 +111,6 @@
</span><span class="cx">
</span><span class="cx"> div#bp-admin table.form-table th {
</span><span class="cx"> border-right: 1px solid #eee;
</span><del>- width: 208px;
</del><span class="cx"> padding: 15px 25px 15px 0;
</span><span class="cx"> color: #555;
</span><span class="cx"> }
</span><span class="lines">@@ -128,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> div#bp-admin table.form-table th img {
</span><span class="cx"> margin-top: 5px;
</span><ins>+ width: 215px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div#bp-admin table.form-table th p { margin: 3px 0 0 0; }
</span></span></pre>
</div>
</div>
</body>
</html>