Ticket #31354: 31354.3.patch

src/wp-admin/network/settings.php

@@ -39 +39 @@
                         $( '#submit', this ).after( '<span class="spinner language-install-spinner" />' );
                 }
         });
+        jQuery('.option-label-chk').find('input[type="number"],select').attr({disabled:'disabled'});
+        jQuery('.option-label-chk input[type="checkbox"]').click(function(){
+            if(jQuery(this).is(':checked')){
+                jQuery(this).parents('.option-label-chk').find('input[type="number"],select').removeAttr('disabled');
+            }else{
+                jQuery(this).parents('.option-label-chk').find('input[type="number"],select').attr({disabled:'disabled'});
+            }
 });
+        jQuery('.option-label-chk input[type="checkbox"]:checked').parents('.option-label-chk').find('input[type="number"],select').removeAttr('disabled');
+});
 </script>
 <?php
 }
@@ -293 +302 @@
                         <tr>
                                 <th scope="row"><?php _e( 'Site upload space' ) ?></th>
                                 <td>
-                                <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
+                                <div class="option-label-chk">    
+                                <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label></div>
                                 </td>
                         </tr>
 

src/wp-admin/options-discussion.php

@@ -21 +21 @@
  */
 function options_discussion_add_js() {
 ?>
-        <script>
+<script type="text/javascript">
         (function($){
                 var parent = $( '#show_avatars' ),
                         children = $( '.avatar-settings' );
@@ -29 +29 @@
                         children.toggleClass( 'hide-if-js', ! this.checked );
                 });
         })(jQuery);
+    jQuery(document).ready(function(){
+        jQuery('.option-label-chk').find('input[type="number"],select').attr({disabled:'disabled'});
+        jQuery('.option-label-chk input[type="checkbox"]').click(function(){
+            if(jQuery(this).is(':checked')){
+                jQuery(this).parents('.option-label-chk').find('input[type="number"],select').removeAttr('disabled');
+            }else{
+                jQuery(this).parents('.option-label-chk').find('input[type="number"],select').attr({disabled:'disabled'});
+            }
+                });
+        jQuery('.option-label-chk input[type="checkbox"]:checked').parents('.option-label-chk').find('input[type="number"],select').removeAttr('disabled');
+    });
         </script>
 <?php
 }
@@ -86 +97 @@
 <?php if ( !get_option( 'users_can_register' ) && is_multisite() ) echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' ); ?>
 </label>
 <br />
-
+<div class="option-label-chk">
 <label for="close_comments_for_old_posts">
 <input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked('1', get_option('close_comments_for_old_posts')); ?> />
 <?php printf( __('Automatically close comments on articles older than %s days'), '</label><label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="' . esc_attr(get_option('close_comments_days_old')) . '" class="small-text" />'); ?>
 </label>
-<br />
+</div>
+<div class="option-label-chk">
 <label for="thread_comments">
 <input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked('1', get_option('thread_comments')); ?> />
 <?php
@@ -115 +127 @@
 printf( __('Enable threaded (nested) comments %s levels deep'), $thread_comments_depth );
 
 ?></label>
-<br />
+</div>
+<div class="option-label-chk">
 <label for="page_comments">
 <input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked('1', get_option('page_comments')); ?> />
 <?php
@@ -141 +154 @@
 printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
 
 ?></label>
+</div>
 </fieldset></td>
 </tr>
 <tr>