<!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][3716] trunk/bp-core: More installer/updater restyling; this time to more closely match the existing WordPress UI.</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>3716</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-15 01:30:39 +0000 (Sat, 15 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>More installer/updater restyling; this time to more closely match the existing WordPress UI.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreadminphp">trunk/bp-core/admin/bp-core-admin.php</a></li>
<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="trunkbpcoreadminbpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-admin.php (3715 => 3716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-admin.php 2011-01-15 00:30:33 UTC (rev 3715)
+++ trunk/bp-core/admin/bp-core-admin.php 2011-01-15 01:30:39 UTC (rev 3716)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="bp-admin-header">
</span><span class="cx"> <h3><?php _e( 'BuddyPress', 'buddypress' ) ?></h3>
</span><del>- <h4><?php _e( 'Dashboard', 'buddypress' ) ?></h4>
</del><ins>+ <h2><?php _e( 'Dashboard', 'buddypress' ) ?></h2>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_admin_notices' ) ?>
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (3715 => 3716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2011-01-15 00:30:33 UTC (rev 3715)
+++ trunk/bp-core/admin/bp-core-update.php 2011-01-15 01:30:39 UTC (rev 3716)
</span><span class="lines">@@ -166,30 +166,19 @@
</span><span class="cx">
</span><span class="cx"> <div id="bp-admin-header">
</span><span class="cx"> <h3><?php _e( 'BuddyPress', 'buddypress' ) ?></h3>
</span><del>- <h4>
</del><ins>+ <h2>
</ins><span class="cx"> <?php if ( 'update' == $this->setup_type ) : ?>
</span><ins>+
</ins><span class="cx"> <?php _e( 'Update', 'buddypress' ) ?>
</span><ins>+
</ins><span class="cx"> <?php else : ?>
</span><ins>+
</ins><span class="cx"> <?php _e( 'Setup', 'buddypress' ) ?>
</span><ins>+
</ins><span class="cx"> <?php endif; ?>
</span><del>- </h4>
</del><ins>+ </h2>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="bp-admin-nav">
- <ol>
- <?php foreach( (array)$this->steps as $i => $name ) : ?>
- <li<?php if ( $this->current_step == $i ) : ?> class="current"<?php endif; ?>>
- <?php if ( $this->current_step > $i ) : ?>
- <span class="complete">&nbsp;</span>
- <?php else : ?>
- <?php echo $i + 1 . '. ' ?>
- <?php endif; ?>
- <?php echo esc_attr( $name ) ?>
- </li>
- <?php endforeach; ?>
- </ol>
- </div>
-
</del><span class="cx"> <?php
</span><span class="cx"> do_action( 'bp_admin_notices' );
</span><span class="cx"> $step_count = count( $this->steps ) - 1;
</span><span class="lines">@@ -198,6 +187,24 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <form action="<?php echo $form_action; ?>" method="post" id="bp-admin-form">
</span><ins>+ <div id="bp-admin-nav">
+ <ol>
+ <?php foreach( (array)$this->steps as $i => $name ) : ?>
+ <li<?php if ( $this->current_step == $i ) : ?> class="current"<?php endif; ?>>
+ <?php if ( $this->current_step > $i ) : ?>
+ <span class="complete">&nbsp;</span>
+ <?php else : ?>
+ <?php echo $i + 1 . '. ' ?>
+ <?php endif; ?>
+ <?php echo esc_attr( $name ) ?>
+ </li>
+ <?php endforeach; ?>
+ </ol>
+ <div class="prev-next submit clear">
+ <input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" />
+ </div>
+ </div>
+
</ins><span class="cx"> <div id="bp-admin-content">
</span><span class="cx"> <?php switch ( $this->steps[$this->current_step] ) {
</span><span class="cx"> case __( 'Database Update', 'buddypress'):
</span><span class="lines">@@ -266,13 +273,8 @@
</span><span class="cx"> if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
</span><span class="cx"> $existing_pages = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
</span><span class="cx"> else
</span><del>- $existing_pages = get_option( 'bp-pages' );
</del><ins>+ $existing_pages = get_option( 'bp-pages' ); ?>
</ins><span class="cx">
</span><del>- ?>
- <div class="prev-next submit clear">
- <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
- </div>
-
</del><span class="cx"> <p><?php printf( __( 'It looks like you have just activated WordPress Multisite mode, which allows members of your BuddyPress community to have their own WordPress blogs. You can enable or disable this feature at any time at <a href="%s">Network Options</a>.', 'buddypress' ), admin_url( 'ms-options.php' ) ); ?></p>
</span><span class="cx">
</span><span class="cx"> <p><?php _e( "Please select the WordPress page you would like to use to display the blog directory. You can either choose an existing page or let BuddyPress auto-create a page for you. If you'd like to manually create pages, please go ahead and do that now, you can come back to this step once you are finished.", 'buddypress' ) ?></p>
</span><span class="lines">@@ -334,10 +336,6 @@
</span><span class="cx">
</span><span class="cx"> $disabled_components = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) ); ?>
</span><span class="cx">
</span><del>- <div class="prev-next submit clear">
- <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
- </div>
-
</del><span class="cx"> <p><?php _e( "BuddyPress is made up of a number of individual components, each one adding a distinct feature. The first step is to decide which of these features you'd like to enable on your site. All features are enabled by default, and don't worry, you can change your mind at any point in the future.", 'buddypress' ) ?></p>
</span><span class="cx">
</span><span class="cx"> <div class="component">
</span><span class="lines">@@ -492,13 +490,8 @@
</span><span class="cx"> else
</span><span class="cx"> $activation_slug = __( 'activate', 'buddypress' );
</span><span class="cx">
</span><del>- ?>
- <div class="prev-next submit clear">
- <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
- </div>
</del><ins>+ if ( 'new' == $this->setup_type ) : ?>
</ins><span class="cx">
</span><del>- <?php if ( 'new' == $this->setup_type ) : ?>
-
</del><span class="cx"> <p><?php _e( "BuddyPress needs to use pages to display content and directories.", 'buddypress' ) ?></p>
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="lines">@@ -636,9 +629,6 @@
</span><span class="cx"> if ( !got_mod_rewrite() && !iis7_supports_permalinks() )
</span><span class="cx"> $prefix = '/index.php';
</span><span class="cx"> ?>
</span><del>- <div class="prev-next submit clear">
- <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
- </div>
</del><span class="cx">
</span><span class="cx"> <p><?php _e( "To make sure the pages we created in the previous step work correctly, you will need to enable permalink support on your site.", 'buddypress' ) ?></p>
</span><span class="cx"> <p><?php printf( __( 'Below are the basic permalink options, please select which permalink setting you would like to use. If you\'d like more advanced options please visit the <a href="%s">permalink settings page</a> then return to complete this setup wizard.', 'buddypress' ), site_url( '/wp-admin/options-permalink.php' ) ) ?>
</span><span class="lines">@@ -694,9 +684,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>- <div class="prev-next submit clear">
- <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
- </div>
</del><span class="cx">
</span><span class="cx"> <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>
</span><span class="cx">
</span><span class="lines">@@ -792,12 +779,8 @@
</span><span class="cx"> function step_finish() {
</span><span class="cx"> if ( !current_user_can( 'activate_plugins' ) )
</span><span class="cx"> return false;
</span><del>- ?>
- <div class="prev-next submit clear">
- <p><input type="submit" value="<?php _e( 'Finish &amp; Activate &rarr;', 'buddypress' ) ?>" name="submit" /></p>
- </div>
</del><span class="cx">
</span><del>- <?php if ( 'new' == $this->setup_type ) :
</del><ins>+ if ( 'new' == $this->setup_type ) :
</ins><span class="cx"> $type = __( 'setup', 'buddypress' ); ?>
</span><span class="cx">
</span><span class="cx"> <h2>Setup Complete!</h2>
</span></span></pre></div>
<a id="trunkbpcorecssadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/css/admin.dev.css (3715 => 3716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/css/admin.dev.css 2011-01-15 00:30:33 UTC (rev 3715)
+++ trunk/bp-core/css/admin.dev.css 2011-01-15 01:30:39 UTC (rev 3716)
</span><span class="lines">@@ -1,15 +1,6 @@
</span><span class="cx"> div#bp-admin {
</span><del>- background: #fff;
</del><span class="cx"> margin: 25px 15px 25px 0;
</span><del>- padding: 20px;
- -moz-border-radius: 6px;
- -webkit-border-radius: 6px;
- border-radius: 6px;
- -moz-box-shadow: #eee 0 -1px 4px;
- -webkit-box-shadow: #eee 0 -1px 4px;
- -khtml-box-shadow: #eee 0 -1px 4px;
- box-shadow: #eee 0 -1px 4px;
- font-family: helvetica, arial, tahoma, sans-serif;
</del><ins>+ padding: 0 20px 20px 20px;
</ins><span class="cx"> color: #555;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> min-width: 680px;
</span><span class="lines">@@ -24,11 +15,9 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx"> div#bp-admin h2 {
</span><del>- font-family: helvetica, arial, tahoma, sans-serif;
</del><span class="cx"> color: #555;
</span><del>- font-style: normal;
- font-weight: bold;
- font-size: 22px;
</del><ins>+ position: relative;
+ top: -6px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div#bp-admin h3 {
</span><span class="lines">@@ -37,7 +26,6 @@
</span><span class="cx"> width: 212px;
</span><span class="cx"> height: 49px;
</span><span class="cx"> background: url( ../images/logo.gif ) top left no-repeat;
</span><del>- border-right: 1px solid #eee;
</del><span class="cx"> padding-right: 20px;
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="lines">@@ -50,11 +38,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div#bp-admin-nav {
</span><del>- background: #f0f0f0;
- margin: 15px -19px 10px -19px;
- padding: 8px 19px 0 19px;
</del><ins>+ background: #e0e0e0;
+ margin: 15px -10px 10px;
+ padding: 10px 10px 0 10px;
</ins><span class="cx"> height: 30px;
</span><ins>+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ border-radius: 6px;
</ins><span class="cx"> }
</span><ins>+div#bp-admin-nav div.submit {
+ position: relative;
+ float: right;
+ margin-top: -36px !important;
+}
+div#bp-admin-nav div.submit input {
+ padding: 6px 10px;
+}
</ins><span class="cx"> div#bp-admin-nav ol {
</span><span class="cx"> list-style-type: decimal;
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -63,7 +62,7 @@
</span><span class="cx"> div#bp-admin-nav ol li {
</span><span class="cx"> float: left;
</span><span class="cx"> margin: 0 10px 0 0;
</span><del>- color: #bbb;
</del><ins>+ color: #666;
</ins><span class="cx"> }
</span><span class="cx"> div#bp-admin-nav ol li {
</span><span class="cx"> padding: 8px 12px;
</span><span class="lines">@@ -74,7 +73,7 @@
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx"> div#bp-admin-nav ol li.current {
</span><del>- background: #fff;
</del><ins>+ background: #f9f9f9;
</ins><span class="cx"> color: #555;
</span><span class="cx"> }
</span><span class="cx"> div#bp-admin-nav ol li span.complete {
</span><span class="lines">@@ -89,17 +88,16 @@
</span><span class="cx"> }
</span><span class="cx"> div.component div.radio {
</span><span class="cx"> position: relative;
</span><del>- background: #f4f4f4;
</del><ins>+ background: #e0e0e0;
</ins><span class="cx"> padding: 5px 10px;
</span><del>- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
</del><ins>+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ border-radius: 6px;
</ins><span class="cx"> top: -6px;
</span><del>- right: 10px;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.component img {
</span><del>- margin-top: 2px;
</del><ins>+ margin-top: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.component p {
</span><span class="lines">@@ -107,14 +105,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.component h5 {
</span><del>- font-size: 15px;
</del><ins>+ font-size: 18px;
</ins><span class="cx"> float: left;
</span><span class="cx"> margin: 0 0 0 4px;
</span><ins>+ width: 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.component div.radio {
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> float: right;
</span><ins>+ top: 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div#bp-admin div.prev-next, div#bp-admin div.prev-next p,
</span><span class="lines">@@ -126,7 +126,6 @@
</span><span class="cx"> div#bp-admin div.prev-next { text-align: right; margin-top: 0; }
</span><span class="cx">
</span><span class="cx"> div#bp-admin div.prev-next {
</span><del>- border-bottom: 1px solid #f0f0f0;
</del><span class="cx"> margin: 0 -20px;
</span><span class="cx"> padding: 0 20px 10px;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>