WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update via ajax the sample output of custom date/times on options-general. fixes #12636. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-10-08 03:29:57 +00:00
parent b7bacd1bf2
commit b0c538b9f1
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/admin-ajax.php
View File

@ -1463,6 +1463,12 @@ case 'set-post-thumbnail':
} }
die( '0' ); die( '0' );
break; break;
case 'date_format' :
die( date_i18n( sanitize_option( 'date_format', $_POST['date'] ) ) );
break;
case 'time_format' :
die( date_i18n( sanitize_option( 'time_format', $_POST['date'] ) ) );
break;
default : default :
do_action( 'wp_ajax_' . $_POST['action'] ); do_action( 'wp_ajax_' . $_POST['action'] );
die('0'); die('0');

23
wp-admin/options-general.php
View File

@ -30,7 +30,7 @@ function add_js() {
jQuery(document).ready(function($){ jQuery(document).ready(function($){
$("input[name='date_format']").click(function(){ $("input[name='date_format']").click(function(){
if ( "date_format_custom_radio" != $(this).attr("id") ) if ( "date_format_custom_radio" != $(this).attr("id") )
$("input[name='date_format_custom']").val( $(this).val() ); $("input[name='date_format_custom']").val( $(this).val() ).siblings('.example').text( $(this).siblings('span').text() );
}); });
$("input[name='date_format_custom']").focus(function(){ $("input[name='date_format_custom']").focus(function(){
$("#date_format_custom_radio").attr("checked", "checked"); $("#date_format_custom_radio").attr("checked", "checked");
@ -38,11 +38,19 @@ function add_js() {
$("input[name='time_format']").click(function(){ $("input[name='time_format']").click(function(){
if ( "time_format_custom_radio" != $(this).attr("id") ) if ( "time_format_custom_radio" != $(this).attr("id") )
$("input[name='time_format_custom']").val( $(this).val() ); $("input[name='time_format_custom']").val( $(this).val() ).siblings('.example').text( $(this).siblings('span').text() );
}); });
$("input[name='time_format_custom']").focus(function(){ $("input[name='time_format_custom']").focus(function(){
$("#time_format_custom_radio").attr("checked", "checked"); $("#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); } );
});
}); });
//]]> //]]>
</script> </script>
@ -265,14 +273,14 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
echo " checked='checked'"; echo " checked='checked'";
$custom = false; $custom = false;
} }
echo ' /> ' . date_i18n( $format ) . "</label><br />\n"; echo ' /> <span>' . date_i18n( $format ) . "</span></label><br />\n";
} }
echo ' <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"'; echo ' <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
checked( $custom ); checked( $custom );
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 '/> ' . __('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 formatting</a>. Click &#8220;Save Changes&#8221; to update sample output.') . "</p>\n"; echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
?> ?>
</fieldset> </fieldset>
</td> </td>
@ -297,12 +305,13 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
echo " checked='checked'"; echo " checked='checked'";
$custom = false; $custom = false;
} }
echo ' /> ' . date_i18n( $format ) . "</label><br />\n"; echo ' /> <span>' . date_i18n( $format ) . "</span></label><br />\n";
} }
echo ' <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"'; echo ' <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
checked( $custom ); checked( $custom );
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"; 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";
;
?> ?>
</fieldset> </fieldset>
</td> </td>