Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/templates/gitweb/filediff.tmpl
author Gregory Szorc <gregory.szorc@gmail.com>
Fri, 09 Jun 2017 13:55:51 -0700
changeset 32762 2d93d2159e30
parent 32761 cb5123eff7d1
permissions -rw-r--r--
hgweb: refresh styling of gitweb's search form gitweb was missing the hint hover box. So that was added. Also, the positioning of the form was absolute and it didn't vertically align on all pages. The element has been moved inline with the navigation links (which now are contained in a div) and flexbox is used to obtain sane alignment of the navigation links and search form. For those new to flexbox, "justify-content: space-between" basically says to maximize space elements. You can use it to easily get left and right justified containers without having to worry about width, floating, etc. "align-items: center" centers all items in a cross-axis. I've literally wasted hours trying to figure out both these problems before flexbox. Flexbox is amazing. Flexbox has been supported by Chrome and Firefox for a few years. But it is only supported by IE 11. I'm willing to wager that people using this either won't be using IE or will be using IE 11. So I'm willing to be a bit aggressive in adopting flexbox because it makes CSS alignment so much easier.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     1
 
{header}
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     2
 
<title>{repo|escape}: diff {file|escape}</title>
5269
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 4467
diff changeset 
     3
 
<link rel="alternate" type="application/atom+xml"
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset 
     4
 
   href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     5
 
<link rel="alternate" type="application/rss+xml"
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset 
     6
 
   href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     7
 
</head>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     8
 
<body>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     9
 












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    10


<div class="page_header">







18258






bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages



Angel Ezquerra <angel.ezquerra at gmail.com>


parents: 
17202

diff
changeset




    11


<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>












bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages



Angel Ezquerra <angel.ezquerra at gmail.com>


parents: 
17202

diff
changeset




    12


<a href="/">Mercurial</a> {pathdef%breadcrumb} / diff







3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    13


</div>












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    14














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    15


<div class="page_nav">







32762






2d93d2159e30
hgweb: refresh styling of gitweb's search form



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
32761

diff
changeset




    16


<div>







18526






9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    17


<a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |












9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    18


<a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> |












9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    19


<a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> |












9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    20


<a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |












9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    21


<a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |












9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    22


<a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |












9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    23


<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |







25605






dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    24


<a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a> |












dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    25


<a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> |












dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    26


<a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a> |







18526






9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    27


<a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |







25605






dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    28


<a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |












dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    29


<a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |







3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    30


diff |







25605






dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    31


<a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |












dd89304687a3
hgweb: don't dereference symbolic revision in gitweb style



Anton Shestakov <av6@dwimlabs.net>


parents: 
24999

diff
changeset




    32


<a href="{url|urlescape}raw-diff/{symrev}/{file|urlescape}">raw</a> |







18526






9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18258

diff
changeset




    33


<a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>







32762






2d93d2159e30
hgweb: refresh styling of gitweb's search form



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
32761

diff
changeset




    34


</div>












2d93d2159e30
hgweb: refresh styling of gitweb's search form



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
32761

diff
changeset




    35


{searchform}







3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    36


</div>












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    37














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    38


<div class="title">{file|escape}</div>












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    39














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    40


<table>







6250






bf0dd23f55fa
gitweb: show branches in most of the templates



Florent Guillaume <fg@nuxeo.com>


parents: 
6177

diff
changeset




    41


{branch%filerevbranch}







3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    42


<tr>







4467






faf2fa0f3fff
gitweb: file diff: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3364

diff
changeset




    43


 <td>changeset {rev}</td>







24999






30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles



Anton Shestakov <engored@ya.ru>


parents: 
18526

diff
changeset




    44


 <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>












30f449378f64
hgweb: clearly outline <tr> block in gitweb and spartan styles



Anton Shestakov <engored@ya.ru>


parents: 
18526

diff
changeset




    45


</tr>







3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    46


{parent%filediffparent}












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    47


{child%filediffchild}












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    48


</table>












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    49









4467






faf2fa0f3fff
gitweb: file diff: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3364

diff
changeset




    50


<div class="list_head"></div>












faf2fa0f3fff
gitweb: file diff: Display metadata in same order as changeset does



Josef "Jeff" Sipek <jeffpc@josefsipek.net>


parents: 
3364

diff
changeset




    51









3353






2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    52


<div class="page_body">












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    53


{diff}












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    54


</div>












2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    55














2edf53386d86
gitweb: add file diff view



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    56


{footer}














mercurial