| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -168,6 +168,7 @@ |
| 169 | 169 | edit in a batch group. Isolated and patched by Travis Derouin. |
| 170 | 170 | * Fix for paths in 1.4->1.5 special-case updater script |
| 171 | 171 | * (bug 8789) AJAX search: IE users can now use the return key |
| | 172 | +* (bug 6844) Use <ins> and <del> tags to emphase the differences |
| 172 | 173 | |
| 173 | 174 | |
| 174 | 175 | == Languages updated == |
| Index: trunk/phase3/skins/chick/main.css |
| — | — | @@ -415,7 +415,8 @@ |
| 416 | 416 | background:#eeeeee; |
| 417 | 417 | font-size: smaller; |
| 418 | 418 | } |
| 419 | | -span.diffchange { color: red; } |
| | 419 | +ins.diffchange { color: red; text-decoration: none; } |
| | 420 | +del.diffchange { color: red; text-decoration: none; } |
| 420 | 421 | |
| 421 | 422 | a.external { color: #3366bb; } |
| 422 | 423 | |
| Index: trunk/phase3/skins/monobook/main.css |
| — | — | @@ -591,10 +591,16 @@ |
| 592 | 592 | background: #eee; |
| 593 | 593 | font-size: smaller; |
| 594 | 594 | } |
| 595 | | -span.diffchange { |
| | 595 | +ins.diffchange { |
| 596 | 596 | color: red; |
| 597 | 597 | font-weight: bold; |
| | 598 | + text-decoration: none; |
| 598 | 599 | } |
| | 600 | +del.diffchange { |
| | 601 | + color: red; |
| | 602 | + font-weight: bold; |
| | 603 | + text-decoration: none; |
| | 604 | +} |
| 599 | 605 | |
| 600 | 606 | /* |
| 601 | 607 | ** keep the whitespace in front of the ^=, hides rule from konqueror |
| Index: trunk/phase3/skins/common/commonPrint.css |
| — | — | @@ -283,5 +283,13 @@ |
| 284 | 284 | background:#eeeeee; |
| 285 | 285 | font-size: smaller; |
| 286 | 286 | } |
| 287 | | -span.diffchange { color: silver; font-weight: bold; text-decoration: underline; } |
| 288 | | - |
| | 287 | +ins.diffchange { |
| | 288 | + color: silver; |
| | 289 | + font-weight: bold; |
| | 290 | + text-decoration: underline; |
| | 291 | +} |
| | 292 | +del.diffchange { |
| | 293 | + color: silver; |
| | 294 | + font-weight: bold; |
| | 295 | + text-decoration: underline; |
| | 296 | +} |
| Index: trunk/phase3/skins/common/common.css |
| — | — | @@ -125,7 +125,16 @@ |
| 126 | 126 | background:#eeeeee; |
| 127 | 127 | font-size: 94%; |
| 128 | 128 | } |
| 129 | | -span.diffchange { color: red; font-weight: bold; } |
| | 129 | +ins.diffchange { |
| | 130 | + color: red; |
| | 131 | + font-weight: bold; |
| | 132 | + text-decoration: none; |
| | 133 | +} |
| | 134 | +del.diffchange { |
| | 135 | + color: red; |
| | 136 | + font-weight: bold; |
| | 137 | + text-decoration: none; |
| | 138 | +} |
| 130 | 139 | |
| 131 | 140 | img { border: none; } |
| 132 | 141 | img.tex { vertical-align: middle; } |
| Index: trunk/phase3/skins/simple/main.css |
| — | — | @@ -268,7 +268,8 @@ |
| 269 | 269 | background-color: #f8ffaa; |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | | -span.diffchange { background-color: #FFCDF3; } |
| | 272 | +ins.diffchange { background-color: #FFCDF3; text-decoration: none; } |
| | 273 | +del.diffchange { background-color: #FFCDF3; text-decoration: none; } |
| 273 | 274 | .autocomment { color: grey; } |
| 274 | 275 | #pagehistory span.user { |
| 275 | 276 | margin-left: 1.4em; |
| Index: trunk/phase3/includes/DifferenceEngine.php |
| — | — | @@ -1558,9 +1558,12 @@ |
| 1559 | 1559 | |
| 1560 | 1560 | function _flushGroup ($new_tag) { |
| 1561 | 1561 | if ($this->_group !== '') { |
| 1562 | | - if ($this->_tag == 'mark') |
| 1563 | | - $this->_line .= '<span class="diffchange">' . |
| 1564 | | - htmlspecialchars ( $this->_group ) . '</span>'; |
| | 1562 | + if ($this->_tag == 'ins') |
| | 1563 | + $this->_line .= '<ins class="diffchange">' . |
| | 1564 | + htmlspecialchars ( $this->_group ) . '</ins>'; |
| | 1565 | + elseif ($this->_tag == 'del') |
| | 1566 | + $this->_line .= '<del class="diffchange">' . |
| | 1567 | + htmlspecialchars ( $this->_group ) . '</del>'; |
| 1565 | 1568 | else |
| 1566 | 1569 | $this->_line .= htmlspecialchars ( $this->_group ); |
| 1567 | 1570 | } |
| — | — | @@ -1664,7 +1667,7 @@ |
| 1665 | 1668 | if ($edit->type == 'copy') |
| 1666 | 1669 | $orig->addWords($edit->orig); |
| 1667 | 1670 | elseif ($edit->orig) |
| 1668 | | - $orig->addWords($edit->orig, 'mark'); |
| | 1671 | + $orig->addWords($edit->orig, 'del'); |
| 1669 | 1672 | } |
| 1670 | 1673 | $lines = $orig->getLines(); |
| 1671 | 1674 | wfProfileOut( $fname ); |
| — | — | @@ -1680,7 +1683,7 @@ |
| 1681 | 1684 | if ($edit->type == 'copy') |
| 1682 | 1685 | $closing->addWords($edit->closing); |
| 1683 | 1686 | elseif ($edit->closing) |
| 1684 | | - $closing->addWords($edit->closing, 'mark'); |
| | 1687 | + $closing->addWords($edit->closing, 'ins'); |
| 1685 | 1688 | } |
| 1686 | 1689 | $lines = $closing->getLines(); |
| 1687 | 1690 | wfProfileOut( $fname ); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1110,7 +1110,7 @@ |
| 1111 | 1111 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1112 | 1112 | * styles. |
| 1113 | 1113 | */ |
| 1114 | | -$wgStyleVersion = '54'; |
| | 1114 | +$wgStyleVersion = '55'; |
| 1115 | 1115 | |
| 1116 | 1116 | |
| 1117 | 1117 | # Server-side caching: |
| Index: trunk/phase3/includes/normal/RandomTest.php |
| — | — | @@ -69,7 +69,7 @@ |
| 70 | 70 | $formatter = new TableDiffFormatter(); |
| 71 | 71 | $funky = $formatter->format( $diffs ); |
| 72 | 72 | $matches = array(); |
| 73 | | - preg_match_all( '/<span class="diffchange">(.*?)<\/span>/', $funky, $matches ); |
| | 73 | + preg_match_all( '/<(?:ins|del) class="diffchange">(.*?)<\/span>/', $funky, $matches ); |
| 74 | 74 | foreach( $matches[1] as $bit ) { |
| 75 | 75 | $hex = bin2hex( $bit ); |
| 76 | 76 | echo "\t$hex\n"; |