Modified Files:

1) html/Makefile html/proposal/.cvsignore xml/home.xml
   xml/menu.xml xml/project.xml xml/proposal/EC-contribution.xml
   xml/proposal/contribution.xml
   xml/proposal/econ-scient-tech-prospects.xml
   xml/proposal/innovation.xml
   xml/proposal/project-components.xml
   xml/proposal/project-management.xml
   xml/proposal/project-objectives.xml
   xml/proposal/project-planning.xml
   xml/proposal/project-summary.xml xsl/project.xsl: now the proposal index is
   in project.xml that is linked in the Project Menu
Removed Files:
1) xml/proposal/proposal-index.xml: now is in project.xml

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index f99cf3c8b5f574c899119dd3292ee980bc895f7f..a0d616b574bfe9709e2f6f87b5531d70f1d0c977 100644 (file)
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -56,7 +56,6 @@ DOCUMENTS = \
             index.html \
             home.html \
            menu.html \
-            proposal/proposal-index.html \
             proposal/project-management.html \
             proposal/project-objectives.html \
             proposal/project-summary.html \
@@ -172,11 +171,6 @@ software/index.html: $(XMLROOT)/software/index.xml \
                     $(XHTMLCONTENT)
        $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) $<
 
-proposal/proposal-index.html: $(XMLROOT)/proposal/proposal-index.xml \
-                         $(XHTMLCONTENT)
-       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) -
-
-
 proposal/project-management.html: $(XMLROOT)/proposal/project-management.xml \
                          $(XHTMLCONTENT)
        sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) -

diff --git a/helm/mowgli/home/html/proposal/.cvsignore b/helm/mowgli/home/html/proposal/.cvsignore
index 7ae73ada1d7c629dd33e11a3da632d76ba7f6091..4807b69dc75821648673827b3323f7f9257f9ac5 100644 (file)
--- a/helm/mowgli/home/html/proposal/.cvsignore
+++ b/helm/mowgli/home/html/proposal/.cvsignore
@@ -1,4 +1,3 @@
-proposal-index.html
 project-management.html
 project-objectives.html
 project-summary.html
@@ -7,4 +6,4 @@ innovation.html
 EC-contribution.html
 econ-scient-tech-prospects.html
 project-planning.html
-project-components.html
\ No newline at end of file
+project-components.html

diff --git a/helm/mowgli/home/xml/home.xml b/helm/mowgli/home/xml/home.xml
index 55d77c5724136f0ff6984cb9c30a44ce3e696a37..52419613f8568a091c6a6c09f5ed0c0054bcab35 100644 (file)
--- a/helm/mowgli/home/xml/home.xml
+++ b/helm/mowgli/home/xml/home.xml
@@ -56,7 +56,7 @@
       <br/>     
  
       <p>For further description see 
-         <a target="content" href="proposal/proposal-index.html">Proposal</a>
+         <a target="content" href="project.html">Project</a>
          in the Project Menu.</p>
 
       </td>

diff --git a/helm/mowgli/home/xml/menu.xml b/helm/mowgli/home/xml/menu.xml
index 67af04e3aaf49ff97348a3392c84b94def506972..afb54c8df70838e05e2cdd59ba9f29c0fe166fff 100644 (file)
--- a/helm/mowgli/home/xml/menu.xml
+++ b/helm/mowgli/home/xml/menu.xml
@@ -27,7 +27,7 @@
       <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></tr>
       <tr><td><a class="menulink" target="content" href="people-list.html">People</a></td></tr>
-      <tr><td><a class="menulink" target="content" href="proposal/proposal-index.html">Proposal</a></td></tr>
+      <tr><td><a class="menulink" target="content" href="project.html">Project</a></td></tr>
       <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="mowgli-events.html">MoWGLI Events</a></td></tr>
       <tr><td><a class="menulink" target="content" href="other-events.html">Other Events</a></td></tr>

diff --git a/helm/mowgli/home/xml/project.xml b/helm/mowgli/home/xml/project.xml
index 348a636f093aee2292a039d87f11b6b9e425b2d5..b52b45e136dcc0196f76cfd400dc3fe359deaefe 100644 (file)
--- a/helm/mowgli/home/xml/project.xml
+++ b/helm/mowgli/home/xml/project.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE project [
- <!ELEMENT project (full_title,acronym,type,type_acronym,proposal_contract_no,operative_commencement_of_contract)>
+ <!ELEMENT project (full_title,acronym,type,type_acronym,proposal_contract_no,operative_commencement_of_contract,proposal)>
  <!ELEMENT full_title (#PCDATA)>
  <!ELEMENT acronym (#PCDATA)>
  <!ELEMENT type (#PCDATA)>
  <!ELEMENT type_acronym (#PCDATA)>
  <!ELEMENT proposal_contract_no (#PCDATA)>
  <!ELEMENT operative_commencement_of_contract (#PCDATA)>
+ <!ELEMENT proposal (ul)+>
+
+<!-- A subset of XHTML -->
+ <!ELEMENT ul (li)+>
+ <!ELEMENT li (a)+>
+ <!ELEMENT a (#PCDATA)>
+ <!ATTLIST a
+          target CDATA #IMPLIED
+          href CDATA #REQUIRED>
 ]>
 
 <project>
@@ -17,4 +26,22 @@
  <type_acronym>IST</type_acronym>
  <proposal_contract_no>IST-2001-33562 MOWGLI</proposal_contract_no>
  <operative_commencement_of_contract>???</operative_commencement_of_contract>
+ <proposal>
+  <ul>
+   <li><a href="proposal/project-summary.html">Summary</a></li>
+   <li><a href="proposal/project-objectives.html">Objectives</a></li>
+   <li><a href="proposal/project-management.html">Management</a></li>
+   <li><a href="proposal/contribution.html">Contribution to programme/key action objectives</a></li>
+   <li><a href="proposal/innovation.html">Innovation</a></li>
+   <li><a href="proposal/EC-contribution.html">Contribution to policies of the European Community</a></li>
+   <li><a href="proposal/econ-scient-tech-prospects.html">Economic development and Scientific and Technological Prospects</a></li>
+   <li><a href="proposal/project-planning.html">Project Planning and timetable</a></li>
+   <li><a href="proposal/project-components.html">Graphical presentation of projects components</a></li> 
+  </ul>
+ </proposal>
+
 </project>
+
+
+
+

diff --git a/helm/mowgli/home/xml/proposal/EC-contribution.xml b/helm/mowgli/home/xml/proposal/EC-contribution.xml
index 96959cd29b0d633eb63324a63f50aa74a2cc76e3..cc9c4b9dd4e02a7711c90ebeb41f4d118ad462a4 100644 (file)
--- a/helm/mowgli/home/xml/proposal/EC-contribution.xml
+++ b/helm/mowgli/home/xml/proposal/EC-contribution.xml
@@ -14,7 +14,7 @@
      <a href="innovation.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="econ-scient-tech-prospects.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
@@ -175,7 +175,7 @@
      <a href="innovation.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="econ-scient-tech-prospects.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>

diff --git a/helm/mowgli/home/xml/proposal/contribution.xml b/helm/mowgli/home/xml/proposal/contribution.xml
index 0fc1f2ed82b363a91eefb4b1a80b2bac671d7c35..8442270f03b88bde441d7cabcf7f63b6686e32b9 100644 (file)
--- a/helm/mowgli/home/xml/proposal/contribution.xml
+++ b/helm/mowgli/home/xml/proposal/contribution.xml
@@ -14,7 +14,7 @@
      <a href="project-management.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="innovation.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
@@ -83,7 +83,7 @@
      <a href="project-management.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="innovation.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>

diff --git a/helm/mowgli/home/xml/proposal/econ-scient-tech-prospects.xml b/helm/mowgli/home/xml/proposal/econ-scient-tech-prospects.xml
index f6c849e1cc8533596e1f670a481b7b1c66f5ae62..9114d804390f3a42edfe9a3b2650a6b0dbb03f94 100644 (file)
--- a/helm/mowgli/home/xml/proposal/econ-scient-tech-prospects.xml
+++ b/helm/mowgli/home/xml/proposal/econ-scient-tech-prospects.xml
@@ -14,7 +14,7 @@
      <a href="EC-contribution.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="project-planning.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
@@ -114,10 +114,10 @@
      <a href="EC-contribution.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
+     <a href="project-planning.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
     </td>
    </tr>
   </table>

diff --git a/helm/mowgli/home/xml/proposal/innovation.xml b/helm/mowgli/home/xml/proposal/innovation.xml
index fad94bc962260427aecd6585829f6ba22e046b18..aa83768221c0e418c2e4d02dfb811b41def541f9 100644 (file)
--- a/helm/mowgli/home/xml/proposal/innovation.xml
+++ b/helm/mowgli/home/xml/proposal/innovation.xml
@@ -14,7 +14,7 @@
      <a href="contribution.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="EC-contribution.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
@@ -134,7 +134,7 @@
      <a href="contribution.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="EC-contribution.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>

diff --git a/helm/mowgli/home/xml/proposal/project-components.xml b/helm/mowgli/home/xml/proposal/project-components.xml
index 98cdc5537abf5fa6de4e062736899cb50a772fd0..ab2bcb4fea0e50449b86d5ab606211bbf2b35bd7 100644 (file)
--- a/helm/mowgli/home/xml/proposal/project-components.xml
+++ b/helm/mowgli/home/xml/proposal/project-components.xml
@@ -14,10 +14,10 @@
      <a href="project-planning.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
+     <a href="../project.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
     </td>
    </tr>
   </table>
@@ -38,10 +38,10 @@
      <a href="project-planning.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
+     <a href="../project.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
     </td>
    </tr>
   </table>

diff --git a/helm/mowgli/home/xml/proposal/project-management.xml b/helm/mowgli/home/xml/proposal/project-management.xml
index 5430e096ea73973a7f1e067b5a0906be0d2848e6..8912bc90dd05523efaa0a39fe2be74e380388f9e 100644 (file)
--- a/helm/mowgli/home/xml/proposal/project-management.xml
+++ b/helm/mowgli/home/xml/proposal/project-management.xml
@@ -14,7 +14,7 @@
      <a href="project-objectives.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="contribution.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
@@ -168,7 +168,7 @@
      <a href="project-objectives.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="contribution.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>

diff --git a/helm/mowgli/home/xml/proposal/project-objectives.xml b/helm/mowgli/home/xml/proposal/project-objectives.xml
index f0677cb40e09007957815b24ddeb114d8b72f148..554222c545e2b22b3d0df69dbded0bb3b6911d15 100644 (file)
--- a/helm/mowgli/home/xml/proposal/project-objectives.xml
+++ b/helm/mowgli/home/xml/proposal/project-objectives.xml
@@ -14,7 +14,7 @@
      <a href="project-summary.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="project-management.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
@@ -144,7 +144,7 @@
      <a href="project-summary.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="project-management.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>

diff --git a/helm/mowgli/home/xml/proposal/project-planning.xml b/helm/mowgli/home/xml/proposal/project-planning.xml
index 21d54586949df62ad8f467d4adafc59a14b26dab..c45626d050e4d45fe890ca81615e15fd5b802a7f 100644 (file)
--- a/helm/mowgli/home/xml/proposal/project-planning.xml
+++ b/helm/mowgli/home/xml/proposal/project-planning.xml
@@ -14,7 +14,7 @@
      <a href="econ-scient-tech-prospects.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="project-components.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
@@ -38,7 +38,7 @@
      <a href="econ-scient-tech-prospects.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="project-components.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>

diff --git a/helm/mowgli/home/xml/proposal/project-summary.xml b/helm/mowgli/home/xml/proposal/project-summary.xml
index 2883ddd22d6c11e7677d3d6310312a134b5e5c58..00c2374195435f0937e23691cce5eeb27a85f3a7 100644 (file)
--- a/helm/mowgli/home/xml/proposal/project-summary.xml
+++ b/helm/mowgli/home/xml/proposal/project-summary.xml
@@ -11,10 +11,10 @@
   <table width="550">
    <tr>
     <td>
-     <a href="proposal-index.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
+     <a href="../project.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="project-objectives.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>
@@ -104,10 +104,10 @@
   <table width="550">
    <tr>
     <td>
-     <a href="proposal-index.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
+     <a href="../project.html" target="content"><img src="./../../images/PreviousArrow.gif" width="26" height="26" border="0" alt="Previous Page"/></a>
     </td>
     <td>
-     <a href="proposal-index.html" target="content">Index</a>
+     <a href="../project.html" target="content">Index</a>
     </td>
     <td>
      <a href="project-objectives.html" target="content"><img src="./../../images/NextArrow.gif" width="26" height="26" border="0" alt="Next Page"/></a>

diff --git a/helm/mowgli/home/xml/proposal/proposal-index.xml b/helm/mowgli/home/xml/proposal/proposal-index.xml
deleted file mode 100644 (file)
index 0889963..0000000
--- a/helm/mowgli/home/xml/proposal/proposal-index.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-  <head>
-    <title>MoWGLI Proposal</title>
-  </head>
-
-  <body>
-     <h1>MoWGLI Proposal</h1>
-     <ul>
-       <li><a href="project-summary.html">Summary</a></li>
-       <li><a href="project-objectives.html">Objectives</a></li>
-       <li><a href="project-management.html">Management</a></li>
-       <li><a href="contribution.html">Contribution to programme/key action objectives</a></li>
-       <li><a href="innovation.html">Innovation</a></li>
-       <li><a href="EC-contribution.html">Contribution to policies of the European Community</a></li>
-       <li><a href="econ-scient-tech-prospects.html">Economic development and Scientific and Technological Prospects</a></li>
-       <li><a href="project-planning.html">Project Planning and timetable</a></li>
-       <li><a href="project-components.html">Graphical presentation of projects components</a></li> 
-     </ul>
-
-  </body>
-
-</html>

diff --git a/helm/mowgli/home/xsl/project.xsl b/helm/mowgli/home/xsl/project.xsl
index e37aaecd8b09cfd6dd9654718f61e6a0b36bbdeb..a44ba4803541ffb91b86585b1dc1a5228ccf96e9 100644 (file)
--- a/helm/mowgli/home/xsl/project.xsl
+++ b/helm/mowgli/home/xsl/project.xsl
@@ -40,6 +40,9 @@
   <xsl:text>Operative Commencement Date: </xsl:text>
   <xsl:value-of select="operative_commencement_of_contract"/>
  </p>
+ <br/>
+  <p><xsl:text>More about the Proposal:</xsl:text></p>
+  <xsl:copy-of select="proposal/*"/>
 </xsl:template>
 
 </xsl:stylesheet>