Browse Source

- we now use only one step of XSL transformation

svn path=/trunk/; revision=25171
nicoulas 6 years ago
parent
commit
fc5838b0f2
100 changed files with 733 additions and 1863 deletions
  1. 3
    12
      about/legal/de/de.xsl
  2. 3
    12
      about/members.xsl
  3. 0
    4
      about/printable/get_h1.xsl
  4. 0
    4
      about/printable/get_moreinfo.xsl
  5. 5
    14
      about/printable/printable.xsl
  6. 2
    11
      about/team.xsl
  7. 3
    13
      activities/ftf/avm-gpl-violation.xsl
  8. 2
    2
      activities/ftf/tickets/eln-tickets.html
  9. 3
    12
      activities/map/de/de.xsl
  10. 1
    1
      activities/ms-vs-eu/fsfe-statement.html
  11. 1
    1
      activities/ms-vs-eu/halloween1.html
  12. 4
    15
      activities/os/os.xsl
  13. 3
    12
      activities/wipo/wipo.xsl
  14. 9
    12
      activities/wipo/wiwo.de.xhtml
  15. 9
    11
      activities/wipo/wiwo.el.xhtml
  16. 9
    12
      activities/wipo/wiwo.en.xhtml
  17. 10
    12
      activities/wipo/wiwo.es.xhtml
  18. 10
    12
      activities/wipo/wiwo.fr.xhtml
  19. 5
    7
      activities/wipo/wiwo.hu.xhtml
  20. 9
    11
      activities/wipo/wiwo.it.xhtml
  21. 9
    14
      activities/wipo/wiwo.nl.xhtml
  22. 9
    10
      activities/wipo/wiwo.pt.xhtml
  23. 4
    7
      activities/wipo/wiwo.ru.xhtml
  24. 15
    31
      activities/wipo/wiwo.xsl
  25. 2
    0
      associates/associates.ca.xhtml
  26. 3
    0
      associates/associates.da.xhtml
  27. 2
    0
      associates/associates.de.xhtml
  28. 2
    0
      associates/associates.el.xhtml
  29. 3
    0
      associates/associates.en.xhtml
  30. 2
    0
      associates/associates.es.xhtml
  31. 2
    0
      associates/associates.fi.xhtml
  32. 2
    0
      associates/associates.fr.xhtml
  33. 2
    0
      associates/associates.hu.xhtml
  34. 2
    0
      associates/associates.it.xhtml
  35. 2
    0
      associates/associates.nb.xhtml
  36. 2
    0
      associates/associates.nl.xhtml
  37. 2
    0
      associates/associates.pt.xhtml
  38. 2
    0
      associates/associates.ro.xhtml
  39. 2
    0
      associates/associates.ru.xhtml
  40. 3
    0
      associates/associates.sq.xhtml
  41. 2
    0
      associates/associates.sv.xhtml
  42. 2
    0
      associates/associates.tr.xhtml
  43. 14
    22
      associates/associates.xsl
  44. 3
    12
      at/at.xsl
  45. 4
    15
      campaigns/askyourcandidates/askyourcandidates.xsl
  46. 3
    12
      campaigns/finished.xsl
  47. 4
    15
      campaigns/ilovefs/2012/ilovefs.xsl
  48. 4
    15
      campaigns/ilovefs/2012/unperfekthaus.xsl
  49. 3
    12
      campaigns/inactive.xsl
  50. 2
    2
      campaigns/mankind/lsm2002/slides/contact.html
  51. 4
    15
      campaigns/nledu/nledu.xsl
  52. 29
    38
      campaigns/pdfreaders/buglist.xsl
  53. 16
    25
      campaigns/pdfreaders/pdfreaders.xsl
  54. 16
    34
      campaigns/pdfreaders/petition.xsl
  55. 3
    12
      campaigns/projects.xsl
  56. 3
    12
      campaigns/swpat/documents.xsl
  57. 7
    8
      campaigns/swpat/memorandum.de.xhtml
  58. 8
    9
      campaigns/swpat/memorandum.el.xhtml
  59. 7
    8
      campaigns/swpat/memorandum.en.xhtml
  60. 6
    7
      campaigns/swpat/memorandum.it.xhtml
  61. 11
    28
      campaigns/swpat/memorandum.xsl
  62. 2
    11
      campaigns/valentine/2011/valentine-2011.xsl
  63. 36
    45
      contact/local.xsl
  64. 3
    12
      de/de.xsl
  65. 3
    12
      documents/documents.xsl
  66. 3
    14
      documents/whyfs.xsl
  67. 4
    13
      donate/thankgnus-2001.xsl
  68. 4
    13
      donate/thankgnus-2002.xsl
  69. 4
    13
      donate/thankgnus-2003.xsl
  70. 4
    13
      donate/thankgnus-2004.xsl
  71. 4
    13
      donate/thankgnus-2005.xsl
  72. 4
    13
      donate/thankgnus-2006.xsl
  73. 4
    13
      donate/thankgnus-2007.xsl
  74. 4
    13
      donate/thankgnus-2008.xsl
  75. 4
    13
      donate/thankgnus-2009.xsl
  76. 4
    13
      donate/thankgnus-2010.xsl
  77. 4
    13
      donate/thankgnus-2011.xsl
  78. 4
    13
      donate/thankgnus-2012.xsl
  79. 4
    13
      donate/thankgnus-2013.xsl
  80. 5
    14
      donate/thankgnus.xsl
  81. 0
    18
      events/2012/event-20121108.en.xml~
  82. 0
    17
      events/2012/event-20121108.it.xml~
  83. 3
    3
      events/events.ics.xsl
  84. 2
    2
      events/events.rss.xsl
  85. 19
    30
      events/events.xsl
  86. 3
    28
      fellowship/index.xsl
  87. 3
    12
      fi/fi.xsl
  88. 3
    12
      fr/fr.xsl
  89. 0
    60
      freesoftware/support/support.en.xhtml~
  90. 233
    211
      fsfe.xsl
  91. 4
    28
      index.xsl
  92. 3
    12
      it/it.xsl
  93. 2
    18
      news/legal-news.xsl
  94. 2
    12
      news/news.rss.xsl
  95. 7
    19
      news/news.xsl
  96. 22
    37
      news/newsletter.xsl
  97. 0
    487
      news/nl/nl-201205.it.xhtml~
  98. 5
    14
      order/order.xsl
  99. 4
    13
      press/press.xsl
  100. 0
    0
      tags/tagged.xsl

+ 3
- 12
about/legal/de/de.xsl View File

@@ -1,12 +1,13 @@
1 1
 <?xml version="1.0" encoding="ISO-8859-1"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>
4
+  <xsl:import href="../../../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8 9
     <xsl:element name="ul">
9
-      <xsl:for-each select="/html/set/person[@chapter_de='yes']">
10
+      <xsl:for-each select="/buildinfo/document/set/person[@chapter_de='yes']">
10 11
         <xsl:sort select="@id"/>
11 12
         <xsl:element name="li">
12 13
           <xsl:value-of select="name"/>
@@ -15,14 +16,4 @@
15 16
     </xsl:element>
16 17
   </xsl:template>
17 18
 
18
-  <!-- Do not copy <set> or <text> to output at all -->
19
-  <xsl:template match="set | tags"/>
20
-
21
-  <!-- For all other nodes, copy verbatim -->
22
-  <xsl:template match="@*|node()" priority="-1">
23
-    <xsl:copy>
24
-      <xsl:apply-templates select="@*|node()"/>
25
-    </xsl:copy>
26
-  </xsl:template>
27
-
28 19
 </xsl:stylesheet>

+ 3
- 12
about/members.xsl View File

@@ -1,12 +1,13 @@
1 1
 <?xml version="1.0" encoding="ISO-8859-1"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8 9
     <xsl:element name="ul">
9
-      <xsl:for-each select="/html/set/person[@association-member='yes']">
10
+      <xsl:for-each select="/buildinfo/document/set/person[@association-member='yes']">
10 11
         <xsl:sort select="@id"/>
11 12
         <xsl:element name="li">
12 13
           <xsl:element name="p">
@@ -43,14 +44,4 @@
43 44
     </xsl:element>
44 45
   </xsl:template>
45 46
 
46
-  <!-- Do not copy <set> or <text> to output at all -->
47
-  <xsl:template match="set | tags"/>
48
-
49
-  <!-- For all other nodes, copy verbatim -->
50
-  <xsl:template match="@*|node()" priority="-1">
51
-    <xsl:copy>
52
-      <xsl:apply-templates select="@*|node()"/>
53
-    </xsl:copy>
54
-  </xsl:template>
55
-
56 47
 </xsl:stylesheet>

+ 0
- 4
about/printable/get_h1.xsl View File

@@ -9,8 +9,4 @@
9 9
     <xsl:if test="../@id='fsfe'"> - </xsl:if>
10 10
     <xsl:if test="../@id='free_software'"> - </xsl:if>
11 11
   </xsl:template>
12
-  
13
-  <xsl:template match="@*|node()" priority="-1">
14
-    <xsl:apply-templates select="@*|node()"/>
15
-  </xsl:template>
16 12
 </xsl:stylesheet>

+ 0
- 4
about/printable/get_moreinfo.xsl View File

@@ -6,8 +6,4 @@
6 6
   <xsl:template match="a[@id='moreinfo']">
7 7
     <xsl:value-of select="@href"/>
8 8
   </xsl:template>
9
-  
10
-  <xsl:template match="@*|node()" priority="-1">
11
-    <xsl:apply-templates select="@*|node()"/>
12
-  </xsl:template>
13 9
 </xsl:stylesheet>

+ 5
- 14
about/printable/printable.xsl View File

@@ -1,7 +1,8 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
4
+  <xsl:import href="../../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
@@ -12,7 +13,7 @@
12 13
     <xsl:variable name="text-pdf-0"><xsl:value-of select="text[@id='pdf-0']"/></xsl:variable>
13 14
     <xsl:variable name="text-moreinfo"><xsl:value-of select="text[@id='moreinfo']"/></xsl:variable>
14 15
 
15
-    <xsl:for-each select="/html/set/printable[@type=$type]">
16
+    <xsl:for-each select="/buildinfo/document/set/printable[@type=$type]">
16 17
       <xsl:sort select="@id"/>
17 18
       <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
18 19
 
@@ -20,8 +21,8 @@
20 21
       <xsl:element name="h3">
21 22
         <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
22 23
         <xsl:choose>
23
-          <xsl:when test="translation[@lang=/html/@lang]!=''">
24
-            <xsl:value-of select="translation[@lang=/html/@lang]"/>
24
+          <xsl:when test="translation[@lang=/buildinfo/@language]!=''">
25
+            <xsl:value-of select="translation[@lang=/buildinfo/@language]"/>
25 26
           </xsl:when>
26 27
           <xsl:otherwise>
27 28
             <xsl:value-of select="translation[@lang='en']"/>
@@ -127,15 +128,5 @@
127 128
       </xsl:element>
128 129
     </xsl:for-each>
129 130
   </xsl:template>
130
-  
131
-  <!-- Do not copy <set> or <text> to output at all -->
132
-  <xsl:template match="set" />
133
-
134
-  <!-- For all other nodes, copy verbatim -->
135
-  <xsl:template match="@*|node()" priority="-1">
136
-    <xsl:copy>
137
-      <xsl:apply-templates select="@*|node()"/>
138
-    </xsl:copy>
139
-  </xsl:template>
140 131
 
141 132
 </xsl:stylesheet>

+ 2
- 11
about/team.xsl View File

@@ -3,7 +3,8 @@
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4 4
   
5 5
   <xsl:import href="../tools/xsltsl/countries.xsl" />
6
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>
6
+  <xsl:import href="../fsfe.xsl" />
7
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
7 8
   
8 9
   <!-- 
9 10
     For documentation on tagging (e.g. display a people list), take a
@@ -17,15 +18,5 @@
17 18
       <xsl:with-param name="team" select="'main'" />
18 19
     </xsl:call-template>
19 20
   </xsl:template>
20
-  
21
-  <!-- Do not copy <set> to output at all -->
22
-  <xsl:template match="set | tags"/>
23
-
24
-  <!-- For all other nodes, copy verbatim -->
25
-  <xsl:template match="@*|node()" priority="-1">
26
-    <xsl:copy>
27
-      <xsl:apply-templates select="@*|node()"/>
28
-    </xsl:copy>
29
-  </xsl:template>
30 21
 
31 22
 </xsl:stylesheet>

+ 3
- 13
activities/ftf/avm-gpl-violation.xsl View File

@@ -4,10 +4,11 @@
4 4
   
5 5
   <xsl:import href="../../tools/xsltsl/tagging.xsl" />
6 6
   
7
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
7
+  <xsl:import href="../../fsfe.xsl" />
8
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
8 9
 
9 10
   <!-- In /html/body node, append dynamic content -->
10
-  <xsl:template match="/html/body/tagged-docs">
11
+  <xsl:template match="tagged-docs">
11 12
     
12 13
     <xsl:call-template name="fetch-news">
13 14
       <xsl:with-param name="tag" select="'avmgplviolation'" />
@@ -17,15 +18,4 @@
17 18
     </xsl:call-template>
18 19
     
19 20
   </xsl:template>
20
-
21
-  <!-- Do not copy <set> and <text> to output at all -->
22
-  <xsl:template match="/html/set" />
23
-  <xsl:template match="/html/text" />
24
-
25
-  <!-- For all other nodes, copy verbatim -->
26
-  <xsl:template match="@*|node()" priority="-1">
27
-    <xsl:copy>
28
-      <xsl:apply-templates select="@*|node()"/>
29
-    </xsl:copy>
30
-  </xsl:template>
31 21
 </xsl:stylesheet>

+ 2
- 2
activities/ftf/tickets/eln-tickets.html View File

@@ -212,7 +212,7 @@ the page unnecessarily. We want to keep it as simple as possible.] Free Software
212 212
 
213 213
 <td>
214 214
 [[FIXME: kick this out. there already is a PayPal option in the online
215
-payment page. Let's keep it simple.]Please send payments to fsfeurope@paypal.org <span style="color:red;">(FIXME: Is this
215
+payment page. Let's keep it simple.]Please send payments to fsfeurope&#64;paypal.org <span style="color:red;">(FIXME: Is this
216 216
 correct?)</span>
217 217
 </td>
218 218
 </tr>
@@ -304,7 +304,7 @@ people a better feeling.
304 304
 <br />the attendees to be recognized just by their name (o.t.l.) next year?
305 305
 <br />IDEA: optional: get more data for hotel reservation and forward to the hotel,
306 306
       just as an agent, no responsibility
307
-<br />FIXME: Define list of people to get the data directly from the form: Office DUS, ftf-team@? Matija?
307
+<br />FIXME: Define list of people to get the data directly from the form: Office DUS, ftf-team&#64;? Matija?
308 308
 Karsten? Shane?
309 309
 <br />FIXME: Define workflow. Not here. But I beg you on my knees: soon!
310 310
 </div>

+ 3
- 12
activities/map/de/de.xsl View File

@@ -1,26 +1,17 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
4
+  <xsl:import href="../../../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8 9
     <xsl:variable name="type"><xsl:value-of select="@type"/></xsl:variable>
9
-    <xsl:for-each select="/html/set/item[@type=$type]">
10
+    <xsl:for-each select="/buildinfo/document/set/item[@type=$type]">
10 11
       <xsl:element name="li">
11 12
         <xsl:apply-templates select="node()"/>
12 13
       </xsl:element>
13 14
     </xsl:for-each>
14 15
   </xsl:template>
15 16
 
16
-  <!-- Do not copy <set> or <text> to output at all -->
17
-  <xsl:template match="set | tags"/>
18
-
19
-  <!-- For all other nodes, copy verbatim -->
20
-  <xsl:template match="@*|node()" priority="-1">
21
-    <xsl:copy>
22
-      <xsl:apply-templates select="@*|node()"/>
23
-    </xsl:copy>
24
-  </xsl:template>
25
-
26 17
 </xsl:stylesheet>

+ 1
- 1
activities/ms-vs-eu/fsfe-statement.html View File

@@ -775,7 +775,7 @@
775 775
   more than is sensible - to perform &quot;interoperability&quot; analysis.
776 776
 
777 777
   what would _you_ get out of this?  well, ask the team at
778
-  secure@microsoft.com.  whilst i was working on samba, from
778
+  secure&#64;microsoft.com.  whilst i was working on samba, from
779 779
   1996 to 1999, you received numerous really rather important
780 780
   and obscure security reports.  one of these resulted in the
781 781
   deployment of the Netlogon &quot;Schannel&quot; (don't know its real name)

+ 1
- 1
activities/ms-vs-eu/halloween1.html View File

@@ -1215,7 +1215,7 @@ right, anyway. }</FONT><P>
1215 1215
 
1216 1216
 <P ALIGN="JUSTIFY">Put alternately:</P><DIR>
1217 1217
 
1218
-<P>``Debugging is parallelizable''. Jeff [Dutky &lt;dutky@wam.umd.edu&gt;] observes that although debugging requires debuggers to communicate with some coordinating developer, it doesn't require significant coordination between debuggers. Thus it doesn't fall prey to the same quadratic complexity and management costs that make adding developers problematic.</P>
1218
+<P>``Debugging is parallelizable''. Jeff [Dutky &lt;dutky&#64;wam.umd.edu&gt;] observes that although debugging requires debuggers to communicate with some coordinating developer, it doesn't require significant coordination between debuggers. Thus it doesn't fall prey to the same quadratic complexity and management costs that make adding developers problematic.</P>
1219 1219
 </DIR>
1220 1220
 
1221 1221
 <P>One advantage of parallel debugging is that bugs and their fixes are found / propagated much faster than in traditional processes.   For example, when the TearDrop IP attack was first posted to the web, less than 24 hours passed before the Linux community had a working fix available for download.</P>

+ 4
- 15
activities/os/os.xsl View File

@@ -4,7 +4,8 @@
4 4
   
5 5
   <xsl:import href="../../tools/xsltsl/tagging.xsl" />
6 6
   
7
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
7
+  <xsl:import href="../../fsfe.xsl" />
8
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
8 9
   
9 10
   
10 11
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
14 15
     </xsl:call-template>
15 16
   </xsl:template>
16 17
   
17
-  
18
-  <!-- Do not copy <set> and <text> to output at all -->
19
-  <xsl:template match="/html/set" />
20
-  <xsl:template match="/html/text" />
21
-  
22 18
   <!-- How to show a link -->
23
-  <xsl:template match="/html/set/news/link">
19
+  <xsl:template match="/buildinfo/document/set/news/link">
24 20
     <xsl:element name="a">
25 21
       <xsl:attribute name="href">
26 22
         <xsl:value-of select="text()" />
27 23
       </xsl:attribute>
28 24
       <xsl:text>[</xsl:text>
29
-      <xsl:value-of select="/html/text[@id='more']" />
25
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
30 26
       <xsl:text>]</xsl:text>
31 27
     </xsl:element>
32 28
   </xsl:template>
33
-
34
-  <!-- For all other nodes, copy verbatim -->
35
-  <xsl:template match="@*|node()" priority="-1">
36
-    <xsl:copy>
37
-      <xsl:apply-templates select="@*|node()"/>
38
-    </xsl:copy>
39
-  </xsl:template>
40 29
   
41 30
 </xsl:stylesheet>

+ 3
- 12
activities/wipo/wipo.xsl View File

@@ -1,12 +1,13 @@
1 1
 <?xml version="1.0" encoding="ISO-8859-1"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />
4
+  <xsl:import href="../../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8 9
     <xsl:element name="ul">
9
-      <xsl:for-each select="/html/set/document">
10
+      <xsl:for-each select="/buildinfo/document/set/document">
10 11
         <xsl:sort select="@date" order="descending" />
11 12
         <xsl:element name="li">
12 13
           <xsl:element name="p">
@@ -38,14 +39,4 @@
38 39
     </xsl:element>
39 40
   </xsl:template>
40 41
 
41
-  <!-- Do not copy <set> or <text> to output at all -->
42
-  <xsl:template match="set" />
43
-
44
-  <!-- For all other nodes, copy verbatim -->
45
-  <xsl:template match="@*|node()" priority="-1">
46
-    <xsl:copy>
47
-      <xsl:apply-templates select="@*|node()"/>
48
-    </xsl:copy>
49
-  </xsl:template>
50
-
51 42
 </xsl:stylesheet>

+ 9
- 12
activities/wipo/wiwo.de.xhtml View File

@@ -76,19 +76,16 @@
76 76
 
77 77
 <h3>Unterzeichner</h3>
78 78
 
79
+<signatories/>
80
+
81
+<p>
82
+  Wenn sie ihren Namen oder den ihrer Organisation auch in dieser Liste
83
+  sehen wollen, kontaktieren Sie bitte 
84
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
85
+</p>
86
+
79 87
    </body>
80
-   <text id="osig">Organisationen</text>
81
-   <text id="isig">Personen</text>
82
-
83
-   <text>
84
-     <footer>
85
-       <p>
86
-         Wenn sie ihren Namen oder den ihrer Organisation auch in dieser Liste
87
-         sehen wollen, kontaktieren Sie bitte 
88
-         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
89
-       </p>
90
-     </footer>
91
-   </text>
88
+
92 89
 
93 90
    <timestamp>$Date$ $Author$</timestamp>
94 91
 </html>

+ 9
- 11
activities/wipo/wiwo.el.xhtml View File

@@ -62,18 +62,16 @@ WIPO, αλλά τι είδους οργανισμό χρειαζόμαστε γ
62 62
 
63 63
 
64 64
 <h2>Συμβαλλόμενα μέρη</h2>
65
+
66
+<signatories/>
67
+
68
+<p>
69
+  Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού σας να προστίθεται
70
+  σε αυτόν τον κατάλογο, παρακαλούμε επικοινωνήστε στο
71
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
72
+</p>
73
+
65 74
    </body>
66
-   <text id="osig">Οργανισμοί</text>
67
-   <text id="isig">Άτομα</text>
68
-   <text>
69
-     <footer>
70
-       <p>
71
-         Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού σας να προστίθεται
72
-         σε αυτόν τον κατάλογο, παρακαλούμε επικοινωνήστε στο
73
-         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
74
-       </p>
75
-     </footer>
76
-   </text>
77 75
 
78 76
    <timestamp>$Date$ $Author$</timestamp>
79 77
 </html>

+ 9
- 12
activities/wipo/wiwo.en.xhtml View File

@@ -75,19 +75,16 @@
75 75
 
76 76
 
77 77
     <h2>Signatories</h2>
78
-
79
-  </body>
80
-  <text id="osig">Organisations</text>
81
-  <text id="isig">Individuals</text>
82
-  <text>
83
-    <footer>
84
-      <p>
85
-        If you wish to see your name or the name of your organisation
86
-        added to this list, please contact <a
87
-          href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
78
+    
79
+    <signatories/>
80
+    
81
+    <p>
82
+      If you wish to see your name or the name of your organisation
83
+      added to this list, please contact <a
84
+        href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
88 85
      </p>
89
-   </footer>
90
- </text>
86
+     
87
+  </body>
91 88
   <timestamp>$Date$ $Author$</timestamp>
92 89
 </html>
93 90
 <!--

+ 10
- 12
activities/wipo/wiwo.es.xhtml View File

@@ -58,19 +58,17 @@ establecimiento de una agenda de desarrollo para la OMPI:
58 58
 <a href="http://www.wipo.int/documents/es/document/govbody/wo_gb_ga/pdf/wo_ga_31_11.pdf">http://www.wipo.int/documents/es/document/govbody/wo_gb_ga/pdf/wo_ga_31_11.pdf</a></li>
59 59
 </ol>
60 60
 
61
-	 <h2>Firmantes</h2>
61
+    <h2>Firmantes</h2>
62
+    
63
+    <signatories/>
64
+    
65
+    <p>
66
+      Si desea que su nombre o el de su organización aparezca en 
67
+      esta lista, por favor contacte con
68
+      <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
69
+    </p>
70
+    
62 71
    </body>
63
-   <text id="osig">Organizaciones</text>
64
-   <text id="isig">Individuos</text>
65
-   <text>
66
-     <footer>
67
-       <p>
68
-	    Si desea que su nombre o el de su organización aparezca en 
69
-	    esta lista, por favor contacte con
70
-         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
71
-       </p>
72
-     </footer>
73
-   </text>
74 72
 
75 73
    <timestamp>$Date$ $Author$</timestamp>
76 74
 </html>

+ 10
- 12
activities/wipo/wiwo.fr.xhtml View File

@@ -60,18 +60,16 @@ avoir, mais plut
60 60
       </li>
61 61
     </ol>
62 62
 
63
-<h2>Signataires</h2>
64
-   </body>
65
-   <text id="osig">Organisations</text>
66
-   <text id="isig">Individus</text>
67
-  <text>
68
-    <footer>
69
-      <p>
70
-        Si vous désirez ajouter votre nom ou celui de votre organisation à la liste des signataires, veuillez contacter <a
71
-          href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
72
-     </p>
73
-   </footer>
74
- </text>
63
+  <h2>Signataires</h2>
64
+  
65
+  <signatories/>
66
+  
67
+  <p>
68
+    Si vous désirez ajouter votre nom ou celui de votre organisation à la liste des signataires, veuillez contacter <a
69
+    href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
70
+  </p>
71
+
72
+</body>
75 73
 
76 74
    <timestamp>$Date$ $Author$</timestamp>
77 75
 </html>

+ 5
- 7
activities/wipo/wiwo.hu.xhtml View File

@@ -30,14 +30,12 @@ href="http://www.cptech.org/ip/wipo/genevadeclaration.html">Genfi Deklaráció</
30 30
 
31 31
 
32 32
 <h2>Aláírók</h2>
33
+
34
+<signatories/>
35
+
36
+<p>Ha Ön is szerepeltetni szeretné saját vagy szervezete nevét e listán, kérjük jelezze a <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a> e-mail címen.</p>
37
+
33 38
   </body>
34
-  <text id="osig">Szervezetek</text>
35
-  <text id="isig">Egyének</text>
36
-  <text>
37
-    <footer>
38
-      <p>Ha Ön is szerepeltetni szeretné saját vagy szervezete nevét e listán, kérjük jelezze a <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a> e-mail címen.</p>
39
-    </footer>
40
-  </text>
41 39
 
42 40
   <timestamp>$Date$ $Author$</timestamp>
43 41
   <translator>FSF.hu Alapítvány</translator>

+ 9
- 11
activities/wipo/wiwo.it.xhtml View File

@@ -60,18 +60,16 @@ piuttosto al tipo di organizzazione di cui abbiamo bisogno al suo posto.</p>
60 60
 
61 61
 
62 62
 <h2>Firmatari</h2>
63
+
64
+<signatories/>
65
+
66
+<p>
67
+  Per aggiungere il proprio nome, o quello della propria organizzazione,
68
+  a questa lista, si prega di contattare
69
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
70
+</p>
71
+
63 72
    </body>
64
-   <text id="osig">Organizzazioni</text>
65
-   <text id="isig">Individui</text>
66
-   <text>
67
-     <footer>
68
-       <p>
69
-         Per aggiungere il proprio nome, o quello della propria organizzazione,
70
-         a questa lista, si prega di contattare
71
-         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
72
-       </p>
73
-     </footer>
74
-   </text>
75 73
 
76 74
    <timestamp>$Date$ $Author$</timestamp>
77 75
 </html>

+ 9
- 14
activities/wipo/wiwo.nl.xhtml View File

@@ -77,22 +77,17 @@
77 77
     </ol>
78 78
 
79 79
     <h2>Ondertekenaars</h2>
80
-
80
+    
81
+    <signatories/>
82
+    
83
+    <p>
84
+      Als je uw naam of de naam van uw organisatie aan de lijst
85
+      wil toevoegen meld dit dan via <a 
86
+      href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
87
+    </p>
88
+    
81 89
     </body>
82 90
 
83
-
84
-   <text id="osig">Organisaties</text>
85
-   <text id="isig">Personen</text>
86
-   <text>
87
-     <footer>
88
-       <p>
89
-	 Als je uw naam of de naam van uw organisatie aan de lijst
90
-         wil toevoegen meld dit dan via <a 
91
-	 href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
92
-       </p>
93
-     </footer>
94
-   </text>
95
-
96 91
    <timestamp>$Date$ $Author$</timestamp>
97 92
 </html>
98 93
 <!--

+ 9
- 10
activities/wipo/wiwo.pt.xhtml View File

@@ -57,17 +57,16 @@ nova organização, mas não o único e talvez nem mesmo o mais importante.</p>
57 57
 </ol>
58 58
 
59 59
 <h2>Assinantes</h2>
60
+
61
+<signatories/>
62
+
63
+<p>
64
+  Se deseja que o seu nome ou o nome da sua organização apareça
65
+  nesta lista, por favor entre em contacto com <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
66
+</p>
67
+
60 68
    </body>
61
-   <text id="osig">Organizações</text>
62
-   <text id="isig">Indivíduos</text>
63
-   <text>
64
-     <footer>
65
-       <p>
66
-            Se deseja que o seu nome ou o nome da sua organização apareça
67
-            nesta lista, por favor entre em contacto com <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
68
-       </p>
69
-     </footer>
70
-   </text>
69
+   
71 70
    <timestamp>$Date$ $Author$</timestamp>
72 71
 </html>
73 72
 <!--

+ 4
- 7
activities/wipo/wiwo.ru.xhtml View File

@@ -62,16 +62,13 @@ http://www.wipo.int/edocs/mdocs/govbody/en/wo_ga_31/wo_ga_31_11.pdf</a></li>
62 62
 
63 63
 <h2>Присоединившиеся стороны</h2>
64 64
 
65
-</body>
66
-<text id="osig">Организации</text>
67
-<text id="isig">Частные лица</text>
68
-<text>
69
-<footer>
65
+<signatories/>
66
+
70 67
 <p>Если вы хотите внести свое имя или название организации в этот
71 68
 список, напишите по адресу <a
72 69
 href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.</p>
73
-</footer>
74
-</text>
70
+
71
+</body>
75 72
 <timestamp>$Date$ $Author$</timestamp>
76 73
 </html>
77 74
 <!--

+ 15
- 31
activities/wipo/wiwo.xsl View File

@@ -3,39 +3,23 @@
3 3
 <xsl:stylesheet version="1.0"
4 4
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
5 5
 
6
-  <xsl:output method="xml"
7
-           encoding="ISO-8859-1"
8
-           indent="yes"
9
-           />
6
+  <xsl:import href="../../fsfe.xsl" />
7
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
10 8
 
11
-  <xsl:template match="/">
12
-    <xsl:copy>
13
-      <xsl:apply-templates select="@*|node()" />
14
-    </xsl:copy>
15
-  </xsl:template>
16
-
17
-  <xsl:template match="/html/body">
18
-    <body>
19
-      <xsl:apply-templates />
20
-      <h3><xsl:value-of select="/html/text[@id='osig']" /></h3>
21
-      <ul>
22
-        <xsl:apply-templates select="/html/set/osig/node()" />
23
-      </ul>
24
-
25
-      <h3><xsl:value-of select="/html/text[@id='isig']" /></h3>
26
-      <ul>
27
-        <xsl:apply-templates select="/html/set/isig/node()" />
28
-      </ul>
29
-      <xsl:apply-templates select="/html/text/footer/node()" />
30
-    </body>
31
-  </xsl:template>
9
+  <xsl:template match="signatories">
10
+    <h3 id="organisations">
11
+      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template>
12
+    </h3>
13
+    <ul>
14
+      <xsl:apply-templates select="/buildinfo/document/set/osig/node()" />
15
+    </ul>
32 16
 
33
-  <xsl:template match="@*|node()" priority="-1">
34
-    <xsl:copy>
35
-      <xsl:apply-templates select="@*|node()"/>
36
-    </xsl:copy>
17
+    <h3 id="individuals">
18
+      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template>
19
+    </h3>
20
+    <ul>
21
+      <xsl:apply-templates select="/buildinfo/document/set/isig/node()" />
22
+    </ul>
37 23
   </xsl:template>
38 24
 
39
-  <xsl:template match="/html/set" />
40
-  <xsl:template match="/html/text" />
41 25
 </xsl:stylesheet>

+ 2
- 0
associates/associates.ca.xhtml View File

@@ -21,6 +21,8 @@ junts en campanyes i events com fires.</p>
21 21
 <p>Si voleu saber més sobre l'estatus d'associat, trobareu
22 22
 aquesta informació <a href="/associates/about.html">aquí</a>.</p>
23 23
 
24
+<associates/>
25
+
24 26
   </body>
25 27
 
26 28
   <timestamp>$Date$ $Author$</timestamp>

+ 3
- 0
associates/associates.da.xhtml View File

@@ -29,6 +29,9 @@
29 29
       læse om <a href="/associates/about.html">hvad det betyder, at være 
30 30
       tilknyttet FSFE og hvordan man bliver det</a>.
31 31
     </p>
32
+    
33
+    <associates/>
34
+    
32 35
   </body>
33 36
 
34 37
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.de.xhtml View File

@@ -29,6 +29,8 @@
29 29
     Organisation suchen, so lesen Sie was es bedeutet, <a href="/associates/about.html">assoziierte 
30 30
     Organisation zu sein und wie Ihre Organisation es werden kann</a>. 
31 31
     </p>
32
+    
33
+    <associates/>
32 34
 
33 35
   </body>
34 36
 

+ 2
- 0
associates/associates.el.xhtml View File

@@ -21,6 +21,8 @@
21 21
 <p>Αν ενδιαφέρεστε για την ιδιότητα του συνεργαζόμενου, παρακαλούμε διαβάστε
22 22
 <a href="/associates/about.html">τι σημαίνει συνεργαζόμενος με το FSFE και πώς θα γίνετε</a>.</p>
23 23
 
24
+<associates/>
25
+
24 26
   </body>
25 27
 
26 28
   <timestamp>$Date$ $Author$</timestamp>

+ 3
- 0
associates/associates.en.xhtml View File

@@ -26,6 +26,9 @@
26 26
     <p>
27 27
       If you are interested in the associate status, please consider to read <a href="/associates/about.html">what it means to be an associate of FSFE and how to become one</a>.
28 28
     </p>
29
+    
30
+    <associates/>
31
+    
29 32
   </body>
30 33
 
31 34
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.es.xhtml View File

@@ -21,6 +21,8 @@ en todos los aspectos (tales como afiliación, estatutos, finanzas, etc.)</p>
21 21
 
22 22
 <p>Si desea saber más sobre el estatus de asociado, lea nuestra <a href="/associates/about.html">explicación del significado del estatus de asociado y como puede volverselo</a>.</p>
23 23
 
24
+  <associates/>
25
+  
24 26
   </body>
25 27
 
26 28
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.fi.xhtml View File

@@ -21,6 +21,8 @@ messuilla.</p>
21 21
 <p>Lisätietoja kumppanuudesta FSFE:n kanssa löydät 
22 22
 <a href="/associates/about.html">täältä</a>.</p>
23 23
 
24
+<associates/>
25
+
24 26
   </body>
25 27
 
26 28
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.fr.xhtml View File

@@ -22,6 +22,8 @@ salons.</p>
22 22
 
23 23
 <p>Si vous êtes intéressé par le statut de partenaire, nous vous recommandons de considérer<a href="/associates/about.html">ce que cela signifie d'être partenaire de la FSFE et comment en devenir un</a>. </p>
24 24
 
25
+<associates/>
26
+
25 27
   </body>
26 28
 
27 29
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.hu.xhtml View File

@@ -17,6 +17,8 @@
17 17
 
18 18
 <p>Amennyiben többet szeretne tudni a társult szervezeti státusról, további információt találhat <a href="/associates/about.html">itt</a>.</p>
19 19
 
20
+<associates/>
21
+
20 22
   </body>
21 23
 
22 24
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.it.xhtml View File

@@ -23,6 +23,8 @@ esempio fiere e manifestazioni).</p>
23 23
 leggere <a href="/associates/about.html">cosa significa essere associati a FSFE
24 24
 e come diventarlo</a>.</p>
25 25
 
26
+<associates/>
27
+
26 28
   </body>
27 29
 
28 30
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.nb.xhtml View File

@@ -21,6 +21,8 @@ også om kampanjer og begivenheter, som for eksempel messer.</p>
21 21
 <p>Ønsker du å vite mer, kan du lese mer om <a
22 22
 href="/associates/about.html">tilknyttingsstatusen</a>.</p>
23 23
 
24
+<associates/>
25
+
24 26
   </body>
25 27
 
26 28
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.nl.xhtml View File

@@ -22,6 +22,8 @@ samenwerken voor campagnes en evenementen zoals handelsbeurzen.</p>
22 22
 <p>Als u meer wilt weten over de status als partnerorganisatie, kunt u dat
23 23
 <a href="/associates/about.html">hier</a> vinden.</p>
24 24
 
25
+<associates/>
26
+
25 27
   </body>
26 28
 
27 29
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.pt.xhtml View File

@@ -26,6 +26,8 @@
26 26
     <p>
27 27
       Se quiser saber mais sobre o estatuto de associado, você pode ler nossa <a href="/associates/about.html">exploração do significado do estatuto de aasociado e o guia para tornar-se associado da FSFE</a>.
28 28
     </p>
29
+    
30
+    <associates/>
29 31
   </body>
30 32
 
31 33
   <timestamp>$Date: 2010-01-23 16:58:15 +0000 (Sat, 23 Jan 2010) $ $Author: ato $</timestamp>

+ 2
- 0
associates/associates.ro.xhtml View File

@@ -29,6 +29,8 @@ implica în activitãţile FSFE.</p>
29 29
 Dacã doriţi mai multe informaţii despre statutul asociaţilor, puteţi
30 30
 afla mai multe informaţii <a href="/associates/about.html">aici</a>.</p>
31 31
 
32
+<associates/>
33
+
32 34
   </body>
33 35
 
34 36
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.ru.xhtml View File

@@ -24,6 +24,8 @@
24 24
 прочтите, пожалуйста, о том, <a href="/associates/about.html">что значит
25 25
 быть союзной организацией ЕФСПО и как стать такой организацией</a>.</p>
26 26
 
27
+<associates/>
28
+
27 29
   </body>
28 30
 
29 31
   <timestamp>$Date$ $Author$</timestamp>

+ 3
- 0
associates/associates.sq.xhtml View File

@@ -26,6 +26,9 @@
26 26
     <p>
27 27
       Nëse jeni të interesuar rreth statusit të anëtarit shok, ju lutemi, mund të lexoni <a href="/associates/about.html">se ç'do të thotë të jesh anëtar shok i FSFE-së dhe se si të bëheni një i tillë</a>.
28 28
     </p>
29
+    
30
+    <associates/>
31
+    
29 32
   </body>
30 33
 
31 34
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.sv.xhtml View File

@@ -26,6 +26,8 @@ FSFE aktiviteter att g
26 26
 <p>Om du vill veta mer om de associerades status så hittar du den
27 27
 informationen <a href="/associates/about.html">här</a>.</p>
28 28
 
29
+<associates/>
30
+
29 31
   </body>
30 32
 
31 33
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
associates/associates.tr.xhtml View File

@@ -27,6 +27,8 @@ Ortaklık statüsüyle ilgili daha fazla bilgi edinmek isterseniz,
27 27
 <a href="/associates/about.html">burada</a> aradığınızı bulabilirsiniz.
28 28
 </p>
29 29
 
30
+<associates/>
31
+
30 32
   </body>
31 33
 
32 34
   <timestamp>$Date$ $Author$</timestamp>

+ 14
- 22
associates/associates.xsl View File

@@ -3,29 +3,21 @@
3 3
 <xsl:stylesheet version="1.0"
4 4
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
5 5
 
6
-  <xsl:output method="xml"
7
-           encoding="ISO-8859-1"
8
-           indent="yes"
9
-           />
6
+  <xsl:import href="../fsfe.xsl" />
7
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
10 8
 
11
-  <xsl:template match="/">
12
-    <html>
13
-      <xsl:apply-templates select="html/head" />
14
-      <body>
15
-        <xsl:apply-templates select="html/body/node()" />
16
-        <xsl:for-each select="/html/set/associate">
17
-          <xsl:sort select="@id" />
18
-          <h3><a href="{link}"><xsl:value-of select="name" /></a></h3>
19
-          <xsl:apply-templates select="description/node()" />
20
-        </xsl:for-each>
21
-      </body>
22
-    </html>
23
-  </xsl:template>
24
-
25
-  <xsl:template match="@*|node()" priority="-1">
26
-    <xsl:copy>
27
-      <xsl:apply-templates select="@*|node()"/>
28
-    </xsl:copy>
9
+  <xsl:template match="associates">
10
+    <xsl:for-each select="/buildinfo/document/set/associate">
11
+      <xsl:sort select="@id" />
12
+      <h3>
13
+        <xsl:call-template name="generate-id-attribute">
14
+          <xsl:with-param name="title" select="name" />
15
+        </xsl:call-template>
16
+        <a href="{link}"><xsl:value-of select="name" /></a>
17
+      </h3>
18
+      <xsl:apply-templates select="description/node()" />
19
+    </xsl:for-each>
29 20
   </xsl:template>
21
+  
30 22
 </xsl:stylesheet>
31 23
 

+ 3
- 12
at/at.xsl View File

@@ -7,7 +7,8 @@
7 7
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
8 8
   <xsl:import href="../tools/xsltsl/countries.xsl" />
9 9
   <xsl:import href="../tools/xsltsl/translations.xsl" />
10
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
10
+  <xsl:import href="../fsfe.xsl" />
11
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
11 12
 
12 13
   <!-- To localise this page to a new country, copy this file and change the following:
13 14
   
@@ -60,7 +61,7 @@
60 61
   <!--define contact information-->
61 62
   
62 63
   <xsl:template match="contact-details">
63
-    <xsl:for-each select="/html/set/contact">
64
+    <xsl:for-each select="/buildinfo/document/set/contact">
64 65
 
65 66
     <xsl:if test="@id = 'DE'">
66 67
   
@@ -145,15 +146,5 @@
145 146
             </xsl:with-param>
146 147
         </xsl:call-template>
147 148
     </xsl:template>
148
-  
149
-  <!-- Do not copy <set> or <text> to output at all -->
150
-  <xsl:template match="set | tags"/>
151
-
152
-  <!-- For all other nodes, copy verbatim -->
153
-  <xsl:template match="@*|node()" priority="-1">
154
-    <xsl:copy>
155
-      <xsl:apply-templates select="@*|node()"/>
156
-    </xsl:copy>
157
-  </xsl:template>
158 149
 
159 150
 </xsl:stylesheet>

+ 4
- 15
campaigns/askyourcandidates/askyourcandidates.xsl View File

@@ -4,7 +4,8 @@
4 4
   
5 5
   <xsl:import href="../../tools/xsltsl/tagging.xsl" />
6 6
   
7
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
7
+  <xsl:import href="../../fsfe.xsl" />
8
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
8 9
   
9 10
   
10 11
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
14 15
     </xsl:call-template>
15 16
   </xsl:template>
16 17
   
17
-  
18
-  <!-- Do not copy <set> and <text> to output at all -->
19
-  <xsl:template match="/html/set" />
20
-  <xsl:template match="/html/text" />
21
-  
22 18
   <!-- How to show a link -->
23
-  <xsl:template match="/html/set/news/link">
19
+  <xsl:template match="/buildinfo/document/set/news/link">
24 20
     <xsl:element name="a">
25 21
       <xsl:attribute name="href">
26 22
         <xsl:value-of select="text()" />
27 23
       </xsl:attribute>
28 24
       <xsl:text>[</xsl:text>
29
-      <xsl:value-of select="/html/text[@id='more']" />
25
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
30 26
       <xsl:text>]</xsl:text>
31 27
     </xsl:element>
32 28
   </xsl:template>
33
-
34
-  <!-- For all other nodes, copy verbatim -->
35
-  <xsl:template match="@*|node()" priority="-1">
36
-    <xsl:copy>
37
-      <xsl:apply-templates select="@*|node()"/>
38
-    </xsl:copy>
39
-  </xsl:template>
40 29
   
41 30
 </xsl:stylesheet>

+ 3
- 12
campaigns/finished.xsl View File

@@ -1,11 +1,12 @@
1 1
 <?xml version="1.0"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8
-    <xsl:for-each select="/html/set/project [@status = 'finished']">
9
+    <xsl:for-each select="/buildinfo/document/set/project [@status = 'finished']">
9 10
       <xsl:sort select="@date" order="descending"/>
10 11
 
11 12
       <!-- Title -->
@@ -26,14 +27,4 @@
26 27
     </xsl:for-each>
27 28
   </xsl:template>
28 29
 
29
-  <!-- Do not copy <set> or <text> to output at all -->
30
-  <xsl:template match="set | tags"/>
31
-
32
-  <!-- For all other nodes, copy verbatim -->
33
-  <xsl:template match="@*|node()" priority="-1">
34
-    <xsl:copy>
35
-      <xsl:apply-templates select="@*|node()"/>
36
-    </xsl:copy>
37
-  </xsl:template>
38
-
39 30
 </xsl:stylesheet>

+ 4
- 15
campaigns/ilovefs/2012/ilovefs.xsl View File

@@ -4,7 +4,8 @@
4 4
   
5 5
   <xsl:import href="../../../tools/xsltsl/tagging.xsl" />
6 6
   
7
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
7
+  <xsl:import href="../../../fsfe.xsl" />
8
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
8 9
   
9 10
   
10 11
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
14 15
     </xsl:call-template>
15 16
   </xsl:template>
16 17
   
17
-  
18
-  <!-- Do not copy <set> and <text> to output at all -->
19
-  <xsl:template match="/html/set" />
20
-  <xsl:template match="/html/text" />
21
-  
22 18
   <!-- How to show a link -->
23
-  <xsl:template match="/html/set/news/link">
19
+  <xsl:template match="/buildinfo/document/set/news/link">
24 20
     <xsl:element name="a">
25 21
       <xsl:attribute name="href">
26 22
         <xsl:value-of select="text()" />
27 23
       </xsl:attribute>
28 24
       <xsl:text>[</xsl:text>
29
-      <xsl:value-of select="/html/text[@id='more']" />
25
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
30 26
       <xsl:text>]</xsl:text>
31 27
     </xsl:element>
32 28
   </xsl:template>
33
-
34
-  <!-- For all other nodes, copy verbatim -->
35
-  <xsl:template match="@*|node()" priority="-1">
36
-    <xsl:copy>
37
-      <xsl:apply-templates select="@*|node()"/>
38
-    </xsl:copy>
39
-  </xsl:template>
40 29
   
41 30
 </xsl:stylesheet>

+ 4
- 15
campaigns/ilovefs/2012/unperfekthaus.xsl View File

@@ -4,7 +4,8 @@
4 4
   
5 5
   <xsl:import href="../../../tools/xsltsl/tagging.xsl" />
6 6
   
7
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
7
+  <xsl:import href="../../../fsfe.xsl" />
8
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
8 9
   
9 10
   
10 11
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
14 15
     </xsl:call-template>
15 16
   </xsl:template>
16 17
   
17
-  
18
-  <!-- Do not copy <set> and <text> to output at all -->
19
-  <xsl:template match="/html/set" />
20
-  <xsl:template match="/html/text" />
21
-  
22 18
   <!-- How to show a link -->
23
-  <xsl:template match="/html/set/news/link">
19
+  <xsl:template match="/buildinfo/document/set/news/link">
24 20
     <xsl:element name="a">
25 21
       <xsl:attribute name="href">
26 22
         <xsl:value-of select="text()" />
27 23
       </xsl:attribute>
28 24
       <xsl:text>[</xsl:text>
29
-      <xsl:value-of select="/html/text[@id='more']" />
25
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
30 26
       <xsl:text>]</xsl:text>
31 27
     </xsl:element>
32 28
   </xsl:template>
33
-
34
-  <!-- For all other nodes, copy verbatim -->
35
-  <xsl:template match="@*|node()" priority="-1">
36
-    <xsl:copy>
37
-      <xsl:apply-templates select="@*|node()"/>
38
-    </xsl:copy>
39
-  </xsl:template>
40 29
   
41 30
 </xsl:stylesheet>

+ 3
- 12
campaigns/inactive.xsl View File

@@ -1,11 +1,12 @@
1 1
 <?xml version="1.0"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8
-    <xsl:for-each select="/html/set/project [@status = 'inactive']">
9
+    <xsl:for-each select="/buildinfo/document/set/project [@status = 'inactive']">
9 10
       <xsl:sort select="@date" order="descending"/>
10 11
 
11 12
       <!-- Title -->
@@ -26,14 +27,4 @@
26 27
     </xsl:for-each>
27 28
   </xsl:template>
28 29
 
29
-  <!-- Do not copy <set> or <text> to output at all -->
30
-  <xsl:template match="set | tags"/>
31
-
32
-  <!-- For all other nodes, copy verbatim -->
33
-  <xsl:template match="@*|node()" priority="-1">
34
-    <xsl:copy>
35
-      <xsl:apply-templates select="@*|node()"/>
36
-    </xsl:copy>
37
-  </xsl:template>
38
-
39 30
 </xsl:stylesheet>

+ 2
- 2
campaigns/mankind/lsm2002/slides/contact.html View File

@@ -13,9 +13,9 @@
13 13
 <h1>Contact</h1>
14 14
 <ul>
15 15
 <li>http://april.org/groupes/patrimoine-mondial/ (documents in French and English for now)</li>
16
-<li>patrimoine-mondial@april.org (in French)</li>
16
+<li>patrimoine-mondial&#64;april.org (in French)</li>
17 17
 <li>website and English speaking mailing-list opened on FSF Europe site</li>
18
-<li>Beno&icirc;t Sibaud: bsibaud@april.org</li>
18
+<li>Beno&icirc;t Sibaud: bsibaud&#64;april.org</li>
19 19
 </ul>
20 20
 <hr>
21 21
 <a href="plan.html">[Plan]</a>

+ 4
- 15
campaigns/nledu/nledu.xsl View File

@@ -4,7 +4,8 @@
4 4
   
5 5
   <xsl:import href="../../tools/xsltsl/tagging.xsl" />
6 6
   
7
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
7
+  <xsl:import href="../../fsfe.xsl" />
8
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
8 9
   
9 10
   
10 11
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
14 15
     </xsl:call-template>
15 16
   </xsl:template>
16 17
   
17
-  
18
-  <!-- Do not copy <set> and <text> to output at all -->
19
-  <xsl:template match="/html/set" />
20
-  <xsl:template match="/html/text" />
21
-  
22 18
   <!-- How to show a link -->
23
-  <xsl:template match="/html/set/news/link">
19
+  <xsl:template match="/buildinfo/document/set/news/link">
24 20
     <xsl:element name="a">
25 21
       <xsl:attribute name="href">
26 22
         <xsl:value-of select="text()" />
27 23
       </xsl:attribute>
28 24
       <xsl:text>[</xsl:text>
29
-      <xsl:value-of select="/html/text[@id='more']" />
25
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
30 26
       <xsl:text>]</xsl:text>
31 27
     </xsl:element>
32 28
   </xsl:template>
33
-
34
-  <!-- For all other nodes, copy verbatim -->
35
-  <xsl:template match="@*|node()" priority="-1">
36
-    <xsl:copy>
37
-      <xsl:apply-templates select="@*|node()"/>
38
-    </xsl:copy>
39
-  </xsl:template>
40 29
   
41 30
 </xsl:stylesheet>

+ 29
- 38
campaigns/pdfreaders/buglist.xsl View File

@@ -1,11 +1,12 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
4
+  <xsl:import href="../../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic index -->
7 8
   <xsl:template match="dynamic-index">
8
-    <xsl:for-each select="/html/set/buglist">
9
+    <xsl:for-each select="/buildinfo/document/set/buglist">
9 10
       <xsl:sort select="@country"/>
10 11
 
11 12
       <xsl:variable name="country">
@@ -18,7 +19,7 @@
18 19
             <xsl:text>#</xsl:text>
19 20
             <xsl:value-of select="$country"/>
20 21
           </xsl:attribute>
21
-          <xsl:value-of select="/html/set/country[@id=$country]"/>
22
+          <xsl:value-of select="/buildinfo/document/set/country[@id=$country]"/>
22 23
         </xsl:element>
23 24
       </xsl:element>
24 25
 
@@ -29,11 +30,11 @@
29 30
   <!-- fill in global figures -->
30 31
   
31 32
   <xsl:variable name="solved">
32
-    <xsl:value-of select="count( /html/set/buglist/bug[@closed != ''] )" />
33
+    <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@closed != ''] )" />
33 34
   </xsl:variable>
34 35
   
35 36
   <xsl:variable name="total">
36
-    <xsl:value-of select="count( /html/set/buglist/bug )" />
37
+    <xsl:value-of select="count( /buildinfo/document/set/buglist/bug )" />
37 38
   </xsl:variable>
38 39
   
39 40
   <xsl:template match="solved">
@@ -49,18 +50,18 @@
49 50
   </xsl:template>
50 51
   
51 52
   
52
-  <!-- <xsl:key name="indivs-by-name" match="/html/set/buglist/bug/@name" use="normalize-space(.)" />
53
-  <xsl:key name="groups-by-name" match="/html/set/buglist/bug/@group" use="normalize-space(.)" /> -->
53
+  <!-- <xsl:key name="indivs-by-name" match="/buildinfo/document/set/buglist/bug/@name" use="normalize-space(.)" />
54
+  <xsl:key name="groups-by-name" match="/buildinfo/document/set/buglist/bug/@group" use="normalize-space(.)" /> -->
54 55
   
55 56
   <!-- Fill dynamic content -->
56 57
   <xsl:template match="dynamic-content">
57 58
     
58
-    <!-- <xsl:value-of select="count( /html/set/buglist/bug[@closed != ''] ) " /><br/>
59
-    <xsl:value-of select="count( /html/set/buglist/bug ) " /><br/>
60
-    <xsl:value-of select="floor( count(/html/set/buglist/bug[@closed != '']) div count( /html/set/buglist/bug ) * 100)" /><br/>
59
+    <!-- <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@closed != ''] ) " /><br/>
60
+    <xsl:value-of select="count( /buildinfo/document/set/buglist/bug ) " /><br/>
61
+    <xsl:value-of select="floor( count(/buildinfo/document/set/buglist/bug[@closed != '']) div count( /buildinfo/document/set/buglist/bug ) * 100)" /><br/>
61 62
     -->
62 63
     
63
-    <xsl:for-each select="/html/set/buglist">
64
+    <xsl:for-each select="/buildinfo/document/set/buglist">
64 65
       <xsl:sort select="@country"/>
65 66
       
66 67
       <xsl:variable name="country">
@@ -72,24 +73,24 @@
72 73
         <xsl:attribute name="id">
73 74
           <xsl:value-of select="$country"/>
74 75
         </xsl:attribute>
75
-        <xsl:value-of select="/html/set/country[@id=$country]"/>
76
-        <xsl:variable name="nbsolved" select="count( /html/set/buglist[@country=$country]/bug[@closed != ''] )" />
77
-        <xsl:variable name="nbinst" select="count( /html/set/buglist[@country=$country]/bug )" />
76
+        <xsl:value-of select="/buildinfo/document/set/country[@id=$country]"/>
77
+        <xsl:variable name="nbsolved" select="count( /buildinfo/document/set/buglist[@country=$country]/bug[@closed != ''] )" />
78
+        <xsl:variable name="nbinst" select="count( /buildinfo/document/set/buglist[@country=$country]/bug )" />
78 79
         (<xsl:value-of select="$nbsolved" />/<xsl:value-of select="$nbinst" /> = <xsl:value-of select="floor($nbsolved div $nbinst * 100)" />%)
79 80
       </xsl:element>
80 81
       
81 82
       <!-- Table header -->
82 83
       <xsl:element name="table">
83 84
         <xsl:element name="tr">
84
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-name']"/></xsl:element>
85
-          <!--<xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-address']"/></xsl:element>-->
86
-          <!--<xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-url']"/></xsl:element>-->
87
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='opened']"/></xsl:element>
88
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='closed']"/></xsl:element>
89
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='name']"/></xsl:element>
90
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='group']"/></xsl:element>
91
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='closedby']"/></xsl:element>
92
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='comment']"/></xsl:element>
85
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-name']"/></xsl:element>
86
+          <!--<xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-address']"/></xsl:element>-->
87
+          <!--<xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-url']"/></xsl:element>-->
88
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='opened']"/></xsl:element>
89
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closed']"/></xsl:element>
90
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='name']"/></xsl:element>
91
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='group']"/></xsl:element>
92
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closedby']"/></xsl:element>
93
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='comment']"/></xsl:element>
93 94
         </xsl:element>
94 95
         
95 96
         <!-- Table rows -->
@@ -103,7 +104,7 @@
103 104
                 <xsl:attribute name="href">
104 105
                   <xsl:value-of select="@institution-url"/>
105 106
                 </xsl:attribute>
106
-                <xsl:value-of select="@institution-name"/><!--<xsl:value-of select="/html/text[@id='link']"/>-->
107
+                <xsl:value-of select="@institution-name"/><!--<xsl:value-of select="/buildinfo/document/text[@id='link']"/>-->
107 108
               </xsl:element>
108 109
             </xsl:element>
109 110
             <xsl:comment><xsl:element name="td"><xsl:value-of select="translate(@institution-address, '-', '–' )"/></xsl:element></xsl:comment>
@@ -121,19 +122,19 @@
121 122
     
122 123
     <!-- List of participants -->
123 124
     <!-- 
124
-    <xsl:value-of select="count(/html/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ])" />
125
+    <xsl:value-of select="count(/buildinfo/document/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ])" />
125 126
     
126 127
     <xsl:element name="ul">
127 128
       
128
-      <xsl:for-each select=" /html/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ] ">
129
-        <xsl:sort select="count( /html/set/buglist/bug/@name = . )" data-type="number" />
129
+      <xsl:for-each select=" /buildinfo/document/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ] ">
130
+        <xsl:sort select="count( /buildinfo/document/set/buglist/bug/@name = . )" data-type="number" />
130 131
         
131 132
         <xsl:variable name="name" select="." />
132 133
         
133 134
         <xsl:if test="position() &lt;= 5">
134 135
           
135 136
           <xsl:element name="li">
136
-            <xsl:value-of select="count( /html/set/buglist/bug[@group=$name] )" />
137
+            <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@group=$name] )" />
137 138
             <xsl:text>-</xsl:text>
138 139
             <xsl:value-of select="$name" />
139 140
           </xsl:element>
@@ -147,14 +148,4 @@
147 148
     
148 149
   </xsl:template>
149 150
 
150
-  <!-- Do not copy <set> and <text> to output at all -->
151
-  <xsl:template match="set | tags"/>
152
-
153
-  <!-- For all other nodes, copy verbatim -->
154
-  <xsl:template match="@*|node()" priority="-1">
155
-    <xsl:copy>
156
-      <xsl:apply-templates select="@*|node()"/>
157
-    </xsl:copy>
158
-  </xsl:template>
159
-
160 151
 </xsl:stylesheet>

+ 16
- 25
campaigns/pdfreaders/pdfreaders.xsl View File

@@ -1,23 +1,24 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
4
+  <xsl:import href="../../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
   
6 7
   <xsl:template match="number-of-businesses">
7
-    <xsl:value-of select="count(/html/set/bsig/li)" />
8
+    <xsl:value-of select="count(/buildinfo/document/set/bsig/li)" />
8 9
   </xsl:template>
9 10
   
10 11
   <xsl:template match="number-of-orgs">
11
-    <xsl:value-of select="count(/html/set/osig/li)" />
12
+    <xsl:value-of select="count(/buildinfo/document/set/osig/li)" />
12 13
   </xsl:template>
13 14
   
14 15
   <xsl:template match="number-of-individuals">
15
-    <xsl:value-of select="count(/html/set/isig/li)" />
16
+    <xsl:value-of select="count(/buildinfo/document/set/isig/li)" />
16 17
   </xsl:template>
17 18
   
18 19
   <!-- Fill dynamic content -->
19 20
   <xsl:template match="dynamic-content">
20
-    <xsl:for-each select="/html/set/buglist">
21
+    <xsl:for-each select="/buildinfo/document/set/buglist">
21 22
       <xsl:sort select="@country"/>
22 23
 
23 24
       <xsl:variable name="country">
@@ -26,20 +27,20 @@
26 27
 
27 28
       <!-- Heading -->
28 29
       <xsl:element name="h3">
29
-        <xsl:value-of select="/html/set/country[@id=$country]"/>
30
+        <xsl:value-of select="/buildinfo/document/set/country[@id=$country]"/>
30 31
       </xsl:element>
31 32
 
32 33
       <!-- Table header -->
33 34
       <xsl:element name="table">
34 35
         <xsl:element name="tr">
35
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-name']"/></xsl:element>
36
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-address']"/></xsl:element>
37
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-url']"/></xsl:element>
38
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='opened']"/></xsl:element>
39
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='closed']"/></xsl:element>
40
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='name']"/></xsl:element>
41
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='group']"/></xsl:element>
42
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='comment']"/></xsl:element>
36
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-name']"/></xsl:element>
37
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-address']"/></xsl:element>
38
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-url']"/></xsl:element>
39
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='opened']"/></xsl:element>
40
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closed']"/></xsl:element>
41
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='name']"/></xsl:element>
42
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='group']"/></xsl:element>
43
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='comment']"/></xsl:element>
43 44
         </xsl:element>
44 45
 
45 46
         <!-- Table rows -->
@@ -52,7 +53,7 @@
52 53
                 <xsl:attribute name="href">
53 54
                   <xsl:value-of select="@institution-url"/>
54 55
                 </xsl:attribute>
55
-                <xsl:value-of select="/html/text[@id='link']"/>
56
+                <xsl:value-of select="/buildinfo/document/text[@id='link']"/>
56 57
               </xsl:element>
57 58
             </xsl:element>
58 59
             <xsl:element name="td"><xsl:value-of select="@opened"/></xsl:element>
@@ -67,14 +68,4 @@
67 68
     </xsl:for-each>
68 69
   </xsl:template>
69 70
 
70
-  <!-- Do not copy <set> and <text> to output at all -->
71
-  <xsl:template match="set | tags"/>
72
-
73
-  <!-- For all other nodes, copy verbatim -->
74
-  <xsl:template match="@*|node()" priority="-1">
75
-    <xsl:copy>
76
-      <xsl:apply-templates select="@*|node()"/>
77
-    </xsl:copy>
78
-  </xsl:template>
79
-
80 71
 </xsl:stylesheet>

+ 16
- 34
campaigns/pdfreaders/petition.xsl View File

@@ -5,64 +5,46 @@
5 5
 	
6 6
 	<xsl:import href="../../tools/xsltsl/countries.xsl" />
7 7
 	
8
-  <xsl:output method="xml"
9
-           encoding="UTF-8"
10
-           indent="yes"
11
-           />
8
+  <xsl:import href="../../fsfe.xsl" />
9
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
12 10
 
13
-  <xsl:template match="/">
14
-    <xsl:copy>
15
-      <xsl:apply-templates select="@*|node()" />
16
-    </xsl:copy>
17
-  </xsl:template>
18
-
19
-  <xsl:template match="/html/body">
20
-    <body>
11
+  <xsl:template match="body">
21 12
       <xsl:apply-templates />
22 13
       
23
-      <h3>
24
-        <xsl:value-of select="/html/text[@id='osig']" />
25
-        (<xsl:value-of select="count(/html/set/osig/li)" />)
14
+      <h3 id="organisations">
15
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template>
16
+        (<xsl:value-of select="count(/buildinfo/document/set/osig/li)" />)
26 17
       </h3>
27 18
       <ul>
28
-        <xsl:apply-templates select="/html/set/osig/node()">
19
+        <xsl:apply-templates select="/buildinfo/document/set/osig/node()">
29 20
           <xsl:sort select="." />
30 21
         </xsl:apply-templates>
31 22
       </ul>
32 23
       
33
-      <h3>
34
-      	<xsl:value-of select="/html/text[@id='bsig']" />
35
-      	(<xsl:value-of select="count(/html/set/bsig/li)" />)
24
+      <h3 id="businesses">
25
+      	<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'bsig'" /></xsl:call-template>
26
+      	(<xsl:value-of select="count(/buildinfo/document/set/bsig/li)" />)
36 27
       </h3>
37 28
       <ul>
38
-        <xsl:apply-templates select="/html/set/bsig/node()">
29
+        <xsl:apply-templates select="/buildinfo/document/set/bsig/node()">
39 30
           <xsl:sort select="." />
40 31
         </xsl:apply-templates>
41 32
       </ul>
42 33
       
43
-      <h3>
44
-        <xsl:value-of select="/html/text[@id='isig']" />
45
-        (<xsl:value-of select="count(/html/set/isig/li)" />)
34
+      <h3 id="individuals">
35
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template>
36
+        (<xsl:value-of select="count(/buildinfo/document/set/isig/li)" />)
46 37
       </h3>
47 38
       <ul>
48
-        <xsl:apply-templates select="/html/set/isig/node()">
39
+        <xsl:apply-templates select="/buildinfo/document/set/isig/node()">
49 40
           <xsl:sort select="." />
50 41
         </xsl:apply-templates>
51 42
       </ul>
52
-      <xsl:apply-templates select="/html/text/footer/node()" />
53
-    </body>
43
+      <xsl:apply-templates select="/buildinfo/document/text/footer/node()" />
54 44
   </xsl:template>
55 45
   
56 46
   <xsl:template match="country-list">
57 47
     <xsl:call-template name="country-list" />
58 48
   </xsl:template>
59 49
   
60
-  <xsl:template match="@*|node()" priority="-1">
61
-    <xsl:copy>
62
-      <xsl:apply-templates select="@*|node()"/>
63
-    </xsl:copy>
64
-  </xsl:template>
65
-
66
-  <xsl:template match="/html/set" />
67
-  <xsl:template match="/html/text" />
68 50
 </xsl:stylesheet>

+ 3
- 12
campaigns/projects.xsl View File

@@ -1,11 +1,12 @@
1 1
 <?xml version="1.0"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8
-    <xsl:for-each select="/html/set/project [@status = 'active']">
9
+    <xsl:for-each select="/buildinfo/document/set/project [@status = 'active']">
9 10
       <xsl:sort select="@date" order="descending"/>
10 11
 
11 12
       <!-- Title -->
@@ -26,14 +27,4 @@
26 27
     </xsl:for-each>
27 28
   </xsl:template>
28 29
 
29
-  <!-- Do not copy <set> to output at all -->
30
-  <xsl:template match="set | tags"/>
31
-
32
-  <!-- For all other nodes, copy verbatim -->
33
-  <xsl:template match="@*|node()" priority="-1">
34
-    <xsl:copy>
35
-      <xsl:apply-templates select="@*|node()"/>
36
-    </xsl:copy>
37
-  </xsl:template>
38
-
39 30
 </xsl:stylesheet>

+ 3
- 12
campaigns/swpat/documents.xsl View File

@@ -1,12 +1,13 @@
1 1
 <?xml version="1.0" encoding="ISO-8859-1"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />
4
+  <xsl:import href="../../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8 9
     <xsl:element name="ul">
9
-      <xsl:for-each select="/html/set/document">
10
+      <xsl:for-each select="/buildinfo/document/set/document">
10 11
         <xsl:sort select="@date" order="descending" />
11 12
         <xsl:element name="li">
12 13
           <xsl:element name="p">
@@ -38,14 +39,4 @@
38 39
     </xsl:element>
39 40
   </xsl:template>
40 41
 
41
-  <!-- Do not copy <set> or <text> to output at all -->
42
-  <xsl:template match="set" />
43
-
44
-  <!-- For all other nodes, copy verbatim -->
45
-  <xsl:template match="@*|node()" priority="-1">
46
-    <xsl:copy>
47
-      <xsl:apply-templates select="@*|node()"/>
48
-    </xsl:copy>
49
-  </xsl:template>
50
-
51 42
 </xsl:stylesheet>

+ 7
- 8
campaigns/swpat/memorandum.de.xhtml View File

@@ -91,16 +91,15 @@ erlaubt, jedoch Softwarepatentierung eindeutig verhindert.</p>
91 91
  Präsident<br />
92 92
  Free Software Foundation Europe (FSFE)</p>
93 93
 
94
-      <p>
95
-      	Wenn sie ihren Namen, oder den ihrer Organisation auf dieser
96
-	Listen hinzufügen möchten, kontaktieren sie bitte
97
-	<a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
98
-      </p>
94
+<p>
95
+  Wenn sie ihren Namen, oder den ihrer Organisation auf dieser
96
+  Listen hinzufügen möchten, kontaktieren sie bitte
97
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
98
+</p>
99 99
 
100
-  </body>
100
+<signatories/>
101 101
 
102
-  <text id="osig">Organisationen</text>
103
-  <text id="isig">Privatpersonen</text>
102
+  </body>
104 103
 
105 104
 
106 105
   <timestamp>$Date$ $Author$</timestamp>

+ 8
- 9
campaigns/swpat/memorandum.el.xhtml View File

@@ -89,18 +89,17 @@
89 89
  Πρόεδρος<br />
90 90
  Ευρωπαϊκό Ίδρυμα Ελεύθερου Λογισμικού (FSFE)</p>
91 91
 
92
-      <p>
93
-        Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού στον
94
-        οποίο ανήκετε, να προστίθεται σε αυτόν τον κατάλογο, παρακαλούμε
95
-        επικοινωνήστε με τη διεύθυνση 
96
-        <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
97
-      </p>
92
+  <p>
93
+    Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού στον
94
+    οποίο ανήκετε, να προστίθεται σε αυτόν τον κατάλογο, παρακαλούμε
95
+    επικοινωνήστε με τη διεύθυνση 
96
+    <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
97
+  </p>
98
+  
99
+  <signatories/>
98 100
 
99 101
   </body>
100 102
 
101
-  <text id="osig">Οργανισμοί</text>
102
-  <text id="isig">Άτομα</text>
103
-
104 103
 
105 104
   <timestamp>$Date$ $Author$</timestamp>
106 105
 </html>

+ 7
- 8
campaigns/swpat/memorandum.en.xhtml View File

@@ -84,16 +84,15 @@ prevents software patenting.</p>
84 84
  President<br />
85 85
  Free Software Foundation Europe (FSFE)</p>
86 86
 
87
-      <p>
88
-        If you wish to see your name or the name of your organisation added
89
-        to this list, please contact 
90
-        <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
91
-      </p>
87
+<p>
88
+  If you wish to see your name or the name of your organisation added
89
+  to this list, please contact 
90
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
91
+</p>
92 92
 
93
-  </body>
93
+<signatories/>
94 94
 
95
-  <text id="osig">Organisations</text>
96
-  <text id="isig">Individuals</text>
95
+  </body>
97 96
 
98 97
 
99 98
   <timestamp>$Date$ $Author$</timestamp>

+ 6
- 7
campaigns/swpat/memorandum.it.xhtml View File

@@ -107,15 +107,14 @@ esplicitamente la brevettabilit
107 107
  Presidente<br />
108 108
  Free Software Foundation Europe (FSFE)</p>
109 109
 
110
-      <p>
111
-        Se volete aggiungere ai firmatari il vostro nome, o quello della vostra organizzazione,
112
-        contattate <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
113
-      </p>
110
+<p>
111
+  Se volete aggiungere ai firmatari il vostro nome, o quello della vostra organizzazione,
112
+  contattate <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
113
+</p>
114 114
 
115
-  </body>
115
+<signatories/>
116 116
 
117
-  <text id="osig">Organizzazioni</text>
118
-  <text id="isig">Individui</text>
117
+  </body>
119 118
 
120 119
 
121 120
   <timestamp>$Date$ $Author$</timestamp>

+ 11
- 28
campaigns/swpat/memorandum.xsl View File

@@ -3,39 +3,22 @@
3 3
 <xsl:stylesheet version="1.0"
4 4
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
5 5
 
6
-  <xsl:output method="xml"
7
-           encoding="ISO-8859-1"
8
-           indent="yes"
9
-           />
6
+  <xsl:import href="../../fsfe.xsl" />
7
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
10 8
 
11
-  <xsl:template match="/">
12
-    <xsl:copy>
13
-      <xsl:apply-templates select="@*|node()" />
14
-    </xsl:copy>
15
-  </xsl:template>
16
-
17
-  <xsl:template match="/html/body">
18
-    <body>
19
-      <xsl:apply-templates />
20
-      <div class="indent"><b><xsl:value-of select="/html/text[@id='osig']" /></b>
9
+  <xsl:template match="signatories">
10
+      
11
+    <div class="indent">
12
+      <b><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template></b>
21 13
       <ul>
22
-        <xsl:apply-templates select="/html/set/osig/node()" />
14
+        <xsl:apply-templates select="/buildinfo/document/set/osig/node()" />
23 15
       </ul>
24 16
 
25
-      <b><xsl:value-of select="/html/text[@id='isig']" /></b>
17
+      <b><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template></b>
26 18
       <ul>
27
-        <xsl:apply-templates select="/html/set/isig/node()" />
28
-      </ul></div>
29
-      <xsl:apply-templates select="/html/text/footer/node()" />
30
-    </body>
31
-  </xsl:template>
32
-
33
-  <xsl:template match="@*|node()" priority="-1">
34
-    <xsl:copy>
35
-      <xsl:apply-templates select="@*|node()"/>
36
-    </xsl:copy>
19
+        <xsl:apply-templates select="/buildinfo/document/set/isig/node()" />
20
+      </ul>
21
+    </div>
37 22
   </xsl:template>
38 23
 
39
-  <xsl:template match="/html/set" />
40
-  <xsl:template match="/html/text" />
41 24
 </xsl:stylesheet>

+ 2
- 11
campaigns/valentine/2011/valentine-2011.xsl View File

@@ -4,7 +4,8 @@
4 4
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
5 5
   xmlns:dt="http://xsltsl.org/date-time">
6 6
   
7
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
7
+  <xsl:import href="../../../fsfe.xsl" />
8
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
8 9
   
9 10
   <!-- 
10 11
     For documentation on tagging (e.g. fetching news and events), take a
@@ -41,14 +42,4 @@
41 42
 	  </xsl:element>-->
42 43
   </xsl:template>
43 44
   
44
-  <!-- Do not copy <set> or <text> to output at all -->
45
-  <xsl:template match="set | tags"/>
46
-  
47
-  <!-- For all other nodes, copy verbatim -->
48
-  <xsl:template match="@*|node()" priority="-1">
49
-    <xsl:copy>
50
-      <xsl:apply-templates select="@*|node()"/>
51
-    </xsl:copy>
52
-  </xsl:template>
53
-
54 45
 </xsl:stylesheet>

+ 36
- 45
contact/local.xsl View File

@@ -1,11 +1,12 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8
-    <xsl:for-each select="/html/set/contact">
9
+    <xsl:for-each select="/buildinfo/document/set/contact">
9 10
       <xsl:sort select="@id" />
10 11
 
11 12
       <xsl:variable name="country">
@@ -13,31 +14,32 @@
13 14
       </xsl:variable>
14 15
 
15 16
       <!-- Heading -->
16
-      <xsl:element name="h3">
17
-        <xsl:value-of select="/html/set/country[@id=$country]" />
18
-      </xsl:element>
17
+      <h3>
18
+        <xsl:call-template name="generate-id-attribute" />
19
+        <xsl:value-of select="/buildinfo/document/set/country[@id=$country]" />
20
+      </h3>
19 21
 
20 22
       <!-- Team homepage -->
21 23
       <xsl:if test="homepage != ''">
22
-	  <xsl:element name="strong">
23
-		  <xsl:element name="a">
24
-		    <xsl:attribute name="href">
25
-			<xsl:value-of select="homepage" />
26
-		    </xsl:attribute>
27
-		    Team Homepage
28
-		  </xsl:element>
29
-		</xsl:element>
24
+        <xsl:element name="strong">
25
+          <xsl:element name="a">
26
+            <xsl:attribute name="href">
27
+              <xsl:value-of select="homepage" />
28
+            </xsl:attribute>
29
+            Team Homepage
30
+          </xsl:element>
31
+        </xsl:element>
30 32
       </xsl:if>
31 33
 
32 34
       <!-- Address -->
33 35
       <xsl:if test="address != ''">
34
-      <xsl:apply-templates select="address"/>
36
+        <xsl:apply-templates select="address"/>
35 37
       </xsl:if>
36 38
 
37 39
       <!-- Email -->
38 40
       <xsl:if test="email != ''">
39 41
         <xsl:element name="p">
40
-          <xsl:value-of select="/html/text[@id='email']" />
42
+          <xsl:value-of select="/buildinfo/document/text[@id='email']" />
41 43
           <xsl:text> </xsl:text>
42 44
           <xsl:element name="a">
43 45
             <xsl:attribute name="href">
@@ -52,7 +54,7 @@
52 54
       <!-- Phone -->
53 55
       <xsl:if test="phone != ''">
54 56
         <xsl:element name="p">
55
-          <xsl:value-of select="/html/text[@id='phone']" />
57
+          <xsl:value-of select="/buildinfo/document/text[@id='phone']" />
56 58
           <xsl:text> </xsl:text>
57 59
           <xsl:value-of select="phone" />
58 60
         </xsl:element>
@@ -61,7 +63,7 @@
61 63
       <!-- Fax -->
62 64
       <xsl:if test="fax != ''">
63 65
         <xsl:element name="p">
64
-          <xsl:value-of select="/html/text[@id='fax']" />
66
+          <xsl:value-of select="/buildinfo/document/text[@id='fax']" />
65 67
           <xsl:text> </xsl:text>
66 68
           <xsl:value-of select="fax" />
67 69
         </xsl:element>
@@ -70,30 +72,30 @@
70 72
       <!-- Core team members -->
71 73
       <xsl:element name="p">
72 74
         <xsl:choose>
73
-          <xsl:when test="count(/html/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')])>0">
74
-            <xsl:value-of select="/html/text[@id='members']" />
75
+          <xsl:when test="count(/buildinfo/document/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')])>0">
76
+            <xsl:value-of select="/buildinfo/document/text[@id='members']" />
75 77
             <xsl:text> </xsl:text>
76
-            <xsl:for-each select="/html/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')]">
78
+            <xsl:for-each select="/buildinfo/document/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')]">
77 79
               <xsl:if test="position()!=1">
78 80
                 <xsl:text>, </xsl:text>
79 81
               </xsl:if>
80
-	      <xsl:choose>
81
-		<xsl:when test="link != ''">
82
-		  <xsl:element name="a">
83
-		    <xsl:attribute name="href">
84
-			<xsl:value-of select="link" />
85
-		    </xsl:attribute>
86
-		    <xsl:value-of select="name" />
87
-		  </xsl:element>
88
-		</xsl:when>
89
-		<xsl:otherwise>
90
-		  <xsl:value-of select="name" />
91
-		</xsl:otherwise>
92
-	      </xsl:choose>
82
+              <xsl:choose>
83
+                <xsl:when test="link != ''">
84
+                  <xsl:element name="a">
85
+                    <xsl:attribute name="href">
86
+                  <xsl:value-of select="link" />
87
+                    </xsl:attribute>
88
+                    <xsl:value-of select="name" />
89
+                  </xsl:element>
90
+                </xsl:when>
91
+                <xsl:otherwise>
92
+                  <xsl:value-of select="name" />
93
+                </xsl:otherwise>
94
+              </xsl:choose>
93 95
             </xsl:for-each>
94 96
           </xsl:when>
95 97
           <xsl:otherwise>
96
-            <xsl:value-of select="/html/text[@id='nomembers']" />
98
+            <xsl:value-of select="/buildinfo/document/text[@id='nomembers']" />
97 99
           </xsl:otherwise>
98 100
         </xsl:choose>
99 101
       </xsl:element>
@@ -101,15 +103,4 @@
101 103
     </xsl:for-each>
102 104
   </xsl:template>
103 105
 
104
-  <!-- Do not copy <set> and <text> to output at all -->
105
-  <xsl:template match="set" />
106
-  <xsl:template match="text" />
107
-
108
-  <!-- For all other nodes, copy verbatim -->
109
-  <xsl:template match="@*|node()" priority="-1">
110
-    <xsl:copy>
111
-      <xsl:apply-templates select="@*|node()"/>
112
-    </xsl:copy>
113
-  </xsl:template>
114
-
115 106
 </xsl:stylesheet>

+ 3
- 12
de/de.xsl View File

@@ -7,7 +7,8 @@
7 7
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
8 8
   <xsl:import href="../tools/xsltsl/countries.xsl" />
9 9
   <xsl:import href="../tools/xsltsl/translations.xsl" />
10
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
10
+  <xsl:import href="../fsfe.xsl" />
11
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
11 12
 
12 13
   <!-- To localise this page to a new country, copy this file and change the following:
13 14
   
@@ -60,7 +61,7 @@
60 61
   <!--define contact information-->
61 62
   
62 63
   <xsl:template match="contact-details">
63
-    <xsl:for-each select="/html/set/contact">
64
+    <xsl:for-each select="/buildinfo/document/set/contact">
64 65
 
65 66
     <xsl:if test="@id = 'DE'">
66 67
   
@@ -145,15 +146,5 @@
145 146
             </xsl:with-param>
146 147
         </xsl:call-template>
147 148
     </xsl:template>
148
-  
149
-  <!-- Do not copy <set> or <text> to output at all -->
150
-  <xsl:template match="set | tags"/>
151
-
152
-  <!-- For all other nodes, copy verbatim -->
153
-  <xsl:template match="@*|node()" priority="-1">
154
-    <xsl:copy>
155
-      <xsl:apply-templates select="@*|node()"/>
156
-    </xsl:copy>
157
-  </xsl:template>
158 149
 
159 150
 </xsl:stylesheet>

+ 3
- 12
documents/documents.xsl View File

@@ -1,13 +1,14 @@
1 1
 <?xml version="1.0" encoding="ISO-8859-1"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
8 9
     <xsl:variable name="type"><xsl:value-of select="@type" /></xsl:variable>
9 10
     <xsl:element name="ul">
10
-      <xsl:for-each select="/html/set/document [@type = $type]">
11
+      <xsl:for-each select="/buildinfo/document/set/document [@type = $type]">
11 12
         <xsl:sort select="@date" order="descending" />
12 13
         <xsl:element name="li">
13 14
           <xsl:element name="p">
@@ -39,14 +40,4 @@
39 40
     </xsl:element>
40 41
   </xsl:template>
41 42
 
42
-  <!-- Do not copy <set> to output at all -->
43
-  <xsl:template match="set" />
44
-
45
-  <!-- For all other nodes, copy verbatim -->
46
-  <xsl:template match="@*|node()" priority="-1">
47
-    <xsl:copy>
48
-      <xsl:apply-templates select="@*|node()"/>
49
-    </xsl:copy>
50
-  </xsl:template>
51
-
52 43
 </xsl:stylesheet>

+ 3
- 14
documents/whyfs.xsl View File

@@ -3,22 +3,11 @@
3 3
 <xsl:stylesheet version="1.0"
4 4
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
5 5
 
6
-  <xsl:output method="xml"
7
-           encoding="UTF-8"
8
-           indent="yes"
9
-           />
6
+  <xsl:import href="../fsfe.xsl" />
7
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
10 8
 
11 9
   <xsl:template match="speakers">
12
-    <xsl:copy-of select="/html/set/table" />
13
-  </xsl:template>
14
-  
15
-  <!-- Do not copy <set> to output at all -->
16
-  <xsl:template match="set" />
17
-
18
-  <xsl:template match="@*|node()" priority="-1">
19
-    <xsl:copy>
20
-      <xsl:apply-templates select="@*|node()"/>
21
-    </xsl:copy>
10
+    <xsl:copy-of select="/buildinfo/document/set/table" />
22 11
   </xsl:template>
23 12
 </xsl:stylesheet>
24 13
 

+ 4
- 13
donate/thankgnus-2001.xsl View File

@@ -1,7 +1,8 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
9 10
     <xsl:choose>
10 11
       <xsl:when test="$group='patrons'">
11 12
         <xsl:element name="table">
12
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
13
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
13 14
             <xsl:element name="tr">
14 15
               <xsl:element name="td">
15 16
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
26 27
       </xsl:when>
27 28
       <xsl:otherwise>
28 29
         <xsl:element name="ul">
29
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
30
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
30 31
             <xsl:element name="li">
31 32
               <xsl:apply-templates select="node()"/>
32 33
             </xsl:element>
@@ -35,15 +36,5 @@
35 36
       </xsl:otherwise>
36 37
     </xsl:choose>
37 38
   </xsl:template>
38
-
39
-  <!-- Do not copy <set> or <text> to output at all -->
40
-  <xsl:template match="set | tags"/>
41
-
42
-  <!-- For all other nodes, copy verbatim -->
43
-  <xsl:template match="@*|node()" priority="-1">
44
-    <xsl:copy>
45
-      <xsl:apply-templates select="@*|node()"/>
46
-    </xsl:copy>
47
-  </xsl:template>
48 39
 </xsl:stylesheet>
49 40
 

+ 4
- 13
donate/thankgnus-2002.xsl View File

@@ -1,7 +1,8 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
9 10
     <xsl:choose>
10 11
       <xsl:when test="$group='patrons'">
11 12
         <xsl:element name="table">
12
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
13
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
13 14
             <xsl:element name="tr">
14 15
               <xsl:element name="td">
15 16
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
26 27
       </xsl:when>
27 28
       <xsl:otherwise>
28 29
         <xsl:element name="ul">
29
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
30
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
30 31
             <xsl:element name="li">
31 32
               <xsl:apply-templates select="node()"/>
32 33
             </xsl:element>
@@ -35,15 +36,5 @@
35 36
       </xsl:otherwise>
36 37
     </xsl:choose>
37 38
   </xsl:template>
38
-
39
-  <!-- Do not copy <set> or <text> to output at all -->
40
-  <xsl:template match="set | tags"/>
41
-
42
-  <!-- For all other nodes, copy verbatim -->
43
-  <xsl:template match="@*|node()" priority="-1">
44
-    <xsl:copy>
45
-      <xsl:apply-templates select="@*|node()"/>
46
-    </xsl:copy>
47
-  </xsl:template>
48 39
 </xsl:stylesheet>
49 40
 

+ 4
- 13
donate/thankgnus-2003.xsl View File

@@ -1,7 +1,8 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
9 10
     <xsl:choose>
10 11
       <xsl:when test="$group='patrons'">
11 12
         <xsl:element name="table">
12
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
13
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
13 14
             <xsl:element name="tr">
14 15
               <xsl:element name="td">
15 16
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
26 27
       </xsl:when>
27 28
       <xsl:otherwise>
28 29
         <xsl:element name="ul">
29
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
30
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
30 31
             <xsl:element name="li">
31 32
               <xsl:apply-templates select="node()"/>
32 33
             </xsl:element>
@@ -35,15 +36,5 @@
35 36
       </xsl:otherwise>
36 37
     </xsl:choose>
37 38
   </xsl:template>
38
-
39
-  <!-- Do not copy <set> or <text> to output at all -->
40
-  <xsl:template match="set | tags"/>
41
-
42
-  <!-- For all other nodes, copy verbatim -->
43
-  <xsl:template match="@*|node()" priority="-1">
44
-    <xsl:copy>
45
-      <xsl:apply-templates select="@*|node()"/>
46
-    </xsl:copy>
47
-  </xsl:template>
48 39
 </xsl:stylesheet>
49 40
 

+ 4
- 13
donate/thankgnus-2004.xsl View File

@@ -1,7 +1,8 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
9 10
     <xsl:choose>
10 11
       <xsl:when test="$group='patrons'">
11 12
         <xsl:element name="table">
12
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
13
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
13 14
             <xsl:element name="tr">
14 15
               <xsl:element name="td">
15 16
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
26 27
       </xsl:when>
27 28
       <xsl:otherwise>
28 29
         <xsl:element name="ul">
29
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
30
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
30 31
             <xsl:element name="li">
31 32
               <xsl:apply-templates select="node()"/>
32 33
             </xsl:element>
@@ -35,15 +36,5 @@
35 36
       </xsl:otherwise>
36 37
     </xsl:choose>
37 38
   </xsl:template>
38
-
39
-  <!-- Do not copy <set> or <text> to output at all -->
40
-  <xsl:template match="set | tags"/>
41
-
42
-  <!-- For all other nodes, copy verbatim -->
43
-  <xsl:template match="@*|node()" priority="-1">
44
-    <xsl:copy>
45
-      <xsl:apply-templates select="@*|node()"/>
46
-    </xsl:copy>
47
-  </xsl:template>
48 39
 </xsl:stylesheet>
49 40
 

+ 4
- 13
donate/thankgnus-2005.xsl View File

@@ -1,7 +1,8 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
9 10
     <xsl:choose>
10 11
       <xsl:when test="$group='patrons'">
11 12
         <xsl:element name="table">
12
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
13
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
13 14
             <xsl:element name="tr">
14 15
               <xsl:element name="td">
15 16
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
26 27
       </xsl:when>
27 28
       <xsl:otherwise>
28 29
         <xsl:element name="ul">
29
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
30
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
30 31
             <xsl:element name="li">
31 32
               <xsl:apply-templates select="node()"/>
32 33
             </xsl:element>
@@ -35,15 +36,5 @@
35 36
       </xsl:otherwise>
36 37
     </xsl:choose>
37 38
   </xsl:template>
38
-
39
-  <!-- Do not copy <set> or <text> to output at all -->
40
-  <xsl:template match="set | tags"/>
41
-
42
-  <!-- For all other nodes, copy verbatim -->
43
-  <xsl:template match="@*|node()" priority="-1">
44
-    <xsl:copy>
45
-      <xsl:apply-templates select="@*|node()"/>
46
-    </xsl:copy>
47
-  </xsl:template>
48 39
 </xsl:stylesheet>
49 40
 

+ 4
- 13
donate/thankgnus-2006.xsl View File

@@ -1,7 +1,8 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5 6
 
6 7
   <!-- Fill dynamic content -->
7 8
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
9 10
     <xsl:choose>
10 11
       <xsl:when test="$group='patrons'">
11 12
         <xsl:element name="table">
12
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
13
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
13 14
             <xsl:element name="tr">
14 15
               <xsl:element name="td">
15 16
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
26 27
       </xsl:when>
27 28
       <xsl:otherwise>
28 29
         <xsl:element name="ul">
29
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
30
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
30 31
             <xsl:element name="li">
31 32
               <xsl:apply-templates select="node()"/>
32 33
             </xsl:element>
@@ -35,15 +36,5 @@
35 36
       </xsl:otherwise>
36 37
     </xsl:choose>
37 38
   </xsl:template>
38
-
39
-  <!-- Do not copy <set> or <text> to output at all -->
40
-  <xsl:template match="set | tags"/>
41
-
42
-  <!-- For all other nodes, copy verbatim -->
43
-  <xsl:template match="@*|node()" priority="-1">
44
-    <xsl:copy>
45
-      <xsl:apply-templates select="@*|node()"/>
46
-    </xsl:copy>
47
-  </xsl:template>
48 39
 </xsl:stylesheet>
49 40
 

+ 4
- 13
donate/thankgnus-2007.xsl View File

@@ -1,7 +1,8 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 
3 3
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
4
+  <xsl:import href="../fsfe.xsl" />
5
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
5