Mercurial > hg-stable
changeset 2130:90ee844b9f71
hgweb templates: Don't word wrap "foo bar ago" (e.g. "3 months\nago")
This made log entries or hgwebdir index look ugly with certain browser widths.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 26 Apr 2006 06:12:42 +0200 |
| parents | e5f5c21f4169 |
| children | f5bbc5562434 |
| files | templates/filelogentry.tmpl templates/map templates/map-gitweb templates/static/style-gitweb.css templates/static/style.css |
| diffstat | 5 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/templates/filelogentry.tmpl Tue Apr 25 23:28:40 2006 +0200 +++ b/templates/filelogentry.tmpl Wed Apr 26 06:12:42 2006 +0200 @@ -1,6 +1,6 @@ <table class="parity#parity#" width="100%" cellspacing="0" cellpadding="0"> <tr> - <td align="right" width="15%"><b>#date|age# ago: </b></td> + <td class="age" align="right" width="15%"><b>#date|age# ago: </b></td> <td><b><a href="?cs=#node|short#">#desc|strip|firstline|escape#</a></b></td></tr> <tr> <td align="right">revision #filerev#: </td>
--- a/templates/map Tue Apr 25 23:28:40 2006 +0200 +++ b/templates/map Wed Apr 26 06:12:42 2006 +0200 @@ -43,7 +43,7 @@ filelogparent = '<tr><td align="right">parent #rev#: </td><td><a href="?f=#node|short#;file=#file|urlescape#">#node|short#</a></td></tr>' filediffchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="?cs=#node|short#">#node|short#</a></td></tr>' filelogchild = '<tr><td align="right">child #rev#: </td><td><a href="?f=#node|short#;file=#file|urlescape#">#node|short#</a></td></tr>' -indexentry = '<tr class="parity#parity#"><td><a href="#url#">#name|escape#</a></td><td>#shortdesc#</td><td>#contact|obfuscate#</td><td>#lastupdate|age# ago</td><td><a href="#url#?cl=tip;style=rss">RSS</a></td></tr>' +indexentry = '<tr class="parity#parity#"><td><a href="#url#">#name|escape#</a></td><td>#shortdesc#</td><td>#contact|obfuscate#</td><td class="age">#lastupdate|age# ago</td><td><a href="#url#?cl=tip;style=rss">RSS</a></td></tr>' index = index.tmpl archiveentry = '<a href="?ca=#node|short#;type=#type|urlescape#">#type|escape#</a> ' notfound = notfound.tmpl
--- a/templates/map-gitweb Tue Apr 25 23:28:40 2006 +0200 +++ b/templates/map-gitweb Wed Apr 26 06:12:42 2006 +0200 @@ -36,7 +36,7 @@ filerevchild = '<tr><td class="metatag">child:</td><td><a href="?cmd=file;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>' fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="?cmd=annotate;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>' tags = tags-gitweb.tmpl -tagentry = '<tr class="parity#parity#"><td><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#tag|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> | <a href="?cmd=changelog;rev=#node|short#;style=gitweb">changelog</a> | <a href="?mf=#tagmanifest|short#;path=/;style=gitweb">manifest</a></td></tr>' +tagentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#tag|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> | <a href="?cmd=changelog;rev=#node|short#;style=gitweb">changelog</a> | <a href="?mf=#tagmanifest|short#;path=/;style=gitweb">manifest</a></td></tr>' diffblock = '#lines#' changelogtag = '<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>' changesettag = '<tr><td>tag</td><td>#tag|escape#</td></tr>' @@ -45,6 +45,6 @@ filediffchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="?cmd=changeset;node=#node#;style=gitweb">#node|short#</a></td></tr>' filelogchild = '<tr><td align="right">child #rev#: </td><td><a href="?cmd=file;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>' shortlog = shortlog-gitweb.tmpl -shortlogentry = '<tr class="parity#parity#"><td><i>#date|age# ago</i></td><td><i>#author#</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|firstline|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> | <a href="?cmd=manifest;manifest=#manifest|short#;path=/;style=gitweb">manifest</a></td></tr>' -filelogentry = '<tr class="parity#parity#"><td><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|firstline|escape#</b></a></td><td class="link"><!-- FIXME: <a href="?fd=#node|short#;file=#file|urlescape#;style=gitweb">diff</a> | --> <a href="?fa=#filenode|short#;file=#file|urlescape#;style=gitweb">annotate</a> #rename%filelogrename#</td></tr>' +shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author#</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|firstline|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> | <a href="?cmd=manifest;manifest=#manifest|short#;path=/;style=gitweb">manifest</a></td></tr>' +filelogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|firstline|escape#</b></a></td><td class="link"><!-- FIXME: <a href="?fd=#node|short#;file=#file|urlescape#;style=gitweb">diff</a> | --> <a href="?fa=#filenode|short#;file=#file|urlescape#;style=gitweb">annotate</a> #rename%filelogrename#</td></tr>' archiveentry = ' | <a href="?ca=#node|short#;type=#type|urlescape#">#type|escape#</a> '
--- a/templates/static/style-gitweb.css Tue Apr 25 23:28:40 2006 +0200 +++ b/templates/static/style-gitweb.css Wed Apr 26 06:12:42 2006 +0200 @@ -17,6 +17,7 @@ a.title:hover { background-color: #d9d8d1; } div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; } div.log_body { padding:8px 8px 8px 150px; } +.age { white-space:nowrap; } span.age { position:relative; float:left; width:142px; font-style:italic; } div.log_link { padding:0px 8px;
--- a/templates/static/style.css Tue Apr 25 23:28:40 2006 +0200 +++ b/templates/static/style.css Wed Apr 26 06:12:42 2006 +0200 @@ -1,4 +1,5 @@ a { text-decoration:none; } +.age { white-space:nowrap; } .parity0 { background-color: #dddddd; } .parity1 { background-color: #eeeeee; } .lineno { width: 60px; color: #aaaaaa; font-size: smaller;