Change output doc dir to docs to avoid problem where content is not included in the...

diff --git a/xsl/webhelp/build.properties b/xsl/webhelp/build.properties
index 348d1593ad6e4e779606fe71fb1226cfe911cc65..7f45d069e3428d0be316ad149bb987ea9e3234b5 100755 (executable)
--- a/xsl/webhelp/build.properties
+++ b/xsl/webhelp/build.properties
@@ -6,7 +6,7 @@ input-xml=docsrc/readme.xml
 
 # The directory in which to put the output files. 
 # This directory is created if it does not exist.
-output-dir=doc
+output-dir=docs
 
 # If you are using a customization layer that imports webhelp.xsl, use
 # this property to point to it. 
@@ -40,3 +40,4 @@ webhelp.include.search.tab=true
 # see the documentation for details. en=English, fr=French, de=German,
 # zh=Chinese, ja=Japanese etc.  
 webhelp.indexer.language=en
+

diff --git a/xsl/webhelp/docsrc/readme.xml b/xsl/webhelp/docsrc/readme.xml
index a3fe2ecab92eaa918f0825814f82316a306b8f5a..f920b0070c772d08d38e7e15c9c1463809036c73 100755 (executable)
--- a/xsl/webhelp/docsrc/readme.xml
+++ b/xsl/webhelp/docsrc/readme.xml
@@ -435,7 +435,7 @@ input-xml=docsrc/readme.xml
 
 # The directory in which to put the output files. 
 # This directory is created if it does not exist.
-output-dir=doc
+output-dir=docs
 
 # If you are using a customization layer that imports webhelp.xsl, use
 # this property to point to it. 
@@ -542,7 +542,7 @@ webhelp.indexer.language=en</programlisting></para>
       <para>To customize the look and feel of the help, study the following
       css files:<itemizedlist>
           <listitem>
-            <para><filename>doc/common/css/positioning.css</filename>: This
+            <para><filename>docs/common/css/positioning.css</filename>: This
             handles the Positioning of DIVs in appropriate positions. For
             example, it causes the <code>leftnavigation</code> div to appear
             on the left, the header on top, and so on. Use this if you need to
@@ -551,7 +551,7 @@ webhelp.indexer.language=en</programlisting></para>
           </listitem>
 
           <listitem>
-            <para><filename>doc/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css</filename>:
+            <para><filename>docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css</filename>:
             This is the theming part which adds colors and stuff. This is a
             default theme comes with <ulink
             url="http://jqueryui.com/download">jqueryui</ulink> unchanged. You
@@ -562,7 +562,7 @@ webhelp.indexer.language=en</programlisting></para>
           </listitem>
 
           <listitem>
-            <para><filename>doc/common/jquery/treeview/jquery.treeview.css</filename>:
+            <para><filename>docs/common/jquery/treeview/jquery.treeview.css</filename>:
             This styles the toc Tree. Generally, you don't have to edit this
             file.</para>
           </listitem>
@@ -806,7 +806,7 @@ persist: "cookie"
         Mainly the search mechanism has two parts.
         <itemizedlist>
           <listitem>
-            <para>Indexing: First we need to traverse the content in the doc/content folder and index 
+            <para>Indexing: First we need to traverse the content in the docs/content folder and index 
               the words in it. This is done by <filename>nw-cms.jar</filename>. You can invoke it by  
             <code>ant index</code> command from the root of webhelp of directory. You can recompile it 
               again and build the jar file by <code>ant build-indexer</code>. Indexer has some extensive 

diff --git a/xsl/webhelp/xsl/webhelp.xsl b/xsl/webhelp/xsl/webhelp.xsl
index 561a2322c7fe5380736a4fbaa9809237dd3d5396..9d72d5df1cfbe9bc4deb7f01a15af82a2b36209a 100755 (executable)
--- a/xsl/webhelp/xsl/webhelp.xsl
+++ b/xsl/webhelp/xsl/webhelp.xsl
@@ -13,11 +13,14 @@
             cdata-section-elements=""/>
 
     <!-- webhelp-specific params! -->
+    <!-- To be added to normal params file someday -->
     <xsl:param name="webhelp.include.search.tab">true</xsl:param>
     <xsl:param name="webhelp.start.filename">index.html</xsl:param>
-    <xsl:param name="webhelp.base.dir">doc</xsl:param>
+    <xsl:param name="webhelp.base.dir">docs</xsl:param>
     <xsl:param name="webhelp.tree.cookie.id" select="concat( 'treeview-', count(//node()) )"/>
     <xsl:param name="webhelp.indexer.language">en</xsl:param>
+    <xsl:param name="webhelp.default.topic"/>
+    <xsl:param name="webhelp.autolabel">0</xsl:param>
     <!-- webhelp-specific params! -->
 
     <!-- Set some reasonable defaults for webhelp output -->
@@ -32,7 +35,7 @@
     <xsl:param name="para.propagates.style" select="1"/>
     <xsl:param name="phrase.propagates.style" select="1"/>
     <xsl:param name="chunk.first.sections" select="1"/>
-    <xsl:param name="chapter.autolabel" select="0"/>
+    <xsl:param name="chapter.autolabel" select="1"/>
     <xsl:param name="section.autolabel" select="0"/>
     <!--xsl:param name="generate.toc">book toc</xsl:param-->
 
@@ -525,7 +528,7 @@ These problems go away when you add this IE=7 mode meta tag.
         <xsl:choose>
             <xsl:when test="$rootid != ''">
                 <xsl:variable name="title">
-                    <xsl:if test="$eclipse.autolabel=1">
+                    <xsl:if test="$webhelp.autolabel=1">
                         <xsl:variable name="label.markup">
                             <xsl:apply-templates select="key('id',$rootid)" mode="label.markup"/>
                         </xsl:variable>
@@ -553,7 +556,7 @@ These problems go away when you add this IE=7 mode meta tag.
 
             <xsl:otherwise>
                 <xsl:variable name="title">
-                    <xsl:if test="$eclipse.autolabel=1">
+                    <xsl:if test="$webhelp.autolabel=1">
                         <xsl:variable name="label.markup">
                             <xsl:apply-templates select="/*" mode="label.markup"/>
                         </xsl:variable>
@@ -656,7 +659,7 @@ These problems go away when you add this IE=7 mode meta tag.
             mode="webhelptoc">
         <xsl:param name="currentid"/>
         <xsl:variable name="title">
-            <xsl:if test="$eclipse.autolabel=1">
+            <xsl:if test="$webhelp.autolabel=1">
                 <xsl:variable name="label.markup">
                     <xsl:apply-templates select="." mode="label.markup"/>
                 </xsl:variable>
@@ -718,6 +721,9 @@ These problems go away when you add this IE=7 mode meta tag.
     <xsl:template name="index.html">
         <xsl:variable name="default.topic">
             <xsl:choose>
+                <xsl:when test="$webhelp.default.topic != ''">
+                    <xsl:value-of select="$htmlhelp.default.topic"/>
+                </xsl:when>
                 <xsl:when test="$htmlhelp.default.topic != ''">
                     <xsl:value-of select="$htmlhelp.default.topic"/>
                 </xsl:when>
@@ -761,7 +767,7 @@ These problems go away when you add this IE=7 mode meta tag.
                 <html>
                     <head>
                                    <link rel="shortcut icon" href="favicon.ico"/>
-                        <meta http-equiv="Refresh" content="1; URL=content/ch01.html"/>
+                        <meta http-equiv="Refresh" content="1; URL=content/{$default.topic}"/>
                         <title><xsl:value-of select="//title[1]"/>&#160;
                         </title>
                     </head>