Mercurial > hg > gitserve
changeset 672:dbe0ce2ae196
More IE friendly diff output related templates.
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 6eee9b54c53c41643192c7920db642c984a00a21
# Parent 8b8f710bb65875d588044c3615cf42180aee23ff
More IE friendly diff output related templates.
I thought i could use CSS to render properly the diff blocks in IE.
But i was obviously too optmistic and didn't realized that IE only
renders preformated text for pre tag content...
So i had to rollback some of my changes to accomodate to this IE
bug/limitation. A diff blocks become pre tags, and diff lines
become span again. Hopefully, the pages continue validating.
| author | Edouard Gomez <ed.gomez@free.fr> |
|---|---|
| date | Sun, 10 Jul 2005 16:14:28 -0800 |
| parents | efa4a7e2f322 |
| children | 8e518e11f6cf |
| files | templates/changeset.tmpl templates/filediff.tmpl templates/header.tmpl templates/map |
| diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/templates/changeset.tmpl Sun Jul 10 16:14:06 2005 -0800 +++ b/templates/changeset.tmpl Sun Jul 10 16:14:28 2005 -0800 @@ -39,7 +39,7 @@ </tr> </table> -<div id="changesetDiff" class="pre"> +<div id="changesetDiff"> #diff# </div>
--- a/templates/filediff.tmpl Sun Jul 10 16:14:06 2005 -0800 +++ b/templates/filediff.tmpl Sun Jul 10 16:14:28 2005 -0800 @@ -23,7 +23,7 @@ #parent# </table> -<div id="fileDiff" class="pre"> +<div id="fileDiff"> #diff# </div>
--- a/templates/header.tmpl Sun Jul 10 16:14:06 2005 -0800 +++ b/templates/header.tmpl Sun Jul 10 16:14:28 2005 -0800 @@ -27,7 +27,8 @@ } /* Common */ -.pre { font-family: monospace; white-space: pre; } +pre { margin: 0; } + /* Changelog entries */ .changelogEntry { width: 100%; } @@ -44,11 +45,10 @@ #changesetEntry { } #changesetEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; } #changesetEntry th.files, #changesetEntry th.description { vertical-align: top; } -#changesetDiff ul, #changesetDiff li { list-style: none; margin: 0; padding: 0; } /* File diff view */ #filediffEntry { } #filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; } -#fileDiff ul, #fileDiff li { list-style: none; margin: 0; padding: 0; } + --> </style>
--- a/templates/map Sun Jul 10 16:14:06 2005 -0800 +++ b/templates/map Sun Jul 10 16:14:28 2005 -0800 @@ -19,17 +19,17 @@ fileline = "<div class="parity#parity#"><span class="lineno">#linenumber# </span>#line|escape#</div>" filelogentry = filelogentry.tmpl annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>" -difflineplus = "<li class="plusline">#line|escape#</li>" -difflineminus = "<li class="minusline">#line|escape#</li>" -difflineat = "<li class="atline">#line|escape#</li>" -diffline = "<li>#line|escape#</li>" +difflineplus = "<span class="plusline">#line|escape#</span>" +difflineminus = "<span class="minusline">#line|escape#</span>" +difflineat = "<span class="atline">#line|escape#</span>" +diffline = "#line|escape#" changelogparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>" changesetparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>" filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>" fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node|short#</a></td></tr>" tags = tags.tmpl tagentry = "<li class="tagEntry parity#parity#"><span class="node">#node#</span> <a href="?cmd=changeset;node=#node#">#tag#</a></li>" -diffblock = "<ul class="parity#parity#">#lines#</ul>" +diffblock = "<pre class="parity#parity#">#lines#</pre>" changelogtag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>" changesettag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>" filediffparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"