Mercurial > hg > mercurial-source
changeset 23841:70cfa7e1611b
hgweb: close <p> elements
<p> elements can only contain inline elements, so as soon as browser encounters
a block element (e.g. block <div>) "inside" a <p>, it puts an implicit </p>.
It's better to do this explicitly.
author | Anton Shestakov <engored@ya.ru> |
---|---|
date | Sat, 10 Jan 2015 17:52:02 +0800 |
parents | 8b79fdaa9f85 |
children | c4f6fc4eb01e |
files | mercurial/templates/paper/bookmarks.tmpl mercurial/templates/paper/branches.tmpl mercurial/templates/paper/changeset.tmpl mercurial/templates/paper/filelog.tmpl mercurial/templates/paper/graph.tmpl mercurial/templates/paper/shortlog.tmpl mercurial/templates/paper/tags.tmpl tests/test-hgweb-commands.t tests/test-hgweb-diffs.t tests/test-hgweb-empty.t tests/test-hgweb-filelog.t tests/test-hgweb-removed.t |
diffstat | 12 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/paper/bookmarks.tmpl +++ b/mercurial/templates/paper/bookmarks.tmpl @@ -23,7 +23,7 @@ <ul> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> -<p> +<p></p> <div class="atom-logo"> <a href="{url|urlescape}atom-bookmarks" title="subscribe to atom feed"> <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed">
--- a/mercurial/templates/paper/branches.tmpl +++ b/mercurial/templates/paper/branches.tmpl @@ -23,7 +23,7 @@ <ul> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> -<p> +<p></p> <div class="atom-logo"> <a href="{url|urlescape}atom-branches" title="subscribe to atom feed"> <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed">
--- a/mercurial/templates/paper/changeset.tmpl +++ b/mercurial/templates/paper/changeset.tmpl @@ -68,7 +68,7 @@ <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a> <div id="diffstatdetails" style="display:none;"> <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a> - <p> + <p></p> <table class="stripes2">{diffstat}</table> </div> </td>
--- a/mercurial/templates/paper/filelog.tmpl +++ b/mercurial/templates/paper/filelog.tmpl @@ -35,7 +35,7 @@ <ul> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> -<p> +<p></p> <div class="atom-logo"> <a href="{url|urlescape}atom-log/{node|short}/{file|urlescape}" title="subscribe to atom feed"> <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed"></a>
--- a/mercurial/templates/paper/graph.tmpl +++ b/mercurial/templates/paper/graph.tmpl @@ -28,7 +28,7 @@ <ul> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> -<p> +<p></p> <div class="atom-logo"> <a href="{url|urlescape}atom-log" title="subscribe to atom feed"> <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed">
--- a/mercurial/templates/paper/shortlog.tmpl +++ b/mercurial/templates/paper/shortlog.tmpl @@ -30,7 +30,7 @@ <ul> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> -<p> +<p></p> <div class="atom-logo"> <a href="{url|urlescape}atom-log" title="subscribe to atom feed"> <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed">
--- a/mercurial/templates/paper/tags.tmpl +++ b/mercurial/templates/paper/tags.tmpl @@ -23,7 +23,7 @@ <ul> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> -<p> +<p></p> <div class="atom-logo"> <a href="{url|urlescape}atom-tags" title="subscribe to atom feed"> <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed"></a>
--- a/tests/test-hgweb-commands.t +++ b/tests/test-hgweb-commands.t @@ -726,7 +726,7 @@ <ul> <li><a href="/help">help</a></li> </ul> - <p> + <p></p> <div class="atom-logo"> <a href="/atom-log" title="subscribe to atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"> @@ -894,7 +894,7 @@ <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a> <div id="diffstatdetails" style="display:none;"> <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a> - <p> + <p></p> <table class="stripes2"> <tr> <td class="diffstat-file"><a href="#l1.1">da/foo</a></td> <td class="diffstat-total" align="right">1</td>
--- a/tests/test-hgweb-diffs.t +++ b/tests/test-hgweb-diffs.t @@ -118,7 +118,7 @@ <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a> <div id="diffstatdetails" style="display:none;"> <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a> - <p> + <p></p> <table class="stripes2"> <tr> <td class="diffstat-file"><a href="#l1.1">a</a></td> <td class="diffstat-total" align="right">1</td> @@ -390,7 +390,7 @@ <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a> <div id="diffstatdetails" style="display:none;"> <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a> - <p> + <p></p> <table class="stripes2"> <tr> <td class="diffstat-file"><a href="#l1.1">a</a></td> <td class="diffstat-total" align="right">1</td>
--- a/tests/test-hgweb-empty.t +++ b/tests/test-hgweb-empty.t @@ -48,7 +48,7 @@ <ul> <li><a href="/help">help</a></li> </ul> - <p> + <p></p> <div class="atom-logo"> <a href="/atom-log" title="subscribe to atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"> @@ -158,7 +158,7 @@ <ul> <li><a href="/help">help</a></li> </ul> - <p> + <p></p> <div class="atom-logo"> <a href="/atom-log" title="subscribe to atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"> @@ -264,7 +264,7 @@ <ul> <li><a href="/help">help</a></li> </ul> - <p> + <p></p> <div class="atom-logo"> <a href="/atom-log" title="subscribe to atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed">
--- a/tests/test-hgweb-filelog.t +++ b/tests/test-hgweb-filelog.t @@ -156,7 +156,7 @@ <ul> <li><a href="/help">help</a></li> </ul> - <p> + <p></p> <div class="atom-logo"> <a href="/atom-log/01de2d66a28d/a" title="subscribe to atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"></a> @@ -265,7 +265,7 @@ <ul> <li><a href="/help">help</a></li> </ul> - <p> + <p></p> <div class="atom-logo"> <a href="/atom-log/01de2d66a28d/a" title="subscribe to atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"></a> @@ -374,7 +374,7 @@ <ul> <li><a href="/help">help</a></li> </ul> - <p> + <p></p> <div class="atom-logo"> <a href="/atom-log/5ed941583260/a" title="subscribe to atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"></a> @@ -478,7 +478,7 @@ <ul> <li><a href="/help">help</a></li> </ul> - <p> + <p></p> <div class="atom-logo"> <a href="/atom-log/5ed941583260/a" title="subscribe to atom feed"> <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed"></a>
--- a/tests/test-hgweb-removed.t +++ b/tests/test-hgweb-removed.t @@ -99,7 +99,7 @@ <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a> <div id="diffstatdetails" style="display:none;"> <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a> - <p> + <p></p> <table class="stripes2"> <tr> <td class="diffstat-file"><a href="#l1.1">a</a></td> <td class="diffstat-total" align="right">1</td>