Links between the versions with and without frames.

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index 1455b47d930ed1ad933d4d803cf26de5c6fbe3bc..0b8f513f5f6bcdb54e8bc02d4c158a921846549e 100644 (file)
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -161,8 +161,8 @@ home.html: $(XMLROOT)/home.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 "'.'" --param use_frames "'$(FRAMES)'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml
 
-menu.html: $(XMLROOT)/menu.xml
-       cp $< $@
+menu.html: $(XMLROOT)/menu.xml $(XHTMLCONTENT)
+       $(XSLTP) --param path_to_top "'.'" --param use_frames "'$(FRAMES)'" --param make_header "false()" --param make_footer "false()" -o $@ $(XHTMLCONTENT) $<
 
 index.html: $(TEMPLATESROOT)/index.html
        cp $< $@

diff --git a/helm/mowgli/home/xml/menu.xml b/helm/mowgli/home/xml/menu.xml
index afb54c8df70838e05e2cdd59ba9f29c0fe166fff..ddc4242eaebc05ac771cdabe0108b5e6acfbab15 100644 (file)
--- a/helm/mowgli/home/xml/menu.xml
+++ b/helm/mowgli/home/xml/menu.xml
@@ -97,11 +97,14 @@
       </table>
     </td>
   </tr>
-  
   </table>
   </td></tr>
   </table>
 
+  <span style="text-align:center">
+  <mowgli:change-frame-settings/>
+  </span>
+
   </body>
 
 </html>

diff --git a/helm/mowgli/home/xsl/xhtml-content.xsl b/helm/mowgli/home/xsl/xhtml-content.xsl
index d9b0f95e8f5bc8f31b21c7d44690b244632287a0..ff869b216273b34deebe48ebfc332de3a948bcef 100644 (file)
--- a/helm/mowgli/home/xsl/xhtml-content.xsl
+++ b/helm/mowgli/home/xsl/xhtml-content.xsl
@@ -11,6 +11,7 @@
 <xsl:param name="path_to_top" select="'.'"/>
 <xsl:param name="current-date"/>
 <xsl:param name="make_header" select="true()"/>
+<xsl:param name="make_footer" select="true()"/>
 <xsl:param name="use_frames" select="'yes'"/>
 
 <!--CSC: The following mess is due to a bug of xsltproc w.r.t. patterns
@@ -33,9 +34,11 @@
      </xsl:call-template>
     </xsl:if>
     <xsl:apply-templates select="*[2]/node()"/>
-    <xsl:call-template name="foot">
-     <xsl:with-param name="path_to_top" select="$path_to_top"/>
-    </xsl:call-template>
+    <xsl:if test="$make_footer">
+     <xsl:call-template name="foot">
+      <xsl:with-param name="path_to_top" select="$path_to_top"/>
+     </xsl:call-template>
+    </xsl:if>
    </xsl:variable>
    <xsl:choose>
     <xsl:when test="$use_frames = 'yes'">
@@ -84,6 +87,20 @@
  <xsl:copy-of select="$current-date"/>
 </xsl:template>
 
+<xsl:template match="mowgli:change-frame-settings">
+ <br/>
+ <p>
+ <xsl:choose>
+  <xsl:when test="$use_frames = 'yes'">
+   <a href="../html_no_frames" target="_top">Version without frames</a>
+  </xsl:when>
+  <xsl:otherwise>
+   <a href="../html_yes_frames" target="_top">Version with frames</a>
+  </xsl:otherwise>
+ </xsl:choose>
+ </p>
+</xsl:template>
+
 <xsl:template name="a_menu">
  <xsl:copy>
   <xsl:choose>
@@ -109,6 +126,9 @@
   <xsl:when test="name(.) = 'a'">
    <xsl:call-template name="a_menu"/>
   </xsl:when>
+  <xsl:when test="name(.) = 'mowgli:change-frame-settings'">
+   <xsl:apply-templates select="."/>
+  </xsl:when>
   <xsl:otherwise>
    <xsl:copy>
     <xsl:apply-templates mode="menu" select="*|text()|@*"/>