<!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>[26362] trunk/src/wp-admin/network/settings.php: 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.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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><a href="http://core.trac.wordpress.org/changeset/26362">26362</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2013-11-24 16:57:07 +0000 (Sun, 24 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/26211">#26211</a> props hanni.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminnetworksettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/settings.php (26361 => 26362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/settings.php 2013-11-24 16:56:07 UTC (rev 26361)
+++ trunk/src/wp-admin/network/settings.php 2013-11-24 16:57:07 UTC (rev 26362)
</span><span class="lines">@@ -94,8 +94,9 @@
</span><span class="cx"> <th scope="row"><label for="site_name"><?php _e( 'Network Name' ) ?></label></th>
</span><span class="cx"> <td>
</span><span class="cx"> <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
</span><del>- <br />
- <?php _e( 'What you would like to call this network.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'What you would like to call this network.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -103,8 +104,9 @@
</span><span class="cx"> <th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
</span><span class="cx"> <td>
</span><span class="cx"> <input name="admin_email" type="text" id="admin_email" class="regular-text" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" />
</span><del>- <br />
- <?php _e( 'This email address will send update notifcations, and also receive site creation and new user registration notifications.' ); ?>
</del><ins>+ <p class="description">
+ <?php _e( 'This email address will send update notifcations, and also receive site creation and new user registration notifications.' ); ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="lines">@@ -121,10 +123,12 @@
</span><span class="cx"> <label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none') ?> /> <?php _e( 'Registration is disabled.' ); ?></label><br />
</span><span class="cx"> <label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user') ?> /> <?php _e( 'User accounts may be registered.' ); ?></label><br />
</span><span class="cx"> <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 />
</span><del>- <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() )
</del><ins>+ <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() )
</ins><span class="cx"> _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.' );
</span><span class="cx"> ?>
</span><ins>+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -150,8 +154,9 @@
</span><span class="cx"> <th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
</span><span class="cx"> <td>
</span><span class="cx"> <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" />
</span><del>- <br />
- <?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -162,8 +167,9 @@
</span><span class="cx"> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
</span><span class="cx"> <textarea name="limited_email_domains" id="limited_email_domains" cols="45" rows="5">
</span><span class="cx"> <?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
</span><del>- <br />
- <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -172,8 +178,9 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5">
</span><span class="cx"> <?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
</span><del>- <br />
- <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -186,8 +193,9 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text">
</span><span class="cx"> <?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
</span><del>- <br />
- <?php _e( 'The welcome email sent to new site owners.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'The welcome email sent to new site owners.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -195,8 +203,9 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
</span><span class="cx"> <?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
</span><del>- <br />
- <?php _e( 'The welcome email sent to new users.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'The welcome email sent to new users.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -204,8 +213,9 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="first_post" id="first_post" rows="5" cols="45" class="large-text">
</span><span class="cx"> <?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
</span><del>- <br />
- <?php _e( 'The first post on a new site.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'The first post on a new site.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -213,8 +223,9 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="first_page" id="first_page" rows="5" cols="45" class="large-text">
</span><span class="cx"> <?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
</span><del>- <br />
- <?php _e( 'The first page on a new site.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'The first page on a new site.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -222,24 +233,27 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="first_comment" id="first_comment" rows="5" cols="45" class="large-text">
</span><span class="cx"> <?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
</span><del>- <br />
- <?php _e( 'The first comment on a new site.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'The first comment on a new site.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
</span><span class="cx"> <td>
</span><span class="cx"> <input type="text" size="40" name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" />
</span><del>- <br />
- <?php _e( 'The author of the first comment on a new site.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'The author of the first comment on a new site.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
</span><span class="cx"> <td>
</span><span class="cx"> <input type="text" size="40" name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
</span><del>- <br />
- <?php _e( 'The URL for the first comment on a new site.' ) ?>
</del><ins>+ <p class="description">
+ <?php _e( 'The URL for the first comment on a new site.' ) ?>
+ </p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span></span></pre>
</div>
</div>
</body>
</html>