From 5b81212ba13dab05d4d3a220c05197147d4026fa Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Sun, 24 Nov 2013 16:57:07 +0000
Subject: [PATCH] Wrap the settings in the main Network Admin settings page in
 the expected paragraph tags so that the css applies correctly and the layout
 doesn't look off. Fixes #26211 props hanni.

git-svn-id: https://develop.svn.wordpress.org/trunk@26362 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/network/settings.php | 66 +++++++++++++++++++------------
 1 file changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php
index f78cb13b17..48a3f1b70d 100644
--- a/src/wp-admin/network/settings.php
+++ b/src/wp-admin/network/settings.php
@@ -94,8 +94,9 @@ if ( isset( $_GET['updated'] ) ) {
 				<th scope="row"><label for="site_name"><?php _e( 'Network Name' ) ?></label></th>
 				<td>
 					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
-					<br />
-					<?php _e( 'What you would like to call this network.' ) ?>
+					<p class="description">
+						<?php _e( 'What you would like to call this network.' ) ?>
+					</p>
 				</td>
 			</tr>
 
@@ -103,8 +104,9 @@ if ( isset( $_GET['updated'] ) ) {
 				<th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
 				<td>
 					<input name="admin_email" type="text" id="admin_email" class="regular-text" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" />
-					<br />
-					<?php _e( 'This email address will send update notifcations, and also receive site creation and new user registration notifications.' ); ?> 
+					<p class="description">
+						<?php _e( 'This email address will send update notifcations, and also receive site creation and new user registration notifications.' ); ?> 
+					</p>	
 				</td>
 			</tr>
 		</table>
@@ -121,10 +123,12 @@ if ( isset( $_GET['updated'] ) ) {
 					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none') ?> /> <?php _e( 'Registration is disabled.' ); ?></label><br />
 					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user') ?> /> <?php _e( 'User accounts may be registered.' ); ?></label><br />
 					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog') ?> /> <?php _e( 'Logged in users may register new sites.' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label><br />
-					<?php if ( is_subdomain_install() )
+					<label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label>
+					<p class="description">
+						<?php if ( is_subdomain_install() )
 						_e( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a URL you will redirect visitors to if they visit a non-existent site.' );
 					?>
+					</p>
 				</td>
 			</tr>
 
@@ -150,8 +154,9 @@ if ( isset( $_GET['updated'] ) ) {
 				<th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
 				<td>
 					<input name="illegal_names" type="text" id="illegal_names" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
-					<br />
-					<?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
+					<p class="description">
+						<?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
+					</p>
 				</td>
 			</tr>
 
@@ -162,8 +167,9 @@ if ( isset( $_GET['updated'] ) ) {
 					$limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
 					<textarea name="limited_email_domains" id="limited_email_domains" cols="45" rows="5">
 <?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
-					<br />
-					<?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
+					<p class="description">
+						<?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
+					</p>	
 				</td>
 			</tr>
 
@@ -172,8 +178,9 @@ if ( isset( $_GET['updated'] ) ) {
 				<td>
 					<textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5">
 <?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
-					<br />
-					<?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
+					<p class="description">
+						<?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
+					</p>
 				</td>
 			</tr>
 
@@ -186,8 +193,9 @@ if ( isset( $_GET['updated'] ) ) {
 				<td>
 					<textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
-					<br />
-					<?php _e( 'The welcome email sent to new site owners.' ) ?>
+					<p class="description">
+						<?php _e( 'The welcome email sent to new site owners.' ) ?>
+					</p>
 				</td>
 			</tr>
 			<tr valign="top">
@@ -195,8 +203,9 @@ if ( isset( $_GET['updated'] ) ) {
 				<td>
 					<textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
-					<br />
-					<?php _e( 'The welcome email sent to new users.' ) ?>
+					<p class="description">
+						<?php _e( 'The welcome email sent to new users.' ) ?>
+					</p>
 				</td>
 			</tr>
 			<tr valign="top">
@@ -204,8 +213,9 @@ if ( isset( $_GET['updated'] ) ) {
 				<td>
 					<textarea name="first_post" id="first_post" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
-					<br />
-					<?php _e( 'The first post on a new site.' ) ?>
+					<p class="description">
+						<?php _e( 'The first post on a new site.' ) ?>
+					</p>
 				</td>
 			</tr>
 			<tr valign="top">
@@ -213,8 +223,9 @@ if ( isset( $_GET['updated'] ) ) {
 				<td>
 					<textarea name="first_page" id="first_page" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
-					<br />
-					<?php _e( 'The first page on a new site.' ) ?>
+					<p class="description">
+						<?php _e( 'The first page on a new site.' ) ?>
+					</p>
 				</td>
 			</tr>
 			<tr valign="top">
@@ -222,24 +233,27 @@ if ( isset( $_GET['updated'] ) ) {
 				<td>
 					<textarea name="first_comment" id="first_comment" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
-					<br />
-					<?php _e( 'The first comment on a new site.' ) ?>
+					<p class="description">
+						<?php _e( 'The first comment on a new site.' ) ?>
+					</p>	
 				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
 				<td>
 					<input type="text" size="40" name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" />
-					<br />
-					<?php _e( 'The author of the first comment on a new site.' ) ?>
+					<p class="description">
+						<?php _e( 'The author of the first comment on a new site.' ) ?>
+					</p>
 				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
 				<td>
 					<input type="text" size="40" name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
-					<br />
-					<?php _e( 'The URL for the first comment on a new site.' ) ?>
+					<p class="description">
+						<?php _e( 'The URL for the first comment on a new site.' ) ?>
+					</p>
 				</td>
 			</tr>
 		</table>