WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revisions UI: Just another update - Now with improved tick marks and tooltips. 

props adamsilverstein. see #23935.

git-svn-id: http://core.svn.wordpress.org/trunk@24174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2013-05-03 23:17:06 +00:00
parent baab49b174
commit 2f1777986c
5 changed files with 147 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/css/colors-classic.css
View File

@ -1482,7 +1482,8 @@ table.diff .diff-addedline ins {
border: 1px solid #d1e5ee; border: 1px solid #d1e5ee;
} }
#diff-slider .ui-slider-tooltip { #diff-slider .ui-slider-tooltip,
#diff-slider-ticks .ui-slider-tooltip {
border-color: #d1e5ee; border-color: #d1e5ee;
background-color: #fff; background-color: #fff;
} }
@ -1502,26 +1503,30 @@ table.diff .diff-addedline ins {
background-image: none; background-image: none;
} }
.revision-tick.scope-of-changes-vsmall { .revision-tick.scope-of-changes-none {
background-color: #d1e5ee; background-color: #d1e5ee;
} }
.revision-tick.scope-of-changes-small { .revision-tick.scope-of-changes-vsmall {
background-color: #b4d5e3; background-color: #b4d5e3;
} }
.revision-tick.scope-of-changes-med { .revision-tick.scope-of-changes-small {
background-color: #98c5d9; background-color: #98c5d9;
} }
.revision-tick.scope-of-changes-large { .revision-tick.scope-of-changes-med {
background-color: #7bb4ce; background-color: #7bb4ce;
} }
.revision-tick.scope-of-changes-vlarge { .revision-tick.scope-of-changes-large {
background-color: #5ea4c4; background-color: #5ea4c4;
} }
.revision-tick.scope-of-changes-vlarge {
background-color: #4493b7;
}
.diff-label { .diff-label {
color: #666; color: #666;
} }

22
wp-admin/css/colors-fresh.css
View File

@ -1376,7 +1376,8 @@ table.diff .diff-addedline ins {
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
} }
#diff-slider .ui-slider-tooltip { #diff-slider .ui-slider-tooltip,
#diff-slider-ticks .ui-slider-tooltip {
border-color: #d7d7d7; border-color: #d7d7d7;
background-color: #fff; background-color: #fff;
} }
@ -1400,35 +1401,34 @@ table.diff .diff-addedline ins {
background-image: none; background-image: none;
} }
.revision-tick.scope-of-changes-vsmall { .revision-tick.scope-of-changes-none {
background-color: #d7d7d7; background-color: #d7d7d7;
} }
.revision-tick.scope-of-changes-small { .revision-tick.scope-of-changes-vsmall {
background-color: #c3c3c3; background-color: #c3c3c3;
} }
.revision-tick.scope-of-changes-med { .revision-tick.scope-of-changes-small {
background-color: #b0b0b0; background-color: #b0b0b0;
} }
.revision-tick.scope-of-changes-large { .revision-tick.scope-of-changes-med {
background-color: #9c9c9c; background-color: #9c9c9c;
} }
.revision-tick.scope-of-changes-vlarge { .revision-tick.scope-of-changes-large {
background-color: #898989; background-color: #898989;
} }
.revision-tick.scope-of-changes-vlarge {
background-color: #757575;
}
.diff-label { .diff-label {
color: #666; color: #666;
} }
body .ui-tooltip {
border-color: #d7d7d7;
background-color: #fff;
}
/* jQuery UI Slider */ /* jQuery UI Slider */
.wp-slider.ui-slider { .wp-slider.ui-slider {
border-color: #d7d7d7; border-color: #d7d7d7;

74
wp-admin/css/wp-admin.css
View File

@ -3585,6 +3585,9 @@ table.diff .diff-addedline ins {
#loading-status { #loading-status {
display: none; display: none;
position: absolute;
top: 8px;
z-index: 1000;
} }
#loading-status .spinner { #loading-status .spinner {
@ -3619,11 +3622,12 @@ table.diff .diff-addedline ins {
width: 95%; width: 95%;
} }
#diff-slider .ui-slider-tooltip { #diff-slider .ui-slider-tooltip,
#diff-slider-ticks .ui-slider-tooltip {
display: none; display: none;
position: absolute; position: absolute;
bottom: 20px; bottom: 21px;
margin-left: -4em; margin-left: -74px;
} }
#diff-slider .ui-state-active .ui-slider-tooltip, #diff-slider .ui-state-active .ui-slider-tooltip,
@ -3640,17 +3644,6 @@ table.diff .diff-addedline ins {
display: inline; display: inline;
} }
.diff-slider-ticks-wrapper {
margin: 0 auto;
text-align: center;
}
#diff-slider-ticks {
position: absolute;
z-index: 2;
margin-top: 20px;
}
.diff-label { .diff-label {
margin: 20px 0 5px; margin: 20px 0 5px;
padding-left: 3px; padding-left: 3px;
@ -3705,38 +3698,59 @@ table.diff .diff-addedline ins {
display: block; display: block;
} }
.diff-slider-ticks-wrapper {
margin: 0 auto;
text-align: left;
}
#diff-slider-ticks {
position: absolute;
z-index: 2;
margin-top: 20px;
}
.revision-tick { .revision-tick {
width: 1px; width: 1px;
float: left; float: left;
margin: 1px 15px 0 0; margin: 1px 0 0 0;
height: .8em; height: .8em;
padding: 0; padding: 0;
margin-left: 0px; margin-left: 0px;
cursor: pointer;
} }
.revision-tick.scope-of-changes-vsmall { #diff-slider-ticks .revision-tick:first-child {
border-bottom-left-radius: 3px;
border-top-left-radius: 3px;
}
#diff-slider-ticks .revision-tick:last-child {
border-bottom-right-radius: 3px;
border-top-right-radius: 3px;
}
.revision-tick.scope-of-changes-none {
width: 1px; width: 1px;
} }
.revision-tick.scope-of-changes-small { .revision-tick.scope-of-changes-vsmall {
width: 2px; width: 2px;
margin-left: -1px; }
.revision-tick.scope-of-changes-small {
width: 3px;
} }
.revision-tick.scope-of-changes-med { .revision-tick.scope-of-changes-med {
width: 3px; width: 4px;
margin-left: -2px;
} }
.revision-tick.scope-of-changes-large { .revision-tick.scope-of-changes-large {
width: 4px; width: 5px;
margin-left: -3px;
} }
.revision-tick.scope-of-changes-vlarge { .revision-tick.scope-of-changes-vlarge {
margin-left: -3px; width: 6px;
width: 4px;
left: 1;
} }
.diff-loading { .diff-loading {
@ -3757,6 +3771,7 @@ table.diff .diff-addedline ins {
.ui-slider-tooltip img { .ui-slider-tooltip img {
float: left; float: left;
margin-right: 5px; margin-right: 5px;
margin-top: 5px;
} }
@ -3852,13 +3867,8 @@ body .ui-slider-tooltip {
font-size: .7em; font-size: .7em;
display: block; display: block;
border: 0; border: 0;
background-color: transparent;
background-color: #8cc1e9; background-image: none;
background-image: -webkit-gradient(linear, left bottom, left top, from(#72a7cf), to(#8cc1e9));
background-image: -webkit-linear-gradient(bottom, #72a7cf, #8cc1e9);
background-image: -moz-linear-gradient(bottom, #72a7cf, #8cc1e9);
background-image: -o-linear-gradient(bottom, #72a7cf, #8cc1e9);
background-image: linear-gradient(to top, #72a7cf, #8cc1e9);
} }
.wp-slider.ui-slider-horizontal { .wp-slider.ui-slider-horizontal {

129
wp-admin/js/revisions.js
View File

@ -40,12 +40,13 @@ window.wp = window.wp || {};
slider: null, // the slider instance slider: null, // the slider instance
constructor: function() { constructor: function() {
var self = this;
this.slider = new revisions.view.Slider(); this.slider = new revisions.view.Slider();
if ( null === this.revisions ) { if ( null === this.revisions ) {
this.revisions = new Revisions(); // set up collection this.revisions = new Revisions(); // set up collection
this.startRightModelLoading(); this.startRightModelLoading();
var self = this;
this.revisions.fetch({ // load revision data this.revisions.fetch({ // load revision data
success: function() { success: function() {
self.stopRightModelLoading(); self.stopRightModelLoading();
@ -58,7 +59,8 @@ window.wp = window.wp || {};
loadDiffs: function( models ) { loadDiffs: function( models ) {
var self = this, var self = this,
revisionsToLoad = models.where( { completed: false } ), revisionsToLoad = models.where( { completed: false } ),
delay = 0; delay = 0,
totalChanges;
// match slider to passed revision_id // match slider to passed revision_id
_.each( revisionsToLoad, function( revision ) { _.each( revisionsToLoad, function( revision ) {
@ -79,9 +81,7 @@ window.wp = window.wp || {};
if ( 0 === models.where( { completed: false } ).length ) if ( 0 === models.where( { completed: false } ).length )
self.stopModelLoadingSpinner(); self.stopModelLoadingSpinner();
self.tickmarkView.render(); totalChanges = model.get( 'linesAdded' ) + model.get( 'linesDeleted' ),
var totalChanges = model.get( 'linesAdded' ) + model.get( 'linesDeleted' ),
scopeOfChanges = 'vsmall'; scopeOfChanges = 'vsmall';
// Note: hard coded scope of changes // Note: hard coded scope of changes
@ -101,7 +101,7 @@ window.wp = window.wp || {};
// reload if current model refreshed // reload if current model refreshed
self.revisionView.render(); self.revisionView.render();
} }
self.tickmarkView.render();
} }
} ); } );
}, delay ) ; }, delay ) ;
@ -191,8 +191,7 @@ window.wp = window.wp || {};
self.slider.refresh({ self.slider.refresh({
'max': self.revisions.length 'max': self.revisions.length
}); });
// ensure right handle not beyond length, in particular if viewing autosaves is switched from on to off // ensure right handle not beyond length
// the number of models in the collection might get shorter, this ensures right handle is not beyond last model
if ( self.rightDiff > self.revisions.length ) if ( self.rightDiff > self.revisions.length )
self.rightDiff = self.revisions.length; self.rightDiff = self.revisions.length;
}, },
@ -274,7 +273,6 @@ window.wp = window.wp || {};
model: this.revisions model: this.revisions
}); });
this.tickmarkView.render(); this.tickmarkView.render();
this.tickmarkView.resetTicks();
} }
}); });
@ -401,10 +399,6 @@ window.wp = window.wp || {};
refresh: function( options, slide ) { refresh: function( options, slide ) {
$( '#diff-slider' ).slider( 'option', options ); $( '#diff-slider' ).slider( 'option', options );
// reset all of the slider tooltips during a refresh, but not on prev/next button actions
if ( ! slide )
$( 'a.ui-slider-handle' ).html( '<span class="ui-slider-tooltip ui-widget-content ui-corner-all"></span>' );
// Triggers the slide event // Triggers the slide event
if ( slide ) if ( slide )
$( '#diff-slider' ).trigger( 'slide' ); $( '#diff-slider' ).trigger( 'slide' );
@ -441,41 +435,87 @@ window.wp = window.wp || {};
model: Revision, model: Revision,
resetTicks: function() { resetTicks: function() {
var sliderMax = Diff.slider.option( 'max' ); var sliderMax, sliderWidth, adjustMax, tickWidth, tickCount = 0, aTickWidth, tickMargin, self = this, firstTick, lastTick;
var sliderWidth = Diff.slider.width(); sliderMax = Diff.slider.option( 'max' );
var adjustMax = Diff.singleRevision ? 0 : 1; sliderWidth = Diff.slider.width();
var tickWidth = Math.floor( sliderWidth / ( sliderMax - adjustMax ) ); adjustMax = Diff.singleRevision ? 0 : 1;
tickWidth = Math.floor( sliderWidth / ( sliderMax - adjustMax ) );
tickWidth = ( tickWidth > 50 ) ? 50 : tickWidth; // set minimum and maximum widths for tick marks
tickWidth = ( tickWidth < 10 ) ? 10 : tickWidth;
sliderWidth = tickWidth * ( sliderMax - adjustMax ); //calculate the slider width
aTickWidth = $( '.revision-tick' ).width();
// TODO: adjust right margins for wider ticks so they stay centered on handle stop point if ( tickWidth !== aTickWidth ) { // is the width already set correctly?
$( '.revision-tick' ).each( function() {
tickMargin = Math.floor( ( tickWidth - $( this ).width() ) / 2 ) + 1;
$( this ).css( 'border-left', tickMargin + 'px solid #f7f7f7'); // space the ticks out using margins
$( this ).css( 'border-right', ( tickWidth - tickMargin - $( this ).width() ) + 'px solid #f7f7f7'); // space the ticks out using margins
});
firstTick = $( '.revision-tick' ).first(); //cache selectors for optimization
lastTick = $( '.revision-tick' ).last();
// set minimum and maximum widths for tick marks sliderWidth = sliderWidth + Math.ceil( ( tickWidth - ( lastTick.outerWidth() - lastTick.innerWidth() ) ) / 2 ); // room for the last tick
tickWidth = (tickWidth > 50 ) ? 50 : tickWidth; sliderWidth = sliderWidth + Math.ceil( ( tickWidth - ( firstTick.outerWidth() - firstTick.innerWidth() ) ) / 2 ); // room for the first tick
tickWidth = (tickWidth < 10 ) ? 10 : tickWidth; firstTick.css( 'border-left', 'none' ); // first tick gets no left border
lastTick.css( 'border-right', 'none' ); // last tick gets no right border
sliderWidth = tickWidth * (sliderMax - adjustMax ) + 1; }
/**
* reset the slider width
*/
Diff.slider.setWidth( sliderWidth ); Diff.slider.setWidth( sliderWidth );
$( '.diff-slider-ticks-wrapper' ).width( sliderWidth ); $( '.diff-slider-ticks-wrapper' ).width( sliderWidth );
$( '#diff-slider-ticks' ).width( sliderWidth ); $( '#diff-slider-ticks' ).width( sliderWidth );
var aTickWidth = $( '.revision-tick' ).width(); /**
* go through all ticks, add hover and click interactions
if ( tickWidth !== aTickWidth ) { // is the width already set correctly? */
$( '.revision-tick' ).each( function( ) { $( '.revision-tick' ).each( function() {
$(this).css( 'margin-right', tickWidth - 1 + 'px'); // space the ticks out using right margin Diff.slider.addTooltip ( $( this ), Diff.revisions.at( tickCount++ ).get( 'titleTooltip' ) );
}); $( this ).hover(
function() {
$( '.revision-tick' ).last().css( 'margin-right', '0' ); // last tick gets no right margin $( this ).find( '.ui-slider-tooltip' ).show().append('<div class="arrow"></div>');
} },
function() {
$( this ).find( '.ui-slider-tooltip' ).hide().find( '.arrow' ).remove();
}
);
/**
* move the slider handle when the tick marks are clicked
*/
$( this ).on( 'click',
{ tickCount: tickCount }, // //pass the tick through so we know where to move the handle
function( event ) {
if ( Diff.slider.singleRevision ) { //single handle mode
Diff.rightDiff = event.data.tickCount; //reposition the right handle
Diff.slider.refresh({
value: Diff.rightDiff - 1
} );
} else { //compare two mode
if ( event.data.tickCount < Diff.leftDiff ||
isRtl && event.data.tickCount > Diff.leftDiff ) { // click was on the 'left' side
Diff.leftDiff = event.data.tickCount; // set the left handle location
Diff.reloadRight(); //reload the right handle comparison models
} else { //middle or 'right' clicks
Diff.rightDiff = event.data.tickCount; // set the right handle location
Diff.reloadLeft(); //reload left handle models
}
Diff.slider.refresh( { // set the slider handle positions
values: [ Diff.leftDiff, Diff.rightDiff ]
} );
}
Diff.revisionView.render(); // render the main view
} );
} );
}, },
// render the tickmark view // render the tick mark view
render: function() { render: function() {
var self = this; var self = this, addHtml;
if ( null !== self.model ) { if ( null !== self.model ) {
var addHtml = ""; addHtml = "";
_.each ( self.model.models, function( theModel ) { _.each ( self.model.models, function( theModel ) {
addHtml = addHtml + self.template ( theModel.toJSON() ); addHtml = addHtml + self.template ( theModel.toJSON() );
}); });
@ -485,7 +525,7 @@ window.wp = window.wp || {};
self.resetTicks(); self.resetTicks();
return self; return self;
} }
}); } );
/** /**
* wp.revisions.view.Interact * wp.revisions.view.Interact
@ -504,9 +544,10 @@ window.wp = window.wp || {};
}, },
render: function() { render: function() {
var modelcount;
this.$el.html( this.template ); this.$el.html( this.template );
var modelcount = Diff.revisions.length; modelcount = Diff.revisions.length;
Diff.slider.singleRevision = Diff.singleRevision; Diff.slider.singleRevision = Diff.singleRevision;
Diff.slider.render(); Diff.slider.render();
@ -580,8 +621,7 @@ window.wp = window.wp || {};
// render the revisions // render the revisions
render: function() { render: function() {
var addHtml = ''; var addHtml = '', thediff;
var thediff;
// compare two revisions mode? // compare two revisions mode?
if ( ! Diff.singleRevision ) { if ( ! Diff.singleRevision ) {
@ -608,17 +648,6 @@ window.wp = window.wp || {};
$( '.diff-slider-ticks-wrapper' ).hide(); $( '.diff-slider-ticks-wrapper' ).hide();
} }
// add tooltips to the handles
if ( ! Diff.singleRevision ) {
Diff.slider.addTooltip ( $( 'a.ui-slider-handle.left-handle' ),
( Diff.leftDiff < 0 ) ? '' : Diff.revisions.at( Diff.leftDiff - 1 ).get( 'titleTooltip' ) );
Diff.slider.addTooltip ( $( 'a.ui-slider-handle.right-handle' ),
( Diff.rightDiff > Diff.revisions.length ) ? '' : Diff.revisions.at( Diff.rightDiff - 1 ).get( 'titleTooltip' ) );
} else {
Diff.slider.addTooltip ( $( 'a.ui-slider-handle' ),
( Diff.rightDiff > Diff.revisions.length ) ? '' : Diff.revisions.at( Diff.rightDiff - 1 ).get( 'titleTooltip' ) );
}
this.toggleCompareTwoCheckbox(); this.toggleCompareTwoCheckbox();
// hide the restore button when on the last sport/current post data // hide the restore button when on the last sport/current post data

6
wp-admin/revision.php
View File

@ -118,7 +118,7 @@ require_once( './admin-header.php' );
<h2 class="long-header"><?php echo $h2; ?></h2> <h2 class="long-header"><?php echo $h2; ?></h2>
<div id="loading-status" class="updated message"> <div id="loading-status" class="updated message">
<p><span class="spinner" ></span> <?php _e( 'Calculating revision diffs' ); ?></p> <p><span class="spinner" ></span></p>
</div> </div>
<div class="diff-slider-ticks-wrapper"> <div class="diff-slider-ticks-wrapper">
@ -173,7 +173,9 @@ require_once( './admin-header.php' );
</script> </script>
<script id="tmpl-revision-ticks" type="text/html"> <script id="tmpl-revision-ticks" type="text/html">
<div class="revision-tick completed-{{{ data.completed }}} scope-of-changes-{{{ data.scopeOfChanges }}}"></div> <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> </script>
<?php <?php
require_once( './admin-footer.php' ); require_once( './admin-footer.php' );