Changes in trunk/wp-admin/options-general.php [16736:15132]

File:

• trunk/wp-admin/options-general.php (modified) (8 diffs)

trunk/wp-admin/options-general.php

@@ -22 +22 @@
  *
  * @package WordPress
- * @subpackage General_Settings_Screen
+ * @subpackage General_Settings_Panel
  */
 function add_js() {
@@ -31 +31 @@
                 $("input[name='date_format']").click(function(){
                         if ( "date_format_custom_radio" != $(this).attr("id") )
-                                $("input[name='date_format_custom']").val( $(this).val() ).siblings('.example').text( $(this).siblings('span').text() );
+                                $("input[name='date_format_custom']").val( $(this).val() );
                 });
                 $("input[name='date_format_custom']").focus(function(){
@@ -39 +39 @@
                 $("input[name='time_format']").click(function(){
                         if ( "time_format_custom_radio" != $(this).attr("id") )
-                                $("input[name='time_format_custom']").val( $(this).val() ).siblings('.example').text( $(this).siblings('span').text() );
+                                $("input[name='time_format_custom']").val( $(this).val() );
                 });
                 $("input[name='time_format_custom']").focus(function(){
                         $("#time_format_custom_radio").attr("checked", "checked");
                 });
-                $("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
-                        var format = $(this);
-                        format.siblings('img').css('visibility','visible');
-                        $.post(ajaxurl, {
-                                        action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
-                                        date : format.val()
-                                }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
-                });
         });
 //]]>
@@ -57 +49 @@
 <?php
 }
-add_action('admin_head', 'add_js');
+add_filter('admin_head', 'add_js');
 
 add_contextual_help($current_screen,
@@ -123 +115 @@
 <th scope="row"><label for="new_admin_email"><?php _e('E-mail address') ?> </label></th>
 <td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text code" />
-<span class="description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span>
+<span class="setting-description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span>
 <?php
 $new_admin_email = get_option( 'new_admin_email' );
@@ -274 +266 @@
                         $custom = false;
                 }
-                echo ' /> <span>' . date_i18n( $format ) . "</span></label><br />\n";
+                echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
         }
 
         echo '  <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
         checked( $custom );
-        echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('date_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
-
-        echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
+        echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> ' . date_i18n( get_option('date_format') ) . "\n";
+
+        echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click &#8220;Save Changes&#8221; to update sample output.') . "</p>\n";
 ?>
         </fieldset>
@@ -306 +298 @@
                         $custom = false;
                 }
-                echo ' /> <span>' . date_i18n( $format ) . "</span></label><br />\n";
+                echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
         }
 
         echo '  <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
         checked( $custom );
-        echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('time_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
-        ;
+        echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> ' . date_i18n( get_option('time_format') ) . "\n";
 ?>
         </fieldset>
@@ -348 +339 @@
 <?php do_settings_sections('general'); ?>
 
-<?php submit_button(); ?>
+<p class="submit">
+<input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
+</p>
 </form>