forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject cvs commit: xml-forrest/src/resources/skins/bert/xslt/html book2menu.xsl document2html.xsl site2xhtml.xsl
Date Thu, 06 Jun 2002 22:24:53 GMT
stevenn     2002/06/06 15:24:53

  Modified:    src/documentation/content/xdocs index.xml
               src/resources/conf sitemap.xmap
               src/resources/schema catalog
               src/resources/skins/bert/css page.css
               src/resources/skins/bert/xslt/html book2menu.xsl
                        document2html.xsl site2xhtml.xsl
  Log:
  various layout oriented patches to the bert skin
  
  Revision  Changes    Path
  1.8       +1 -0      xml-forrest/src/documentation/content/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/index.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- index.xml	6 Jun 2002 14:32:39 -0000	1.7
  +++ index.xml	6 Jun 2002 22:24:52 -0000	1.8
  @@ -38,5 +38,6 @@
         to help provide some direction.</li>
         </ul> 
       </section> 
  +    <p align="right"><fork href="http://xml.apache.org/cocoon"><img src="skin/images/built-with-cocoon.gif"
border="0" width="88" height="31"/></fork>&#160;<fork href="http://www.krysalis.org/centipede/"><img
src="skin/images/centipede-logo-small.gif" border="0" width="138" height="31"/></fork></p>
     </body>
   </document>
  
  
  
  1.3       +23 -0     xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	3 Jun 2002 03:41:34 -0000	1.2
  +++ sitemap.xmap	6 Jun 2002 22:24:52 -0000	1.3
  @@ -10,6 +10,8 @@
      <map:generator  name="file"        src="org.apache.cocoon.generation.FileGenerator"
label="content"/>
      <map:generator  name="directory"   src="org.apache.cocoon.generation.DirectoryGenerator"
label="content"/>
      <map:generator  name="html"        src="org.apache.cocoon.generation.HTMLGenerator"
label="content"/>
  +   <!-- SN: temporarily added to test libre, the book.xml nuker -->
  +   <map:generator  name="libre"       src="org.outerj.yer.use.cocoon.HierarchyGenerator"
label="content"/>
      <!-- FIXME: Change this once better view handling is implemented -->
      <map:generator  name="file-nolabel" src="org.apache.cocoon.generation.FileGenerator"/>
     </map:generators>
  @@ -85,6 +87,7 @@
     <map:resource name="skinit">
      <map:transform src="skins/@skin@/xslt/html/{type}.xsl">
        <map:parameter name="isfaq" value="{isfaq}"/>
  +     <map:parameter name="resource" value="{resource}"/>
      </map:transform>
      <map:serialize/>
     </map:resource>
  @@ -135,10 +138,19 @@
        <map:serialize type="xml"/>
      </map:match>
   
  +   <map:match pattern="**tab-**.xml">
  +     <map:generate src="content/xdocs/tabs.xml"/>
  +     <map:call resource="skinit">
  +      <map:parameter name="type" value="tab2menu"/>
  +      <map:parameter name="resource" value="{1}"/>
  +     </map:call>         
  +   </map:match>
  +
      <map:match pattern="**book-**.xml">
        <map:generate src="content/xdocs/{1}book.xml"/>
        <map:call resource="skinit">
         <map:parameter name="type" value="book2menu"/>
  +      <map:parameter name="resource" value="{2}"/>
        </map:call>         
      </map:match>
   
  @@ -240,6 +252,7 @@
      <map:match pattern="*.html">
       <map:aggregate element="site">
        <map:part src="cocoon:/book-{1}.xml"/>
  +     <map:part src="cocoon:/tab-{1}.xml"/>
        <map:part src="cocoon:/body-{1}.xml" label="content"/>
       </map:aggregate>
       <map:call resource="skinit">
  @@ -250,12 +263,22 @@
      <map:match pattern="**/*.html">
       <map:aggregate element="site">
        <map:part src="cocoon:/{1}/book-{1}/{2}.xml"/>
  +     <map:part src="cocoon:/{1}/tab-{1}/{2}.xml"/>
        <map:part src="cocoon:/body-{1}/{2}.xml" label="content"/>
       </map:aggregate>
        <map:call resource="skinit">
         <map:parameter name="type" value="site2xhtml"/>
        </map:call>
      </map:match>
  +   
  +   <!-- ================  Libre   =========================== -->
  +   
  +   <map:match pattern="libre">
  +     <map:generate type="libre" src="content/xdocs" >
  +	    <map:parameter name="depth" value="-1" />
  +	   </map:generate>
  +	   <map:serialize type="xml"/>
  +	 </map:match>
   
      <!-- ================  Static  =========================== -->
   
  
  
  
  1.3       +4 -0      xml-forrest/src/resources/schema/catalog
  
  Index: catalog
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/catalog,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- catalog	19 May 2002 18:56:42 -0000	1.2
  +++ catalog	6 Jun 2002 22:24:53 -0000	1.3
  @@ -15,6 +15,8 @@
          "dtd/todo-v11.dtd"
   PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
          "dtd/book-cocoon-v10.dtd"
  +PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN"
  +       "dtd/tab-cocoon-v10.dtd"
   PUBLIC "-//APACHE//DTD How-to V1.0//EN"
          "dtd/howto-v10.dtd"
   
  @@ -40,3 +42,5 @@
   PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
          "entity/ISOlat1.pen"
   
  +PUBLIC "-//Outerthought//DTD Libre Configuration V0.1//EN"
  +       "dtd/libre-v01.dtd"
  \ No newline at end of file
  
  
  
  1.3       +21 -22    xml-forrest/src/resources/skins/bert/css/page.css
  
  Index: page.css
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/bert/css/page.css,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- page.css	6 Jun 2002 09:39:55 -0000	1.2
  +++ page.css	6 Jun 2002 22:24:53 -0000	1.3
  @@ -1,26 +1,27 @@
  -body {  background-color: #FFFFFF; margin: 0px 0px 0px 0px; font-size: 1em; font-family:
Arial, Helvetica, sans-serif}
  +body {  background-color: #FFFFFF; margin: 0px 0px 0px 0px; font-family: Arial, Helvetica,
sans-serif;  font : 12px;  }
   
  -a:link { color: #0F3660 }
  -a:visited { color: #880000 }
  -a:active { font-weight: bold }
  -a:hover { color: #880000; }
  -
  -.menu { background-color: #4C6C8F; margin: 0px; padding: 3px 8px 5px 3px; font-size: 1em}
  -.menu a:link { color: #FFFFFF }
  -.menu a:visited { color: #FFFFFF }
  -.menu a:active { font-weight: bold }
  -.menu a:hover { color: #880000; }
  +a:link { color: #0F3660; }
  +a:visited { color: #009999; }
  +a:active { color: #000066; }
  +a:hover { color: #000066; }
  +
  +.menu { background-color: #4C6C8F; margin: 0px; padding: 3px 8px 5px 3px;  font : 12px;
 }
  +.menu a:link { color: #FFFFFF;  text-decoration : none;  }
  +.menu a:visited { color: #FFFFFF; text-decoration : none; }
  +/*.menu a:active { font-weight: bold }*/
  +.menu a:hover { color: #FFCC00; text-decoration : none; }
   .menu ul { margin: 0px 0px 0px 20px; padding: 0px; }
  -.menu li  { list-style-image: url('images/chapter.gif'); }
  +.menu li  { list-style-image: url('images/label.gif'); }
  +.menu ul ul li .sel { list-style-image: url('images/current.gif'); }
   .menu ul ul li  { list-style-image: url('images/page.gif'); }
   
  -.content { padding: 5px 5px 5px 10px; }
  -.content table { width: 100%; font-size: 1em; background-color: #7099C5; color: #ffffff;
}
  -.content table .caption { text-align: left; color: black; }
  -.content table .th { text-align: center; }
  -.content td { background-color: #f0f0ff; color: black; }
  +.content { padding: 5px 5px 5px 10px;  font : small;  font-size : 12px;   }
  +.content table { width: 100%; background-color: #7099C5; color: #ffffff;  font-size : 12px;}
  +.content table .caption { text-align: left; color: black; font-size : 12px; }
  +.content table .th { text-align: center;  font-size : 12px;}
  +.content td { background-color: #f0f0ff; color: black;  font-size : 12px;}
   
  -.frame { width: 100%; margin: 5px 20px 5px 20px; font-size: 1em; }
  +.frame { width: 100%; margin: 5px 20px 5px 20px;  }
   .frame .content { margin: 0px; }
   
   .note { border: solid 1px #7099C5; background-color: #f0f0ff; }
  @@ -32,10 +33,8 @@
   .fixme { border: solid 1px #C6C600; background-color: #FAF9C3; }
   .fixme .label { background-color: #C6C600; color: #ffffff; }
   
  -.code { border-color: #CFDCED; border-style: solid; border-width: 1px; font-size: 0.75em;}
  -
  -.dida { font-size: 1em; }
  +.code { border-color: #CFDCED; border-style: solid; border-width: 1px; }
   
   .highlight { background-color: yellow; }
   
  -.minitoc {font-size: 1em; margin: 5px 5px 5px 40px;}
  +.minitoc {margin: 5px 5px 5px 40px;}
  
  
  
  1.3       +20 -14    xml-forrest/src/resources/skins/bert/xslt/html/book2menu.xsl
  
  Index: book2menu.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/bert/xslt/html/book2menu.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- book2menu.xsl	6 Jun 2002 09:39:55 -0000	1.2
  +++ book2menu.xsl	6 Jun 2002 22:24:53 -0000	1.3
  @@ -1,5 +1,6 @@
   <?xml version="1.0"?>
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +  <xsl:param name="resource"/>
     <xsl:template match="book">
       <div class="menu">
         <ul>
  @@ -10,28 +11,33 @@
     <xsl:template match="menu">
       <li>
         <font color="white"><xsl:value-of select="@label"/></font>
  -      <xsl:choose>
  -        <xsl:when test="menu-item">
  -          <ul>
  -            <xsl:apply-templates select="menu-item"/>
  -          </ul>
  -        </xsl:when>
  -        <xsl:otherwise>
  -          <ul>
  -            <xsl:apply-templates select="external"/>
  -          </ul>
  -        </xsl:otherwise>
  -      </xsl:choose>
  +      <ul>
  +        <xsl:apply-templates/>
  +      </ul>
       </li>
     </xsl:template>
     <xsl:template match="menu-item">
       <li>
  -      <a href="{@href}"><xsl:value-of select="@label"/></a>
  +       <xsl:choose>
  +         <xsl:when test="starts-with(@href, $resource)">
  +          <span class="sel"><font color="#ffcc00"><xsl:value-of select="@label"/></font></span>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <a href="{@href}"><xsl:value-of select="@label"/></a>
  +        </xsl:otherwise>
  +      </xsl:choose>
       </li>
     </xsl:template>
     <xsl:template match="external">
       <li>
  -      <a href="{@href}" target="_blank"><xsl:value-of select="@label"/></a>
  +       <xsl:choose>
  +         <xsl:when test="starts-with(@href, $resource)">
  +          <font color="#ffcc00"><xsl:value-of select="@label"/></font>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <a href="{@href}" target="_blank"><xsl:value-of select="@label"/></a>
  +        </xsl:otherwise>
  +      </xsl:choose>
       </li>
     </xsl:template>
     <xsl:template match="menu-item[@type='hidden']"/>
  
  
  
  1.4       +7 -7      xml-forrest/src/resources/skins/bert/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/bert/xslt/html/document2html.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- document2html.xsl	6 Jun 2002 09:39:55 -0000	1.3
  +++ document2html.xsl	6 Jun 2002 22:24:53 -0000	1.4
  @@ -4,9 +4,9 @@
     <xsl:template match="document">
       <div class="content">
         <xsl:if test="normalize-space(header/title)!=''">
  -        <h2>
  +        <h1>
             <xsl:value-of select="header/title"/>
  -        </h2>
  +        </h1>
         </xsl:if>
         <xsl:if test="normalize-space(header/subtitle)!=''">
           <h3>
  @@ -35,14 +35,14 @@
           <xsl:for-each select="section">
             <li>
               <a href="#{generate-id()}">
  -              <xsl:value-of select="@title"/>
  +              <xsl:value-of select="title"/>
               </a>
               <xsl:if test="section">
                 <ul class="minitoc">
                   <xsl:for-each select="section">
                     <li>
                       <a href="#{generate-id()}">
  -                      <xsl:value-of select="@title"/>
  +                      <xsl:value-of select="title"/>
                       </a>
                     </li>
                   </xsl:for-each>
  @@ -57,7 +57,7 @@
     <!--  section handling
           - <a name/> anchors are added if the id attribute is specified
           - generated anchors are still included for the TOC - what should we do about this?
  -        - FIXME: provide a generic facility to process section irrelevant to their 
  +        - FIXME: provide a generic facility to process section irrelevant to their
             nesting depth
     -->
     <xsl:template match="section">
  @@ -66,7 +66,7 @@
         <a name="{@id}"/>
       </xsl:if>
       <h3>
  -      <xsl:value-of select="@title"/>
  +      <xsl:value-of select="title"/>
       </h3>
       <xsl:apply-templates/>
     </xsl:template>
  @@ -76,7 +76,7 @@
         <a name="{@id}"/>
       </xsl:if>
       <h4>
  -      <xsl:value-of select="@title"/>
  +      <xsl:value-of select="title"/>
       </h4>
       <xsl:apply-templates/>
     </xsl:template>
  
  
  
  1.9       +5 -60     xml-forrest/src/resources/skins/bert/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/bert/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- site2xhtml.xsl	6 Jun 2002 09:56:03 -0000	1.8
  +++ site2xhtml.xsl	6 Jun 2002 22:24:53 -0000	1.9
  @@ -2,7 +2,7 @@
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 
<xsl:template match="site">
       <html>
         <head>
  -        <title><xsl:value-of select="div[@class='content']/h2"/></title>
  +        <title><xsl:value-of select="div[@class='content']/h1"/></title>
           <link rel="stylesheet" href="skin/page.css" type="text/css"/>
         </head>
         <body bgcolor="#FFFFFF" text="#000000" leftmargin="0" topmargin="0" marginwidth="0"
marginheight="0">
  @@ -11,7 +11,7 @@
         <tr>
           <td height="20" bgcolor="#CFDCED" valign="middle" nowrap="nowrap">
             <img src="skin/images/spacer.gif" border="0" alt="" width="5" height="1" />
  -          <font face="Arial, Helvetica, Sans-serif" size="2"><a href="@link1.href@">@link1@</a>
: <a href="@link2.href@">@link2@</a> : <a href="@link3.href@">@link3@</a></font>
  +          <font face="Arial, Helvetica, Sans-serif" size="2"><a href="@link1.href@">@link1@</a>
&#62; <a href="@link2.href@">@link2@</a> &#62; <a href="@link3.href@">@link3@</a></font>
           </td>
         </tr>
         <tr>
  @@ -57,62 +57,7 @@
         </tr>
         <tr>
           <td colspan="2" bgcolor="#294563" valign="bottom">
  -          <table cellspacing="0" cellpadding="0" border="0" summary="tab bar">
  -            <tr>
  -              <td width="8"><img src="skin/images/spacer.gif" width="8" height="8"
alt="" /></td>
  -              <td valign="bottom">
  -<!--
  -  selected tab code
  -
  -                <table cellspacing="0" cellpadding="0" border="0" height="30" summary="selected
tab">
  -                  <tr>
  -                    <td bgcolor="#4C6C8F" width="5" valign="top"><img src="skin/images/tabSel-left.gif"
alt="" width="5" height="5" /></td>
  -                    <td bgcolor="#4C6C8F" valign="middle">
  -                      <a href="/xml-forrest/"><font face="Arial, Helvetica, Sans-serif"
size="2" color="#ffffff">Home</font></a>
  -                    </td>
  -                    <td bgcolor="#4C6C8F" width="5" valign="top"><img src="skin/images/tabSel-right.gif"
alt="" width="5" height="5" /></td>
  -                  </tr>
  -                </table>  unselected tab code
  -                  <table cellspacing="0" cellpadding="0" border="0" height="25" summary="non
selected tab">
  -                  <tr>
  -                    <td bgcolor="#B2C4E0" width="5" valign="top"><img src="skin/images/tab-left.gif"
alt="" width="5" height="5" /></td>
  -                    <td bgcolor="#B2C4E0" valign="middle">
  -                      <font face="Arial, Helvetica, Sans-serif" size="2">Area 4</font>
  -                    </td>
  -                    <td bgcolor="#B2C4E0" width="5" valign="top"><img src="skin/images/tab-right.gif"
alt="" width="5" height="5" />
  -                    </td>
  -                  </tr>
  -                </table>
  --->
  -<!-- ==================================  Home TAB =================================
-->
  -                <table cellspacing="0" cellpadding="0" border="0" height="30" summary="selected
tab">
  -                  <tr>
  -                    <td bgcolor="#4C6C8F" width="5" valign="top"><img src="skin/images/tabSel-left.gif"
alt="" width="5" height="5" /></td>
  -                    <td bgcolor="#4C6C8F" valign="middle">
  -                      <a href="#N-A"><font face="Arial, Helvetica, Sans-serif"
size="2" color="#ffffff">Home</font></a>
  -                    </td>
  -                    <td bgcolor="#4C6C8F" width="5" valign="top"><img src="skin/images/tabSel-right.gif"
alt="" width="5" height="5" /></td>
  -                  </tr>
  -                </table>
  -<!-- ================================ End of home TAB ===============================
-->
  -              </td>
  -              <td width="8"><img src="skin/images/spacer.gif" width="8" height="8"
alt="" /></td>
  -              <td valign="bottom">
  -<!-- ==================================  Howto TAB =================================
-->
  -                  <table cellspacing="0" cellpadding="0" border="0" height="25" summary="non
selected tab">
  -                  <tr>
  -                    <td bgcolor="#B2C4E0" width="5" valign="top"><img src="skin/images/tab-left.gif"
alt="" width="5" height="5" /></td>
  -                    <td bgcolor="#B2C4E0" valign="middle">
  -                      <a href="#N-A"><font face="Arial, Helvetica, Sans-serif"
size="2" color="#ffffff">How-Tos</font></a>
  -                    </td>
  -                    <td bgcolor="#B2C4E0" width="5" valign="top"><img src="skin/images/tab-right.gif"
alt="" width="5" height="5" />
  -                    </td>
  -                  </tr>
  -                </table>
  -<!-- ================================ End of howto TAB ===============================
-->
  -              </td>
  -            </tr>
  -            </table>
  +            <xsl:apply-templates select="div[@class='tab']"/>
           </td>
           <td bgcolor="#294563"><img src="skin/images/spacer.gif" height="1" width="1"
alt="" /></td>
         </tr>
  @@ -120,7 +65,7 @@
           <td colspan="4" bgcolor="#4C6C8F"><img src="skin/images/spacer.gif" alt=""
height="10" width="1" /></td>
         </tr>
       </table>
  -    <!-- ======================================  Tabs and fContent table ======================================
-->
  +    <!-- ======================================  Menu and Content table ======================================
-->
       <table cellspacing="0" cellpadding="0" border="0" width="100%" bgcolor="#ffffff"
summary="page content">
         <tr>
           <td valign="top">
  @@ -195,7 +140,7 @@
         <tr>
           <td width="10"><img src="skin/images/spacer.gif" alt="" height="1" width="10"
/></td>
         </tr>
  -      <tr><td bgcolor="#4C6C8F" height="1" colspan="2"><img src="skin/images/spacer.gif"
alt="" width="1" height="1" /><a href="skin/images/page.gif"><img src="skin/images/spacer.gif"
alt="" width="1" height="1" border="0"/></a><a href="skin/images/chapter.gif"><img
src="skin/images/spacer.gif" alt="" width="1" height="1" border="0"/></a><a href="skin/images/chapter_open.gif"><img
src="skin/images/spacer.gif" alt="" width="1" height="1" border="0"/></a><a href="skin/images/current.gif"><img
src="skin/images/spacer.gif" alt="" width="1" height="1" border="0"/></a></td></tr>
  +      <tr><td bgcolor="#4C6C8F" height="1" colspan="2"><img src="skin/images/spacer.gif"
alt="" width="1" height="1" /><a href="skin/images/label.gif"><img src="skin/images/spacer.gif"
alt="" width="1" height="1" border="0"/></a><a href="skin/images/page.gif"><img
src="skin/images/spacer.gif" alt="" width="1" height="1" border="0"/></a><a href="skin/images/chapter.gif"><img
src="skin/images/spacer.gif" alt="" width="1" height="1" border="0"/></a><a href="skin/images/chapter_open.gif"><img
src="skin/images/spacer.gif" alt="" width="1" height="1" border="0"/></a><a href="skin/images/current.gif"><img
src="skin/images/spacer.gif" alt="" width="1" height="1" border="0"/></a></td></tr>
         <tr>
           <td align="center" class="copyright" bgcolor="#CFDCED" colspan="2">
             <font face="Arial, Helvetica, Sans-Serif" size="2">Copyright &#169;
2002 Apache Sofware Foundation. All Rights Reserved<script language="JavaScript" type="text/javascript"><![CDATA[<!--
  
  
  

Mime
View raw message