Author: artdaw Date: 2009-05-25 05:04:55 -0400 (Mon, 25 May 2009) New Revision: 14297 Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-common.xsl Log: https://jira.jboss.org/jira/browse/RF-7081 - all components were grouped Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl 2009-05-25 08:54:17 UTC (rev 14296) +++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl 2009-05-25 09:04:55 UTC (rev 14297) @@ -3,20 +3,21 @@ xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:u="http:/jsf.exadel.com/template/util" xmlns:f='http:/jsf.exadel.com/template' - version="1.0" exclude-result-prefixes="javaee"> - <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" + version="1.0" exclude-result-prefixes="javaee u f"> + <xsl:output name="xmlOutput" method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes" /> <xsl:param name="lang" /> <xsl:param name="title" /> <xsl:param name="separator" /> <xsl:param name="prefix" /> <xsl:param name="xcssPath" /> + <xsl:param name="outputDir" /> <xsl:variable name="rowsAmount"> <xsl:value-of select="count(.)" /> </xsl:variable> - <xsl:template match="//f:template"> + <!--xsl:template match="//f:template"> <table> <xsl:for-each select="u:selector"> <xsl:sort select="@name" /> @@ -41,7 +42,7 @@ </table> </xsl:template> - <xsl:template match="/f:template/f:verbatim"/> + <xsl:template match="/f:template/f:verbatim"/--> <xsl:template match="javaee:taglib | taglib"> @@ -53,29 +54,46 @@ <!--xsl:value-of select="./name/text()" /--> - <xsl:if - test="not(contains($excluded-tag-names, javaee:name))"> + <xsl:if test="not(contains($excluded-tag-names, javaee:name))"> <xsl:call-template name="tag" /> </xsl:if> - <xsl:if - test="not(contains($excluded-tag-names, ./name/text()))"> - <xsl:call-template name="tag" /> + <xsl:if test="not(contains($excluded-tag-names, ./name/text()))"> + <xsl:call-template name="tag" /> </xsl:if> </xsl:for-each> </xsl:template> <xsl:template name="tag"> + + <xsl:variable name="tag_name"> + <xsl:choose> + <xsl:when test="javaee:name"> + <xsl:value-of select="javaee:name" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="./name/text()" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="descPrefixExistence" select="boolean(document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.desc.xml')))" /> + <xsl:variable name="prefixExistence" select="boolean(document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.xml')))" /> + + <!--xsl:variable name="hrefForResultDoc"> + <xsl:choose> + <xsl:when test="$descPrefixExistence and $prefixExistence"> + <xsl:value-of select="concat($outputDir, $prefix, '_', $tag_name, '.xml')" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($outputDir, $tag_name, '.xml')" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable--> + + + <xsl:result-document href="{concat($outputDir, $prefix, '_', $tag_name, '.xml')}" format="xmlOutput"> <section role="NotInToc"> - <xsl:variable name="tag_name"> - <xsl:choose> - <xsl:when test="javaee:name"> - <xsl:value-of select="javaee:name" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="./name/text()" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> + <!-- <xsl:variable name="prefix"> <xsl:choose> @@ -88,7 +106,8 @@ </xsl:choose> </xsl:variable> --> - <xsl:attribute name="id"><xsl:value-of select="concat($prefix, '_', $tag_name)" /> + <xsl:attribute name="id"> + <xsl:value-of select="concat($prefix, '_', $tag_name)" /> </xsl:attribute> <title> &lt; @@ -97,7 +116,7 @@ </title> <xsl:choose> - <xsl:when test="document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.desc.xml'))"> + <xsl:when test="$descPrefixExistence"> <xsl:for-each select="document(concat($lang, $separator,'included',$separator, $prefix, '_', $tag_name, '.desc.xml'))/*"> <xsl:copy-of select="./*" /> </xsl:for-each> @@ -108,7 +127,8 @@ </xsl:for-each> </xsl:otherwise> </xsl:choose> - + + <table> <title> <xsl:value-of select="$prefix" /> @@ -169,8 +189,9 @@ </tgroup> </table> </xsl:if--> + <xsl:choose> - <xsl:when test="document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.xml'))"> + <xsl:when test="$prefixExistence"> <xsl:for-each select="document(concat($lang, $separator,'included',$separator, $prefix, '_', $tag_name, '.xml'))/*"> <xsl:copy-of select="./*" /> </xsl:for-each> @@ -182,7 +203,7 @@ </xsl:otherwise> </xsl:choose> - </section> +</xsl:result-document> </xsl:template> -</xsl:transform> \ No newline at end of file +</xsl:transform> Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-common.xsl =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-05-25 08:54:17 UTC (rev 14296) +++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-05-25 09:04:55 UTC (rev 14297) @@ -12,8 +12,17 @@ <!--xsl:param name="generate.toc" select="'book toc'"/--> <xsl:param name="toc.section.depth" select="5"/> <xsl:param name="use.id.as.filename" select="1"/> + <xsl:param name="generate.toc"> +book toc +chapter toc +sect1 toc +sect2 toc +sect3 toc +sect4 toc +sect5 toc +section toc +</xsl:param> - <!-- From: xhtml/docbook.xsl @@ -123,45 +132,9 @@ <a id="feedback-link" onclick="showPopup('feedback-maincontainer');"> <img src="images/feedback_logo.png" class="feedback-images" onload="init('feedback-summary', 'feedback-description');"/> </a> - </div> - <!--div id="feedback-maincontainer" style="display:none"> - <div id="feedback-header"> - Send your remarks, comments or wishes to doc team - </div> - <a href="#" onclick="feedbackClose();" id="feedback-close"> - <img src="images/close.png" class="feedback-images" /> - </a> - <div id="feedback-state"><xsl:text> </xsl:text></div> - <iframe id='feedback-iFrame' name="feedback-iFrame"><xsl:text> </xsl:text></iframe> - <form id="feedback-mailform" method="post" action="http://192.168.0.194:8090/feedbackRF/FeedbackRF" target="feedback-iFrame"> - <div class="feedback-textbox-div"> - Subject:<input type="text" id="subject" name="subject" title="Enter the subject of your message" class="feedback-textbox" /> - </div> - <div class="feedback-textbox-div"> - <span style="vertical-align: top;">Message:</span> - <textarea name="emailContent" title="Type here the text of your message" id="feedback-emailContent"><xsl:text> </xsl:text></textarea> - </div> - <div class="feedback-textbox-div"> - Your name:<input type="text" id="senderName" name="senderName" title="Enter your name" class="feedback-textbox" /> - </div> - <div class="feedback-textbox-div"> - Your email:<input type="text" id="from" name="from" title="Enter your email address" class="feedback-textbox" /> - </div> - <span class="feedback-button-container"> - <input type="submit" value="Send Message" name="submit" class="feedback-formbutton" title="Send Message" /> - </span> - <span class="feedback-button-container"> - <input type="reset" value="Clear All Fields" class="feedback-formbutton" title="Clear All Fields" /> - </span> - </form> - </div> - <div id="feedback-wrapper"> - <a id="feedback-link" onclick="feedbackAppear();"> - <img src="images/feedback_logo.png" class="feedback-images" width="100px"/> - </a> - </div--> - </xsl:template> - + </div> + </xsl:template> + <xsl:template name="header.navigation"> <xsl:param name="prev" select="/foo"/> <xsl:param name="next" select="/foo"/> @@ -172,11 +145,11 @@ <xsl:variable name="row2" select="count($prev) &gt; 0 or (count($up) &gt; 0 and generate-id($up) != generate-id($home) and $navig.showtitles != 0) or count($next) &gt; 0"/> <xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'"> <xsl:if test="$row1 or $row2"> - <xsl:if test="$row1"> + <xsl:if test="$row1"> <xsl:if test="$nightly &gt; 0"> <div id="overlay"> <xsl:text> </xsl:text> - </div> + </div> </xsl:if> <!-- FEEDBACK --> <xsl:call-template name="feedback" /> @@ -335,52 +308,52 @@ and $generate.legalnotice.link != 0">1</xsl:when> <xsl:otherwise>0</xsl:otherwise> </xsl:choose> -</xsl:template> - - - -<!-- ==================================================================== --> - -<xsl:template name="navig.content"> - <xsl:param name="direction" select="next"/> - <xsl:variable name="navtext"> - <xsl:choose> - <xsl:when test="$direction = 'prev'"> - <xsl:call-template name="gentext.nav.prev"/> - </xsl:when> - <xsl:when test="$direction = 'next'"> - <xsl:call-template name="gentext.nav.next"/> - </xsl:when> - <xsl:when test="$direction = 'up'"> - <xsl:call-template name="gentext.nav.up"/> - </xsl:when> - <xsl:when test="$direction = 'home'"> - <xsl:call-template name="gentext.nav.home"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>xxx</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$navig.graphics != 0"> - <img> - <xsl:attribute name="src"> - <xsl:value-of select="$navig.graphics.path"/> - <xsl:value-of select="$direction"/> - <xsl:value-of select="$navig.graphics.extension"/> - </xsl:attribute> - <xsl:attribute name="alt"> - <xsl:value-of select="$navtext"/> - </xsl:attribute> - </img> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$navtext"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- ==================================================================== --> +</xsl:template> + + + +<!-- ==================================================================== --> + +<xsl:template name="navig.content"> + <xsl:param name="direction" select="next"/> + <xsl:variable name="navtext"> + <xsl:choose> + <xsl:when test="$direction = 'prev'"> + <xsl:call-template name="gentext.nav.prev"/> + </xsl:when> + <xsl:when test="$direction = 'next'"> + <xsl:call-template name="gentext.nav.next"/> + </xsl:when> + <xsl:when test="$direction = 'up'"> + <xsl:call-template name="gentext.nav.up"/> + </xsl:when> + <xsl:when test="$direction = 'home'"> + <xsl:call-template name="gentext.nav.home"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>xxx</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$navig.graphics != 0"> + <img> + <xsl:attribute name="src"> + <xsl:value-of select="$navig.graphics.path"/> + <xsl:value-of select="$direction"/> + <xsl:value-of select="$navig.graphics.extension"/> + </xsl:attribute> + <xsl:attribute name="alt"> + <xsl:value-of select="$navtext"/> + </xsl:attribute> + </img> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$navtext"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<!-- ==================================================================== --> </xsl:stylesheet>