Changeset 31095 for trunk/src/wp-admin/options-discussion.php

Timestamp:

01/08/2015 05:00:15 PM (10 years ago)

Author:

helen

Message:

Collapse additional avatar settings if avatars are disabled.

props markjaquith, krogsgard, valendesigns.
fixes #30168.

File:

• trunk/src/wp-admin/options-discussion.php (modified) (6 diffs)

trunk/src/wp-admin/options-discussion.php

@@ -14 +14 @@
 $title = __('Discussion Settings');
 $parent_file = 'options-general.php';
+
+/**
+ * Display JavaScript on the page.
+ *
+ * @since 4.2.0
+ */
+function options_discussion_add_js() {
+?>
+    <script>
+    (function($){
+        var parent = $( '#show_avatars' ),
+            children = $( '.avatar-settings' );
+        parent.change(function(){
+            children.toggleClass( 'hide-if-js', ! this.checked );
+        });
+    })(jQuery);
+    </script>
+<?php
+}
+add_action( 'admin_print_footer_scripts', 'options_discussion_add_js' );
 
 get_current_screen()->add_help_tab( array(
@@ -173 +193 @@
 <p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
 
-<?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
+<?php
+// the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that?
+
+$show_avatars = get_option( 'show_avatars' );
+?>
 
 <table class="form-table">
@@ -180 +204 @@
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
     <label for="show_avatars">
-        <input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked( get_option('show_avatars'), 1 ); ?> />
+        <input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked( $show_avatars, 1 ); ?> />
         <?php _e( 'Show Avatars' ); ?>
     </label>
 </fieldset></td>
 </tr>
-<tr>
+<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
 <th scope="row"><?php _e('Maximum Rating'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
@@ -208 +232 @@
 </fieldset></td>
 </tr>
-<tr>
+<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
 <th scope="row"><?php _e('Default Avatar'); ?></th>
 <td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
@@ -240 +264 @@
 $size = 32;
 $avatar_list = '';
+
+// Force avatars on to display these choices
+add_filter( 'pre_option_show_avatars', '__return_true', 100 );
+
 foreach ( $avatar_defaults as $default_key => $default_name ) {
     $selected = ($default == $default_key) ? 'checked="checked" ' : '';
@@ -250 +278 @@
     $avatar_list .= '<br />';
 }
+
+remove_filter( 'pre_option_show_avatars', '__return_true', 100 );
+
 /**
  * Filter the HTML output of the default avatar list.