* Work Package Leaders added (and rendered)

* Rendering of Work Packages improved

diff --git a/helm/mowgli/home/xml/work-packages/information-dissemination-and-exploitation.xml b/helm/mowgli/home/xml/work-packages/information-dissemination-and-exploitation.xml
index 0f3b15ec305faf253b2311af61061169b105aa06..fe427b1a93f632795edc8f598b8646c6ceaf5ed9 100644 (file)
--- a/helm/mowgli/home/xml/work-packages/information-dissemination-and-exploitation.xml
+++ b/helm/mowgli/home/xml/work-packages/information-dissemination-and-exploitation.xml
@@ -6,6 +6,7 @@
  <name>Information Dissemination and Exploitation</name>
  <begin>Month 3</begin>
  <end>Month 30</end>
+ <leader file="aei/wegner"/>
  <person-month participant="bologna" number="1"/>
  <person-month participant="inria" number="0"/>
  <person-month participant="dfki" number="0"/>

diff --git a/helm/mowgli/home/xml/work-packages/interfaces.xml b/helm/mowgli/home/xml/work-packages/interfaces.xml
index cbd3db83b1e7e8ee647412263571ab28533d21b8..b8ca886fd2f313a58c360141030c3ba4511771f8 100644 (file)
--- a/helm/mowgli/home/xml/work-packages/interfaces.xml
+++ b/helm/mowgli/home/xml/work-packages/interfaces.xml
@@ -6,6 +6,7 @@
  <name>Interfaces</name>
  <begin>Month 3</begin>
  <end>Month 24</end>
+ <leader file="inria/pottier"/>
  <person-month participant="bologna" number="16"/>
  <person-month participant="inria" number="16"/>
  <person-month participant="dfki" number="5"/>

diff --git a/helm/mowgli/home/xml/work-packages/project-management.xml b/helm/mowgli/home/xml/work-packages/project-management.xml
index 10674e31cf95e13a1235a5082bb59ae9e6c6119e..645d2beaf09cea2b7190c02e0e9ad333a1ad7617 100644 (file)
--- a/helm/mowgli/home/xml/work-packages/project-management.xml
+++ b/helm/mowgli/home/xml/work-packages/project-management.xml
@@ -6,6 +6,7 @@
  <name>Project Management</name>
  <begin>Month 0</begin>
  <end>Month 30</end>
+ <leader file="bologna/asperti"/>
  <person-month participant="bologna" number="8"/>
  <person-month participant="inria" number="0"/>
  <person-month participant="dfki" number="0"/>

diff --git a/helm/mowgli/home/xml/work-packages/requirement-analysis.xml b/helm/mowgli/home/xml/work-packages/requirement-analysis.xml
index 42fe780a0467d9461761a2c229403eb87ff132b0..996fce7e0ab133f11d95be64292c643021b18a36 100644 (file)
--- a/helm/mowgli/home/xml/work-packages/requirement-analysis.xml
+++ b/helm/mowgli/home/xml/work-packages/requirement-analysis.xml
@@ -6,6 +6,7 @@
  <name>Requirement Analysis</name>
  <begin>Month 0</begin>
  <end>Month 6</end>
+ <leader file="nijmegen/geuvers"/>
  <person-month participant="bologna" number="3"/>
  <person-month participant="inria" number="4"/>
  <person-month participant="dfki" number="3"/>

diff --git a/helm/mowgli/home/xml/work-packages/testing-and-validation.xml b/helm/mowgli/home/xml/work-packages/testing-and-validation.xml
index 3bd3982e8c68b16b2ac091260778e4158a9b610a..bbdd09cb9cf331eb8bbc7c918a839fa7e121fce3 100644 (file)
--- a/helm/mowgli/home/xml/work-packages/testing-and-validation.xml
+++ b/helm/mowgli/home/xml/work-packages/testing-and-validation.xml
@@ -6,6 +6,7 @@
  <name>Testing and Validation</name>
  <begin>Month 12</begin>
  <end>Month 30</end>
+ <leader file="nijmegen/geuvers"/>
  <person-month participant="bologna" number="5"/>
  <person-month participant="inria" number="6"/>
  <person-month participant="dfki" number="3"/>

diff --git a/helm/mowgli/home/xml/work-packages/transformation.xml b/helm/mowgli/home/xml/work-packages/transformation.xml
index b10948fdeb9f3691bb0149c24e0ce16575763b74..972abe1a2bc3cf4f52ac8507490d26f9a85fce17 100644 (file)
--- a/helm/mowgli/home/xml/work-packages/transformation.xml
+++ b/helm/mowgli/home/xml/work-packages/transformation.xml
@@ -6,6 +6,7 @@
  <name>Transformation</name>
  <begin>Month 0</begin>
  <end>Month 21</end>
+ <leader file="bologna/sacerdoti"/>
  <person-month participant="bologna" number="13"/>
  <person-month participant="inria" number="4"/>
  <person-month participant="dfki" number="3"/>

diff --git a/helm/mowgli/home/xml/work-packages/work-package.dtd b/helm/mowgli/home/xml/work-packages/work-package.dtd
index 57650a3889cb7668f239251a9170746d61be2582..723468da54a38b1ea8fee9d6df780fe409911e9e 100644 (file)
--- a/helm/mowgli/home/xml/work-packages/work-package.dtd
+++ b/helm/mowgli/home/xml/work-packages/work-package.dtd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!ELEMENT work-package (name,begin,end,person-month+,objectives,description,
-                        deliverable*,milestones)>
+<!ELEMENT work-package (name,begin,end,leader,person-month+,objectives,
+                        description,deliverable*,milestones)>
 <!ATTLIST work-package
           number CDATA #REQUIRED>
 
@@ -11,6 +11,8 @@
 
 <!ELEMENT end (#PCDATA)>
 
+<!ELEMENT leader (#PCDATA)>
+
 <!ELEMENT person-month EMPTY>
 <!ATTLIST person-month
           participant CDATA #REQUIRED

diff --git a/helm/mowgli/home/xsl/work-package.xsl b/helm/mowgli/home/xsl/work-package.xsl
index cee606d3758f89dce5adc5ee8afc6a18e7b90b54..8cb465b5d86e1780ee0c565d15dc4273eb0c18f3 100644 (file)
--- a/helm/mowgli/home/xsl/work-package.xsl
+++ b/helm/mowgli/home/xsl/work-package.xsl
@@ -30,20 +30,37 @@
   <xsl:text>: </xsl:text>
   <xsl:value-of select="name"/>
  </h1>
- <h2>Begin: <xsl:value-of select="begin"/></h2>
- <h2>End: <xsl:value-of select="end"/></h2>
+ <h2>
+   Begin: <xsl:value-of select="begin"/> &#x0A0;&#x0A0;&#x0A0;
+   End: <xsl:value-of select="end"/>
+ </h2>
+ <h2>
+  <xsl:text>Work Package Leader: </xsl:text>
+  <a href="../people/{leader/@file}.html">
+   <xsl:call-template name="person-name">
+    <xsl:with-param name="file" select="leader/@file"/>
+   </xsl:call-template>
+  </a>
+ </h2>
+ <h2>Contribution of Each Site (in Man Monthes):</h2>
+ <span style="margin-left: 1cm">
  <table>
   <tr>
    <xsl:for-each select="person-month">
-    <td><xsl:value-of select="@participant"/></td>
+    <td>
+     <a href="../sites/{@participant}.html">
+      <xsl:value-of select="@participant"/>
+     </a>
+    </td>
    </xsl:for-each>
   </tr>
   <tr>
    <xsl:for-each select="person-month">
-    <td><xsl:value-of select="@number"/></td>
+    <td align="center"><xsl:value-of select="@number"/></td>
    </xsl:for-each>
   </tr>
  </table>
+ </span>
  <h2>Objectives:</h2>
  <xsl:copy-of select="objectives/*"/>
  <h2>Description:</h2>