From aec0205f30e65b81519d0c1b103f24ca88cddf95 Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Mon, 25 Feb 2002 15:47:02 +0000 Subject: [PATCH] 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. --- helm/mowgli/home/html/Makefile | 108 +++++++++++------- helm/mowgli/home/xml/members-index.xml | 3 +- .../home/xml/mowgli-events/kick-off.xml | 3 +- helm/mowgli/home/xml/project-management.xml | 3 +- helm/mowgli/home/xml/project-objectives.xml | 3 +- helm/mowgli/home/xml/project-summary.xml | 3 +- helm/mowgli/home/xsl/consortium.xsl | 10 +- helm/mowgli/home/xsl/deadlines.xsl | 10 +- helm/mowgli/home/xsl/deliverable.xsl | 10 +- helm/mowgli/home/xsl/events.xsl | 10 +- helm/mowgli/home/xsl/news.xsl | 10 +- helm/mowgli/home/xsl/people-list.xsl | 11 +- helm/mowgli/home/xsl/person.xsl | 10 +- helm/mowgli/home/xsl/project.xsl | 10 +- helm/mowgli/home/xsl/publication.xsl | 10 +- helm/mowgli/home/xsl/publications-index.xsl | 10 +- helm/mowgli/home/xsl/site.xsl | 10 +- helm/mowgli/home/xsl/work-package.xsl | 10 +- helm/mowgli/home/xsl/work-packages_index.xsl | 10 +- 19 files changed, 86 insertions(+), 168 deletions(-) diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile index df78f8dfa..a8fb04c50 100644 --- 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 f54a4a26d..a0ffbcaee 100644 --- a/helm/mowgli/home/xml/members-index.xml +++ b/helm/mowgli/home/xml/members-index.xml @@ -1,7 +1,6 @@ - + diff --git a/helm/mowgli/home/xml/mowgli-events/kick-off.xml b/helm/mowgli/home/xml/mowgli-events/kick-off.xml index d84e120ec..ec7580fb7 100644 --- a/helm/mowgli/home/xml/mowgli-events/kick-off.xml +++ b/helm/mowgli/home/xml/mowgli-events/kick-off.xml @@ -1,7 +1,6 @@ - + diff --git a/helm/mowgli/home/xml/project-management.xml b/helm/mowgli/home/xml/project-management.xml index 18948fc01..aa1dfaeaa 100644 --- a/helm/mowgli/home/xml/project-management.xml +++ b/helm/mowgli/home/xml/project-management.xml @@ -1,7 +1,6 @@ - + diff --git a/helm/mowgli/home/xml/project-objectives.xml b/helm/mowgli/home/xml/project-objectives.xml index 4a26a46c5..bfeaefa16 100644 --- a/helm/mowgli/home/xml/project-objectives.xml +++ b/helm/mowgli/home/xml/project-objectives.xml @@ -1,7 +1,6 @@ - + diff --git a/helm/mowgli/home/xml/project-summary.xml b/helm/mowgli/home/xml/project-summary.xml index 89bc026ef..df880ff95 100644 --- a/helm/mowgli/home/xml/project-summary.xml +++ b/helm/mowgli/home/xml/project-summary.xml @@ -1,7 +1,6 @@ - + diff --git a/helm/mowgli/home/xsl/consortium.xsl b/helm/mowgli/home/xsl/consortium.xsl index f42274f9b..17420ee41 100644 --- a/helm/mowgli/home/xsl/consortium.xsl +++ b/helm/mowgli/home/xsl/consortium.xsl @@ -5,23 +5,15 @@ - + Consortium - - - - - - - - diff --git a/helm/mowgli/home/xsl/deadlines.xsl b/helm/mowgli/home/xsl/deadlines.xsl index 030c64480..a71a04feb 100644 --- a/helm/mowgli/home/xsl/deadlines.xsl +++ b/helm/mowgli/home/xsl/deadlines.xsl @@ -5,7 +5,7 @@ - + @@ -17,13 +17,8 @@ Events Sorted by Deadlines - - - - -

Events @@ -49,9 +44,6 @@ - - - diff --git a/helm/mowgli/home/xsl/deliverable.xsl b/helm/mowgli/home/xsl/deliverable.xsl index 2721a5ff0..3d7fa816f 100644 --- a/helm/mowgli/home/xsl/deliverable.xsl +++ b/helm/mowgli/home/xsl/deliverable.xsl @@ -5,7 +5,7 @@ - + @@ -15,17 +15,9 @@ - - - - - - - - diff --git a/helm/mowgli/home/xsl/events.xsl b/helm/mowgli/home/xsl/events.xsl index 8ca0df467..8b8ed5aa0 100644 --- a/helm/mowgli/home/xsl/events.xsl +++ b/helm/mowgli/home/xsl/events.xsl @@ -5,7 +5,7 @@ - + @@ -17,13 +17,8 @@ Events - - - - -

Events @@ -45,9 +40,6 @@ - - - diff --git a/helm/mowgli/home/xsl/news.xsl b/helm/mowgli/home/xsl/news.xsl index 83c531376..eaf4e5478 100644 --- a/helm/mowgli/home/xsl/news.xsl +++ b/helm/mowgli/home/xsl/news.xsl @@ -5,26 +5,18 @@ - + News Archive - - - - -

News Archive

- - - diff --git a/helm/mowgli/home/xsl/people-list.xsl b/helm/mowgli/home/xsl/people-list.xsl index 351ca3418..e7236ec26 100644 --- a/helm/mowgli/home/xsl/people-list.xsl +++ b/helm/mowgli/home/xsl/people-list.xsl @@ -5,19 +5,14 @@ - + People Directory - - - - -

People

@@ -40,10 +35,6 @@
- - - - diff --git a/helm/mowgli/home/xsl/person.xsl b/helm/mowgli/home/xsl/person.xsl index f4ef1e328..385465cca 100644 --- a/helm/mowgli/home/xsl/person.xsl +++ b/helm/mowgli/home/xsl/person.xsl @@ -5,7 +5,7 @@ - + @@ -20,17 +20,9 @@ select="person/surname"/> - - - - - - - - diff --git a/helm/mowgli/home/xsl/project.xsl b/helm/mowgli/home/xsl/project.xsl index 5588c763d..e37aaecd8 100644 --- a/helm/mowgli/home/xsl/project.xsl +++ b/helm/mowgli/home/xsl/project.xsl @@ -5,23 +5,15 @@ - + The Project - - - - - - - - diff --git a/helm/mowgli/home/xsl/publication.xsl b/helm/mowgli/home/xsl/publication.xsl index 868622aed..f994ad30b 100644 --- a/helm/mowgli/home/xsl/publication.xsl +++ b/helm/mowgli/home/xsl/publication.xsl @@ -5,23 +5,15 @@ - + <xsl:value-of select="publication/title"/> - - - - - - - - diff --git a/helm/mowgli/home/xsl/publications-index.xsl b/helm/mowgli/home/xsl/publications-index.xsl index 1bca09a51..aba49604d 100644 --- a/helm/mowgli/home/xsl/publications-index.xsl +++ b/helm/mowgli/home/xsl/publications-index.xsl @@ -5,28 +5,20 @@ - + List of Publications - - - - -

Publications

About MoWGLI

Related Publications

- - - diff --git a/helm/mowgli/home/xsl/site.xsl b/helm/mowgli/home/xsl/site.xsl index d488bacdc..034bc9329 100644 --- a/helm/mowgli/home/xsl/site.xsl +++ b/helm/mowgli/home/xsl/site.xsl @@ -5,23 +5,15 @@ - + <xsl:value-of select="site/name"/> - - - - - - - - diff --git a/helm/mowgli/home/xsl/work-package.xsl b/helm/mowgli/home/xsl/work-package.xsl index b013b8808..cee606d37 100644 --- a/helm/mowgli/home/xsl/work-package.xsl +++ b/helm/mowgli/home/xsl/work-package.xsl @@ -5,7 +5,7 @@ - + @@ -16,17 +16,9 @@ : - - - - - - - - diff --git a/helm/mowgli/home/xsl/work-packages_index.xsl b/helm/mowgli/home/xsl/work-packages_index.xsl index 629009dae..d13fd454a 100644 --- a/helm/mowgli/home/xsl/work-packages_index.xsl +++ b/helm/mowgli/home/xsl/work-packages_index.xsl @@ -5,23 +5,15 @@ - + Work Packages - - - - - - - - -- 2.39.2