Index: wp-admin/css/colors-classic.css
===================================================================
--- wp-admin/css/colors-classic.css (revision 24759)
+++ wp-admin/css/colors-classic.css (working copy)
@@ -164,7 +164,7 @@
color: #fff;
}
-#diff-header,
+.revisions-meta,
.widget .widget-top,
.postbox h3,
.stuffbox h3,
@@ -1481,10 +1481,19 @@
background-color: #afa;
}
-#diff-header {
+.revisions-meta {
border: 1px solid #d1e5ee;
}
+.revisions-controls {
+ background: #fff;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0%,rgba(255,255,255,1)), color-stop(30px,rgba(255,255,255,1)), color-stop(100%,rgba(255,255,255,1)));
+ background: -webkit-linear-gradient(bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
+ background: -moz-linear-gradient(bottom, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
+ background: -o-linear-gradient(bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
+ background: linear-gradient(to top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
+}
+
.revisions-tooltip,
.revisions-tooltip-arrow span {
border-color: #d1e5ee;
@@ -1491,14 +1500,13 @@
background-color: #fff;
}
-#diff-title-to strong {
- color: #08a;
+.revisions-tickmarks > div {
+ border-color: #d1e5ee;
}
/* jQuery UI Slider */
.wp-slider.ui-slider {
border-color: #d1e5ee;
- background: #eff8ff;
}
.wp-slider .ui-slider-handle {
@@ -1507,7 +1515,6 @@
}
.wp-slider .ui-slider-handle {
- border-color: #ccc;
border-color: #d0dfe9;
background: #eff8ff;
background-image: -webkit-gradient(linear, left bottom, left top, from(#eff8ff), to(#fff));
Index: wp-admin/css/colors-fresh.css
===================================================================
--- wp-admin/css/colors-fresh.css (revision 24759)
+++ wp-admin/css/colors-fresh.css (working copy)
@@ -164,7 +164,7 @@
color: #fff;
}
-#diff-header,
+.revisions-meta,
.widget .widget-top,
.postbox h3,
.stuffbox h3,
@@ -1375,10 +1375,19 @@
background-color: #afa;
}
-#diff-header {
+.revisions-meta {
border: 1px solid #dfdfdf;
}
+.revisions-controls {
+ background: #fff;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0%,rgba(255,255,255,1)), color-stop(30px,rgba(255,255,255,1)), color-stop(100%,rgba(255,255,255,1)));
+ background: -webkit-linear-gradient(bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
+ background: -moz-linear-gradient(bottom, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
+ background: -o-linear-gradient(bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
+ background: linear-gradient(to top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
+}
+
.revisions-tooltip,
.revisions-tooltip-arrow span {
border-color: #d7d7d7;
@@ -1389,14 +1398,9 @@
border-color: #aaa;
}
-#diff-title-to strong {
- color: #08a;
-}
-
/* jQuery UI Slider */
.wp-slider.ui-slider {
border-color: #d7d7d7;
- background: transparent;
}
.wp-slider .ui-slider-handle {
Index: wp-admin/css/wp-admin-rtl.css
===================================================================
--- wp-admin/css/wp-admin-rtl.css (revision 24759)
+++ wp-admin/css/wp-admin-rtl.css (working copy)
@@ -976,6 +976,14 @@
padding: 9px 0 0 9px;
}
+.revisions .loading-indicator {
+ margin-right: -90px;
+}
+
+body.folded .revisions .loading-indicator {
+ margin-right: -32px;
+}
+
.revisions-next {
float: left;
}
@@ -984,10 +992,6 @@
float: right;
}
-#diff-header {
- padding: 5px 5px 5px 200px;
-}
-
.diff-title {
float: right;
}
@@ -1004,7 +1008,7 @@
margin-right: 5px;
}
-.diff-header > input.restore-revision {
+.diff-meta > input.restore-revision {
margin-left: 0;
margin-right: 10px;
}
@@ -1027,13 +1031,13 @@
.revisions-tooltip {
margin-left: 0;
margin-right: -70px;
- -webkit-transition: right 15ms;
- -moz-transition: right 15ms;
- -ms-transition: right 15ms;
- -o-transition: right 15ms;
- transition: right 15ms;
}
+.revisions-tooltip.flipped {
+ margin-right: 0;
+ margin-left: -70px;
+}
+
.ie8 .revisions-tooltip {
margin-right: -75px;
}
@@ -1044,10 +1048,22 @@
margin-right: 35px;
}
+.revisions-tooltip.flipped .revisions-tooltip-arrow {
+ margin-right: 0;
+ margin-left: 35px;
+ right: auto;
+ left: 0;
+}
+
.revisions-tooltip-arrow > span {
right: 20px;
}
+.revisions-tooltip.flipped .revisions-tooltip-arrow > span {
+ right: auto;
+ left: 20px;
+}
+
.revisions-tooltip img {
float: right;
margin: 2px 0 0 5px;
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css (revision 24759)
+++ wp-admin/css/wp-admin.css (working copy)
@@ -3519,6 +3519,7 @@
.revisions-controls {
padding-top: 40px;
height: 100px;
+ z-index: 1;
}
.revisions-controls input[type="checkbox"] {
@@ -3527,6 +3528,12 @@
vertical-align: text-bottom;
}
+.revisions.pinned .revisions-controls {
+ position: fixed;
+ top: 0;
+ padding-bottom: 10px;
+}
+
.revisions-tickmarks {
position: relative;
margin: 0 auto;
@@ -3571,11 +3578,12 @@
}
.revisions .loading-indicator {
- position: absolute;
+ position: fixed;
vertical-align: middle;
opacity: 0;
width: 100%;
- top: 3em;
+ top: 50%;
+ margin-left: -90px;
-webkit-transition: opacity 0.5s;
-moz-transition: opacity 0.5s;
-ms-transition: opacity 0.5s;
@@ -3584,6 +3592,10 @@
filter: alpha(opacity=0); /* ie8 and earlier */
}
+body.folded .revisions .loading-indicator {
+ margin-left: -32px;
+}
+
.revisions .loading-indicator span.spinner {
display: block;
margin: 0 auto;
@@ -3623,10 +3635,22 @@
}
.comparing-two-revisions .revisions-previous,
-.comparing-two-revisions .revisions-next {
+.comparing-two-revisions .revisions-next,
+.revisions-meta .diff-meta-to strong {
display: none;
}
+.revisions-controls .author-card .date {
+ color: #777;
+}
+.revisions-controls .author-card .author-name {
+ font-weight: bold;
+}
+
+.comparing-two-revisions .diff-meta-to strong {
+ display: block;
+}
+
.revisions-previous,
.revisions-next {
position: relative;
@@ -3689,49 +3713,50 @@
text-decoration: none;
}
-#diff-title-to strong {
- display: inline;
-}
-
-#diff-header {
+.diff-meta {
-webkit-border-radius: 3px;
border-radius: 3px;
padding: 5px;
clear: both;
+ min-height: 32px;
}
-.diff-header {
- min-height: 35px;
- line-height: 35px;
+.diff-title strong {
+ line-height: 32px;
+ min-width: 60px;
+ text-align: right;
+ float: left;
+ margin-right: 5px;
}
-.diff-title {
+.revisions-controls .author-card .avatar,
+.revisions-controls .author-card .author-info {
float: left;
+ margin-left: 6px;
+ margin-right: 6px;
}
-.diff-title strong {
- font-size: 14px;
- width: 60px;
- text-align: right;
- float: left;
- margin-right: 5px;
+.revisions-controls .author-card .byline {
+ display: block;
+ font-size: 12px;
}
-.diff-title img {
+.revisions-controls .author-card .avatar {
vertical-align: middle;
- margin-left: 5px;
}
-.diff-header > input.restore-revision {
- margin-left: 10px;
+.diff-meta input.restore-revision {
+ float: right;
+ margin-left: 6px;
+ margin-right: 6px;
+ margin-top: 4px;
}
-#diff-header-from {
+.diff-meta-from {
display: none;
}
-.comparing-two-revisions #diff-title-from,
-.comparing-two-revisions #diff-header-from {
+.comparing-two-revisions .diff-meta-from {
display: block;
}
@@ -3740,31 +3765,27 @@
bottom: 105px;
margin-right: 0;
margin-left: -70px;
- line-height: 28px;
z-index: 1;
max-width: 350px;
min-width: 130px;
- padding: 4px;
+ padding: 8px 4px;
display: none;
opacity: 0;
- -webkit-transition: left 15ms;
- -moz-transition: left 15ms;
- -ms-transition: left 15ms;
- -o-transition: left 15ms;
- transition: left 15ms;
}
+.revisions-tooltip.flipped {
+ margin-left: 0;
+ margin-right: -70px;
+}
+
+.revisions.pinned .revisions-tooltip {
+ display: none !important;
+}
+
.comparing-two-revisions .revisions-tooltip {
bottom: 145px;
}
-.revisions-tooltip img {
- float: left;
- margin: 2px 5px 0 0;
- padding: 0;
- vertical-align: middle;
-}
-
.revisions-tooltip-arrow {
width: 70px;
height: 15px;
@@ -3776,6 +3797,13 @@
z-index: 10000;
}
+.revisions-tooltip.flipped .revisions-tooltip-arrow {
+ margin-left: 0;
+ margin-right: 35px;
+ left: auto;
+ right: 0;
+}
+
.revisions-tooltip-arrow > span {
content: "";
position: absolute;
@@ -3790,10 +3818,15 @@
tranform: rotate(45deg);
}
+.revisions-tooltip.flipped .revisions-tooltip-arrow > span {
+ left: auto;
+ right: 20px;
+}
+
.ie8 .revisions-tooltip-arrow > span {
left: 14px;
top: -25px;
- -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */
+ -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)";
}
.revisions-tooltip,
Index: wp-admin/includes/revision.php
===================================================================
--- wp-admin/includes/revision.php (revision 24759)
+++ wp-admin/includes/revision.php (working copy)
@@ -99,7 +99,7 @@
foreach ( $revisions as $revision ) {
$modified = strtotime( $revision->post_modified );
$modified_gmt = strtotime( $revision->post_modified_gmt );
- $restore_link = wp_nonce_url(
+ $restore_link = str_replace( '&', '&', wp_nonce_url(
add_query_arg(
array( 'revision' => $revision->ID,
'action' => 'restore' ),
@@ -106,12 +106,12 @@
admin_url( 'revision.php' )
),
"restore-post_{$revision->ID}"
- );
+ ) );
if ( ! isset( $authors[ $revision->post_author ] ) ) {
$authors[ $revision->post_author ] = array(
'id' => (int) $revision->post_author,
- 'avatar' => $show_avatars ? get_avatar( $revision->post_author, 24 ) : '',
+ 'avatar' => $show_avatars ? get_avatar( $revision->post_author, 32 ) : '',
'name' => get_the_author_meta( 'display_name', $revision->post_author ),
);
}
Index: wp-admin/js/revisions.js
===================================================================
--- wp-admin/js/revisions.js (revision 24759)
+++ wp-admin/js/revisions.js (working copy)
@@ -531,6 +531,8 @@
className: 'revisions-controls',
initialize: function() {
+ _.bindAll( this, 'setWidth' );
+
// Add the button view
this.views.add( new revisions.view.Buttons({
model: this.model
@@ -573,7 +575,40 @@
this.views.add( new revisions.view.Meta({
model: this.model
}) );
+ },
+ ready: function() {
+ this.top = this.$el.offset().top;
+ this.window = $(window);
+ this.window.on( 'scroll.wp.revisions', {controls: this}, function(e) {
+ var controls = e.data.controls;
+ var container = controls.$el.parent();
+ var scrolled = controls.window.scrollTop();
+ var frame = controls.views.parent;
+
+ if ( scrolled >= controls.top ) {
+ if ( ! frame.$el.hasClass('pinned') ) {
+ controls.setWidth();
+ container.css('height', container.height() + 'px' );
+ controls.window.on('resize.wp.revisions.pinning click.wp.revisions.pinning', {controls: controls}, function(e) {
+ e.data.controls.setWidth();
+ });
+ }
+ frame.$el.addClass('pinned');
+ } else if ( frame.$el.hasClass('pinned') ) {
+ controls.window.off('.wp.revisions.pinning');
+ controls.$el.css('width', 'auto');
+ frame.$el.removeClass('pinned');
+ container.css('height', 'auto');
+ controls.top = controls.$el.offset().top;
+ } else {
+ controls.top = controls.$el.offset().top;
+ }
+ });
+ },
+
+ setWidth: function() {
+ this.$el.css('width', this.$el.parent().width() + 'px');
}
});
@@ -592,15 +627,18 @@
tick = this.$('div:nth-of-type(' + index + ')');
offset = tick.allPositions();
elWidth = tick.outerWidth();
- // adjust
_.extend( offset, {
- right: offset.right + elWidth + 1,
- left: offset.left + elWidth + 1
+ rightPlusWidth: offset.right,
+ leftPlusWidth: offset.left
});
} else {
// Normal tick
tick = this.$('div:nth-of-type(' + (index + 1) + ')');
offset = tick.allPositions();
+ _.extend( offset, {
+ leftPlusWidth: offset.left + tick.outerWidth() + 1,
+ rightPlusWidth: offset.right + tick.outerWidth() + 1
+ });
}
this.model.set({ offset: offset });
},
@@ -626,7 +664,7 @@
},
initialize: function() {
- this.listenTo( this.model, 'update:revisions', this.ready );
+ this.listenTo( this.model, 'update:revisions', this.render );
},
prepare: function() {
@@ -633,13 +671,8 @@
return this.model.toJSON();
},
- ready: function() {
- this.$('.restore-revision').prop( 'disabled', this.model.get('to').get('current') );
- },
-
restoreRevision: function() {
- var restoreUrl = this.model.get('to').attributes.restoreUrl.replace(/&/g, '&');
- document.location = restoreUrl;
+ document.location = this.model.get('to').attributes.restoreUrl;
}
});
@@ -677,7 +710,6 @@
revisions.view.Tooltip = wp.Backbone.View.extend({
className: 'revisions-tooltip',
template: wp.template('revisions-tooltip'),
- direction: isRtl ? 'right' : 'left',
initialize: function( options ) {
this.listenTo( this.model, 'change:offset', this.render );
@@ -690,10 +722,20 @@
},
render: function() {
- var css = {};
+ var direction, directionVal, flipped, css = {}, position = this.model.revisions.indexOf( this.model.get('revision') ) + 1;
+ flipped = ( position / this.model.revisions.length ) > 0.5;
+ if ( isRtl ) {
+ direction = flipped ? 'left' : 'right';
+ directionVal = flipped ? 'leftPlusWidth' : direction;
+ } else {
+ direction = flipped ? 'right' : 'left';
+ directionVal = flipped ? 'rightPlusWidth' : direction;
+ }
+ otherDirection = 'right' === direction ? 'left': 'right';
wp.Backbone.View.prototype.render.apply( this, arguments );
- css[this.direction] = this.model.get('offset')[this.direction] + 'px';
- this.$el.css( css );
+ css[direction] = this.model.get('offset')[directionVal] + 'px';
+ css[otherDirection] = '';
+ this.$el.toggleClass( 'flipped', flipped ).css( css );
},
visible: function() {
@@ -716,8 +758,8 @@
template: wp.template('revisions-buttons'),
events: {
- 'click #next': 'nextRevision',
- 'click #previous': 'previousRevision'
+ 'click .revisions-next .button': 'nextRevision',
+ 'click .revisions-previous .button': 'previousRevision'
},
initialize: function() {
Index: wp-admin/revision.php
===================================================================
--- wp-admin/revision.php (revision 24759)
+++ wp-admin/revision.php (working copy)
@@ -122,20 +122,23 @@