FSFE/fsfe-website
25
31
Fork 91
Code Issues 65 Pull Requests 7 Wiki Activity

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

Browse Source
This commit is contained in:
samtuke 2010-10-09 14:53:48 +00:00
parent a643b6f811
commit d532dd964c
4 changed files with 62 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
fsfe.xsl
View File

@ -144,6 +144,50 @@
<!-- Menu -->
<xsl:element name="div">
<xsl:attribute name="id">menu</xsl:attribute>
<xsl:element name="ul">
<!-- FSFE portal menu -->
<xsl:element name="li">
FSFE
<xsl:element name="ul">
<xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
<xsl:for-each select="/buildinfo/menuset/menu[@parent='fsfe']">
<!--<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>
</xsl:element>
</xsl:element>
</xsl:element><!-- end ul -->
<xsl:for-each select="/buildinfo/menuset/menu[not(@parent)]">
<xsl:sort select="@id" />
@ -174,34 +218,7 @@
</xsl:element>
</xsl:otherwise>
</xsl:choose>
<!-- Submenu -->
<xsl:if test="/buildinfo/menuset/menu[@parent=$id]">
<xsl:element name="ul">
<xsl:for-each select="/buildinfo/menuset/menu[@parent=$id]">
<!--<xsl:sort select="@id" />-->
<xsl:sort select="@priority" />
<xsl:variable name="mid"><xsl:value-of select="@id" /></xsl:variable>
<xsl:element name="li">
<xsl:attribute name="class">submenu</xsl:attribute>
<xsl:choose>
<xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
<xsl:value-of select="/buildinfo/textset/text[@id=$mid]|
/buildinfo/textsetbackup/text[@id=$mid
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=$mid]|
/buildinfo/textsetbackup/text[@id=$mid
and not(@id=/buildinfo/textset/text/@id)]"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:element>
</xsl:for-each>
</xsl:element> <!-- /submenu ul -->
</xsl:if>
</xsl:element> <!-- /li -->
</xsl:for-each>
</xsl:element> <!-- /ul -->
@ -309,7 +326,7 @@
<xsl:attribute name="type">text</xsl:attribute>
<xsl:attribute name="name">query</xsl:attribute>
<xsl:attribute name="placeholder">
<xsl:value-of select="/buildinfo/textset/text[@id='email-address']" />
email@example.org
</xsl:attribute>
</xsl:element>

1
look/generic.css
View File

@ -474,7 +474,6 @@ ul.subpages li p {
clear: left;
float: left;
line-height: 100%;
margin-top: 67px;
width: 150px;
/*
top: 200px;

16
tools/menu-global.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<menuset>
<menu id="menu1" />
<menu id="menu1/about" priority="0" parent="menu1">/about/about.html</menu>
<menu id="menu1/projects" priority="1" parent="menu1">/projects/work.html</menu>
<menu id="menu1/help" priority="2" parent="menu1">/contribute/contribute.html</menu>
<menu id="menu1/donate" priority="3" parent="menu1">/donate/donate.html</menu>
<menu id="menu1/order" priority="4" parent="menu1">/order/order.html</menu>
<menu id="menu1/press" priority="5" parent="menu1">/press/press.html</menu>
<menu id="menu1/thankgnus" priority="6" parent="menu1">/donate/thankgnus.html</menu>
<menu id="fsfe" />
<menu id="fsfe/about" priority="0" parent="fsfe">/about/about.html</menu>
<menu id="fsfe/projects" priority="1" parent="fsfe">/projects/work.html</menu>
<menu id="fsfe/help" priority="2" parent="fsfe">/contribute/contribute.html</menu>
<menu id="fsfe/donate" priority="3" parent="fsfe">/donate/donate.html</menu>
<menu id="fsfe/order" priority="4" parent="fsfe">/order/order.html</menu>
<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>

16
tools/texts-en.xml
View File

@ -56,14 +56,14 @@
<text id="to">to</text>
<!-- Menu -->
<text id="menu1/about">About</text>
<text id="menu1/projects">Our work</text>
<text id="menu1/documents">Documents</text>
<text id="menu1/help">Contribute</text>
<text id="menu1/donate">Donate</text>
<text id="menu1/order">Shop</text>
<text id="menu1/lists">Mailing Lists</text>
<text id="menu1/press">Press</text>
<text id="fsfe/about">About</text>
<text id="fsfe/projects">Our work</text>
<text id="fsfe/documents">Documents</text>
<text id="fsfe/help">Contribute</text>
<text id="fsfe/donate">Donate</text>
<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>