<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23901] trunk/wp-admin: Revisions CSS cleanup.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23901">23901</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-04 15:49:28 +0000 (Thu, 04 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions CSS cleanup.
props ocean90. fixes <a href="http://core.trac.wordpress.org/ticket/23933">#23933</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsscolorsclassiccss">trunk/wp-admin/css/colors-classic.css</a></li>
<li><a href="#trunkwpadmincsscolorsfreshcss">trunk/wp-admin/css/colors-fresh.css</a></li>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadminjsrevisionsjs">trunk/wp-admin/js/revisions.js</a></li>
<li><a href="#trunkwpadminrevisionphp">trunk/wp-admin/revision.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsscolorsclassiccss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-classic.css (23900 => 23901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-classic.css 2013-04-04 08:58:49 UTC (rev 23900)
+++ trunk/wp-admin/css/colors-classic.css 2013-04-04 15:49:28 UTC (rev 23901)
</span><span class="lines">@@ -1476,14 +1476,25 @@
</span><span class="cx"> background-color: #e9f6ea;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#diffsubheader{
</del><ins>+.diff-header {
</ins><span class="cx"> background-color: #f7f7f7;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#att-info {
- background-color: #e4f2fd;
</del><ins>+#diff-title-to strong {
+ color: #0080aa;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.revision-tick.loading-true {
+ background-color: #9999cc;
+ background: url(../images/wpspin_light.gif) no-repeat;
+ background-position: middle;
+ background-size: 1px 10px;
+}
+
+.revision-tick.loading-false {
+ background-color: #aaa;
+}
+
</ins><span class="cx"> /* jQuery UI Slider */
</span><span class="cx"> .wp-slider.ui-slider {
</span><span class="cx"> border-color: #d1e5ee;
</span></span></pre></div>
<a id="trunkwpadmincsscolorsfreshcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-fresh.css (23900 => 23901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-fresh.css 2013-04-04 08:58:49 UTC (rev 23900)
+++ trunk/wp-admin/css/colors-fresh.css 2013-04-04 15:49:28 UTC (rev 23901)
</span><span class="lines">@@ -1379,33 +1379,25 @@
</span><span class="cx"> background-color: #e9f6ea;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.diff-to-title {
- color: #0080AA;
</del><ins>+#diff-title-to strong {
+ color: #0080aa;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#diffsubheader{
</del><ins>+.diff-header {
</ins><span class="cx"> background-color: #f7f7f7;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.comparetwo#diffsubheader.diff-left-hand-meta-row {
- background-color: #fcfcfc;
-}
-
-.revision-tick.revision-toloadtrue {
</del><ins>+.revision-tick.loading-true {
</ins><span class="cx"> background-color: #9999cc;
</span><span class="cx"> background: url(../images/wpspin_light.gif) no-repeat;
</span><span class="cx"> background-position: middle;
</span><span class="cx"> background-size: 1px 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.revision-toloadfalse {
</del><ins>+.revision-tick.loading-false {
</ins><span class="cx"> background-color: #aaa;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#att-info {
- background-color: #e4f2Fd;
-}
-
</del><span class="cx"> body .ui-tooltip {
</span><span class="cx"> border-color: #d7d7d7;
</span><span class="cx"> background-color: #fff;
</span></span></pre></div>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (23900 => 23901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-04-04 08:58:49 UTC (rev 23900)
+++ trunk/wp-admin/css/wp-admin.css 2013-04-04 15:49:28 UTC (rev 23901)
</span><span class="lines">@@ -3617,6 +3617,11 @@
</span><span class="cx"> 11.2 - Post Revisions
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><ins>+/* Revision meta box */
+.post-revisions li img {
+ vertical-align: middle;
+}
+
</ins><span class="cx"> table.diff {
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="lines">@@ -3653,270 +3658,175 @@
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#revisions-meta-mostrecent,
-#revisions-meta-stored,
-#revisions-meta-oldest,
-#revisions-meta-link {
- line-height: 30px;
- height: 30px;
- vertical-align: middle;
- padding-right: 10px;
</del><ins>+#revision-diff-container {
+ position: relative;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#revisions-meta-mostrecent img,
-#revisions-meta-oldest img {
- vertical-align: middle;
</del><ins>+#toogle-revision-compare-mode {
+ position: absolute;
+ top: 0;
+ right: 0;
+ padding-top: 15px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.diff-from-title,
-.diff-to-title {
- font-size: 14px;
- font-weight: bold;
- width:60px;
- text-align: right;
- float: left;
- margin-right: 5px;
</del><ins>+#loading-status {
+ position: absolute;
+ top: 0;
+ right: 170px;
+ line-height: 30px;
+ display: none;
+ margin: 9px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.revisiondiffcontainer {
- width: 96%;
</del><ins>+#loading-status .spinner {
+ float: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.revisiondiffcontainer input.button {
- margin: 2px;
</del><ins>+#revision-interact {
+ border-bottom: 1px solid #dfdfdf;
+ padding: 20px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#diffnext {
- float: right;
- margin-right: 5px;
</del><ins>+#diff-next-revision,
+#diff-previous-revision {
+ margin-top: -.4em; /* Same line as the slider (height: .8em) */
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#diffrestore input{
- margin-left: 10px;
</del><ins>+#diff-next-revision {
+ float: right;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#diffprevious,
-#difftitle,
-#difftitlefrom,
-#diff_from_current_revision {
</del><ins>+#diff-previous-revision {
</ins><span class="cx"> float: left;
</span><del>- margin-left: 5px;
- height: 35px;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#diffprevious,
-#diffnext {
- height: 30px;
</del><ins>+#diff-slider{
+ width: 70%;
+ margin: 0 auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#diffheader, #diffsubheader {
- clear: both;
- width: 100%;
</del><ins>+.comparetwo #diff-slider {
+ width: 95%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#diffheader {
- border-bottom: 1px solid #dfdfdf;
- width: 100%;
- height: 40px;
- line-height: 40px;
- padding-top: 30px;
-}
-
-#diffsubheader,.diff-left-hand-meta-row {
- width: 100%;
- height:35px;
- line-height: 35px;
- display: block;
-}
-
-#diffslider{
- width: 70%;
- margin-left: auto;
- margin-right: auto;
- text-align: center;
- height: 0.8em;
- margin-top: 20px;
-}
-
</del><span class="cx"> .diff-slider-ticks-wrapper {
</span><del>- margin-left: auto;
- margin-right: auto;
</del><ins>+ margin: 0 auto;
</ins><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #diff-slider-ticks {
</span><span class="cx"> position: absolute;
</span><del>- margin-top: 50px;
</del><span class="cx"> z-index: 1;
</span><ins>+ margin-top: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#revisioncount {
- width: 50%;
- margin-left: auto;
- margin-right: auto;
- margin-top: 0;
- line-height: 1em;
- height: 1em;
- text-align: center;
- clear: none;
- padding: 5px;
</del><ins>+.diff-header {
+ height: 35px;
+ line-height: 35px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.revisiondiffcontainer {
- margin-top: 10px;
</del><ins>+.diff-title {
+ float: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#diffsliderwrap {
- width: 80%;
- margin-left: auto;
- margin-right: auto;
</del><ins>+.diff-title strong {
+ font-size: 14px;
+ width: 60px;
+ text-align: right;
+ float: left;
+ margin-right: 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#diffsliderwrap #sliderinner {
- position: relative;
- top: 47px;
</del><ins>+.diff-title img {
+ vertical-align: middle;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#removedandadded {
- width: 100%;
- padding-bottom: 30px;
- padding-top: 3px;
</del><ins>+#restore-revision {
+ margin-left: 10px;
+}
+
+.diff-col-titles {
</ins><span class="cx"> font-size: 16px;
</span><ins>+ width: 100%;
+ margin: 20px 0 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#removed,
-#added {
</del><ins>+.diff-col-title-added,
+.diff-col-title-removed {
</ins><span class="cx"> width: auto;
</span><span class="cx"> text-align: left;
</span><del>- padding-left: 5px;
- padding-right: 5px;
- padding-top: 5px;
- padding-bottom: 5px;
</del><span class="cx"> float: left;
</span><ins>+ width: 48%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.diffsplit #added {
- float: right;
- width: 47%;
- text-align: left;
</del><ins>+.diff-col-title-added span,
+.diff-col-title-removed span {
+ padding: .5em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.diffsplit #removedandadded {
- width: 100%;
-}
-
-#added {
- padding-left: 10px;
</del><ins>+.diff-col-title-added {
+ float: right;
</ins><span class="cx"> color: #00a100;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#removed {
- padding-left: 0px;
</del><ins>+.diff-col-title-removed {
</ins><span class="cx"> color: #d2281f;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#comparetworevisions {
- float: right;
- position: absolute;
- top: 10px;
- right: 10px;
- line-height: 35px;
- padding-right: 5px;
-}
-
-#comparetworevisions input {
- margin-right: 2px;
-}
-
-#difftitle img,
-#difftitlefrom img,
-.post-revisions li img {
- vertical-align: middle;
- margin-left: 5px;
-}
-.post-revisions li {
- vertical-align: middle;
- height: 28px;
-}
-
-#showsplitviewoption,
-#toggleshowautosavesoption {
- float: right;
- padding-left: 10px;
- padding-right: 10px;
-}
-
-#revisionoptions {
- margin-top: 0px;
- line-height: 40px;
- clear: both;
- width: 100%;
-}
-
-.comparetwo #diffslider {
- width: 95%;
-}
-
-.comparetwo #diffprevious,
-.comparetwo #diffnext,
-span#diff_left_current_revision,
-#diff_from_current_revision,
-.currentversion span#diff_left_count,
-.currentversion span#diff_left_count_inner,
-.comparetwo.currentversion #diff_from_current_revision,
-#diffsubheader.diff-left-hand-meta-row {
</del><ins>+.comparing-two-revisions #diff-previous-revision,
+.comparing-two-revisions #diff-next-revision,
+#diff-title-from-current-version,
+.comparing-two-revisions.current-version #diff-title-from-current-version,
+#diff-header-from {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.currentversion span#diff_left_current_revision,
-span#diff_left_count,
-span#diff_left_count_inner,
-.comparetwo #difftitlefrom,
-.leftmodelloading #modelsloading,
-.rightmodelloading #modelsloading,
-.leftmodelloading #modelsloading .spinner,
-.rightmodelloading #modelsloading .spinner,
-.comparetwo #diffsubheader.diff-left-hand-meta-row {
</del><ins>+.comparing-two-revisions #diff-title-from,
+.left-model-loading #loading-status,
+.right-model-loading #loading-status,
+.left-model-loading #loading-status .spinner,
+.right-model-loading #loading-status .spinner,
+.comparing-two-revisions #diff-header-from {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .revision-tick {
</span><span class="cx"> width: 1px;
</span><span class="cx"> float: left;
</span><del>- margin-right: 15px;
- height: 11px;
</del><ins>+ margin: 1px 15px 0 0;
+ height: .8em;
</ins><span class="cx"> padding: 0;
</span><span class="cx"> margin-left: 0px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.revision-scopeofchanges-vsmall {
- width: 1px;
- background-color: #aaa;
</del><ins>+.revision-tick.scope-of-changes-vsmall {
+ width: 1px;
+ background-color: #aaa;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.revision-scopeofchanges-small {
- width: 2px;
- background-color: #aaa;
- margin-left: -1px;
</del><ins>+.revision-tick.scope-of-changes-small {
+ width: 2px;
+ background-color: #aaa;
+ margin-left: -1px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.revision-scopeofchanges-med {
- width: 3px;
- margin-left: -2px;
- background-color: #666;
</del><ins>+.revision-tick.scope-of-changes-med {
+ width: 3px;
+ margin-left: -2px;
+ background-color: #666;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.revision-scopeofchanges-large {
- width: 4px;
- margin-left: -3px;
- background-color: #333;
</del><ins>+.revision-tick.scope-of-changes-large {
+ width: 4px;
+ margin-left: -3px;
+ background-color: #333;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.revision-scopeofchanges-vlarge {
- margin-left: -3px;
- width: 4px;
- background-color: #111;
- left: 1;
</del><ins>+.revision-tick.scope-of-changes-vlarge {
+ margin-left: -3px;
+ width: 4px;
+ background-color: #111;
+ left: 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .diff-loading {
</span><span class="lines">@@ -3924,8 +3834,8 @@
</span><span class="cx"> width: 100%;
</span><span class="cx"> height: 200px;
</span><span class="cx"> }
</span><del>-.diff-loading .spinner
-{
</del><ins>+
+.diff-loading .spinner {
</ins><span class="cx"> clear: both;
</span><span class="cx"> margin-left: auto;
</span><span class="cx"> margin-right: auto;
</span><span class="lines">@@ -3933,27 +3843,12 @@
</span><span class="cx"> float: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#modelsloading {
- float: right;
- position: absolute;
- line-height: 30px;
- display: none;
- clear: none;
- right: 170px;
- margin-top: -40px;
-}
-
-#modelsloading .spinner {
- float: left;
-}
-
</del><span class="cx"> .ui-tooltip-content img {
</span><span class="cx"> float: left;
</span><span class="cx"> margin-right: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> /* jQuery UI Tooltip 1.10.1 */
</span><span class="cx">
</span><span class="cx"> .ui-tooltip {
</span><span class="lines">@@ -3985,7 +3880,6 @@
</span><span class="cx"> margin-left: -35px;
</span><span class="cx"> bottom: -16px;
</span><span class="cx"> z-index: 99999;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .arrow.top {
</span></span></pre></div>
<a id="trunkwpadminjsrevisionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/revisions.js (23900 => 23901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-04-04 08:58:49 UTC (rev 23900)
+++ trunk/wp-admin/js/revisions.js 2013-04-04 15:49:28 UTC (rev 23901)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> startLeftModelLoading: function() {
</span><span class="cx"> this.leftModelLoading = true;
</span><del>- $('.revisiondiffcontainer').addClass('leftmodelloading');
</del><ins>+ $('#revision-diff-container').addClass('left-model-loading');
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> stopLeftModelLoading: function() {
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> startRightModelLoading: function() {
</span><span class="cx"> this.rightModelLoading = true;
</span><del>- $('.revisiondiffcontainer').addClass('rightmodelloading');
</del><ins>+ $('#revision-diff-container').addClass('right-model-loading');
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> stopRightModelLoading: function() {
</span><span class="lines">@@ -133,8 +133,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> stopModelLoadingSpinner: function() {
</span><del>- $('.revisiondiffcontainer').removeClass('rightmodelloading');
- $('.revisiondiffcontainer').removeClass('leftmodelloading');
</del><ins>+ $('#revision-diff-container').removeClass('right-model-loading');
+ $('#revision-diff-container').removeClass('left-model-loading');
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> reloadModel: function() {
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> * The slider
</span><span class="cx"> */
</span><span class="cx"> revisions.view.Slider = Backbone.View.extend({
</span><del>- el: $( '#slider' ),
</del><ins>+ el: $( '#diff-slider' ),
</ins><span class="cx"> singleRevision: true,
</span><span class="cx">
</span><span class="cx"> initialize: function( options ) {
</span><span class="lines">@@ -314,9 +314,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 0 === Diff.leftDiff ) {
</span><del>- $( '.revisiondiffcontainer' ).addClass( 'currentversion' );
</del><ins>+ $( '#revision-diff-container' ).addClass( 'currentversion' );
</ins><span class="cx"> } else {
</span><del>- $( '.revisiondiffcontainer' ).removeClass( 'currentversion' );
</del><ins>+ $( '#revision-diff-container' ).removeClass( 'currentversion' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Diff.revisionView.render();
</span><span class="lines">@@ -380,7 +380,6 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> addTooltip: function( handle, message ) {
</span><del>-
</del><span class="cx"> handle.attr( 'title', '' ).tooltip({
</span><span class="cx"> track: false,
</span><span class="cx">
</span><span class="lines">@@ -406,29 +405,29 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> width: function() {
</span><del>- return $( '#slider' ).width();
</del><ins>+ return $( '#diff-slider' ).width();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setWidth: function( width ) {
</span><del>- return $( '#slider' ).width( width );
</del><ins>+ return $( '#diff-slider' ).width( width );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> refresh: function( options, slide ) {
</span><del>- $( '#slider' ).slider( 'option', options );
</del><ins>+ $( '#diff-slider' ).slider( 'option', options );
</ins><span class="cx">
</span><span class="cx"> // Triggers the slide event
</span><span class="cx"> if ( slide )
</span><del>- $( '#slider' ).trigger( 'slide' );
</del><ins>+ $( '#diff-slider' ).trigger( 'slide' );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> option: function( key ) {
</span><del>- return $( '#slider' ).slider( 'option', key );
</del><ins>+ return $( '#diff-slider' ).slider( 'option', key );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><span class="cx"> var self = this;
</span><span class="cx"> // this.$el doesn't work, why?
</span><del>- $( '#slider' ).slider( {
</del><ins>+ $( '#diff-slider' ).slider( {
</ins><span class="cx"> slide: $.proxy( self.slide, self ),
</span><span class="cx"> start: $.proxy( self.start, self ),
</span><span class="cx"> stop: $.proxy( self.stop, self )
</span><span class="lines">@@ -465,7 +464,6 @@
</span><span class="cx">
</span><span class="cx"> Diff.slider.setWidth( sliderWidth );
</span><span class="cx"> $( '.diff-slider-ticks-wrapper' ).width( sliderWidth );
</span><del>- $( '#diffslider' ).width( sliderWidth );
</del><span class="cx"> $( '#diff-slider-ticks' ).width( sliderWidth );
</span><span class="cx">
</span><span class="cx"> var aTickWidth = $( '.revision-tick' ).width();
</span><span class="lines">@@ -507,8 +505,8 @@
</span><span class="cx"> */
</span><span class="cx"> // TODO: Change Interact to something else.
</span><span class="cx"> revisions.view.Interact = Backbone.View.extend({
</span><del>- el: $('#backbonerevisionsinteract'),
- template: wp.template('revision-interact'),
</del><ins>+ el: $( '#revision-interact' ),
+ template: wp.template( 'revision-interact' ),
</ins><span class="cx">
</span><span class="cx"> // next and previous buttons, only available in compare one mode
</span><span class="cx"> events: {
</span><span class="lines">@@ -517,11 +515,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><del>- var self = this;
</del><ins>+ this.$el.html( this.template );
</ins><span class="cx">
</span><del>- var addHtml = this.template;
- this.$el.html( addHtml );
-
</del><span class="cx"> var modelcount = Diff.revisions.length;
</span><span class="cx">
</span><span class="cx"> Diff.slider.singleRevision = Diff.singleRevision;
</span><span class="lines">@@ -534,7 +529,7 @@
</span><span class="cx"> max: modelcount - 1
</span><span class="cx"> });
</span><span class="cx">
</span><del>- $( '.revisiondiffcontainer' ).removeClass( 'comparetwo' );
</del><ins>+ $( '#revision-diff-container' ).removeClass( 'comparing-two-revisions' );
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> Diff.slider.refresh({
</span><span class="lines">@@ -544,9 +539,9 @@
</span><span class="cx"> range: true
</span><span class="cx"> });
</span><span class="cx">
</span><del>- $( '.revisiondiffcontainer' ).addClass( 'comparetwo' );
- $( '#diffslider a.ui-slider-handle' ).first().addClass( 'left-handle' );
- $( '#diffslider a.ui-slider-handle' ).last().addClass( 'right-handle' );
</del><ins>+ $( '#revision-diff-container' ).addClass( 'comparing-two-revisions' );
+ $( '#diff-slider a.ui-slider-handle' ).first().addClass( 'left-handle' );
+ $( '#diff-slider a.ui-slider-handle' ).last().addClass( 'right-handle' );
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -584,14 +579,14 @@
</span><span class="cx"> * Next/Prev buttons and the slider
</span><span class="cx"> */
</span><span class="cx"> revisions.view.Diff = Backbone.View.extend({
</span><del>- el: $('#backbonerevisionsdiff'),
- template: wp.template('revision'),
</del><ins>+ el: $( '#revisions-diff' ),
+ template: wp.template( 'revisions-diff' ),
</ins><span class="cx"> draggingLeft: false,
</span><span class="cx">
</span><span class="cx"> // the compare two button is in this view, add the interaction here
</span><span class="cx"> events: {
</span><del>- 'click #comparetwo': 'compareTwo',
- 'click #restore': 'restore'
</del><ins>+ 'click #compare-two-revisions': 'compareTwo',
+ 'click #restore-revision': 'restore'
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // render the revisions
</span><span class="lines">@@ -613,7 +608,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else { // end compare two revisions mode, eg only one slider handle
</span><del>- this.comparetwochecked = '';
</del><span class="cx"> if ( this.model.at( Diff.rightDiff - 1 ) ) {
</span><span class="cx"> addHtml = this.template( this.model.at( Diff.rightDiff - 1 ).toJSON() );
</span><span class="cx"> }
</span><span class="lines">@@ -621,7 +615,7 @@
</span><span class="cx"> this.$el.html( addHtml );
</span><span class="cx">
</span><span class="cx"> if ( this.model.length < 2 ) {
</span><del>- $( '#diffslider' ).hide(); // don't allow compare two if fewer than three revisions
</del><ins>+ $( '#diff-slider' ).hide(); // don't allow compare two if fewer than three revisions
</ins><span class="cx"> $( '.diff-slider-ticks-wrapper' ).hide();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -640,9 +634,9 @@
</span><span class="cx">
</span><span class="cx"> // hide the restore button when on the last sport/current post data
</span><span class="cx"> if ( Diff.rightDiff === Diff.revisions.length ){
</span><del>- $( '#restore' ).hide();
</del><ins>+ $( '#restore-revision' ).hide();
</ins><span class="cx"> } else {
</span><del>- $( '#restore' ).show();
</del><ins>+ $( '#restore-revision' ).show();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return this;
</span><span class="lines">@@ -651,14 +645,14 @@
</span><span class="cx"> toogleCompareTwoCheckbox: function() {
</span><span class="cx"> // don't allow compare two if fewer than three revisions
</span><span class="cx"> if ( this.model.length < 3 )
</span><del>- $( '#comparetworevisions' ).hide();
</del><ins>+ $( '#toogle-revision-compare-mode' ).hide();
</ins><span class="cx">
</span><del>- $( '#comparetwo' ).prop( 'checked', ! Diff.singleRevision );
</del><ins>+ $( '#compare-two-revisions' ).prop( 'checked', ! Diff.singleRevision );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // turn on/off the compare two mode
</span><span class="cx"> compareTwo: function() {
</span><del>- if ( $( 'input#comparetwo' ).is( ':checked' ) ) { // compare 2 mode
</del><ins>+ if ( $( '#compare-two-revisions' ).is( ':checked' ) ) { // compare 2 mode
</ins><span class="cx"> Diff.singleRevision = false ;
</span><span class="cx">
</span><span class="cx"> if ( 1 === Diff.rightDiff )
</span></span></pre></div>
<a id="trunkwpadminrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/revision.php (23900 => 23901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/revision.php 2013-04-04 08:58:49 UTC (rev 23900)
+++ trunk/wp-admin/revision.php 2013-04-04 15:49:28 UTC (rev 23901)
</span><span class="lines">@@ -75,10 +75,9 @@
</span><span class="cx"> $parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
</span><span class="cx"> else
</span><span class="cx"> $parent_file = $submenu_file = 'edit.php';
</span><ins>+
</ins><span class="cx"> wp_enqueue_script( 'revisions' );
</span><span class="cx">
</span><del>-require_once( './admin-header.php' );
-
</del><span class="cx"> $strings = array(
</span><span class="cx"> 'diffFromTitle' => _x( 'From: %s', 'revision from title' ),
</span><span class="cx"> 'diffToTitle' => _x( 'To: %s', 'revision to title' )
</span><span class="lines">@@ -91,83 +90,80 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $strings['settings'] = $settings;
</span><del>-
</del><span class="cx"> wp_localize_script( 'revisions', 'wpRevisionsL10n', $strings );
</span><span class="cx">
</span><del>-$comparetworevisionslink = get_edit_post_link( $revision->ID );
</del><ins>+require_once( './admin-header.php' );
+
</ins><span class="cx"> ?>
</span><span class="cx">
</span><del>-<div id="backbonerevisionsoptions">
-</div>
</del><span class="cx"> <div class="wrap">
</span><del>- <div class="icon32 icon32-posts-post" id="icon-edit">
- <br>
- </div>
- <div class="revisiondiffcontainer diffsplit currentversion rightmodelloading">
- <div id="modelsloading" class="updated message">
</del><ins>+ <?php screen_icon(); ?>
+ <div id="revision-diff-container" class="current-version right-model-loading">
+ <div id="loading-status" class="updated message">
</ins><span class="cx"> <span class="spinner" ></span> <?php _e( 'Calculating revision diffs' ); ?>
</span><span class="cx"> </div>
</span><ins>+
</ins><span class="cx"> <h2 class="long-header"><?php echo $h2; ?></h2>
</span><ins>+
</ins><span class="cx"> <div class="diff-slider-ticks-wrapper">
</span><del>- <div id="diff-slider-ticks">
- </div>
</del><ins>+ <div id="diff-slider-ticks"></div>
</ins><span class="cx"> </div>
</span><del>- <div id="backbonerevisionsinteract">
- </div>
- <div id="backbonerevisionsdiff">
- </div>
</del><ins>+
+ <div id="revision-interact"></div>
+
+ <div id="revisions-diff"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<script id="tmpl-revision" type="text/html">
- <div id="comparetworevisions">
</del><ins>+<script id="tmpl-revisions-diff" type="text/html">
+ <div id="toogle-revision-compare-mode">
</ins><span class="cx"> <label>
</span><del>- <input type="checkbox" id="comparetwo" />
</del><ins>+ <input type="checkbox" id="compare-two-revisions" />
</ins><span class="cx"> <?php esc_attr_e( 'Compare two revisions' ); ?>
</span><span class="cx"> </label>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="diffsubheader" class="diff-left-hand-meta-row">
- <div id="diff_from_current_revision">
- <?php printf( '<b>%1$s</b> %2$s.' , __( 'From:' ), __( 'the current version' ) ); ?>
</del><ins>+ <div id="diff-header-from" class="diff-header">
+ <div id="diff-title-from-current-version" class="diff-title">
+ <?php printf( '<strong>%1$s</strong> %2$s.' , __( 'From:' ), __( 'the current version' ) ); ?>
</ins><span class="cx"> </div>
</span><del>- <div id="difftitlefrom">
- <div class="diff-from-title"><?php _e( 'From:' ); ?></div>{{{ data.titleFrom }}}
</del><ins>+
+ <div id="diff-title-from" class="diff-title">
+ <strong><?php _e( 'From:' ); ?></strong> {{{ data.titleFrom }}}
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="diffsubheader">
- <div id="difftitle">
- <div class="diff-to-title"><?php _e( 'To:' ); ?></div>{{{ data.titleTo }}}
</del><ins>+ <div id="diff-header-to" class="diff-header">
+ <div id="diff-title-to" class="diff-title">
+ <strong><?php _e( 'To:' ); ?></strong> {{{ data.titleTo }}}
</ins><span class="cx"> </div>
</span><del>- <div id="diffrestore">
- <input class="button button-primary" data-restore-link="{{{ data.restoreLink }}}" type="button" id="restore" value="<?php esc_attr_e( 'Restore This Revision' )?>" />
- </div>
</del><ins>+
+ <input type="button" id="restore-revision" class="button button-primary" data-restore-link="{{{ data.restoreLink }}}" value="<?php esc_attr_e( 'Restore This Revision' )?>" />
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="removedandadded">
- <div id="removed"><?php _e( 'Removed -' ); ?></div>
- <div id="added"><?php _e( 'Added +' ); ?></div>
</del><ins>+ <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>
</ins><span class="cx"> </div
</span><ins>+
</ins><span class="cx"> <div>{{{ data.diff }}}</div>
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script id="tmpl-revision-interact" type="text/html">
</span><del>- <div id="diffheader">
- <div id="diffprevious"><input class="button" type="submit" id="previous" value="<?php esc_attr_e( 'Previous' ); ?>" />
- </div>
- <div id="diffnext"><input class="button" type="submit" id="next" value="<?php esc_attr_e( 'Next' ); ?>" />
- </div>
- <div id="diffslider">
- <div id="slider" class="wp-slider">
- </div>
- </div>
</del><ins>+ <div id="diff-previous-revision">
+ <input class="button" type="button" id="previous" value="<?php esc_attr_e( 'Previous' ); ?>" />
</ins><span class="cx"> </div>
</span><ins>+
+ <div id="diff-next-revision">
+ <input class="button" type="button" id="next" value="<?php esc_attr_e( 'Next' ); ?>" />
+ </div>
+
+ <div id="diff-slider" class="wp-slider"></div>
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script id="tmpl-revision-ticks" type="text/html">
</span><del>- <div class="revision-tick revision-toload{{{ data.revision_toload }}} revision-scopeofchanges-{{{ data.scope_of_changes }}}">
- </div>
</del><ins>+ <div class="revision-tick loading-{{{ data.revision_toload }}} scope-of-changes-{{{ data.scope_of_changes }}}"></div>
</ins><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> require_once( './admin-footer.php' );
</span></span></pre>
</div>
</div>
</body>
</html>