Great changes in all the stylesheets. Every page is now generated in two

phases:

1) A stylesheet from XML to XHTML that generates the page.
   This stylesheet no more bothers with the layout of the page w.r.t. the
   rest of the site (i.e. it doesn't add the link to CSS; it doesn't call
   the head and foot templates)
2) A common stylesheet from XHTML to HTML that just adds the header, footer
   and CSS link to the page.

The idea is that in this way it is easier to change the overall layout of
the site (e.g. removing frames). Moreover, less code is required.

Problem: xsltproc is too intelligent (= rather stupid), so that it
recognises XHTML pages and fails in applying the stylesheet. So, in the
Makefile, care (= sed) must be taken to remove the DOCTYPE definitions
from XHTML files.

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index df78f8dfa4461e9d1aab2daac248b921a755c8c4..a8fb04c5023ad93c7056211fd14c68fa79cdbac8 100644 (file)
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -7,6 +7,8 @@ TEMPLATESROOT = ../templates
 XMLROOT = ../xml
 XSLROOT = ../xsl
 
+RMDOCTYPE = "s/<\\!DOCTYPE[^>]*>//"
+
 PEOPLE = \
        people/aei/kelley.html \
        people/aei/schutz.html \
@@ -139,90 +141,116 @@ members/ml-help-example.txt: $(TEMPLATESROOT)/ml-help-example.txt
        cp $< $@
 
 members/index.html: $(XMLROOT)/members-index.xml \
-       $(XSLROOT)/xhtml-content.xsl
-       $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
+                   $(XSLROOT)/xhtml-content.xsl
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
 
 software/index.html: $(XMLROOT)/software/index.xml \
-       $(XSLROOT)/xhtml-content.xsl
+                    $(XSLROOT)/xhtml-content.xsl
        $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
 
 menu.html: $(TEMPLATESROOT)/menu.html
        cp $< $@
 
 project-management.html: $(XMLROOT)/project-management.xml \
-       $(XSLROOT)/xhtml-content.xsl
-       $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
+                        $(XSLROOT)/xhtml-content.xsl
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
 
 project-summary.html: $(XMLROOT)/project-summary.xml \
-       $(XSLROOT)/xhtml-content.xsl
-       $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
+                     $(XSLROOT)/xhtml-content.xsl
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
 
 project-objectives.html: $(XMLROOT)/project-objectives.xml \
-       $(XSLROOT)/xhtml-content.xsl
-       $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
+                        $(XSLROOT)/xhtml-content.xsl
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
 
 mowgli-events/kick-off.html: $(XMLROOT)/mowgli-events/kick-off.xml \
-       $(XSLROOT)/xhtml-content.xsl
-       $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
+                            $(XSLROOT)/xhtml-content.xsl
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
 
 people-list.html: $(XMLROOT)/people/index.xml \
-                  $(XSLROOT)/people-list.xsl 
-       $(XSLTP) -o $@ $(XSLROOT)/people-list.xsl $<
+                  $(XSLROOT)/people-list.xsl \
+                  $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/people-list.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
 
 consortium.html: $(XMLROOT)/consortium.xml \
-                 $(XSLROOT)/consortium.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/consortium.xsl $<
+                 $(XSLROOT)/consortium.xsl \
+                 $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/consortium.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
 
 project.html: $(XMLROOT)/project.xml \
-              $(XSLROOT)/project.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/project.xsl $<
+              $(XSLROOT)/project.xsl \
+              $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/project.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 news.html: $(XMLROOT)/news.xml \
-          $(XSLROOT)/news.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/news.xsl $<
+          $(XSLROOT)/news.xsl \
+           $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/news.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 other-events.html: $(XMLROOT)/other-events.xml \
-          $(XSLROOT)/events.xsl
-       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" -o $@ $(XSLROOT)/events.xsl $<
+                  $(XSLROOT)/events.xsl \
+                   $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 mowgli-events.html: $(XMLROOT)/mowgli-events.xml \
-          $(XSLROOT)/events.xsl
-       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'MOWGLI'" -o $@ $(XSLROOT)/events.xsl $<
+                   $(XSLROOT)/events.xsl \
+                    $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'MOWGLI'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 deadlines.html: $(XMLROOT)/other-events.xml \
-          $(XSLROOT)/deadlines.xsl
-       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" -o $@ $(XSLROOT)/deadlines.xsl $<
+               $(XSLROOT)/deadlines.xsl \
+                $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/deadlines.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 deliverables/%.html: $(XMLROOT)/deliverables/%.xml \
-              $(XSLROOT)/deliverable.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/deliverable.xsl $<
+                     $(XSLROOT)/deliverable.xsl \
+                     $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/deliverable.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 sites/%.html: $(XMLROOT)/sites/%.xml \
-              $(XSLROOT)/site.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/site.xsl $<
+              $(XSLROOT)/site.xsl \
+              $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/site.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 people/%.html: $(XMLROOT)/people/%.xml \
-              $(XSLROOT)/person.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/person.xsl $<
+               $(XSLROOT)/person.xsl \
+               $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/person.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 publications/index.html: $(XMLROOT)/publications/index.xml \
-       $(XSLROOT)/publications-index.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/publications-index.xsl $<
+                        $(XSLROOT)/publications-index.xsl \
+                         $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/publications-index.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 publications/%.html: $(XMLROOT)/publications/%.xml \
-              $(XSLROOT)/publication.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/publication.xsl $<
+                     $(XSLROOT)/publication.xsl \
+                     $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/publication.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 work-packages/index.html: $(XMLROOT)/work-packages/index.xml \
-                          $(XSLROOT)/work-packages_index.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/work-packages_index.xsl $<
+                          $(XSLROOT)/work-packages_index.xsl \
+                          $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/work-packages_index.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
        
 work-packages/%.html: $(XMLROOT)/work-packages/%.xml \
-              $(XSLROOT)/work-package.xsl
-       $(XSLTP) -o $@ $(XSLROOT)/work-package.xsl $<
+                      $(XSLROOT)/work-package.xsl \
+                      $(XSLROOT)/xhtml-content.xsl 
+       $(XSLTP) $(XSLROOT)/work-package.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+
 
 clean:
-       rm -f $(DOCUMENTS)
+       rm -f $(DOCUMENTS) approaching-deadlines.xml latest-news.xml
 .PHONY: clean
 
 install: $(DOCUMENTS)

diff --git a/helm/mowgli/home/xml/members-index.xml b/helm/mowgli/home/xml/members-index.xml
index f54a4a26d28d0ae1266e3e481ca9bff059e457ba..a0ffbcaee0535e8dae7f6f68bc273b9beb83195f 100644 (file)
--- a/helm/mowgli/home/xml/members-index.xml
+++ b/helm/mowgli/home/xml/members-index.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
  <head>

diff --git a/helm/mowgli/home/xml/mowgli-events/kick-off.xml b/helm/mowgli/home/xml/mowgli-events/kick-off.xml
index d84e120ec5e23a8206e57f13abe556b0f70e4346..ec7580fb7434deabf114944cc35b4169acc52fa1 100644 (file)
--- a/helm/mowgli/home/xml/mowgli-events/kick-off.xml
+++ b/helm/mowgli/home/xml/mowgli-events/kick-off.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
  <head>

diff --git a/helm/mowgli/home/xml/project-management.xml b/helm/mowgli/home/xml/project-management.xml
index 18948fc01e79419e8d8b0802bb561f333e02b481..aa1dfaeaaf4b1945e04e792bca080216de89bd13 100644 (file)
--- a/helm/mowgli/home/xml/project-management.xml
+++ b/helm/mowgli/home/xml/project-management.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
  <head>

diff --git a/helm/mowgli/home/xml/project-objectives.xml b/helm/mowgli/home/xml/project-objectives.xml
index 4a26a46c52dda87657c6367345edf79bdd24a3ec..bfeaefa16eb9399744d1ba184ae5ce43a74dc625 100644 (file)
--- a/helm/mowgli/home/xml/project-objectives.xml
+++ b/helm/mowgli/home/xml/project-objectives.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
  <head>

diff --git a/helm/mowgli/home/xml/project-summary.xml b/helm/mowgli/home/xml/project-summary.xml
index 89bc026eff04eeb4bb1c88f977f00b9d804c9efe..df880ff959f8d669b2630594f13b9422fafb846a 100644 (file)
--- a/helm/mowgli/home/xml/project-summary.xml
+++ b/helm/mowgli/home/xml/project-summary.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
  <head>

diff --git a/helm/mowgli/home/xsl/consortium.xsl b/helm/mowgli/home/xsl/consortium.xsl
index f42274f9b6a9d242b2b40c7214b3fa088b25016b..17420ee41964be38be857350e66e9ab325475b24 100644 (file)
--- a/helm/mowgli/home/xsl/consortium.xsl
+++ b/helm/mowgli/home/xsl/consortium.xsl
@@ -5,23 +5,15 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="/">
  <html>
   <head>
    <title>Consortium</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
     <xsl:apply-templates/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/deadlines.xsl b/helm/mowgli/home/xsl/deadlines.xsl
index 030c64480c026512d2adec9b9b64e7005613f49b..a71a04feb5a792e8cba5c9a3980ece6829491b28 100644 (file)
--- a/helm/mowgli/home/xsl/deadlines.xsl
+++ b/helm/mowgli/home/xsl/deadlines.xsl
@@ -5,7 +5,7 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:param name="events-class" select="''"/>
 <xsl:param name="today" select="''"/>
@@ -17,13 +17,8 @@
     <xsl:value-of select="$events-class"/>
     <xsl:text> Events Sorted by Deadlines</xsl:text>
    </title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
     <h1>
      <xsl:value-of select="$events-class"/>
      <xsl:text> Events</xsl:text>
@@ -49,9 +44,6 @@
       <xsl:sort select="date" data-type="number" order="descending"/>
      </xsl:apply-templates>
     </ul>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/deliverable.xsl b/helm/mowgli/home/xsl/deliverable.xsl
index 2721a5ff04009620a359e6706e16f46a24685819..3d7fa816f0349409bf966b2e0666a57746c5c1ab 100644 (file)
--- a/helm/mowgli/home/xsl/deliverable.xsl
+++ b/helm/mowgli/home/xsl/deliverable.xsl
@@ -5,7 +5,7 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="/">
  <html>
@@ -15,17 +15,9 @@
     <xsl:text> </xsl:text>
     <xsl:value-of select="deliverable/@name"/>
    </title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../../../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'../..'"/>
-    </xsl:call-template>
     <xsl:apply-templates/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'../..'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/events.xsl b/helm/mowgli/home/xsl/events.xsl
index 8ca0df467e98e3306ace23e2251067f1cb441089..8b8ed5aa0ffbba5df9d06ce1e5fc4d612f06449b 100644 (file)
--- a/helm/mowgli/home/xsl/events.xsl
+++ b/helm/mowgli/home/xsl/events.xsl
@@ -5,7 +5,7 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:param name="events-class" select="''"/>
 <xsl:param name="today"/>
@@ -17,13 +17,8 @@
     <xsl:value-of select="$events-class"/>
     <xsl:text> Events</xsl:text>
    </title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
     <h1>
      <xsl:value-of select="$events-class"/>
      <xsl:text> Events</xsl:text>
@@ -45,9 +40,6 @@
       <xsl:sort select="when/begin" data-type="number"/>
      </xsl:apply-templates>
     </dl>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/news.xsl b/helm/mowgli/home/xsl/news.xsl
index 83c5313764d5b786aea5ced0814202d7f5aeda9e..eaf4e54782cd7e22fece9251a0d689f1eda85360 100644 (file)
--- a/helm/mowgli/home/xsl/news.xsl
+++ b/helm/mowgli/home/xsl/news.xsl
@@ -5,26 +5,18 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="/">
  <html>
   <head>
    <title>News Archive</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
     <h1>News Archive</h1>
     <dl>
      <xsl:apply-templates/>
     </dl>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/people-list.xsl b/helm/mowgli/home/xsl/people-list.xsl
index 351ca3418a4a155c8771482f49dfeda9c4cecefb..e7236ec267af62269e940fb3bc5397f996bcfa64 100644 (file)
--- a/helm/mowgli/home/xsl/people-list.xsl
+++ b/helm/mowgli/home/xsl/people-list.xsl
@@ -5,19 +5,14 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="people">
  <html>
   <head>
    <title>People Directory</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
     <h1>People</h1>
 
     <table border="0" width="100%">
@@ -40,10 +35,6 @@
     </td>
     </tr>
     </table>
-
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/person.xsl b/helm/mowgli/home/xsl/person.xsl
index f4ef1e328cf6a8e204787037ae91ee1906800528..385465cca96761a55200acd5841c59954ef12ef8 100644 (file)
--- a/helm/mowgli/home/xsl/person.xsl
+++ b/helm/mowgli/home/xsl/person.xsl
@@ -5,7 +5,7 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="/">
  <html>
@@ -20,17 +20,9 @@
                      select="person/surname"/>
     </xsl:call-template>
    </title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../../../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'../..'"/>
-    </xsl:call-template>
     <xsl:apply-templates/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'../..'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/project.xsl b/helm/mowgli/home/xsl/project.xsl
index 5588c763d8e451f3a75984592423c86cc88df781..e37aaecd8b09cfd6dd9654718f61e6a0b36bbdeb 100644 (file)
--- a/helm/mowgli/home/xsl/project.xsl
+++ b/helm/mowgli/home/xsl/project.xsl
@@ -5,23 +5,15 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="/">
  <html>
   <head>
    <title>The Project</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'.'"/>
-    </xsl:call-template>
     <xsl:apply-templates/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'../..'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/publication.xsl b/helm/mowgli/home/xsl/publication.xsl
index 868622aed720294ca101eeec80f53ea65696b471..f994ad30b6035c976636e0475dc2d099b93dc195 100644 (file)
--- a/helm/mowgli/home/xsl/publication.xsl
+++ b/helm/mowgli/home/xsl/publication.xsl
@@ -5,23 +5,15 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="/">
  <html>
   <head>
    <title><xsl:value-of select="publication/title"/></title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../../../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'../..'"/>
-    </xsl:call-template>
     <xsl:apply-templates/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'../..'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/publications-index.xsl b/helm/mowgli/home/xsl/publications-index.xsl
index 1bca09a516570938624495291b40d5c8420f0c2f..aba49604d32794d39ec965c3d88176232588dc67 100644 (file)
--- a/helm/mowgli/home/xsl/publications-index.xsl
+++ b/helm/mowgli/home/xsl/publications-index.xsl
@@ -5,28 +5,20 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="publications">
  <html>
   <head>
    <title>List of Publications</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'..'"/>
-    </xsl:call-template>
     <h1>Publications</h1>
     <h2>About MoWGLI</h2>
     <xsl:apply-templates select="project"/>
     <h2>Related Publications</h2>
     <a name="related"/>
     <xsl:apply-templates select="related"/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'..'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/site.xsl b/helm/mowgli/home/xsl/site.xsl
index d488bacdcea2ac41080d2992608c4caf5b41efc0..034bc93293a33acd699479e1c3fc713764388d10 100644 (file)
--- a/helm/mowgli/home/xsl/site.xsl
+++ b/helm/mowgli/home/xsl/site.xsl
@@ -5,23 +5,15 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="/">
  <html>
   <head>
    <title><xsl:value-of select="site/name"/></title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'..'"/>
-    </xsl:call-template>
     <xsl:apply-templates/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'..'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/work-package.xsl b/helm/mowgli/home/xsl/work-package.xsl
index b013b880812c2c3812d6fe06ffe20a894f73001f..cee606d3758f89dce5adc5ee8afc6a18e7b90b54 100644 (file)
--- a/helm/mowgli/home/xsl/work-package.xsl
+++ b/helm/mowgli/home/xsl/work-package.xsl
@@ -5,7 +5,7 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="/">
  <html>
@@ -16,17 +16,9 @@
     <xsl:text>: </xsl:text>
     <xsl:value-of select="work-package/name"/>
    </title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'..'"/>
-    </xsl:call-template>
     <xsl:apply-templates/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'..'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/work-packages_index.xsl b/helm/mowgli/home/xsl/work-packages_index.xsl
index 629009daeee376518591885288ad9822af6ce07e..d13fd454ad23deb3851eb4006aee87880e966524 100644 (file)
--- a/helm/mowgli/home/xsl/work-packages_index.xsl
+++ b/helm/mowgli/home/xsl/work-packages_index.xsl
@@ -5,23 +5,15 @@
 
 <xsl:import href="common.xsl"/>
 
-<xsl:output method="html"/>
+<xsl:output method="xml"/>
 
 <xsl:template match="/">
  <html>
   <head>
    <title>Work Packages</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-   <link rel="stylesheet" href="../../style/mowgli.css" type="text/css"/>
   </head>
   <body>
-    <xsl:call-template name="head">
-     <xsl:with-param name="path_to_top" select="'..'"/>
-    </xsl:call-template>
     <xsl:apply-templates/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="'..'"/>
-    </xsl:call-template>
   </body>
  </html>
 </xsl:template>