From: Claudio Sacerdoti Coen Date: Tue, 26 Feb 2002 13:51:04 +0000 (+0000) Subject: * non-html stuff that was installed in html/members/contract is now X-Git-Tag: V_0_3_0_debian_8~268 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=be56394cb6821b40d444a62e6139ca3719bdb59a;p=helm.git * non-html stuff that was installed in html/members/contract is now installed in misc/contract. * the html dir can now be changed as wished. This allows to have both the "with frames" and the "without frames" versions on-line at the same time. * xhtml-content.html can now produce both the version with and without frames --- diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile index 378b60e9b..8d91bb726 100644 --- a/helm/mowgli/home/html/Makefile +++ b/helm/mowgli/home/html/Makefile @@ -6,6 +6,12 @@ FRAMES = yes DESTDIR = /projects/mowgli/public_html #DESTDIR = /tmp/mowgli +#HTMLDESTDIRSUFFIX = html_frames +#HTMLDESTDIRSUFFIX = html_no_frames +HTMLDESTDIRSUFFIX = html + +HTMLDESTDIR = $(DESTDIR)/$(HTMLDESTDIRSUFFIX) + XSLTP = xsltproc --param current-date "'`date`'" TEMPLATESROOT = ../templates XMLROOT = ../xml @@ -13,11 +19,7 @@ XSLROOT = ../xsl RMDOCTYPE = "s/<\\!DOCTYPE[^>]*>//" -ifeq ($(FRAMES),yes) - XHTMLCONTENT = $(XSLROOT)/xhtml-content.xsl -else - XHTMLCONTENT = $(XSLROOT)/xhtml-content-no-frames.xsl -endif +XHTMLCONTENT = $(XSLROOT)/xhtml-content.xsl PEOPLE = \ people/aei/kelley.html \ @@ -142,7 +144,7 @@ home.html: $(XMLROOT)/home.xml \ $(XHTMLCONTENT) $(XSLTP) -o latest-news.xml $(XSLROOT)/latest-news.xsl $(XMLROOT)/news.xml $(XSLTP) --param today `date +%Y%m%d` -o approaching-deadlines.xml $(XSLROOT)/approaching-deadlines.xsl $(XMLROOT)/other-events.xml - $(XSLTP) --param make_header "false()" --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml + $(XSLTP) --param make_header "false()" --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml ifeq ($(FRAMES),yes) index.html: $(TEMPLATESROOT)/index.html @@ -152,7 +154,7 @@ index.html: home.html cp $< $@ #Same stuff as for home.html... but with a different path_to_top dot_dot_index.html: home.html - $(XSLTP) --param make_header "false()" --param path_to_top "'html'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml + $(XSLTP) --param make_header "false()" --param path_to_top "'html'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml endif members/ml-help-example.txt: $(TEMPLATESROOT)/ml-help-example.txt @@ -160,111 +162,111 @@ members/ml-help-example.txt: $(TEMPLATESROOT)/ml-help-example.txt members/index.html: $(XMLROOT)/members-index.xml \ $(XHTMLCONTENT) - sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) - + sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - software/index.html: $(XMLROOT)/software/index.xml \ $(XHTMLCONTENT) - $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) $< + $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) $< menu.html: $(TEMPLATESROOT)/menu.html cp $< $@ project-management.html: $(XMLROOT)/project-management.xml \ $(XHTMLCONTENT) - sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - project-summary.html: $(XMLROOT)/project-summary.xml \ $(XHTMLCONTENT) - sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - project-objectives.html: $(XMLROOT)/project-objectives.xml \ $(XHTMLCONTENT) - sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - mowgli-events/kick-off.html: $(XMLROOT)/mowgli-events/kick-off.xml \ $(XHTMLCONTENT) - sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) - + sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - people-list.html: $(XMLROOT)/people/index.xml \ $(XSLROOT)/people-list.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/people-list.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/people-list.xsl $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - consortium.html: $(XMLROOT)/consortium.xml \ $(XSLROOT)/consortium.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/consortium.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/consortium.xsl $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - project.html: $(XMLROOT)/project.xml \ $(XSLROOT)/project.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/project.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/project.xsl $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - news.html: $(XMLROOT)/news.xml \ $(XSLROOT)/news.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/news.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/news.xsl $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - other-events.html: $(XMLROOT)/other-events.xml \ $(XSLROOT)/events.xsl \ $(XHTMLCONTENT) - $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - mowgli-events.html: $(XMLROOT)/mowgli-events.xml \ $(XSLROOT)/events.xsl \ $(XHTMLCONTENT) - $(XSLTP) --param today `date +%Y%m%d` --param events-class "'MOWGLI'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) --param today `date +%Y%m%d` --param events-class "'MOWGLI'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - deadlines.html: $(XMLROOT)/other-events.xml \ $(XSLROOT)/deadlines.xsl \ $(XHTMLCONTENT) - $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/deadlines.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/deadlines.xsl $< | $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - deliverables/%.html: $(XMLROOT)/deliverables/%.xml \ $(XSLROOT)/deliverable.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/deliverable.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/deliverable.xsl $< | $(XSLTP) --param path_to_top "'../..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - sites/%.html: $(XMLROOT)/sites/%.xml \ $(XSLROOT)/site.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/site.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/site.xsl $< | $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - people/%.html: $(XMLROOT)/people/%.xml \ $(XSLROOT)/person.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/person.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/person.xsl $< | $(XSLTP) --param path_to_top "'../..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - publications/index.html: $(XMLROOT)/publications/index.xml \ $(XSLROOT)/publications-index.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/publications-index.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/publications-index.xsl $< | $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - publications/%.html: $(XMLROOT)/publications/%.xml \ $(XSLROOT)/publication.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/publication.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/publication.xsl $< | $(XSLTP) --param path_to_top "'../..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - work-packages/index.html: $(XMLROOT)/work-packages/index.xml \ $(XSLROOT)/work-packages_index.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/work-packages_index.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/work-packages_index.xsl $< | $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - work-packages/%.html: $(XMLROOT)/work-packages/%.xml \ $(XSLROOT)/work-package.xsl \ $(XHTMLCONTENT) - $(XSLTP) $(XSLROOT)/work-package.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) - + $(XSLTP) $(XSLROOT)/work-package.xsl $< | $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) - clean: @@ -272,21 +274,22 @@ clean: .PHONY: clean install: $(DOCUMENTS) - mkdir -p $(DESTDIR)/html + mkdir -p $(HTMLDESTDIR) for i in $(dir $(DOCUMENTS)); do \ - mkdir -p $(DESTDIR)/html/$$i; \ + mkdir -p $(HTMLDESTDIR)/$$i; \ done for i in $(DOCUMENTS); do \ - cp $$i $(DESTDIR)/html/$$i; \ + cp $$i $(HTMLDESTDIR)/$$i; \ done mkdir -p $(DESTDIR)/images cp ../images/*.* $(DESTDIR)/images mkdir -p $(DESTDIR)/style cp ../style/*.css $(DESTDIR)/style - cp ../htaccess $(DESTDIR)/html/members/.htaccess - mkdir -p $(DESTDIR)/html/members/contract - cp ../misc/contract/*.* $(DESTDIR)/html/members/contract - if [ -f dot_dot_index.html ] ; then cp dot_dot_index.html $(DESTDIR)/index.html ; else sed s/menu\\.html/html\\/menu\\.html/ $(DESTDIR)/index.html ; fi + cp ../htaccess $(HTMLDESTDIR)/members/.htaccess + mkdir -p $(DESTDIR)/misc/contract + cp ../htaccess $(DESTDIR)/misc/contract/.htaccess + cp ../misc/contract/*.* $(DESTDIR)/misc/contract + if [ -f dot_dot_index.html ] ; then cp dot_dot_index.html $(DESTDIR)/index.html ; else sed s/menu\\.html/$(HTMLDESTDIRSUFFIX)\\/menu\\.html/ $(DESTDIR)/index.html ; fi uninstall: rm -rf $(DESTDIR)/* diff --git a/helm/mowgli/home/xml/members-index.xml b/helm/mowgli/home/xml/members-index.xml index a0ffbcaee..017f37e28 100644 --- a/helm/mowgli/home/xml/members-index.xml +++ b/helm/mowgli/home/xml/members-index.xml @@ -47,10 +47,10 @@

The Contract

-

The contract in PostScript - and PDF. The - contract sources (in - LaTeX) and the Excel forms +

The contract in PostScript + and PDF. The + contract sources (in + LaTeX) and the Excel forms are also available.

diff --git a/helm/mowgli/home/xsl/xhtml-content.xsl b/helm/mowgli/home/xsl/xhtml-content.xsl index 924f7e825..128c1de03 100644 --- a/helm/mowgli/home/xsl/xhtml-content.xsl +++ b/helm/mowgli/home/xsl/xhtml-content.xsl @@ -11,6 +11,7 @@ + @@ -25,6 +26,7 @@ + @@ -34,6 +36,25 @@ + + + + + + + + + + + + +
+ +   + +
+
+
@@ -62,4 +83,38 @@ + + + + + + + + + + + / + + + + + + + + + + + + + + + + + + + + +