From 08d6ebf600566b4673e806663903c3eff2442dcf Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Mon, 18 Jul 2016 23:48:04 +0300 Subject: [PATCH 01/12] Updated CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 5367ede0..e28e9d69 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -5,7 +5,7 @@ Phalcon Diff is an open source project and a volunteer effort. Phalcon Diff does not have human resources fully dedicated to the maintenance of this software. If you want something to be improved or you want a new feature please submit a Pull Request. -If you have a change or new feature in mind, please fill an [NFR](https://github.com/phalcon/cphalcon/wiki/New-Feature-Request---NFR). +If you have a change or new feature in mind, please fill an [NFR](https://github.com/phalcongelist/php-diff/wiki/New-Feature-Request---NFR). Thanks!
Phalcon Team From 5493a870d538752ed45e78eeafb12ca2f7f19e67 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 19 Jul 2016 08:22:21 +0300 Subject: [PATCH 02/12] Updated README.md --- README.md | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 75ea4fa6..d1afe5fe 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This is a fork of [Chris Boulton's Diff][fork] project. ## Introduction -A comprehensive library for generating differences between +Phalcon Diff is a comprehensive library for generating differences between two hashable objects (strings or arrays). Generated differences can be rendered in all of the standard formats including: @@ -21,6 +21,40 @@ The logic behind the core of the diff engine (ie, the sequence matcher) is primarily based on the Python difflib package. The reason for doing so is primarily because of its high degree of accuracy. +Please write us if you have any feedback. + +## Get Started + +### Requirements + +To run this library on your project, you need at least: + +* PHP >= 5.4 + +### Installation + +Install [Composer][composer] in a common location or in your project: + +```sh +$ curl -s http://getcomposer.org/installer | php +``` + +Create the `composer.json` file as follows: + +```json +{ + "require": { + "phalcongelist/php-diff": "~2.0" + } +} +``` + +Run the composer installer: + +```sh +$ php composer.phar install +``` + ## Example Use More complete documentation will be available shortly. @@ -40,4 +74,5 @@ Phalcon Diff is open-sourced software licensed under the [New BSD License][licen All rights reserved. [fork]: https://github.com/chrisboulton/php-diff +[composer]: https://getcomposer.org [license]: https://github.com/phalcongelist/php-diff/blob/master/docs/LICENSE.txt From 3a2f6c77016d2a10821b0ab27a9ae1676577c32e Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 19 Jul 2016 08:27:09 +0300 Subject: [PATCH 03/12] Updated README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1afe5fe..fcfa746c 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,8 @@ More complete documentation will be available shortly. Phalcon Diff is open-sourced software licensed under the [New BSD License][license]. -© 2009-2016, Chris Boulton
© 2016, Phalcon Framework Team and contributors
+© 2009-2016, Chris Boulton
All rights reserved. [fork]: https://github.com/chrisboulton/php-diff From 1e88465b0ca9ac83820ca6c5aad317b281650f34 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 19 Jul 2016 08:33:52 +0300 Subject: [PATCH 04/12] Updated dependencies --- README.md | 1 + composer.json | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fcfa746c..b1656366 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ Please write us if you have any feedback. To run this library on your project, you need at least: * PHP >= 5.4 +* PHP mbstring extension ### Installation diff --git a/composer.json b/composer.json index 802d6900..f1ce732b 100644 --- a/composer.json +++ b/composer.json @@ -16,10 +16,12 @@ ], "support": { "source": "https://github.com/phalcongelist/php-diff", - "issues": "https://github.com/phalcongelist/php-diff/issues" + "issues": "https://github.com/phalcongelist/php-diff/issues", + "wiki": "https://github.com/phalcongelist/php-diff/wiki" }, "require": { - "php": ">= 5.4" + "php": ">= 5.4", + "ext-mbstring": "*" }, "require-dev": { "squizlabs/php_codesniffer": "~2.6" From a8ccfc6262ba483a4900c835c1203fb4479e28da Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 19 Jul 2016 08:42:42 +0300 Subject: [PATCH 05/12] Added ability to set title for SideBySide renderer --- CHANGELOG.md | 4 ++++ src/Diff/Renderer/Html/SideBySide.php | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7acdaaac..2b3f2d83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# [2.0.4](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.4) (2016-XX-XX) + +* Added ability to set title for `SideBySide` renderer + # [2.0.3](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.3) (2016-07-18) * Fixed `BaseArray` class name diff --git a/src/Diff/Renderer/Html/SideBySide.php b/src/Diff/Renderer/Html/SideBySide.php index 2976183e..bea6c23c 100644 --- a/src/Diff/Renderer/Html/SideBySide.php +++ b/src/Diff/Renderer/Html/SideBySide.php @@ -25,6 +25,9 @@ */ class SideBySide extends BaseArray { + private $oldTitle = 'Old Version'; + private $newTitle = 'New Version'; + /** * Render a and return diff with changes between the two sequences * displayed side by side. @@ -40,11 +43,19 @@ public function render() return $html; } + if (isset($this->options['oldTitle'])) { + $this->oldTitle = $this->options['oldTitle']; + } + + if (isset($this->options['newTitle'])) { + $this->newTitle = $this->options['newTitle']; + } + $html .= ''; $html .= ''; $html .= ''; - $html .= ''; - $html .= ''; + $html .= ''; + $html .= ''; $html .= ''; $html .= ''; From 968c8e244cb66c7b5d72080e7b9ce9f3b15d39eb Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 19 Jul 2016 20:56:36 +0300 Subject: [PATCH 06/12] Added ability to set title for Inline renderer --- CHANGELOG.md | 1 + composer.json | 3 + example2/a.txt | 13 ++++ example2/b.txt | 14 ++++ example2/example.php | 49 ++++++++++++++ example2/styles.css | 93 +++++++++++++++++++++++++++ src/Diff/Renderer/Html/Inline.php | 22 ++++++- src/Diff/Renderer/Html/SideBySide.php | 4 +- 8 files changed, 194 insertions(+), 5 deletions(-) create mode 100644 example2/a.txt create mode 100644 example2/b.txt create mode 100644 example2/example.php create mode 100644 example2/styles.css diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b3f2d83..a8a0d76d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # [2.0.4](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.4) (2016-XX-XX) * Added ability to set title for `SideBySide` renderer +* Added ability to set title for `Inline` renderer # [2.0.3](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.3) (2016-07-18) diff --git a/composer.json b/composer.json index f1ce732b..83c768ac 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,9 @@ "type": "library", "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).", "license": "BSD-3-Clause", + "keywords": [ + "php", "diff", "phalcon" + ], "authors": [ { "name": "Phalcon Team", diff --git a/example2/a.txt b/example2/a.txt new file mode 100644 index 00000000..6f3897b2 --- /dev/null +++ b/example2/a.txt @@ -0,0 +1,13 @@ + + + + Hello World! + + +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+ +

A heading we'll be removing

+ +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+ + \ No newline at end of file diff --git a/example2/b.txt b/example2/b.txt new file mode 100644 index 00000000..5918964d --- /dev/null +++ b/example2/b.txt @@ -0,0 +1,14 @@ + + + + Goodbye Cruel World! + + +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+ + +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+ +

Just a small amount of new text...

+ + \ No newline at end of file diff --git a/example2/example.php b/example2/example.php new file mode 100644 index 00000000..20018cfe --- /dev/null +++ b/example2/example.php @@ -0,0 +1,49 @@ + true, + // 'ignoreCase' => true, +]; + +// Initialize the diff class +$diff = new Diff($a, $b, $options); +?> + + + + + Phalcon Diff - Examples + + + +

Phalcon Diff - Examples

+
+ +

Side by Side Diff

+ render(new SideBySide);?> + +

Inline Diff

+ render(new Inline); ?> + +

Unified Diff

+ 
render(new Unified)); ?>
+ +

Context Diff

+ 
render(new Context)); ?>
+ + diff --git a/example2/styles.css b/example2/styles.css new file mode 100644 index 00000000..5454896f --- /dev/null +++ b/example2/styles.css @@ -0,0 +1,93 @@ +body { + background: #fff; + font-family: Arial; + font-size: 12px; +} +.Differences { + width: 100%; + border-collapse: collapse; + border-spacing: 0; + empty-cells: show; +} + +.Differences thead th { + text-align: left; + border-bottom: 1px solid #000; + background: #aaa; + color: #000; + padding: 4px; +} +.Differences tbody th { + text-align: right; + background: #ccc; + width: 4em; + padding: 1px 2px; + border-right: 1px solid #000; + vertical-align: top; + font-size: 13px; +} + +.Differences td { + padding: 1px 2px; + font-family: Consolas, monospace; + font-size: 13px; +} + +.DifferencesSideBySide .ChangeInsert td.Left { + background: #dfd; +} + +.DifferencesSideBySide .ChangeInsert td.Right { + background: #cfc; +} + +.DifferencesSideBySide .ChangeDelete td.Left { + background: #f88; +} + +.DifferencesSideBySide .ChangeDelete td.Right { + background: #faa; +} + +.DifferencesSideBySide .ChangeReplace .Left { + background: #fe9; +} + +.DifferencesSideBySide .ChangeReplace .Right { + background: #fd8; +} + +.Differences ins, .Differences del { + text-decoration: none; +} + +.DifferencesSideBySide .ChangeReplace ins, .DifferencesSideBySide .ChangeReplace del { + background: #fc0; +} + +.Differences .Skipped { + background: #f7f7f7; +} + +.DifferencesInline .ChangeReplace .Left, +.DifferencesInline .ChangeDelete .Left { + background: #fdd; +} + +.DifferencesInline .ChangeReplace .Right, +.DifferencesInline .ChangeInsert .Right { + background: #dfd; +} + +.DifferencesInline .ChangeReplace ins { + background: #9e9; +} + +.DifferencesInline .ChangeReplace del { + background: #e99; +} + +pre { + width: 100%; + overflow: auto; +} \ No newline at end of file diff --git a/src/Diff/Renderer/Html/Inline.php b/src/Diff/Renderer/Html/Inline.php index fa4eaba1..ba4e4af7 100644 --- a/src/Diff/Renderer/Html/Inline.php +++ b/src/Diff/Renderer/Html/Inline.php @@ -25,6 +25,10 @@ */ class Inline extends BaseArray { + private $oldTitle = 'Old'; + private $newTitle = 'New'; + private $diffTitle = 'Differences'; + /** * Render a and return diff with changes between the two sequences * displayed inline (under each other) @@ -40,12 +44,24 @@ public function render() return $html; } + if (isset($this->options['oldTitle'])) { + $this->oldTitle = $this->options['oldTitle']; + } + + if (isset($this->options['newTitle'])) { + $this->newTitle = $this->options['newTitle']; + } + + if (isset($this->options['diffTitle'])) { + $this->diffTitle = $this->options['diffTitle']; + } + $html .= '
Old VersionNew Version' . $this->oldTitle . '' . $this->newTitle . '
'; $html .= ''; $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; $html .= ''; $html .= ''; foreach ($changes as $i => $blocks) { diff --git a/src/Diff/Renderer/Html/SideBySide.php b/src/Diff/Renderer/Html/SideBySide.php index bea6c23c..4744f917 100644 --- a/src/Diff/Renderer/Html/SideBySide.php +++ b/src/Diff/Renderer/Html/SideBySide.php @@ -54,8 +54,8 @@ public function render() $html .= '
OldNewDifferences' . htmlspecialchars($this->oldTitle) . '' . htmlspecialchars($this->newTitle) . '' . htmlspecialchars($this->diffTitle) . '
'; $html .= ''; $html .= ''; - $html .= ''; - $html .= ''; + $html .= ''; + $html .= ''; $html .= ''; $html .= ''; From 326a6a45a46c8e77e105342e986d29bdf92c9d72 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Mon, 5 Sep 2016 13:16:08 +0300 Subject: [PATCH 07/12] Updated Travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 59b48436..ac38ecb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,6 @@ script: notifications: email: recipients: - - serghei@phalconphp.com + - build@phalconphp.com on_success: change on_failure: always From dafbdc8f71d3d2269e85eebc34b1ebf6e2a5d5a0 Mon Sep 17 00:00:00 2001 From: Ben Peachey Date: Tue, 20 Sep 2016 07:01:45 +0200 Subject: [PATCH 08/12] Adds `mbstring` extension as package dependency Fixes #6. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 802d6900..464adf72 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "issues": "https://github.com/phalcongelist/php-diff/issues" }, "require": { - "php": ">= 5.4" + "php": ">= 5.4", + "ext-mbstring": "*" }, "require-dev": { "squizlabs/php_codesniffer": "~2.6" From 841aebc53dac790468d1cfdaff08ac13af66244e Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 20 Sep 2016 21:26:32 +0300 Subject: [PATCH 09/12] Updated CONTRIBUTING.md --- .github/CONTRIBUTING.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e28e9d69..3e3bc892 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -5,7 +5,11 @@ Phalcon Diff is an open source project and a volunteer effort. Phalcon Diff does not have human resources fully dedicated to the maintenance of this software. If you want something to be improved or you want a new feature please submit a Pull Request. -If you have a change or new feature in mind, please fill an [NFR](https://github.com/phalcongelist/php-diff/wiki/New-Feature-Request---NFR). +If you have a change or new feature in mind, please fill an [NFR][:nfr:]. +**Note**: We don't add changes directly to stable branches or `master`. +So, if you are going to do a PR, use the dev-branch. Thanks!
Phalcon Team + +[:nfr:]: https://github.com/phalcongelist/php-diff/wiki/New-Feature-Request---NFR From bf3023cf44c141f5f758f36327b107add30a89fc Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 20 Sep 2016 21:27:08 +0300 Subject: [PATCH 10/12] Updated PHP_CodeSniffer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 83c768ac..43a0fef2 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "ext-mbstring": "*" }, "require-dev": { - "squizlabs/php_codesniffer": "~2.6" + "squizlabs/php_codesniffer": "~2.7" }, "autoload": { "psr-4": { From 6276aeb1627e99a6ffe3182dbf8608ce0e1ed140 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 20 Sep 2016 21:30:42 +0300 Subject: [PATCH 11/12] Updated CHANGELOG.md --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8a0d76d..c908ced0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ -# [2.0.4](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.4) (2016-XX-XX) +# [2.0.5](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.5) (2016-XX-XX) + + +# [2.0.4](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.4) (2016-09-20) * Added ability to set title for `SideBySide` renderer * Added ability to set title for `Inline` renderer +* Added `mbstring` extension as package dependency [#6](https://github.com/phalcongelist/php-diff/issues/6) # [2.0.3](https://github.com/phalcongelist/php-diff/releases/tag/v2.0.3) (2016-07-18) From 86329cab7f7f85a5cd6569217be08b5720b6b78e Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 20 Sep 2016 21:32:19 +0300 Subject: [PATCH 12/12] Removed old examples --- example2/a.txt | 13 ------- example2/b.txt | 14 ------- example2/example.php | 49 ----------------------- example2/styles.css | 93 -------------------------------------------- 4 files changed, 169 deletions(-) delete mode 100644 example2/a.txt delete mode 100644 example2/b.txt delete mode 100644 example2/example.php delete mode 100644 example2/styles.css diff --git a/example2/a.txt b/example2/a.txt deleted file mode 100644 index 6f3897b2..00000000 --- a/example2/a.txt +++ /dev/null @@ -1,13 +0,0 @@ - - - - Hello World! - - -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- -

A heading we'll be removing

- -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- - \ No newline at end of file diff --git a/example2/b.txt b/example2/b.txt deleted file mode 100644 index 5918964d..00000000 --- a/example2/b.txt +++ /dev/null @@ -1,14 +0,0 @@ - - - - Goodbye Cruel World! - - -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- - -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- -

Just a small amount of new text...

- - \ No newline at end of file diff --git a/example2/example.php b/example2/example.php deleted file mode 100644 index 20018cfe..00000000 --- a/example2/example.php +++ /dev/null @@ -1,49 +0,0 @@ - true, - // 'ignoreCase' => true, -]; - -// Initialize the diff class -$diff = new Diff($a, $b, $options); -?> - - - - - Phalcon Diff - Examples - - - -

Phalcon Diff - Examples

-
- -

Side by Side Diff

- render(new SideBySide);?> - -

Inline Diff

- render(new Inline); ?> - -

Unified Diff

- 
render(new Unified)); ?>
- -

Context Diff

- 
render(new Context)); ?>
- - diff --git a/example2/styles.css b/example2/styles.css deleted file mode 100644 index 5454896f..00000000 --- a/example2/styles.css +++ /dev/null @@ -1,93 +0,0 @@ -body { - background: #fff; - font-family: Arial; - font-size: 12px; -} -.Differences { - width: 100%; - border-collapse: collapse; - border-spacing: 0; - empty-cells: show; -} - -.Differences thead th { - text-align: left; - border-bottom: 1px solid #000; - background: #aaa; - color: #000; - padding: 4px; -} -.Differences tbody th { - text-align: right; - background: #ccc; - width: 4em; - padding: 1px 2px; - border-right: 1px solid #000; - vertical-align: top; - font-size: 13px; -} - -.Differences td { - padding: 1px 2px; - font-family: Consolas, monospace; - font-size: 13px; -} - -.DifferencesSideBySide .ChangeInsert td.Left { - background: #dfd; -} - -.DifferencesSideBySide .ChangeInsert td.Right { - background: #cfc; -} - -.DifferencesSideBySide .ChangeDelete td.Left { - background: #f88; -} - -.DifferencesSideBySide .ChangeDelete td.Right { - background: #faa; -} - -.DifferencesSideBySide .ChangeReplace .Left { - background: #fe9; -} - -.DifferencesSideBySide .ChangeReplace .Right { - background: #fd8; -} - -.Differences ins, .Differences del { - text-decoration: none; -} - -.DifferencesSideBySide .ChangeReplace ins, .DifferencesSideBySide .ChangeReplace del { - background: #fc0; -} - -.Differences .Skipped { - background: #f7f7f7; -} - -.DifferencesInline .ChangeReplace .Left, -.DifferencesInline .ChangeDelete .Left { - background: #fdd; -} - -.DifferencesInline .ChangeReplace .Right, -.DifferencesInline .ChangeInsert .Right { - background: #dfd; -} - -.DifferencesInline .ChangeReplace ins { - background: #9e9; -} - -.DifferencesInline .ChangeReplace del { - background: #e99; -} - -pre { - width: 100%; - overflow: auto; -} \ No newline at end of file
' . $this->oldTitle . '' . $this->newTitle . '' . htmlspecialchars($this->oldTitle) . '' . htmlspecialchars($this->newTitle) . '