templates: make earlycommands and othercommands optional

We now have sub-topics in the help system. The "helptopics" template
serves as a mechanism for displaying an index of help topics.
Previously, it was only used to show the top-level list of help topics,
which includes special groupings of topics.

In the near future, we'll adapt "helptopics" for showing the index
of sub-topics. In this patch, we optionally render {earlycommands} and
{othercommands} since they aren't present on sub-topics.
This commit is contained in:
Gregory Szorc 2015-12-30 17:12:59 -07:00
parent 901d6a2088
commit 627d3b55af
4 changed files with 19 additions and 0 deletions

View File

@ -30,11 +30,16 @@ help
<tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
{topics % helpentry}
{if(earlycommands, '
<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
{earlycommands % helpentry}
')}
{if(othercommands, '
<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
{othercommands % helpentry}
')}
</table>
{footer}

View File

@ -35,11 +35,15 @@
<tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
{topics % helpentry}
{if(earlycommands, '
<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
{earlycommands % helpentry}
')}
{if(othercommands, '
<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
{othercommands % helpentry}
')}
</table>
{footer}

View File

@ -32,11 +32,16 @@
<tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
{topics % helpentry}
{if(earlycommands, '
<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
{earlycommands % helpentry}
')}
{if(othercommands, '
<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
{othercommands % helpentry}
')}
</table>
</div>
</div>

View File

@ -1787,6 +1787,7 @@ Dish up an empty repo; serve it cold.
This is the topic to test omit indicating.
</td></tr>
<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
<tr><td>
@ -1909,6 +1910,8 @@ Dish up an empty repo; serve it cold.
update working directory (or switch revisions)
</td></tr>
<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
<tr><td>
@ -2149,6 +2152,8 @@ Dish up an empty repo; serve it cold.
</td><td>
output version and copyright information
</td></tr>
</table>
</div>
</div>