You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2003/07/08 10:11:58 UTC

cvs commit: cocoon-lenya/src/webapp/lenya/xslt/menu menu.xsl root.xsl

gregor      2003/07/08 01:11:57

  Modified:    src/webapp/lenya/xslt/menu menu.xsl root.xsl
  Log:
  - made CSS valid
  - simplified menu code
  - added breadcrumb in title
  - removed legacy javascript
  
  Revision  Changes    Path
  1.17      +1 -36     cocoon-lenya/src/webapp/lenya/xslt/menu/menu.xsl
  
  Index: menu.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/menu/menu.xsl,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- menu.xsl	7 Jul 2003 17:55:37 -0000	1.16
  +++ menu.xsl	8 Jul 2003 08:11:57 -0000	1.17
  @@ -2,21 +2,7 @@
   
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   
  -<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
  -
   <xsl:template match="menu">
  -<html>
  -
  -<head>
  -<title>Lenya > <xsl:value-of select="url-info/publication-id"/> > <xsl:value-of select="url-info/area"/> > <xsl:value-of select="url-info/document-id"/></title>
  -<script type="text/javascript" src="/lenya/lenya/menu/menu.js">
  -</script>
  -
  -<link type="text/css" rel="stylesheet" href="/lenya/lenya/menu/menu.css" />
  -</head>
  -
  -<body bgcolor="#ffffff" leftmargin="0" marginwidth="0" topmargin="0" marginheight="0">
  -
   <table width="100%" border="0" cellspacing="0" cellpadding="0">
   <tr>
   <td background="/lenya/lenya/menu/images/frame-bg_oben.gif" width="13" height="4">
  @@ -95,24 +81,13 @@
   </table>
   
   <xsl:apply-templates select="menus/menu" mode="menu"/>
  -
  -<script type="text/javascript">
  - initialize(); 
  -</script>
  -</body>
  -</html>
   </xsl:template>
   
  -
  -
  -
  -
   <xsl:template match="workflow-state">
     Workflow State: <b><xsl:apply-templates/></b> |
   </xsl:template>
   
   
  -
   <xsl:template match="menu" mode="nav">
     <div style="float:left; width:1px"><img src="/lenya/lenya/menu/images/grau.gif" width="1" height="21" /></div>
   
  @@ -127,11 +102,6 @@
   </xsl:template>
   
   
  -
  -
  -
  -
  -
   <xsl:template match="menu" mode="menu">
     <div id="menu{@label}" class="menuOutline">
     <div class="menuBg">
  @@ -158,9 +128,4 @@
     </div>
   </xsl:template>
   
  -
  -
  -
  -
  -</xsl:stylesheet>
  -
  +</xsl:stylesheet>
  \ No newline at end of file
  
  
  
  1.5       +20 -5     cocoon-lenya/src/webapp/lenya/xslt/menu/root.xsl
  
  Index: root.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/menu/root.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- root.xsl	7 Jul 2003 17:55:37 -0000	1.4
  +++ root.xsl	8 Jul 2003 08:11:57 -0000	1.5
  @@ -1,8 +1,8 @@
  -<?xml version="1.0" encoding="iso-8859-1"?>
  +<?xml version="1.0"?>
   
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
    
  -<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
  +<xsl:include href="menu.xsl"/>
   
   <xsl:template match="/">
     <xsl:apply-templates/>
  @@ -11,15 +11,30 @@
   <xsl:variable name="context_prefix" select="/lenya/menu/context_prefix"/>
   
   <xsl:template match="lenya">
  +
  +<html>   
  +<head>
  +<title>Apache Lenya - <xsl:value-of select="menu/url-info/publication-id"/> - <xsl:value-of select="menu/url-info/area"/> - <xsl:value-of select="menu/url-info/document-id"/></title>
  +<script type="text/javascript" src="/lenya/lenya/menu/menu.js" />
  +<link type="text/css" rel="stylesheet" href="/lenya/lenya/menu/menu.css" />
  +</head>
  +
  +<body bgcolor="#ffffff" leftmargin="0" marginwidth="0" topmargin="0" marginheight="0">
  +
     <div style="position:absolute;top:0px;left:0px;z-index:2">
         <xsl:apply-templates select="menu"/>
     </div>
   
     <div style="position:absolute;top:60px;left:0px;z-index:1">
  -      <xsl:apply-templates select="cmsbody"/>
  +<!--  	<iframe id="page" name="page" src="{$context_prefix}{live_uri}"> -->
  +     <xsl:apply-templates select="cmsbody/"/>
  +<!--</iframe> -->
     </div>
  +<script type="text/javascript">
  + initialize(); 
  +</script>
  +</body>
  +</html>
   </xsl:template>
  -
  -<xsl:include href="menu.xsl"/>
    
   </xsl:stylesheet>  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org