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

Timestamp:

07/03/2013 08:27:19 PM (11 years ago)

Author:

ocean90

Message:

Revisions UI update:

• Restore Compare two mode
• Restore tooltips
• RTL support
• First pass for URL routing and history

props adamsilverstein, see #24425.

File:

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

trunk/wp-admin/revision.php

@@ -116 +116 @@
 
 <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>
-
+<script id="tmpl-revisions-buttons" type="text/html">
     <div class="revisions-previous">
         <input class="button" type="button" id="previous" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
@@ -139 +130 @@
 </script>
 
+<script id="tmpl-revisions-tooltip" type="text/html">
+    <div class="ui-slider-tooltip ui-widget-content ui-corner-all ">
+    <# if ( 'undefined' !== typeof data && 'undefined' !== typeof data.author ) { #>
+            {{{ data.author.avatar }}} {{{ data.author.name }}},
+            {{{ data.timeAgo }}} <?php _e( 'ago' ); ?>
+            ({{{ data.dateShort }}})
+    <# } #>
+    </div>
+    <div class="arrow"></div>
+</script>
+
+<script id="tmpl-revisions-checkbox" type="text/html">
+    <div class="revision-toggle-compare-mode">
+        <label>
+            <input type="checkbox" class="compare-two-revisions"
+            <#
+            if ( 'undefined' !== typeof data && data.model.attributes.compareTwoMode ) {
+                #> checked="checked"<#
+            }
+            #>
+            />
+            <?php esc_attr_e( 'Compare two revisions' ); ?>
+        </label>
+    </div>
+</script>
 
 <script id="tmpl-revisions-meta" type="text/html">
@@ -144 +160 @@
         <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 }}})
-                    <# } #>
-
+                <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>
@@ -159 +173 @@
             <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>
+                <# 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' )?>" />
@@ -178 +192 @@
 </script>
 
-<script id="tmpl-revisions-diff-old" type="text/html">
-    <div id="toggle-revision-compare-mode">
-        <label>
-            <input type="checkbox" id="compare-two-revisions" />
-            <?php esc_attr_e( 'Compare two revisions' ); ?>
-        </label>
-    </div>
 
-    <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> {{{ data.titleFrom }}}
-            </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> {{{ data.titleTo }}}
-            </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 class="clear"></div>
-        </div>
-    </div>
-
-    <div id="diff-table">{{{ data.diff }}}</div>
-</script>
-
-<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' ); ?>" />
-    </div>
-
-    <div id="diff-next-revision">
-        <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-revision-ticks" type="text/html">
-    <div class="revision-tick completed-{{{ data.completed }}} scope-of-changes-{{{ data.scopeOfChanges }}}">
-        <span class="ui-slider-tooltip ui-widget-content ui-corner-all hidden"></span>
-    </div>
-</script>
 <?php
 require_once( './admin-footer.php' );