- added common stylesheet

- preliminary support for news
- modified menu
- simplified makefile

diff --git a/helm/mowgli/home/html/.cvsignore b/helm/mowgli/home/html/.cvsignore
index f0808a004e313c3560f7236e49da66787d0bab08..1ea3c06cac0aba810058e87d79977a5f68c58040 100644 (file)
--- a/helm/mowgli/home/html/.cvsignore
+++ b/helm/mowgli/home/html/.cvsignore
@@ -3,3 +3,4 @@ index.html
 menu.html 
 consortium.html 
 project.html 
+news.html

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index 0d514f07d622bd16bc252abdf7af698d801513f8..0537f51d121153310e20cd3675e40be4d813f92c 100644 (file)
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -1,9 +1,13 @@
 TEMPLATESROOT = ../templates
 XMLROOT = ../xml
 XSLROOT = ../xsl
-DOCUMENTS = home.html index.html menu.html \
+DOCUMENTS = \
+            index.html \
+            home.html \
+           menu.html \
             consortium.html \
             project.html \
+           news.html \
             sites/aei.html \
             sites/bologna.html \
             sites/dfki.html \
@@ -55,6 +59,7 @@ DOCUMENTS = home.html index.html menu.html \
             publications/others/tcs2001_og.html \
             publications/others/tphols2000_gwz.html \
             publications/others/tphols2001_apss.html \
+            work-packages/index.html \
             work-packages/distribution.html \
             work-packages/information-dissemination-and-exploitation.html \
             work-packages/interfaces.html \
@@ -67,38 +72,48 @@ DOCUMENTS = home.html index.html menu.html \
 all: $(DOCUMENTS)
 
 home.html: $(TEMPLATESROOT)/home.html
-       cp $(TEMPLATESROOT)/home.html .
+       cp $< $@
 
 index.html: $(TEMPLATESROOT)/index.html
-       cp $(TEMPLATESROOT)/index.html .
+       cp $< $@
 
 menu.html: $(TEMPLATESROOT)/menu.html
-       cp $(TEMPLATESROOT)/menu.html .
+       sed s/\@DATE\@/"`date`"/ $< >$@
 
 consortium.html: $(XMLROOT)/consortium.xml \
                  $(XSLROOT)/consortium.xsl
-       xsltproc -o $@ $(XSLROOT)/consortium.xsl $(XMLROOT)/consortium.xml
+       xsltproc -o $@ $(XSLROOT)/consortium.xsl $<
 
 project.html: $(XMLROOT)/project.xml \
               $(XSLROOT)/project.xsl
-       xsltproc -o $@ $(XSLROOT)/project.xsl $(XMLROOT)/project.xml
+       xsltproc -o $@ $(XSLROOT)/project.xsl $<
 
-sites/%.html: $(XMLROOT)/$(@:%.html=%.xml) \
+news.html: $(XMLROOT)/news.xml \
+          $(XSLROOT)/news.xsl
+       xsltproc -o $@ $(XSLROOT)/news.xsl $<
+
+sites/%.html: $(XMLROOT)/sites/%.xml \
               $(XSLROOT)/site.xsl
-       xsltproc -o $@ $(XSLROOT)/site.xsl $(XMLROOT)/$(@:%.html=%.xml)
+       xsltproc -o $@ $(XSLROOT)/site.xsl $<
 
-people/%.html: $(XMLROOT)/$(@:%.html=%.xml) \
+people/%.html: $(XMLROOT)/people/%.xml \
               $(XSLROOT)/person.xsl
-       xsltproc -o $@ $(XSLROOT)/person.xsl $(XMLROOT)/$(@:%.html=%.xml)
+       xsltproc -o $@ $(XSLROOT)/person.xsl $<
 
-publications/%.html: $(XMLROOT)/$(@:%.html=%.xml) \
+publications/%.html: $(XMLROOT)/publications/%.xml \
               $(XSLROOT)/publication.xsl
-       xsltproc -o $@ $(XSLROOT)/publication.xsl $(XMLROOT)/$(@:%.html=%.xml)
+       xsltproc -o $@ $(XSLROOT)/publication.xsl $<
 
-work-packages/%.html: $(XMLROOT)/$(@:%.html=%.xml) \
+work-packages/index.html: $(TEMPLATESROOT)/work-packages/index.html
+       cp $< $@
+       
+work-packages/%.html: $(XMLROOT)/work-packages/%.xml \
               $(XSLROOT)/work-package.xsl
-       xsltproc -o $@ $(XSLROOT)/work-package.xsl $(XMLROOT)/$(@:%.html=%.xml)
+       xsltproc -o $@ $(XSLROOT)/work-package.xsl $<
 
 clean:
        rm -f $(DOCUMENTS)
 .PHONY: clean
+
+$(XSLROOT)/%.xsl : $(XSLROOT)/common.xsl
+

diff --git a/helm/mowgli/home/templates/index.html b/helm/mowgli/home/templates/index.html
index 89df5e643863cf4e2d02a58e391f012da776fb90..30a32119cf09819a35cc59537930a68e2a66620e 100644 (file)
--- a/helm/mowgli/home/templates/index.html
+++ b/helm/mowgli/home/templates/index.html
@@ -10,8 +10,8 @@
   </head>
 
   <frameset cols="200,*" border="0">
-    <frame src="menu.html">
-    <frame src="home.html">
+    <frame name="menu" src="menu.html">
+    <frame name="content" src="home.html">
   </frameset>
 
 </html>

diff --git a/helm/mowgli/home/templates/menu.html b/helm/mowgli/home/templates/menu.html
index 894dc63e6e71993baacd005bf026c0736e4207d3..7a04a4303d68a9d17f31a451a582e6ca8a34285f 100644 (file)
--- a/helm/mowgli/home/templates/menu.html
+++ b/helm/mowgli/home/templates/menu.html
@@ -20,13 +20,15 @@
   <tr>
     <td class="menuentries">
       <table width="100%" border="0">
-      <tr><td><a class="menulink" href="">Members</a></td></tr>
-      <tr><td><a class="menulink" href="">Documentation</a></td></tr>
-      <tr><td><a class="menulink" href="">Software</a> (<a class="menulink" href="">CVS</a>)</td></tr>
-      <tr><td><a class="menulink" href="">Bibliography</a></td></tr>
-      <tr><td><a class="menulink" href="">Events</a></td></tr>
-      <tr><td><a class="menulink" href="">News Archive</a></td></tr>
-      <tr><td><a class="menulink" href="">Members Area</a></td></tr>
+      <tr><td><a class="menulink" target="content" href="home.html">Home</a></td></tr>
+      <tr><td><a class="menulink" target="content" href="consortium.html">Consortium</a></td></td>
+      <tr><td><a class="menulink" target="content" href="work-packages/index.html">Work Packages</a></td></tr>
+      <tr><td><a class="menulink" target="content" href="publications/mowgli">Publications</a></td></tr>
+      <tr><td><a class="menulink" target="content" href="publications/others">Bibliography</a></td></tr>
+      <tr><td><a class="menulink" target="content" href="">Events</a></td></tr>
+      <tr><td><a class="menulink" target="content" href="news.html">News Archive</a></td></tr>
+      <tr><td><a class="menulink" target="content" href="">Members Area</a></td></tr>
+      <tr><td><a class="menulink" target="content" href="">Software</a> (<a class="menulink" href="">CVS</a>)</td></tr>
       </table>
     </td>
   </tr>
@@ -36,13 +38,14 @@
   <tr>
     <td class="menuentries">
       <table width="100%" border="0">
-      <tr><td><a class="menulink" href="">HELM</a></td></tr>
-      <tr><td><a class="menulink" href="">MathML</a></td></tr>
-      <tr><td><a class="menulink" href="">OpenMath</a></td></tr>
-      <tr><td><a class="menulink" href="">OmDOC</a></td></tr>
+      <tr><td><a class="menulink" target="_top" href="http://www.cs.unibo.it/helm">HELM</a></td></tr>
+      <tr><td><a class="menulink" target="_top" href="http://www.w3.org/Math">MathML</a></td></tr>
+      <tr><td><a class="menulink" target="_top" href="http://www.openmath.org">OpenMath</a></td></tr>
+      <tr><td><a class="menulink" target="_top" href="">OmDOC</a></td></tr>
       </table>
     </td>
   </tr>
+  <!--
   <tr>
     <td class="menutitle">Technologies</td>
   </tr>
@@ -50,30 +53,34 @@
     <td class="menuentries">
       <table width="100%" border="0">
       <tr><td>
-        <a class="menulink" href="">SGML</a>,
-        <a class="menulink" href="">HTML</a>,
-        <a class="menulink" href="">CSS</a>
+        <a class="menulink" target="_top" href="">SGML</a>,
+        <a class="menulink" target="_top" href="">HTML</a>,
+        <a class="menulink" target="_top" href="">CSS</a>
       </td></tr>
       <tr><td>
-        <a class="menulink" href="">XML</a>,
-        <a class="menulink" href="">XSL</a>,
-        <a class="menulink" href="">MathML</a>,
-        <a class="menulink" href="">SVG</a>
+        <a class="menulink" target="_top" href="">XML</a>,
+        <a class="menulink" target="_top" href="">XSL</a>,
+        <a class="menulink" target="_top" href="">MathML</a>,
+        <a class="menulink" target="_top" href="">SVG</a>
       </td></tr>
-      <tr><td><a class="menulink" href="">DOM</a></td></tr>
+      <tr><td><a class="menulink" target="_top" href="">DOM</a></td></tr>
       </table>
     </td>
   </tr>
-  
+  -->
+
   <tr><td class="menutitle">About</td></tr>
 
   <tr>
     <td class="menuentries">
       <div class="small">
         <table width="100%" border="0">
-        <tr><td>Contact: <a href="mailto:asperti@cs.unibo.it">asperti@cs.unibo.it</a></td></tr>
-       <tr><td>Webmaster: <a href="mailto:mowgli-webmaster@cs.unibo.it">mowgli-webmaster@cs.unibo.it</a></td></tr>
-        <tr><td>Last Updated: <b>January 18, 2002</b></td></tr>
+        <tr><td>Contact:</td></tr>
+       <tr><td><a href="mailto:asperti@cs.unibo.it">asperti@cs.unibo.it</a></td></tr>
+       <tr><td>Webmaster:</td></tr>
+       <tr><td><a href="mailto:mowgli-webmaster@cs.unibo.it">mowgli-webmaster@cs.unibo.it</a></td></tr>
+        <tr><td>Last Update:</td></tr>
+       <tr><td><b>@DATE@</b></td></tr>
         </table>
     </td>
   </tr>

diff --git a/helm/mowgli/home/templates/work-packages/index.html b/helm/mowgli/home/templates/work-packages/index.html
new file mode 100644 (file)
index 0000000..199ead8
--- /dev/null
+++ b/helm/mowgli/home/templates/work-packages/index.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+  <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 class="content">
+
+    <blockquote>
+      <h1>Work Packages</h1>
+
+      <ul>
+        <li><a href="distribution.html">Distribution</a></li>
+       <li><a href="information-dissemination-and-exploitation.html">Information Dissemination and Exploitation</a></li>
+       <li><a href="interfaces.html">Interfaces</a></li>
+       <li><a href="metadata.html">Metadata</a></li>
+       <li><a href="project-management.html">Project Management</a></li>
+       <li><a href="requirement-analysis.html">Requirement Analysis</a></li>
+       <li><a href="testing-and-validation.html">Testing and Validation</a></li>
+       <li><a href="transformation.html">Transformation</a></li>
+      </ul>
+    </blockquote>
+  </body>
+
+</html>

diff --git a/helm/mowgli/home/xml/news.xml b/helm/mowgli/home/xml/news.xml
new file mode 100644 (file)
index 0000000..455f8c2
--- /dev/null
+++ b/helm/mowgli/home/xml/news.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE news [
+ <!ELEMENT news (event*)>
+ <!ELEMENT event (date,header?,description,who?)>
+]>
+
+<news>
+
+  <event>
+    <date>February 12, 2002</date>
+    <description>
+      Site moved into CVS. XSLT stylesheets are used to generate
+      HTML pages from XML sources.
+    </description>
+    <who>Claudio Sacerdoti Coen</who>
+  </event>
+  
+  <event>
+    <date>January 19, 2002</date>
+    <description>
+      First Web pages created.
+    </description>
+    <who>Luca Padovani</who>
+  </event>
+  
+</news>
+

diff --git a/helm/mowgli/home/xsl/common.xsl b/helm/mowgli/home/xsl/common.xsl
new file mode 100644 (file)
index 0000000..c4f0d3a
--- /dev/null
+++ b/helm/mowgli/home/xsl/common.xsl
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:template name="head">
+  <div class="right">
+   <div class="small">
+    <a href="home.html">MoWGLI: Mathematics on the Web: Get It by Logic and Interfaces</a>
+   </div>
+  </div>
+  <hr/>
+</xsl:template>
+
+<xsl:template name="foot">
+  <hr/>
+  <div class="small">
+   This page is hosted by the
+   <a href="http://www.cs.unibo.it">Department of Computer Science</a>,
+   <a href="http://www.unibo.it">University of Bologna</a>
+  </div>
+</xsl:template>
+
+</xsl:stylesheet>
+

diff --git a/helm/mowgli/home/xsl/consortium.xsl b/helm/mowgli/home/xsl/consortium.xsl
index 09ee0d8d4395658a9a9fd35312c9c27a2446e242..81327d1410fa4d28caadd3b7e13b5e6ff8070fc9 100644 (file)
--- a/helm/mowgli/home/xsl/consortium.xsl
+++ b/helm/mowgli/home/xsl/consortium.xsl
@@ -3,6 +3,8 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+<xsl:import href="common.xsl"/>
+
 <xsl:output method="html"/>
 
 <xsl:template match="/">

diff --git a/helm/mowgli/home/xsl/news.xsl b/helm/mowgli/home/xsl/news.xsl
new file mode 100644 (file)
index 0000000..d14069f
--- /dev/null
+++ b/helm/mowgli/home/xsl/news.xsl
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:import href="common.xsl"/>
+
+<xsl:output method="html"/>
+
+<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>
+   <blockquote>
+    <xsl:call-template name="head"/>
+    <h1>News Archive</h1>
+    <dl>
+     <xsl:apply-templates/>
+    </dl>
+    <xsl:call-template name="foot"/>
+   </blockquote>
+  </body>
+ </html>
+</xsl:template>
+
+<xsl:template match="event">
+ <dt>
+  <b><xsl:value-of select="date"/></b>
+  <xsl:if test="head">
+   <xsl:value-of select="' -- '"/>
+   <em>
+    <xsl:value-of select="head"/>
+   </em>
+  </xsl:if>
+ </dt>
+ <dd>
+  <xsl:value-of select="description"/>
+  <xsl:if test="who">
+   <br/><br/>
+   <div class="right">
+    <em><div class="small"><xsl:value-of select="who"/></div></em>
+   </div>
+  </xsl:if>
+ </dd>
+</xsl:template>
+
+</xsl:stylesheet>

diff --git a/helm/mowgli/home/xsl/person.xsl b/helm/mowgli/home/xsl/person.xsl
index 8323ecf0ef8e98c288ed3adb6f3c8792ebfde774..1942a977ce9ed376737dbad7c01578fd6005b72d 100644 (file)
--- a/helm/mowgli/home/xsl/person.xsl
+++ b/helm/mowgli/home/xsl/person.xsl
@@ -3,6 +3,8 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+<xsl:import href="common.xsl"/>
+
 <xsl:output method="html"/>
 
 <xsl:template match="/">

diff --git a/helm/mowgli/home/xsl/project.xsl b/helm/mowgli/home/xsl/project.xsl
index ba1f7a9bd9642d0aee5ac3b23c72f198ca1cac54..5e93d57655f377f3dbab278106e32687a53c1cec 100644 (file)
--- a/helm/mowgli/home/xsl/project.xsl
+++ b/helm/mowgli/home/xsl/project.xsl
@@ -3,6 +3,8 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+<xsl:import href="common.xsl"/>
+
 <xsl:output method="html"/>
 
 <xsl:template match="/">

diff --git a/helm/mowgli/home/xsl/publication.xsl b/helm/mowgli/home/xsl/publication.xsl
index 49a9b7b172fa761f2b2b13fbac47cdfaa5b49c2c..2c9903cb7f048397d27982086027341d63e9d3a6 100644 (file)
--- a/helm/mowgli/home/xsl/publication.xsl
+++ b/helm/mowgli/home/xsl/publication.xsl
@@ -3,6 +3,8 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+<xsl:import href="common.xsl"/>
+
 <xsl:output method="html"/>
 
 <xsl:template match="/">

diff --git a/helm/mowgli/home/xsl/site.xsl b/helm/mowgli/home/xsl/site.xsl
index df3ce1d0d46a7e545051a2f0195f79354005391e..f7568a823ba4ebef55c50c40bc19c807b8225a14 100644 (file)
--- a/helm/mowgli/home/xsl/site.xsl
+++ b/helm/mowgli/home/xsl/site.xsl
@@ -1,7 +1,10 @@
 <?xml version="1.0"?>
+
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+<xsl:import href="common.xsl"/>
+
 <xsl:output method="html"/>
 
 <xsl:template match="/">

diff --git a/helm/mowgli/home/xsl/work-package.xsl b/helm/mowgli/home/xsl/work-package.xsl
index 62231d7b8844562708c60a66b907050a878235dd..b6bc9347f817c1ee01d9fa5d10819da187ed5d06 100644 (file)
--- a/helm/mowgli/home/xsl/work-package.xsl
+++ b/helm/mowgli/home/xsl/work-package.xsl
@@ -3,6 +3,8 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+<xsl:import href="common.xsl"/>
+
 <xsl:output method="html"/>
 
 <xsl:template match="/">