Skip to content

Commit 459dc20

Browse files
committed
Regenerated after dfe8ae3.
1 parent 8794af3 commit 459dc20

File tree

2 files changed

+23
-125
lines changed

2 files changed

+23
-125
lines changed

xslt/menu.xslt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
.. "menu/item[@href = $LINK]", etc.
1515
-->
1616

17+
<li>
18+
1719
<xsl:choose><xsl:when test="@href = $LINK">
1820
<xsl:choose><xsl:when test="$YEAR and @href='/'">
1921
<a href="./"> news </a> <br/>
@@ -22,7 +24,6 @@
2224
</xsl:otherwise></xsl:choose>
2325

2426
</xsl:when><xsl:otherwise>
25-
2627
<!--
2728
.. If a menu item has the switchlang attribute, then it will point
2829
.. to the same document in the specified language.
@@ -67,33 +68,34 @@
6768

6869
<xsl:if test="@lang"> <xsl:text> [</xsl:text> <xsl:value-of select="@lang"/> <xsl:text>]</xsl:text></xsl:if>
6970
</xsl:otherwise></xsl:choose>
70-
71-
<br/>
7271
</xsl:otherwise></xsl:choose>
72+
</li>
7373
</xsl:template>
7474

7575

7676
<xsl:template match="menu/item[@year]">
7777
<xsl:if test="$YEAR or $LINK='/'">
78+
<li>
7879
<xsl:choose><xsl:when test="$YEAR=@year">
79-
<xsl:value-of select="@year"/> <br/>
80+
<xsl:value-of select="@year"/>
8081
</xsl:when><xsl:otherwise>
8182
<xsl:if test="@href"> <a href="{@href}"> <xsl:value-of select="@year"/> </a> </xsl:if>
82-
<br/>
8383
</xsl:otherwise></xsl:choose>
84+
</li>
8485
</xsl:if>
8586
</xsl:template>
8687

8788

8889
<xsl:template match="menu/item[starts-with(@href, 'http://') or starts-with(@href, 'https://')]">
90+
<li>
8991
<a href="{@href}"> <xsl:value-of select=" normalize-space(text()) "/> </a>
9092
<xsl:if test="@lang"> <xsl:text> [</xsl:text> <xsl:value-of select="@lang"/> <xsl:text>]</xsl:text></xsl:if>
91-
<br/>
93+
</li>
9294
</xsl:template>
9395

9496

9597
<xsl:template match="menu/item[not(@href) and not(@year)]">
96-
<xsl:value-of select=" normalize-space(text()) "/> <br/>
98+
<li><xsl:value-of select=" normalize-space(text()) "/> <br/></li>
9799
</xsl:template>
98100

99101
</xsl:stylesheet>

xslt/style.xslt

Lines changed: 14 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -8,126 +8,22 @@
88

99
<xsl:template name="style"><xsl:param name="lang"/>
1010

11-
<style type="text/css"><xsl:value-of select=" normalize-space('
12-
body { background: white;
13-
color: black;
14-
font-family: sans-serif;
15-
line-height: 1.4em;
16-
text-align: center;
17-
margin: 0;
18-
padding: 0; }
19-
#banner { background: black;
20-
color: #F2F2F2;
21-
line-height: 1.2em;
22-
padding: .3em 0;
23-
box-shadow: 0 5px 10px black; }
24-
#banner a { color: #00B140; }
25-
#main { text-align: left;
26-
margin: 0 auto;
27-
min-width: 32em;
28-
max-width: 64em; }
29-
#menu { float: right;
30-
width: 11em;
31-
padding: 0 .5em 1em .5em;
32-
border-left: 2px solid #DDD; }
33-
#content { margin-right: 13.5em;
34-
padding: 0 .2em 0 1.5em; }
35-
h1 { display: block;
36-
font-size: 3em;
37-
text-align: left;
38-
height: .7em;
39-
margin: 0;
40-
margin-bottom: .5em; }
41-
h1 img { width: 100%; }
42-
h2 { text-align: center; }
43-
p { text-align: justify; }
44-
table.news p { margin-top: 0; }
45-
table.news td { vertical-align: baseline; }
46-
table.news .date { text-align: right;
47-
padding-right: 0.5em;
48-
white-space: nowrap; }
49-
table.donors td { vertical-align: baseline; }
50-
table.donors li { text-align: left; }
51-
div.directive { background: #F2F2F2;
52-
line-height: 1em;
53-
margin: 1em 0 1em -1em;
54-
padding: .7em .7em .7em 1em;
55-
border-top: 2px solid #DDD; }
56-
div.directive th { padding-left: 0;
57-
padding-right: .5em;
58-
vertical-align: baseline;
59-
text-align: left;
60-
font-weight: normal; }
61-
div.directive td { vertical-align: baseline; }
62-
div.directive pre { padding: 0;
63-
margin: 0; }
64-
div.directive p { margin: .5em 0 0 .1em;
65-
font-size: .8em; }
66-
a.notrans { color: gray;
67-
text-decoration:none; }
68-
span.initial { font-size: 200%;
69-
float: left;
70-
padding-right: 10pt;}
71-
ul, ol { margin: .5em 0 1em 1em;
72-
padding: 0 .5em; }
73-
ol { list-style-position: inside; }
74-
li { text-align: justify;
75-
padding: .5em 0 0 1px; }
76-
.compact li { padding-top: 0; }
77-
dl { margin: .5em 0 1em 0; }
78-
dt { margin: .5em 0; }
79-
.compact dt { margin-bottom: .2em; }
80-
dd { margin-left: 1.5em;
81-
padding-left: 1px;
82-
text-align: justify; }
83-
td.list { background: #F2F2F2; }
84-
blockquote { margin: 1em 0 1em 1em;
85-
padding: .5em; }
86-
li blockquote, dd blockquote
87-
{ margin: .7em 0; }
88-
blockquote.note { border: 1px dotted #999;
89-
line-height: 1.2em;
90-
text-align: justify; }
91-
blockquote.example {
92-
line-height: 1em;
93-
border-left: 1px solid #BBB; }
94-
blockquote.example pre {
95-
padding: 0;
96-
margin: 0; }
97-
sup { font-size: 50%; }
98-
.video { position: relative;
99-
padding-bottom: 56.25%;
100-
overflow: hidden; }
101-
.video iframe,
102-
.video object,
103-
.video embed { position: absolute;
104-
top:0;
105-
left:0;
106-
width:100%;
107-
height:100%; }
108-
') "/>
11+
<meta name="viewport" content="width=device-width,initial-scale=1"></meta>
10912

110-
<xsl:if test="$lang = 'he'">
111-
<xsl:value-of select=" normalize-space('
112-
pre { text-align: left;
113-
direction: ltr; }
114-
code { direction: ltr;
115-
unicode-bidi: embed; }
116-
.ltr { direction: ltr;
117-
unicode-bidi: embed; }
118-
') "/>
119-
</xsl:if>
13+
<link>
14+
<xsl:attribute name="rel">
15+
<xsl:text>stylesheet</xsl:text>
16+
</xsl:attribute>
17+
<xsl:attribute name="href">
18+
<xsl:choose><xsl:when test="substring-after($DIRNAME, '/')">
19+
<xsl:value-of select=" concat($ROOT, '/css/style_', $lang, '.css') "/>
20+
</xsl:when><xsl:otherwise>
21+
<xsl:value-of select=" substring-after(concat('/css/style_', $lang, '.css'), '/') "/>
22+
</xsl:otherwise></xsl:choose>
23+
</xsl:attribute>
24+
<xsl:apply-templates/>
25+
</link>
12026

121-
<xsl:if test="$lang = 'cn'">
122-
<xsl:value-of select=" normalize-space('
123-
p { text-align: left; }
124-
li { text-align: left; }
125-
dd { text-align: left; }
126-
blockquote.note { text-align: left; }
127-
') "/>
128-
</xsl:if>
129-
130-
</style>
13127
</xsl:template>
13228

13329
</xsl:stylesheet>

0 commit comments

Comments
 (0)