Changeset 24520 for trunk/wp-admin/revision.php

Timestamp:

06/26/2013 09:06:50 PM (12 years ago)

Author:

markjaquith

Message:

Cleanup of the revisions screen, both on the PHP API side, and the JS.

• Much simpler PHP API
• Cleaner and more Backbone-y JS API
• Consequently, does batch queries; this now scales up to hundreds of revisions

Currently missing, but much easier considering the cleaned up base:

• Compare two mode
• RTL

props koopersmith, nacin, adamsilverstein, ocean90. see #24425

File:

• trunk/wp-admin/revision.php (modified) (6 diffs)

trunk/wp-admin/revision.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
+
+require ABSPATH . 'wp-admin/includes/revision.php';
+
+// wp_get_revision_ui_diff( $post, $compare_from, $compare_to )
+// wp_prepare_revisions_for_js( $post )
+
 wp_reset_vars( array( 'revision', 'action' ) );
 
@@ -21 +27 @@
     if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
         break;
-
 
     if ( ! $post = get_post( $revision->post_parent ) )
@@ -78 +83 @@
 
 wp_enqueue_script( 'revisions' );
-
-
-$settings = array(
-    'post_id'     => $post->ID,
-    'nonce'       => wp_create_nonce( 'revisions-ajax-nonce' ),
-    'revision_id' => $revision_id
-);
-
-wp_localize_script( 'revisions', 'wpRevisionsSettings', $settings );
+wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id ) );
 
 /* Revisions Help Tab */
@@ -115 +112 @@
 <div class="wrap">
     <?php screen_icon(); ?>
-    <div id="revision-diff-container" class="current-version right-model-loading">
-        <h2 class="long-header"><?php echo $h2; ?></h2>
-
-        <div id="loading-status" class="updated message">
-            <p><span class="spinner" ></span></p>
-        </div>
-
-        <div class="diff-slider-ticks-wrapper">
-            <div id="diff-slider-ticks"></div>
-        </div>
-
-        <div id="revision-interact"></div>
-
-        <div id="revisions-diff"></div>
-    </div>
+    <h2 class="long-header"><?php echo $h2; ?></h2>
 </div>
 
+<script id="tmpl-revisions-frame" type="text/html">
+    <span class="spinner"></span>
+    <div class="revisions-control-frame"></div>
+    <div class="revisions-diff-frame"></div>
+</script>
+
+<script id="tmpl-revisions-controls" type="text/html">
+
+    <div class="revision-toggle-compare-mode">
+        <label>
+            <input type="checkbox" class="compare-two-revisions" />
+            <?php esc_attr_e( 'Compare two revisions' ); ?>
+        </label>
+    </div>
+
+    <div class="revisions-previous">
+        <input class="button" type="button" id="previous" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
+    </div>
+
+    <div class="revisions-next">
+        <input class="button" type="button" id="next" value="<?php echo esc_attr_x( 'Next', 'Button label for a next revision' ); ?>" />
+    </div>
+</script>
+
+
+<script id="tmpl-revisions-meta" type="text/html">
+    <div id="diff-header">
+        <div id="diff-header-from" class="diff-header">
+            <div id="diff-title-from" class="diff-title">
+                <strong>
+                <?php _ex( 'From:', 'Followed by post revision info' ); ?></strong>
+                    <# if ( 'undefined' !== typeof data.from ) { #>
+                        {{{ data.from.attributes.author.avatar }}} {{{ data.from.attributes.author.name }}},
+                        {{{ data.from.attributes.timeAgo }}} <?php _e( 'ago' ); ?>
+                        ({{{ data.from.attributes.dateShort }}})
+                    <# } #>
+
+            </div>
+            <div class="clear"></div>
+        </div>
+
+        <div id="diff-header-to" class="diff-header">
+            <div id="diff-title-to" class="diff-title">
+                <strong><?php _ex( 'To:', 'Followed by post revision info' ); ?></strong>
+                    <# if ( 'undefined' !== typeof data.to ) { #>
+                        {{{ data.to.attributes.author.avatar }}} {{{ data.to.attributes.author.name }}},
+                        {{{ data.to.attributes.timeAgo }}} <?php _e( 'ago' ); ?>
+                        ({{{ data.to.attributes.dateShort }}})
+                    <# } #>
+        </div>
+
+            <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>
+</script>
+
 <script id="tmpl-revisions-diff" type="text/html">
+    <# _.each( data.fields, function( field ) { #>
+        <h3>{{{ field.name }}}</h3>
+        {{{ field.diff }}}
+    <# }); #>
+</script>
+
+<script id="tmpl-revisions-diff-old" type="text/html">
     <div id="toggle-revision-compare-mode">
         <label>
@@ -158 +204 @@
     </div>
 
-    </div>
-
     <div id="diff-table">{{{ data.diff }}}</div>
 </script>
 
-<script id="tmpl-revision-interact" type="text/html">
+<script id="tmpl-revision-interact-old" type="text/html">
     <div id="diff-previous-revision">
         <input class="button" type="button" id="previous" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
@@ -172 +216 @@
     </div>
 
-    <div id="diff-slider" class="wp-slider"></div>
 </script>