annotate mercurial/templates/paper/search.tmpl @ 37400:47aea60d114d

hgweb: fix search {entries} to not return results of template expansion "{entries%changelogentry}" in raw/search.tmpl was utterly wrong because "{entries}" here was a generator yielding results of template expansion. That's why we have a weird hack in runmap(), which I'm going to get rid of. https://www.mercurial-scm.org/repo/hg/file/4.5.2/mercurial/templater.py#l469 We have two choices: a) drop "%changelogentry" from raw/search.tmpl b) fix "{entries}" to yield mappings I take (b) because that's what the other log-like "{entries}" do. The "entries" keyword is wrapped by mappinggenerator so "{entries}" without "%searchentry" still works.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 18 Mar 2018 20:51:39 +0900
parents cba4461aa0a0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
1 {header}
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
2 <title>{repo|escape}: searching for {query|escape}</title>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
3 </head>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
4 <body>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
5
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
6 <div class="container">
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
7 <div class="menu">
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
8 <div class="logo">
13964
616ad3f6fd33 hgweb: support alternate logo url
Steven Stallion <sstallion@gmail.com>
parents: 13597
diff changeset
9 <a href="{logourl}">
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
10 <img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a>
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
11 </div>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
12 <ul>
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
13 <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
14 <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
15 <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
16 <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
17 <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
25524
e0c09398c237 hgweb: put help link in paper/search.tmpl separately for consistency
Anton Shestakov <av6@dwimlabs.net>
parents: 24054
diff changeset
18 </ul>
e0c09398c237 hgweb: put help link in paper/search.tmpl separately for consistency
Anton Shestakov <av6@dwimlabs.net>
parents: 24054
diff changeset
19 <ul>
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
20 <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
21 </ul>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
22 </div>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
23
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
24 <div class="main">
18258
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages
Angel Ezquerra <angel.ezquerra at gmail.com>
parents: 14913
diff changeset
25 <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
26 <h3>searching for '{query|escape}'</h3>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
27
19766
393e9f1fc4d2 paper: show current search mode name at search results
Alexander Plavin <alexander@plav.in>
parents: 19452
diff changeset
28 <p>
393e9f1fc4d2 paper: show current search mode name at search results
Alexander Plavin <alexander@plav.in>
parents: 19452
diff changeset
29 Assuming {modedesc}.
19768
186f54d40fdd hgweb: add link to force literal keyword search
Alexander Plavin <alexander@plav.in>
parents: 19766
diff changeset
30 {if(showforcekw, '<a href="{url|urlescape}log?rev={query|urlescape}&forcekw=1">
186f54d40fdd hgweb: add link to force literal keyword search
Alexander Plavin <alexander@plav.in>
parents: 19766
diff changeset
31 Use {showforcekw}</a> instead.')}
186f54d40fdd hgweb: add link to force literal keyword search
Alexander Plavin <alexander@plav.in>
parents: 19766
diff changeset
32 {if(showunforcekw, '<a href="{url|urlescape}log?rev={query|urlescape}">
186f54d40fdd hgweb: add link to force literal keyword search
Alexander Plavin <alexander@plav.in>
parents: 19766
diff changeset
33 Use {showunforcekw}</a> instead.')}
19766
393e9f1fc4d2 paper: show current search mode name at search results
Alexander Plavin <alexander@plav.in>
parents: 19452
diff changeset
34 </p>
393e9f1fc4d2 paper: show current search mode name at search results
Alexander Plavin <alexander@plav.in>
parents: 19452
diff changeset
35
32758
cba4461aa0a0 hgweb: consolidate search form for paper
Gregory Szorc <gregory.szorc@gmail.com>
parents: 25524
diff changeset
36 {searchform}
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
37
10247
e8c7410371e0 hgweb: add less/more links for search logs (issue1972)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9999
diff changeset
38 <div class="navigate">
23377
c00b156d6e76 templates: fix broken "less" & "more" links in paper style (issue4460)
Anton Shestakov <engored@ya.ru>
parents: 19795
diff changeset
39 <a href="{url|urlescape}log{lessvars%urlparameter}">less</a>
c00b156d6e76 templates: fix broken "less" & "more" links in paper style (issue4460)
Anton Shestakov <engored@ya.ru>
parents: 19795
diff changeset
40 <a href="{url|urlescape}log{morevars%urlparameter}">more</a>
10247
e8c7410371e0 hgweb: add less/more links for search logs (issue1972)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9999
diff changeset
41 </div>
e8c7410371e0 hgweb: add less/more links for search logs (issue1972)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9999
diff changeset
42
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
43 <table class="bigtable">
24054
fdf7794be41d hgweb: replace implicit <tbody> with explicit <thead> where appropriate
Anton Shestakov <engored@ya.ru>
parents: 23377
diff changeset
44 <thead>
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
45 <tr>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
46 <th class="age">age</th>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
47 <th class="author">author</th>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
48 <th class="description">description</th>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
49 </tr>
24054
fdf7794be41d hgweb: replace implicit <tbody> with explicit <thead> where appropriate
Anton Shestakov <engored@ya.ru>
parents: 23377
diff changeset
50 </thead>
19452
6f5556454edd hgweb: make stripes in log and search with CSS
Alexander Plavin <me@aplavin.ru>
parents: 19396
diff changeset
51 <tbody class="stripes2">
37400
47aea60d114d hgweb: fix search {entries} to not return results of template expansion
Yuya Nishihara <yuya@tcha.org>
parents: 32758
diff changeset
52 {entries%changelogentry}
19452
6f5556454edd hgweb: make stripes in log and search with CSS
Alexander Plavin <me@aplavin.ru>
parents: 19396
diff changeset
53 </tbody>
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
54 </table>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
55
10247
e8c7410371e0 hgweb: add less/more links for search logs (issue1972)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9999
diff changeset
56 <div class="navigate">
23377
c00b156d6e76 templates: fix broken "less" & "more" links in paper style (issue4460)
Anton Shestakov <engored@ya.ru>
parents: 19795
diff changeset
57 <a href="{url|urlescape}log{lessvars%urlparameter}">less</a>
c00b156d6e76 templates: fix broken "less" & "more" links in paper style (issue4460)
Anton Shestakov <engored@ya.ru>
parents: 19795
diff changeset
58 <a href="{url|urlescape}log{morevars%urlparameter}">more</a>
10247
e8c7410371e0 hgweb: add less/more links for search logs (issue1972)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9999
diff changeset
59 </div>
e8c7410371e0 hgweb: add less/more links for search logs (issue1972)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9999
diff changeset
60
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
61 </div>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
62 </div>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
63
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
64 {footer}