Changeset 8286

Timestamp:

07/08/2008 05:51:28 PM (18 years ago)

Author:

mdawaffe

Message:

crazyhorse: timestamp language changes. multiple ok/cancels may give inconsistent data

Location:

branches/crazyhorse/wp-admin

Files:

• edit-form-advanced.php (modified) (2 diffs)
• includes/template.php (modified) (1 diff)
• js/post.js (modified) (2 diffs)

branches/crazyhorse/wp-admin/edit-form-advanced.php

@@ -307 +307 @@
 <?php
         if ( current_user_can( 'publish_posts' ) ) : // Contributors don't get to choose the date of publish
+                $stamp = __( 'Timestamp: <span class="timestamp">%1$s%3$s</span>' );
+                $edit = '&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex="4">' . __('(Change)') . '</a>';
                 if ($post_ID) {
-                        if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
-                                $stamp = __('Scheduled for: %1$s at %2$s');
-                        } else if ( 'publish' == $post->post_status ) { // already published
-                                $stamp = __('Published on: %1$s at %2$s');
-                        } else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified
-                                $stamp = __('Publish immediately');
-                        } else { // draft, 1 or more saves, date specified
-                                $stamp = __('Publish on: %1$s at %2$s');
+                        if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified
+                                $stamp = __( 'Timestamp: <span class="timestamp">Today, %1$s%3$s</span>' );
                         }
                         $date = mysql2date(get_option('date_format'), $post->post_date);
                         $time = mysql2date(get_option('time_format'), $post->post_date);
                 } else { // draft (no saves, and thus no date specified)
-                        $stamp = __('Publish immediately');
+                        $stamp = __( 'Timestamp: <span class="timestamp">Today, %1$s%3$s</span>' );
                         $date = mysql2date(get_option('date_format'), current_time('mysql'));
                         $time = mysql2date(get_option('time_format'), current_time('mysql'));
@@ -326 +322 @@
 ?>
 
-        <p class="curtime"><?php printf($stamp, $date, $time); ?>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p>
+        <p class="curtime"><?php printf($stamp, $date, $time, $edit); ?>
+</p>
         <div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div>
 

branches/crazyhorse/wp-admin/includes/template.php

@@ -965 +965 @@
 
 <input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" />
+
+<a href="#edit_timestamp" class="save-timestamp hide-if-no-js button"><?php _e('OK'); ?></a>
+<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Cancel'); ?></a>
 <?php
 }

branches/crazyhorse/wp-admin/js/post.js

@@ -163 +163 @@
                 if (jQuery('#timestampdiv').is(":hidden")) {
                         jQuery('#timestampdiv').slideDown("normal");
-                        jQuery('.edit-timestamp').text(postL10n.cancel);
+                        jQuery('.timestamp').hide();
                 } else {
                         jQuery('#timestampdiv').hide();
@@ -171 +171 @@
                         jQuery('#hh').val(jQuery('#hidden_hh').val());
                         jQuery('#mn').val(jQuery('#hidden_mn').val());
-                        jQuery('.edit-timestamp').text(postL10n.edit);
-                }
-                return false;
-
+                        jQuery('.timestamp').show();
+                }
+                return false;
+
+        });
+        jQuery('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
+                jQuery('#timestampdiv').hide();
+                var link = jQuery('.timestamp a').clone( true );
+                jQuery('.timestamp').show().html(
+                        jQuery( '#mm option[value=' + jQuery('#mm').val() + ']' ).text() + ' ' +
+                        jQuery('#jj').val() + ', ' +
+                        jQuery('#aa').val() + ' @ ' +
+                        jQuery('#hh').val() + ':' +
+                        jQuery('#mn').val() + ' '
+                ).append( link );
+                return false;
         });