svn path=/branches/design/; revision=17388

This commit is contained in:
samtuke 2010-10-09 15:09:14 +00:00
parent d532dd964c
commit 089fdf9aff
3 changed files with 44 additions and 12 deletions

View File

@ -181,6 +181,39 @@
</xsl:element> <!-- /li -->
</xsl:for-each>
</xsl:element>
</xsl:element>
<xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
<xsl:for-each select="/buildinfo/menuset/menu[@parent='fellowship']">
<!--<xsl:sort select="@id"/>-->
<xsl:sort select="@priority" />
<xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
<xsl:element name="li">
<xsl:choose>
<xsl:when test="not(string(.))">
<xsl:value-of select="/buildinfo/textset/text[@id=$id]|
/buildinfo/textsetbackup/text[@id=$id
and not(@id=/buildinfo/textset/text/@id)]"/>
</xsl:when>
<xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
<xsl:value-of select="/buildinfo/textset/text[@id=$id]|
/buildinfo/textsetbackup/text[@id=$id
and not(@id=/buildinfo/textset/text/@id)]"/>
</xsl:when>
<xsl:otherwise>
<xsl:element name="a">
<xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
<xsl:value-of select="/buildinfo/textset/text[@id=$id]|
/buildinfo/textsetbackup/text[@id=$id
and not(@id=/buildinfo/textset/text/@id)]"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:element> <!-- /li -->
</xsl:for-each>

View File

@ -10,10 +10,9 @@
<menu id="fsfe/press" priority="5" parent="fsfe">/press/press.html</menu>
<menu id="fsfe/thankgnus" priority="6" parent="fsfe">/donate/thankgnus.html</menu>
<menu id="menu2" />
<menu id="menu2/fellowship" priority="0" parent="menu2">http://fellowship.fsfe.org/</menu>
<menu id="menu2/fellowship/1-wiki" priority="1" parent="menu2/fellowship">http://wiki.fsfe.org/</menu>
<menu id="menu2/fellowship/2-planet" priority="2" parent="menu2/fellowship">http://planet.fsfe.org/</menu>
<menu id="menu2/fellowship/3-join" priority="3" parent="menu2/fellowship">http://fellowship.fsfe.org/join</menu>
</menuset>
<menu id="fellowship" />
<menu id="fellowship/fellowship" priority="0" parent="fellowship">http://fellowship.fsfe.org/</menu>
<menu id="fellowship/fellowship/1-wiki" priority="1" parent="fellowship/fellowship">http://wiki.fsfe.org/</menu>
<menu id="fellowship/fellowship/2-planet" priority="2" parent="fellowship/fellowship">http://planet.fsfe.org/</menu>
<menu id="fellowship/fellowship/3-join" priority="3" parent="fellowship/fellowship">http://fellowship.fsfe.org/join</menu>
</menuset>

View File

@ -64,11 +64,11 @@
<text id="fsfe/order">Shop</text>
<text id="fsfe/lists">Mailing Lists</text>
<text id="fsfe/press">Press</text>
<text id="menu1/thankgnus">Our Donors</text>
<text id="menu2/fellowship">Fellowship</text>
<text id="menu2/fellowship/1-wiki">Wiki</text>
<text id="menu2/fellowship/2-planet">Planet Blog</text>
<text id="menu2/fellowship/3-join">Join</text>
<text id="fsfe/thankgnus">Our Donors</text>
<text id="fellowship/fellowship">Fellowship</text>
<text id="fellowship/fellowship/1-wiki">Wiki</text>
<text id="fellowship/fellowship/2-planet">Planet Blog</text>
<text id="fellowship/fellowship/3-join">Join</text>
<!-- Date time -->
<text id="months/1">January</text>