Overview
Comment: | Rendu des diff du wiki |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6a9c3ed7564bbef7885dd656967fe156 |
User & Date: | bohwaz on 2014-04-18 04:17:18 |
Other Links: | manifest | tags |
Context
2014-04-18
| ||
14:49 | Version stable check-in: 28fdbfc799 user: bohwaz tags: trunk, stable | |
04:17 | Rendu des diff du wiki check-in: 6a9c3ed756 user: bohwaz tags: trunk | |
04:08 | identité, pas identifiant check-in: 346ce111fe user: bohwaz tags: trunk | |
Changes
Modified src/include/lib.template.php from [31bea94e50] to [84ca0c71e0].
︙ | ︙ | |||
273 274 275 276 277 278 279 | $class1 = $class2 = ''; $t1 = $t2 = ''; if ($type == \simpleDiff::INS) { $class2 = 'ins'; | | | | | | 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 | $class1 = $class2 = ''; $t1 = $t2 = ''; if ($type == \simpleDiff::INS) { $class2 = 'ins'; $t2 = '<b class="icn">➕</b>'; $old = htmlspecialchars($old, ENT_QUOTES, 'UTF-8'); $new = htmlspecialchars($new, ENT_QUOTES, 'UTF-8'); } elseif ($type == \simpleDiff::DEL) { $class1 = 'del'; $t1 = '<b class="icn">➖</b>'; $old = htmlspecialchars($old, ENT_QUOTES, 'UTF-8'); $new = htmlspecialchars($new, ENT_QUOTES, 'UTF-8'); } elseif ($type == \simpleDiff::CHANGED) { $class1 = 'del'; $class2 = 'ins'; $t1 = '<b class="icn">➖</b>'; $t2 = '<b class="icn">➕</b>'; $lineDiff = \simpleDiff::wdiff($old, $new); $lineDiff = htmlspecialchars($lineDiff, ENT_QUOTES, 'UTF-8'); // Don't show new things in deleted line $old = preg_replace('!\{\+(?:.*)\+\}!U', '', $lineDiff); $old = str_replace(' ', ' ', $old); |
︙ | ︙ |
Modified src/www/admin/static/admin.css from [97e6cabd27] to [218216a26b].
︙ | ︙ | |||
932 933 934 935 936 937 938 | text-align: right; font-family: Mono; font-size: 90%; color: #666; } .diff .leftChange, .diff .rightChange { | < > | 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 | text-align: right; font-family: Mono; font-size: 90%; color: #666; } .diff .leftChange, .diff .rightChange { text-align: center; vertical-align: middle; } .diff ins { background: #9f9; } .diff del { background: #f99; } .diff hr { background: none; |
︙ | ︙ | |||
963 964 965 966 967 968 969 | .diff tr { border: 1px solid #ccc; vertical-align: top; } .diff .leftChange b, .diff .rightChange b { | < < < < | < < < < < | | 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 | .diff tr { border: 1px solid #ccc; vertical-align: top; } .diff .leftChange b, .diff .rightChange b { text-shadow: 1px 1px 1px #ccc; color: #666; } .pagination { clear: both; list-style-type: none; padding: 0.4em 0; text-align: center; |
︙ | ︙ |