X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8ab4a4532479e8db471032b51042ec8c4716d091..b925718b4bf2dd47a8429f844d0a255ca6e35bd1:/wp-admin/my-sites.php

diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php
index 269b0811..efefb44e 100644
--- a/wp-admin/my-sites.php
+++ b/wp-admin/my-sites.php
@@ -13,7 +13,7 @@ if ( !is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( ! current_user_can('read') )
-	wp_die( __( 'You do not have sufficient permissions to view this page.' ) );
+	wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
 
 $action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
 
@@ -39,7 +39,7 @@ get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .
+		'<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the front end or the dashboard for that site.') . '</p>' .
 		'<p>' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '</p>'
 ) );
 
@@ -56,7 +56,16 @@ if ( $updated ) { ?>
 <?php } ?>
 
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php
+echo esc_html( $title );
+
+if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) {
+	/** This filter is documented in wp-login.php */
+	$sign_up_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
+	printf( ' <a href="%s" class="page-title-action">%s</a>', esc_url( $sign_up_url ), esc_html_x( 'Add New', 'site' ) );
+}
+?></h1>
+
 <?php
 if ( empty( $blogs ) ) :
 	echo '<p>';
@@ -68,14 +77,14 @@ else :
 	<?php
 	choose_primary_blog();
 	/**
-	 * Fires before the sites table on the My Sites screen.
+	 * Fires before the sites list on the My Sites screen.
 	 *
 	 * @since 3.0.0
 	 */
 	do_action( 'myblogs_allblogs_options' );
 	?>
 	<br clear="all" />
-	<table class="widefat fixed striped">
+	<ul class="my-sites striped">
 	<?php
 	/**
 	 * Enable the Global Settings section on the My Sites screen.
@@ -91,51 +100,35 @@ else :
 	 */
 	$settings_html = apply_filters( 'myblogs_options', '', 'global' );
 	if ( $settings_html != '' ) {
-		echo '<tr><td><h3>' . __( 'Global Settings' ) . '</h3></td><td>';
+		echo '<h3>' . __( 'Global Settings' ) . '</h3>';
 		echo $settings_html;
-		echo '</td></tr>';
 	}
 	reset( $blogs );
-	$num = count( $blogs );
-	$cols = 1;
-	if ( $num >= 20 )
-		$cols = 4;
-	elseif ( $num >= 10 )
-		$cols = 2;
-	$num_rows = ceil( $num / $cols );
-	$split = 0;
-	for ( $i = 1; $i <= $num_rows; $i++ ) {
-		$rows[] = array_slice( $blogs, $split, $cols );
-		$split = $split + $cols;
-	}
 
-	foreach ( $rows as $row ) {
-		echo "<tr>";
-		$i = 0;
-		foreach ( $row as $user_blog ) {
-			$s = $i == 3 ? '' : 'border-right: 1px solid #ccc;';
-			echo "<td style='$s'>";
-			echo "<h3>{$user_blog->blogname}</h3>";
-			/**
-			 * Filter the row links displayed for each site on the My Sites screen.
-			 *
-			 * @since MU
-			 *
-			 * @param string $string    The HTML site link markup.
-			 * @param object $user_blog An object containing the site data.
-			 */
-			echo "<p>" . apply_filters( 'myblogs_blog_actions', "<a href='" . esc_url( get_home_url( $user_blog->userblog_id ) ). "'>" . __( 'Visit' ) . "</a> | <a href='" . esc_url( get_admin_url( $user_blog->userblog_id ) ) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
-			/** This filter is documented in wp-admin/my-sites.php */
-			echo apply_filters( 'myblogs_options', '', $user_blog );
-			echo "</td>";
-			$i++;
-		}
-		echo "</tr>";
+	foreach ( $blogs as $user_blog ) {
+		echo "<li>";
+		echo "<h3>{$user_blog->blogname}</h3>";
+		/**
+		 * Filter the row links displayed for each site on the My Sites screen.
+		 *
+		 * @since MU
+		 *
+		 * @param string $string    The HTML site link markup.
+		 * @param object $user_blog An object containing the site data.
+		 */
+		echo "<p class='my-sites-actions'>" . apply_filters( 'myblogs_blog_actions', "<a href='" . esc_url( get_home_url( $user_blog->userblog_id ) ). "'>" . __( 'Visit' ) . "</a> | <a href='" . esc_url( get_admin_url( $user_blog->userblog_id ) ) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
+		/** This filter is documented in wp-admin/my-sites.php */
+		echo apply_filters( 'myblogs_options', '', $user_blog );
+		echo "</li>";
 	}?>
-	</table>
-	<input type="hidden" name="action" value="updateblogsettings" />
-	<?php wp_nonce_field( 'update-my-sites' ); ?>
-	<?php submit_button(); ?>
+	</ul>
+	<?php
+	if ( count( $blogs ) > 1 || has_action( 'myblogs_allblogs_options' ) || has_filter( 'myblogs_options' ) ) {
+		?><input type="hidden" name="action" value="updateblogsettings" /><?php
+		wp_nonce_field( 'update-my-sites' );
+		submit_button();
+	}
+	?>
 	</form>
 <?php endif; ?>
 	</div>