Ticket #16383: 16383.6.patch
| File 16383.6.patch, 6.3 KB (added by , 11 years ago) |
|---|
-
src/wp-admin/css/forms.css
775 775 vertical-align: middle; 776 776 } 777 777 778 /*------------------------------------------------------------------------------ 779 21.0 - Network Admin 780 ------------------------------------------------------------------------------*/ 781 782 .form-field #site-address { 783 max-width: 25em; 784 } 785 786 .form-field #domain { 787 max-width: 22em; 788 } 789 790 .form-field #site-title, 791 .form-field #admin-email, 792 .form-field #path, 793 .form-field #blog_registered, 794 .form-field #blog_last_updated { 795 max-width: 25em; 796 } 797 798 .form-field #path { 799 margin-bottom: 5px; 800 } 801 778 802 /* =Media Queries 779 803 -------------------------------------------------------------- */ 780 804 … … 784 808 -webkit-appearance: none; 785 809 } 786 810 787 input[type=text], input[type="search"], 788 input[type=password], input[type="number"] { 811 input[type="text"], 812 input[type="email"], 813 input[type="search"], 814 input[type="password"], 815 input[type="number"] { 789 816 -webkit-appearance: none; 790 817 padding: 6px 10px; 791 818 } … … 874 901 } 875 902 876 903 .form-table td input[type="text"], 904 .form-table td input[type="email"], 877 905 .form-table td input[type="password"], 878 906 .form-table td select, 879 907 .form-table td textarea, -
src/wp-admin/network/site-info.php
126 126 <?php if ( $is_main_site ) { ?> 127 127 <td><code><?php echo $parsed['scheme'] . '://' . esc_attr( $details->domain ) ?></code></td> 128 128 <?php } else { ?> 129 <td><?php echo $parsed['scheme'] . '://'; ?><input name="blog[domain]" type="text" id="domain" value="<?php echo esc_attr( $details->domain ) ?>" size="33"/></td>129 <td><?php echo $parsed['scheme'] . '://'; ?><input name="blog[domain]" type="text" id="domain" value="<?php echo esc_attr( $details->domain ) ?>" /></td> 130 130 <?php } ?> 131 131 </tr> 132 132 <tr class="form-field form-required"> … … 137 137 } else { 138 138 switch_to_blog( $id ); 139 139 ?> 140 <td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" size="40" style="margin-bottom:5px;"/>141 <br /><input type="checkbox" style="width:20px;"name="update_home_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></td>140 <td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" /> 141 <br /><input type="checkbox" name="update_home_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></td> 142 142 <?php 143 143 restore_current_blog(); 144 144 } ?> … … 145 145 </tr> 146 146 <tr class="form-field"> 147 147 <th scope="row"><?php _ex( 'Registered', 'site' ) ?></th> 148 <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" size="40"/></td>148 <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" /></td> 149 149 </tr> 150 150 <tr class="form-field"> 151 151 <th scope="row"><?php _e( 'Last Updated' ); ?></th> 152 <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" size="40"/></td>152 <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" /></td> 153 153 </tr> 154 154 <?php 155 155 $attribute_fields = array( 'public' => __( 'Public' ) ); -
src/wp-admin/network/site-new.php
130 130 <th scope="row"><?php _e( 'Site Address' ) ?></th> 131 131 <td> 132 132 <?php if ( is_subdomain_install() ) { ?> 133 <input name="blog[domain]" type="text" class="regular-text" title="<?php esc_attr_e( 'Domain' ) ?>"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>133 <input name="blog[domain]" type="text" class="regular-text" id="site-address" title="<?php esc_attr_e( 'Domain' ) ?>"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span> 134 134 <?php } else { 135 echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>135 echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" id="site-address" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/> 136 136 <?php } 137 137 echo '<p>' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>'; 138 138 ?> … … 140 140 </tr> 141 141 <tr class="form-field form-required"> 142 142 <th scope="row"><?php _e( 'Site Title' ) ?></th> 143 <td><input name="blog[title]" type="text" class="regular-text" title="<?php esc_attr_e( 'Title' ) ?>"/></td>143 <td><input name="blog[title]" type="text" class="regular-text" id="site-title" title="<?php esc_attr_e( 'Title' ) ?>"/></td> 144 144 </tr> 145 145 <tr class="form-field form-required"> 146 146 <th scope="row"><?php _e( 'Admin Email' ) ?></th> 147 <td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" data-autocomplete-type="search" data-autocomplete-field="user_email" title="<?php esc_attr_e( 'Email' ) ?>"/></td>147 <td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" title="<?php esc_attr_e( 'Email' ) ?>"/></td> 148 148 </tr> 149 149 <tr class="form-field"> 150 150 <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>