Ticket #23903: 23903.3.diff

wp-admin/includes/ajax-actions.php

@@ -2135 +2135 @@
                 $lines_added = $lines_deleted = 0;
                 $content = '';
                 //compare from left to right, passed from application
-                foreach ( array_keys( _wp_post_revision_fields() ) as $field ) {
+                foreach ( _wp_post_revision_fields() as $field => $field_value ) {
                         $left_content = apply_filters( "_wp_post_revision_field_$field", $left_revision->$field, $field, $left_revision, 'left' );
                         $right_content = apply_filters( "_wp_post_revision_field_$field", $right_revision->$field, $field, $right_revision, 'right' );
 
@@ -2149 +2149 @@
                         // compare_to == 0 means first revision, so compare to a blank field to show whats changed
                         $diff = wp_text_diff_with_count( ( 0 == $compare_to ) ? '' : $left_content, $right_content, $args );
 
-                        if ( isset( $diff[ 'html' ] ) )
+                        if ( isset( $diff[ 'html' ] ) ) {
+                                $content .= sprintf( '<div class="diff-label">%s</div>', $field_value );
                                 $content .= $diff[ 'html' ];
+                        }
 
                         if ( isset( $diff[ 'lines_added' ] ) )
                                 $lines_added = $lines_added + $diff[ 'lines_added' ];

wp-admin/css/wp-admin.css

@@ -3612 +3612 @@
         width: 95%;
 }
 
+#diff-title-to strong {
+        display: none;
+}
+
+.comparing-two-revisions #diff-title-to strong {
+        display: inline;
+}
+
 .diff-slider-ticks-wrapper {
         margin: 0 auto;
         text-align: center;
@@ -3623 +3631 @@
         margin-top: 20px;
 }
 
+.diff-label {
+        margin: 20px 0 5px;
+        padding-left: 3px;
+        font-size: 13px;
+        color: #666
+}
+
 .diff-header {
         height: 35px;
         line-height: 35px;
@@ -3642 +3657 @@
 
 .diff-title img {
         vertical-align: middle;
+        margin-left: 5px;
 }
 
 #restore-revision {
         margin-left: 10px;
 }
 
-.diff-col-titles {
-        font-size: 16px;
-        width: 100%;
-        margin: 20px 0 10px;
+#diff-table {
+        margin-top: 20px;
 }
 
-.diff-col-title-added,
-.diff-col-title-removed {
-        width: auto;
-        text-align: left;
-        float: left;
-        width: 48%;
-}
-
-.diff-col-title-added span,
-.diff-col-title-removed span {
-        padding: .5em;
-}
-
-.diff-col-title-added {
-        float: right;
-        color: #00a100;
-}
-
-.diff-col-title-removed {
-        color: #d2281f;
-}
-
 .comparing-two-revisions #diff-previous-revision,
 .comparing-two-revisions #diff-next-revision,
 #diff-title-from-current-version,

wp-admin/revision.php

@@ -141 +141 @@
                 <input type="button" id="restore-revision" class="button button-primary" data-restore-link="{{{ data.restoreLink }}}" value="<?php esc_attr_e( 'Restore This Revision' )?>" />
         </div>
 
-        <div class="diff-col-titles">
-                <div class="diff-col-title-removed"><span><?php _e( 'Removed -' ); ?></span></div>
-                <div class="diff-col-title-added"><span><?php _e( 'Added +' ); ?></span></div>
-                <div class="clear"></div>
-        </div>
-
-        <div>{{{ data.diff }}}</div>
+        <div id="diff-table">{{{ data.diff }}}</div>
 </script>
 
 <script id="tmpl-revision-interact" type="text/html">