Mercurial > hg > nginx-site
changeset 32:2bcfb5f75e06
Supporting new format of <module> and <section>:
<module name="..." ...> and <section id="..." name="...">
Old format should be eventually removed.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 30 Sep 2011 13:13:21 +0000 |
parents | dc74e3a8f324 |
children | ae5aca1efe2c |
files | xsls/body.xsls xsls/content.xsls xsls/link.xsls |
diffstat | 3 files changed, 29 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/xsls/body.xsls +++ b/xsls/body.xsls @@ -11,7 +11,7 @@ X:template body (lang) { <tr> <td width="70%"><center><h3> - !{@title} X:if "$YEAR" { X:text{: } !{$YEAR} } + !{@name | @title} X:if "$YEAR" { X:text{: } !{$YEAR} } </h3></center></td> <td rowspan="2" align="{$ALIGN}" valign="top"> @@ -29,8 +29,14 @@ X:template body (lang) { <tr><td valign="top"> <table width="100%"><tr><td align="{$ALIGN}"> - X:for-each "section[@name]" { - <a href="#{@name}"> !{@title} </a><br/> + X:if "section[@id]" { + X:for-each "section[@id]" { + <a href="#{@id}"> !{@name} </a><br/> + } + } else { + X:for-each "section[@name]" { + <a href="#{@name}"> !{@title} </a><br/> + } } </td></tr></table>
--- a/xsls/content.xsls +++ b/xsls/content.xsls @@ -1,5 +1,19 @@ X:stylesheet { + X:template = "section[@id and @name]" { + <a name="{@id}" /> <center><h4> !{@name} </h4></center> + !!; + } + + X:template = "section[not(@id) and @name]" { + <center><h4> !{@name} </h4></center> + !!; + } + + X:template = "section[not(@id) and not(@name)]" { !!; } + + <!-- legacy section templates --> + X:template = "section[@name and @title]" { <a name="{@name}" /> <center><h4> !{@title} </h4></center> !!; @@ -12,6 +26,8 @@ X:stylesheet { X:template = "section[not(@name) and not(@title)]" { !!; } + <!-- --> + X:template = "para" { <p> !!; </p> } X:template = "item/para" { <p class="noindent"> !!; </p> }
--- a/xsls/link.xsls +++ b/xsls/link.xsls @@ -31,8 +31,10 @@ X:template = "a[starts-with(@href, '/') |document(concat($XML, @href))/module/@link) } } } - !{ document(concat($XML, @href))/article/@title - |document(concat($XML, @href))/module/@title } + !{ document(concat($XML, @href))/article/@title + |document(concat($XML, @href))/article/@name + |document(concat($XML, @href))/module/@title + |document(concat($XML, @href))/module/@name } </a> }