Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/delibero.git
Fixed conflicting XSL templates between index page and tags page.
| Author | Dave Jarvis <email> |
|---|---|
| Date | 2014-11-25 13:44:40 GMT-0800 |
| Commit | 6aa8d07b8fb34f4b7a7e0f113c3808d50fecf26c |
| Parent | dda9268 |
xml/account.html
| </head> | ||
| <body> | ||
| - <div class="header"><a class="page-prev" href="support.html">Previous</a></div> | ||
| + <div class="header"><a class="page-prev" href="support.html">Previous</a><a class="page-next" href="tags.html">Next</a></div> | ||
| <hr><iframe id="page" src="account.xml" width="100%" height="100%" frameborder="0"></iframe></body> | ||
| </html> |
xml/account.xml
| <header> | ||
| <implication>Implication</implication> | ||
| - <policy>Proposal</policy> | ||
| + <policy-title>Proposal</policy-title> | ||
| <timestamp>Date</timestamp> | ||
| <state>State</state> |
xml/css/tags.css
| } | ||
| +div.toolbar:after { | ||
| + font-size: 0.8em; | ||
| + content: "add | edit | flag"; | ||
| + height: 1.25em; | ||
| + line-height: 1.25em; | ||
| + float: right; | ||
| + padding-right: 1em; | ||
| +} | ||
| + | ||
| /* *********************************************************************** | ||
| * | ||
| * Sets up the remainder of the web page. | ||
| * | ||
| * ***********************************************************************/ | ||
| h1 { | ||
| - padding-bottom: 1em; | ||
| + font-size: 1.5em; | ||
| + padding-bottom: 0.5em; | ||
| } | ||
| -.description { | ||
| - padding-bottom: 1em; | ||
| - border-bottom: 1px solid black; | ||
| -} | ||
xml/pages.xml
| <page file="support"/> | ||
| <page file="account"/> | ||
| + <page file="tags"/> | ||
| </pages> | ||
xml/tags.xml
| <title>Tag Editor</title> | ||
| </summary> | ||
| - <tags> | ||
| + <taglist> | ||
| <tag id="1"> | ||
| <name>Act</name> | ||
 |
||
| <name>Tax</name> | ||
| </tag> | ||
| - </tags> | ||
| - | ||
| - <related> | ||
| - <edit id="1" /> | ||
| - <flag id="1" /> | ||
| - </related> | ||
| + </taglist> | ||
| </policy> | ||
xml/tags.xsl
| xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> | ||
| -<xsl:template match="policy"> | ||
| - <xsl:apply-templates /> | ||
| - <xsl:apply-templates mode="tag" /> | ||
| -</xsl:template> | ||
| - | ||
| -<xsl:template match="tags" mode="tag"> | ||
| +<!-- Override the match="*" from the common template by forcing priority. --> | ||
| +<xsl:template match="taglist" priority="1"> | ||
| <div class="columns"> | ||
| <ul> | ||
| - <xsl:apply-templates mode="tag" /> | ||
| + <xsl:apply-templates mode="tag"/> | ||
| </ul> | ||
| </div> | ||
|
||
| <li> | ||
| <xsl:attribute name="id"> | ||
| - <xsl:value-of select="@id" /> | ||
| + <xsl:value-of select="@id"/> | ||
| </xsl:attribute> | ||
| - <xsl:value-of select="name" /> | ||
| + <xsl:value-of select="name"/> | ||
| <xsl:if test="tag"> | ||
| <ul> | ||
| - <xsl:apply-templates select="tag" mode="tag" /> | ||
| + <xsl:apply-templates select="tag" mode="tag"/> | ||
| </ul> | ||
| </xsl:if> | ||
| </li> | ||
| </xsl:template> | ||
| <!-- Ignore any nodes having nothing to do with tags. --> | ||
| -<xsl:template match="*" mode="tag" /> | ||
| +<xsl:template match="*" mode="tag"/> | ||
| <!-- Ignore the tags not in the correct mode. --> | ||
| -<xsl:template match="tags" /> | ||
| +<xsl:template match="taglist"/> | ||
| </xsl:stylesheet> | ||
| - | ||
| Delta | 24 lines added, 27 lines removed, 3-line decrease |
|---|