From: <dc...@us...> - 2010-10-04 15:14:27
|
Revision: 8917 http://docbook.svn.sourceforge.net/docbook/?rev=8917&view=rev Author: dcramer Date: 2010-10-04 15:14:20 +0000 (Mon, 04 Oct 2010) Log Message: ----------- Merged in changes from webhelp branch to address issue #3058244 regarding the xx.html temp file that was being created Modified Paths: -------------- trunk/xsl/webhelp/build.xml trunk/xsl/webhelp/indexer/src/com/nexwave/nquindexer/IndexerTask.java trunk/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java Property Changed: ---------------- trunk/xsl/webhelp/ Property changes on: trunk/xsl/webhelp ___________________________________________________________________ Added: svn:mergeinfo + /branches/webhelp/xsl/webhelp:8693-8881,8914-8916 Modified: trunk/xsl/webhelp/build.xml =================================================================== --- trunk/xsl/webhelp/build.xml 2010-10-04 13:50:56 UTC (rev 8916) +++ trunk/xsl/webhelp/build.xml 2010-10-04 15:14:20 UTC (rev 8917) @@ -93,8 +93,6 @@ <fileset dir="${output-dir}/content/search" includes="*.props"/> </delete> - <delete file="xx.html"/> - </target> <target name="webhelp" depends="validate,chunk,index"/> Modified: trunk/xsl/webhelp/indexer/src/com/nexwave/nquindexer/IndexerTask.java =================================================================== --- trunk/xsl/webhelp/indexer/src/com/nexwave/nquindexer/IndexerTask.java 2010-10-04 13:50:56 UTC (rev 8916) +++ trunk/xsl/webhelp/indexer/src/com/nexwave/nquindexer/IndexerTask.java 2010-10-04 15:14:20 UTC (rev 8917) @@ -11,14 +11,10 @@ import java.util.Map; import java.util.Properties; -/* - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; -*/ - import com.nexwave.nsidita.DirList; import com.nexwave.nsidita.DocFileInfo; @@ -30,8 +26,7 @@ * @author N. Quaine * @author Kasun Gajasinghe <http://kasunbg.blogspot.com> */ -public class IndexerTask{ -//public class IndexerTask extends Task { +public class IndexerTask extends Task { // messages private String txt_no_inputdir = "Input directory not found:"; @@ -61,11 +56,13 @@ // Indexing features: words to remove private ArrayList<String> cleanUpStrings = null; private ArrayList<String> cleanUpChars = null; + + //Html extension + private String htmlExtension = "html"; // Constructor public IndexerTask() { super(); - } /** The setter for the "htmldir" attribute (parameter of the task) * @param htmldir @@ -75,6 +72,18 @@ this.htmldir = htmldir; } + /** + * Set the extension in which html files are generated + * @param htmlExtension The extension in wich html files are generated + */ + public void setHtmlextension(String htmlExtension) { + this.htmlExtension = htmlExtension; + //Trim the starting "." + if(this.htmlExtension.startsWith(".")) { + this.htmlExtension = this.htmlExtension.substring(1); + } + } + /** * setter for "indexerLanguage" attribute from ANT * @param indexerLanguage language for the search indexer. Used to differerentiate which stemmer to be used. @@ -104,14 +113,11 @@ IndexerTask.indexerLanguage = "@@"; //fail-safe mechanism, This vm should not reach this point. } } - - /** * Implementation of the execute function (Task interface) */ -// public void execute() throws BuildException { - public void execute(){ + public void execute() throws BuildException { try{ //Use Xerces as the parser. Does not support Saxon6.5.5 parser System.setProperty("org.xml.sax.driver", "org.apache.xerces.parsers.SAXParser"); @@ -184,8 +190,7 @@ // Get the list of all html files but the tocs, covers and indexes - //DirList nsiDoc = new DirList(inputDir, "^(?!(toc|index|search|frameset|ix01)).*\\.html$", 1); - DirList nsiDoc = new DirList(inputDir, "^.*\\.html?$", 1); + DirList nsiDoc = new DirList(inputDir, "^.*\\." + htmlExtension + "?$", 1); htmlFiles = nsiDoc.getListFiles(); // Check if found html files if (htmlFiles.isEmpty()) { @@ -211,7 +216,7 @@ // Retrieve the clean-up properties for indexing RetrieveCleanUpProps(); - // System.out.print("clean"+" " +cleanUpStrings); + // System.out.print("clean"+" " +cleanUpStrings); //create a default handler //SaxHTMLIndex spe = new SaxHTMLIndex (); // do not use clean-up props files Modified: trunk/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java =================================================================== --- trunk/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java 2010-10-04 13:50:56 UTC (rev 8916) +++ trunk/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java 2010-10-04 15:14:20 UTC (rev 8917) @@ -1,17 +1,11 @@ package com.nexwave.nquindexer; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; +import java.io.*; import com.nexwave.nsidita.BlankRemover; import com.nexwave.nsidita.DocFileInfo; +import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; /** @@ -88,8 +82,11 @@ long start = System.currentTimeMillis(); //System.out.println("about to parse " + file.getName() + " >>> " + start); - if ( RemoveValidationPI (file) == 0){ - sp.parse("xx.html", this); + String content = RemoveValidationPI (file); + if (content != null){ + InputSource is = new InputSource(new StringReader(content)); + is.setSystemId(file.toURI().toURL().toString()); + sp.parse(is, this); } long finish = System.currentTimeMillis(); @@ -182,12 +179,9 @@ //triggers when there's character data inside an element. public void characters(char[] ch, int start, int length) throws org.xml.sax.SAXException { - - // dwc: Bug fix. Don't index contents of script tag. - // dwc: TODO: Add code here to conditionally index or not + // index certain elements. E.g. Use this to implement a - // "titles only" index, say if you wanted to use <span/>s to - // create space breaks in ja_JP lines to indicate word breaks. + // "titles only" index, if((addContent || addHeaderInfo) && !doNotIndex && !currentElName.equalsIgnoreCase("script")){ String text = new String(ch,start,length); @@ -245,17 +239,14 @@ * @param file * @return int: returns 0 if no IOException occurs, else 1. */ - public int RemoveValidationPI (File file) { - + public String RemoveValidationPI (File file) { + StringBuilder sb = new StringBuilder(); + //The content that needs to be indexed after removing validation will be written to sb. This StringBuilder will + // be the source to index the content of the particular html page. try { BufferedReader br = new BufferedReader( new InputStreamReader( new FileInputStream(file),"UTF-8")); - - //PrintWriter pw = new PrintWriter(new FileOutputStream(new File("xx.html"))); - PrintWriter pw = new PrintWriter(new OutputStreamWriter (new FileOutputStream(new File("xx.html")),"UTF-8")); - //writes the content to xx.html after removing validation. This temp file will be source to index the - // content of the particular html page. while(true) { @@ -278,7 +269,8 @@ if (line.contains("<?xml version")) { line = line.replaceAll("\\x3C\\x3Fxml[^\\x3E]*\\x3F\\x3E","\n"); } - pw.write(line + "\n"); + + sb.append(line + "\n"); } else { //dwc: What is this trying to do? Nuke the DOCTYPE? Why? @@ -296,7 +288,8 @@ line = line.replaceAll("\\x3C\\x3Fxml[^\\x3E]*\\x3F\\x3E","\n"); } line = line.replaceAll("\\x3C\\x21DOCTYPE[^\\x3E]*\\x3E","\n"); - pw.write(line); + + sb.append(line); } } catch (IOException e) @@ -304,18 +297,15 @@ break; } } - - - pw.flush(); - pw.close(); + br.close(); } catch (IOException e) { - return 1; + return null; } - return 0; // return status + return sb.toString(); // return status } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2010-12-04 04:52:35
|
Revision: 8941 http://docbook.svn.sourceforge.net/docbook/?rev=8941&view=rev Author: kasunbg Date: 2010-12-04 04:52:28 +0000 (Sat, 04 Dec 2010) Log Message: ----------- Added documentation for how to add images to WebHelp Modified Paths: -------------- trunk/xsl/webhelp/docsrc/readme.xml Added Paths: ----------- trunk/xsl/webhelp/template/content/images/ trunk/xsl/webhelp/template/content/images/sample.jpg Modified: trunk/xsl/webhelp/docsrc/readme.xml =================================================================== --- trunk/xsl/webhelp/docsrc/readme.xml 2010-11-28 08:49:43 UTC (rev 8940) +++ trunk/xsl/webhelp/docsrc/readme.xml 2010-12-04 04:52:28 UTC (rev 8941) @@ -683,6 +683,40 @@ </listitem> </itemizedlist></para> </section> + <section> + <title>Adding images</title> + <para>This section shows how to add images to WebHelp. For that, follow the simple procedure given.<itemizedlist> + <listitem> + <para>Add all the images to template/content folder.</para> + </listitem> + <listitem> + <para>Then refer to those images from your docbook document.</para> + <para>Following image is from <emphasis role="bold">webhelp/template/content/images/sample.jpg</emphasis>. The + docbook code is shown below.</para> + <para> + <figure> + <title>Sample Image</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/sample.jpg" format="JPG"/> + </imageobject> + </mediaobject> + </figure> + </para> + <example> + <title>Example code for adding images. Note down the relative path used</title> + <programlisting><figure> + <title>Sample</title> + <mediaobject> + <imageobject> + <imagedata fileref="<emphasis role="bold">images/sample.jpg</emphasis>" format="JPG"/> + </imageobject> + </mediaobject> +</figure></programlisting> + </example> + </listitem> + </itemizedlist></para> + </section> </chapter> <chapter> Added: trunk/xsl/webhelp/template/content/images/sample.jpg =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/content/images/sample.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2011-06-05 20:11:15
|
Revision: 9015 http://docbook.svn.sourceforge.net/docbook/?rev=9015&view=rev Author: dcramer Date: 2011-06-05 20:11:09 +0000 (Sun, 05 Jun 2011) Log Message: ----------- Localize string in nwSearchFnt.js file Modified Paths: -------------- trunk/xsl/webhelp/template/content/search/nwSearchFnt.js trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/template/content/search/nwSearchFnt.js =================================================================== --- trunk/xsl/webhelp/template/content/search/nwSearchFnt.js 2011-06-02 08:27:47 UTC (rev 9014) +++ trunk/xsl/webhelp/template/content/search/nwSearchFnt.js 2011-06-05 20:11:09 UTC (rev 9015) @@ -150,7 +150,7 @@ } results += "</p>"; } else { - results = "<p>" + "Your search returned no results for " + "<span class=\"searchExpression\">" + txt_wordsnotfound + "</span>" + "</p>"; + results = "<p>" + localeresource.search_no_results + "</p>"; } //alert(results); document.getElementById('searchResults').innerHTML = results; Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-06-02 08:27:47 UTC (rev 9014) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-06-05 20:11:09 UTC (rev 9015) @@ -66,6 +66,7 @@ <l:gentext key="txt_results_for" text="Results for: "/> <l:gentext key="TableofContents" text="Contents"/> <l:gentext key="HighlightButton" text="Toggle search result highlighting"/> + <l:gentext key="Your_search_returned_no_results" text="Your search returned no results."/> </l10n> <!-- The fallback mechansim doesn't seem to work for local l10n stuff --> <l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ja"> @@ -382,6 +383,7 @@ <xsl:call-template name="index.html"/> + <xsl:call-template name="l10n.js"/> </xsl:template> @@ -828,4 +830,22 @@ </xsl:call-template> </xsl:template> + <xsl:template name="l10n.js"> + <xsl:call-template name="write.chunk"> + <xsl:with-param name="filename"> + <xsl:value-of select="concat($base.dir,'search/l10n.js')"/> + </xsl:with-param> + <xsl:with-param name="method" select="'text'"/> + <xsl:with-param name="encoding" select="'utf-8'"/> + <xsl:with-param name="indent" select="'no'"/> + <xsl:with-param name="content"> + //Resource strings for localization + var localeresource = new Object; + localeresource["search_no_results"]="<xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Your_search_returned_no_results'"/> + </xsl:call-template>"; + </xsl:with-param> + </xsl:call-template> + </xsl:template> + </xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-09-18 03:57:06
|
Revision: 9064 http://docbook.svn.sourceforge.net/docbook/?rev=9064&view=rev Author: kasunbg Date: 2011-09-18 03:56:59 +0000 (Sun, 18 Sep 2011) Log Message: ----------- UI improvements. Moved search highligher to search tab. Added nice icons for navigation buttons etc. Removed footer navigation Corrected tree colorings Overall, some css magic Modified Paths: -------------- trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/template/common/main.js trunk/xsl/webhelp/xsl/webhelp.xsl Added Paths: ----------- trunk/xsl/webhelp/template/common/css/ie.css trunk/xsl/webhelp/template/common/images/main_bg_fade.png trunk/xsl/webhelp/template/common/images/next-arrow.png trunk/xsl/webhelp/template/common/images/previous-arrow.png trunk/xsl/webhelp/template/common/images/sidebar.png Added: trunk/xsl/webhelp/template/common/css/ie.css =================================================================== --- trunk/xsl/webhelp/template/common/css/ie.css (rev 0) +++ trunk/xsl/webhelp/template/common/css/ie.css 2011-09-18 03:56:59 UTC (rev 9064) @@ -0,0 +1,13 @@ +.statustext{ + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1) + progid:DXImageTransform.Microsoft.BasicImage(opacity=.5); + width: 100%; + height: 30px; + right: -5px; + top:105px; + /* left: 280px; */ /* change to -12px; when sidebar is collapsed */ +} + +body #content{ + padding-top: 136px; +} Property changes on: trunk/xsl/webhelp/template/common/css/ie.css ___________________________________________________________________ Added: svn:executable + * Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-16 19:51:38 UTC (rev 9063) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-18 03:56:59 UTC (rev 9064) @@ -1,10 +1,29 @@ +tr th .added { color: #E6E6FA; } +tr th .changed {color: #99ff99; } +div.added tr, div.added { background-color: #E6E6FA; } +div.deleted tr, div.deleted { text-decoration: line-through; + background-color: #FF7F7F; } +div.changed tr, div.changed { background-color: #99ff99; } +div.off { } + +span.added { background-color: #E6E6FA; } +span.deleted { text-decoration: line-through; + background-color: #FF7F7F; } +span.changed { background-color: #99ff99; } +span.off { } + + body { font: 12px Verdana, Geneva, sans-serif; } p, ul, ol, li { font: 10pt Verdana, Geneva, sans-serif; } -h1 { font: bold 15pt Arial, Helvetica, geneva; } -h2 { font: bold 14pt Arial, Helvetica, geneva; } +h1 { font: 15pt Arial, Helvetica, geneva; + color: black!important!; +} +h2 { font: normal 12pt Arial, Helvetica, geneva; + color: black!important; +} #header { - background: white url(../images/header-bg.gif) repeat-x; + background: #444444 url("../images/main_bg_fade.png") scroll top left no-repeat; position: fixed; width: 100%; height: 95px; @@ -12,10 +31,30 @@ right: 0; bottom: auto; left: 0; - border-bottom: 2px solid #cccccc; + border-bottom: 1px solid #bbc4c5; z-index: 2000; } +#header h1 { + color: #fff; + margin-left: 310px; +} + +#header h1, p.breadcrumbs { + margin-top: 30px; + margin-left: 310px; +} + +#header img { + float: left; + margin-left: 20px; + margin-top: 12px; +} + +#header p.breadcrumbs a { + color: #bbb; +} + #leftnavigation { /* background-color:#91e7b3;*/ overflow: auto; @@ -26,7 +65,9 @@ left: 0; width: 280px; z-index: 1500; - border-right:2px solid #CCCCCC; + border-right:2px solid #bbc4c5; + padding: 0px; + background-color: #f0f0f0!important; } #treeDiv { @@ -39,6 +80,7 @@ width: 243px; z-index: 1500; border-right:2px solid #CCCCCC; + background-color: #f0f0f0!important; } #searchDiv { @@ -51,6 +93,7 @@ width: 243px; z-index: 1500; border-right:2px solid #CCCCCC; + background-color: #f0f0f0!important; } #content { @@ -65,36 +108,82 @@ color: #000000; /*border-left: 2px solid #cccccc; overflow :scroll;*/ z-index: 1000; - - max-width: 70em; min-width:800px; } #navheader { position: fixed; - top: 65px; - right:4px; + background: #fff; + border-radius: 5px 0px 0px 5px; + padding-left: 10px; + right: 0px; + top: 37px; } -#content h1, #content h2 { color: #cc0000; } +#content h1, #content h2 { color: black; } .navfooter { bottom: 2%; } .highlight { background-color: #c5d3c3; } .highlightButton{ font-size: 0; } +#content pre.literallayout, #content pre.programlisting +{ + -x-system-font: none; + background-color: silver; + border-bottom-color: #DEDEDE !important; + border-bottom-style: solid !important; + border-bottom-width: 1px !important; + border-left-color-ltr-source: physical !important; + border-left-color-rtl-source: physical !important; + border-left-color-value: #DEDEDE !important; + border-left-style-ltr-source: physical !important; + border-left-style-rtl-source: physical !important; + border-left-style-value: solid !important; + border-left-width-ltr-source: physical !important; + border-left-width-rtl-source: physical !important; + border-left-width-value: 1px !important; + border-right-color-ltr-source: physical !important; + border-right-color-rtl-source: physical !important; + border-right-color-value: #DEDEDE !important; + border-right-style-ltr-source: physical !important; + border-right-style-rtl-source: physical !important; + border-right-style-value: solid !important; + border-right-width-ltr-source: physical !important; + border-right-width-rtl-source: physical !important; + border-right-width-value: 1px !important; + border-top-color: #DEDEDE !important; + border-top-style: solid !important; + border-top-width: 1px !important; + color: #23302D; + display: block; + font-family: Monaco,'Courier New','DejaVu Sans Mono','Bitstream Vera Sans Mono',monospace; + font-size: 12px !important; + font-size-adjust: none; + font-stretch: normal; + font-style: normal; + font-variant: normal; + font-weight: normal; + line-height: normal; + margin-bottom: 1em !important; + margin-left: 0 !important; + margin-right: 0 !important; + margin-top: 1em !important; + overflow-x: scroll; + padding-bottom: 0.5em !important; + padding-left: 0.5em !important; + padding-right: 0.5em !important; + padding-top: 0.5em !important; + width: 100%; +} + /* Show Hide TOC tree */ .pointLeft { - background: url("../images/showHideTreeIcons.png") 0 0 no-repeat; - height: 28px; - width: 15px; + padding-right: 5px; display: block; - font-size: 0; cursor: pointer; } .pointRight { - background: url("../images/showHideTreeIcons.png") -15px 0 no-repeat; - height: 28px; + padding-right: 5px; display: block; - font-size: 0; cursor: pointer; } @@ -132,6 +221,29 @@ font-weight: bold; } +p.breadcrumbs { + display: inline; + margin-bottom: 0px; + margin-top: 33px; +} + +p.breadcrumbs a { + padding-right: 12px; + margin-right: 5px; + text-decoration: none; + color: #575757; + text-transform: uppercase; + font-size: 10px; +} + +p.breadcrumbs a:first-child { + background: url(../images/breadcrumb-arrow-white.png) no-repeat right center; +} + +p.breadcrumbs a:hover { + text-decoration: underline; +} + /* OXYGEN ADDITION FOR SEARCH RESULT RATING */ #star ul.star { @@ -166,3 +278,167 @@ FONT-SIZE: 1px; } +<!-- +#header h1 { + margin-top: 2px; +} +--> + +table.navLinks { + margin-right: 20px; +} + +table.navLinks td a { + text-decoration: none; + text-transform: uppercase; + color: black; + font-size: 11px; +} + +a.navLinkPrevious { + padding-left: 12px; + background: url(../images/previous-arrow.png) no-repeat left center; +} + +a.navLinkNext { + padding-right: 12px; + background: url(../images/next-arrow.png) no-repeat right center; +} + +a#showHideButton { + padding-left: 20px; + background: url(../images/sidebar.png) no-repeat left center; +} + + +.filetree li span a { color: #777; } + +#treediv { -webkit-box-shadow: #CCC 0px 1px 2px 0px inset; } + +.legal, .legal *{ + color: #555; + text-align: center; + padding-bottom: 10px; +} + +.internal + { + color : #0000CC; + } + +.writeronly + { + color : red; + } + +.remark, .remark .added, .remark .changed, .remark .deleted{ + background: yellow; + } + +tr th, tr th .internal, tr th .added, tr th .changed + { + background: #00589E; + color: white; + font-weight: bold; + text-align: left; + } + +.statustext{ + position:fixed; + top:105px; + width: 0%; + height: 0%; + opacity: .3; + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -o-transform: rotate(90deg); + white-space: nowrap; + color: red; + font-weight: bold; + font-size: 2em; + margin-top: 30px; + } + +#toolbar { + width: 100%; + height: 33px; + position: fixed; + top: 93px; + z-index: 99; + left: 280px; + color: #333; + line-height: 28px; + padding-left: 10px; +} + +#toolbar-left { + position: relative; + left: 0px; +} + +body p.breadcrumbs { + margin: 0px; + padding: 0px; + line-height: 28px; +} + +body #content { + position: static; + margin-top: 126px; + top: 0px; +} + +<!-- +#header h1 { + position: fixed; + top: 35px; + left: -15px; + color: white!important; +} +--> + +body.sidebar #toolbar{ + left: 0px; +} + +body.sidebar #toolbar-left{ + left: 0px; +} + +div#toolbar-left img { + vertical-align: text-top; +} + + +div.note *, div.caution *, div.important *, div.tip *, div.warning * { + background: inherit !important; + color: inherit !important; + border: inherit !important; +} + +#content table thead, #content table th{ + background: gray; + color: white; + font-weight: bold; +} + +#content table caption{ + font-weight: bold; +} + +#content table td, #content table { + border: 1px solid black; +} + +#content table td, #content table th { + padding: 5px; +} + +#content table { + margin-bottom: 20px; + +} + +*[align = 'center']{ + text-align: center; +} Added: trunk/xsl/webhelp/template/common/images/main_bg_fade.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/main_bg_fade.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/next-arrow.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/next-arrow.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/previous-arrow.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/previous-arrow.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/sidebar.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/sidebar.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: trunk/xsl/webhelp/template/common/main.js =================================================================== --- trunk/xsl/webhelp/template/common/main.js 2011-09-16 19:51:38 UTC (rev 9063) +++ trunk/xsl/webhelp/template/common/main.js 2011-09-18 03:56:59 UTC (rev 9064) @@ -103,10 +103,10 @@ var ulNode = a.getElementsByTagName("ul")[0]; if (ulNode != undefined) { if (ulNode.hasAttribute("style")) { - ulNode.setAttribute("style", "display: block;"); + ulNode.setAttribute("style", "display: block; background-color: #D8D8D8 !important;"); } else { var ulStyle = document.createAttribute("style"); - ulStyle.nodeValue = "display: block;"; + ulStyle.nodeValue = "display: block; background-color: #D8D8D8 !important;"; ulNode.setAttributeNode(ulStyle); } } //adjust tree's + sign to - @@ -128,15 +128,16 @@ //Setting the background for selected node. var style = a.getAttribute("style", 2); if (style != null && !style.match(/background-color: Background;/)) { - a.setAttribute("style", "background-color: #6495ed; " + style); - b.setAttribute("style", "color: white;"); + a.setAttribute("style", "background-color: #D8D8D8; " + style); + b.setAttribute("style", "color: black;"); } else if (style != null || style != "") { - a.setAttribute("style", "background-color: #6495ed; " + style); - b.setAttribute("style", "color: white;"); + a.setAttribute("style", "background-color: #D8D8D8; " + style); + b.setAttribute("style", "color: black;"); } else { - a.setAttribute("style", "background-color: #6495ed; "); - b.setAttribute("style", "color: white;"); - } } + a.setAttribute("style", "background-color: #D8D8D8; "); + b.setAttribute("style", "color: black;"); + } + } //shows the node related to current content. //goes a recursive call from current node to ancestor nodes, displaying all of them. @@ -194,13 +195,13 @@ if (showHideButton != undefined && showHideButton.hasClass("pointLeft")) { //Hide TOC showHideButton.removeClass('pointLeft').addClass('pointRight'); - content.css("margin", "0 0 0 0"); + content.css("margin", "125px 0 0 0"); leftNavigation.css("display", "none"); showHideButton.attr("title", "Show the TOC tree"); } else { //Show the TOC showHideButton.removeClass('pointRight').addClass('pointLeft'); - content.css("margin", "0 0 0 280px"); + content.css("margin", "125px 0 0 280px"); leftNavigation.css("display", "block"); showHideButton.attr("title", "Hide the TOC Tree"); } Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-16 19:51:38 UTC (rev 9063) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-18 03:56:59 UTC (rev 9064) @@ -193,6 +193,16 @@ padding-left: 20px; background: transparent url(<xsl:value-of select="$webhelp.common.dir"/>jquery/treeview/images/folder.gif) 0 0px no-repeat; } + + /* Overide jquery treeview's defaults for ul. */ + .treeview ul { + background-color: #F0F0F0 !important; + margin-top: 4px; + } + + #webhelp-currentid { + background-color: #D8D8D8 !important; + } </style> <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"/> <link rel="stylesheet" type="text/css" href="{$webhelp.common.dir}css/positioning.css"/> @@ -444,11 +454,15 @@ <xsl:call-template name="user.footer.content"/> - <xsl:call-template name="footer.navigation"> + <hr/> + <div class="legal"><a href="index.html">Legal notices</a></div> + + <!-- Redundant since the upper navigation bar always visible --> + <!--xsl:call-template name="footer.navigation"> <xsl:with-param name="prev" select="$prev"/> <xsl:with-param name="next" select="$next"/> <xsl:with-param name="nav.context" select="$nav.context"/> - </xsl:call-template> + </xsl:call-template--> <xsl:call-template name="user.webhelp.content.footer"/> </div> @@ -473,8 +487,9 @@ <xsl:variable name="up" select="parent::*"/> <div id="header"> - <xsl:call-template name="webhelpheader.logo"/> - + <!--xsl:call-template name="webhelpheader.logo"/--> + <img style='margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px' align="right" + src='{$webhelp.common.dir}images/logo.png' alt="Company Logo"/> <!-- Display the page title and the main heading(parent) of it--> <h1 align="center"> <xsl:apply-templates select="." mode="object.title.markup"/> @@ -492,20 +507,20 @@ <div id="navheader" align="right"> <xsl:comment> <!-- KEEP this code. In case of neither prev nor next links are available, this will help to - keep the integrity of the DOM tree--> + keep the integrity of the DOM tree--> </xsl:comment> <!--xsl:with-param name="prev" select="$prev"/> <xsl:with-param name="next" select="$next"/> <xsl:with-param name="nav.context" select="$nav.context"/--> - <table> + <table class="navLinks"> <tr> - <td style="height: 28px; width: 16px;"> + <td> <a id="showHideButton" onclick="showHideToc();" - class="pointLeft" title="Hide TOC tree">. + class="pointLeft" title="Hide TOC tree">Sidebar </a> </td> <td> - <xsl:if test="$webhelp.include.search.tab = 'true'"> + <!--xsl:if test="$webhelp.include.search.tab = 'true'"> <img src="{$webhelp.common.dir}images/highlight-blue.gif" alt="H" height="25px" onclick="toggleHighlight()" id="showHideHighlight" style="cursor:pointer"> <xsl:attribute name="title"> @@ -514,16 +529,16 @@ </xsl:call-template> </xsl:attribute> </img> - </xsl:if> + </xsl:if--> </td> <xsl:if test="count($prev) > 0 - or (count($up) > 0 - and generate-id($up) != generate-id($home) - and $navig.showtitles != 0) - or count($next) > 0"> + or (count($up) > 0 + and generate-id($up) != generate-id($home) + and $navig.showtitles != 0) + or count($next) > 0"> <td> <xsl:if test="count($prev)>0"> - <a accesskey="p" tabindex="5"> + <a accesskey="p" class="navLinkPrevious" tabindex="5"> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$prev"/> @@ -540,7 +555,7 @@ <xsl:when test="count($up)>0 and generate-id($up) != generate-id($home)"> | - <a accesskey="u" tabindex="5"> + <a accesskey="u" class="navLinkUp" tabindex="5"> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$up"/> @@ -556,7 +571,7 @@ <xsl:if test="count($next)>0"> | - <a accesskey="n" tabindex="5"> + <a accesskey="n" class="navLinkNext" tabindex="5"> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$next"/> @@ -702,6 +717,7 @@ <div id="searchResults"> <center> </center> </div> + <p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p> </div> </xsl:if> <xsl:call-template name="user.webhelp.tabs.content"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-09-18 11:03:10
|
Revision: 9066 http://docbook.svn.sourceforge.net/docbook/?rev=9066&view=rev Author: kasunbg Date: 2011-09-18 11:03:04 +0000 (Sun, 18 Sep 2011) Log Message: ----------- Customized the left navagation headers; Contents and Search. Adding custom css for the current redmond ui of jquery-ui. These override jquery-ui's default css customizations. These are supposed to take precedence. Modified Paths: -------------- trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/xsl/webhelp.xsl Added Paths: ----------- trunk/xsl/webhelp/template/common/images/search-icon.png trunk/xsl/webhelp/template/common/images/toc-icon.png Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-18 04:19:15 UTC (rev 9065) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-18 11:03:04 UTC (rev 9066) @@ -81,6 +81,8 @@ z-index: 1500; border-right:2px solid #CCCCCC; background-color: #f0f0f0!important; + -webkit-box-shadow: inset 0px 1px 2px 0px #bdd1e5; + -moz-box-shadow: inset 0px 1px 2px 0px #bdd1e5; } #searchDiv { @@ -94,6 +96,8 @@ z-index: 1500; border-right:2px solid #CCCCCC; background-color: #f0f0f0!important; + -webkit-box-shadow: inset 0px 1px 2px 0px #bdd1e5; + -moz-box-shadow: inset 0px 1px 2px 0px #bdd1e5; } #content { Added: trunk/xsl/webhelp/template/common/images/search-icon.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/search-icon.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/toc-icon.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/toc-icon.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-18 04:19:15 UTC (rev 9065) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-18 11:03:04 UTC (rev 9066) @@ -181,39 +181,80 @@ <xsl:with-param name="key" select="'txt_results_for'"/> </xsl:call-template>"; </script> - <style type="text/css"> - input { - margin-bottom: 5px; - margin-top: 2px; - } - .folder { - display: block; - height: 22px; - padding-left: 20px; - background: transparent url(<xsl:value-of select="$webhelp.common.dir"/>jquery/treeview/images/folder.gif) 0 0px no-repeat; - } - - /* Overide jquery treeview's defaults for ul. */ - .treeview ul { - background-color: #F0F0F0 !important; - margin-top: 4px; - } - - #webhelp-currentid { - background-color: #D8D8D8 !important; - } - </style> <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"/> <link rel="stylesheet" type="text/css" href="{$webhelp.common.dir}css/positioning.css"/> <link rel="stylesheet" type="text/css" href="{$webhelp.common.dir}jquery/theme-redmond/jquery-ui-1.8.2.custom.css"/> <link rel="stylesheet" type="text/css" href="{$webhelp.common.dir}jquery/treeview/jquery.treeview.css"/> + <style type="text/css"> +input { + margin-bottom: 5px; + margin-top: 2px; +} +.folder { + display: block; + height: 22px; + padding-left: 20px; + background: transparent url(<xsl:value-of select="$webhelp.common.dir"/>jquery/treeview/images/folder.gif) 0 0px no-repeat; +} +span.contentsTab { + padding-left: 20px; + background: url(<xsl:value-of select="$webhelp.common.dir"/>images/toc-icon.png) no-repeat 0 center; +} +span.searchTab { + padding-left: 20px; + background: url(<xsl:value-of select="$webhelp.common.dir"/>images/search-icon.png) no-repeat 0 center; +} + +/* Overide jquery treeview's defaults for ul. */ +.treeview ul { + background-color: #F0F0F0 !important; + margin-top: 4px; +} +#webhelp-currentid { + background-color: #D8D8D8 !important; +} + +/* Override jquery-ui's default css customizations. These are supposed to take precedence over those.*/ +.ui-widget-content { + border: 0px; + background: none; + color: none; +} +.ui-widget-header { + color: #e9e8e9; + border-left: 1px solid #e5e5e5; + border-right: 1px solid #e5e5e5; + border-bottom: 1px solid #bbc4c5; + border-top: 4px solid #e5e5e5; + background: #F4F4F4; /* old browsers */ + background: -moz-linear-gradient(top, #F4F4F4 0%, #E6E4E5 100%); /* firefox */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F4F4F4), color-stop(100%,#E6E4E5)); /* webkit */ + font-weight: none; +} +.ui-widget-header a { color: none; } +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { +border: none; background: none; font-weight: none; color: none; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: black; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: none; background: none; font-weight: none; color: none; } + +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: none; background: none; font-weight: none; color: none; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { + color: black; text-decoration: none; + background: #C6C6C6; /* old browsers */ + background: -moz-linear-gradient(top, #C6C6C6 0%, #D8D8D8 100%); /* firefox */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#C6C6C6), color-stop(100%,#D8D8D8)); /* webkit */ + -webkit-border-radius:15px; -moz-border-radius:10px; + border: 1px solid #f1f1f1; +} + </style> + <!-- browserDetect is an Oxygen addition to warn the user if they're using chrome from the file system. This breaks the Oxygen search highlighting. --> - <script type="text/javascript" src="../common/browserDetect.js"> + <script type="text/javascript" src="{$webhelp.common.dir}browserDetect.js"> <xsl:comment> </xsl:comment> </script> <script type="text/javascript" src="{$webhelp.common.dir}jquery/jquery-1.4.2.min.js"> @@ -659,21 +700,21 @@ <ul> <li> <a href="#treeDiv" tabindex="1"> - <em> + <span class="contentsTab"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'TableofContents'"/> </xsl:call-template> - </em> + </span> </a> </li> <xsl:if test="$webhelp.include.search.tab != 'false'"> <li> <a href="#searchDiv" tabindex="1"> - <em> + <span class="searchTab"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Search'"/> </xsl:call-template> - </em> + </span> </a> </li> </xsl:if> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-09-18 11:24:10
|
Revision: 9067 http://docbook.svn.sourceforge.net/docbook/?rev=9067&view=rev Author: kasunbg Date: 2011-09-18 11:24:03 +0000 (Sun, 18 Sep 2011) Log Message: ----------- deleting svn:executable flag from webhelp files Property Changed: ---------------- trunk/xsl/webhelp/LICENSE trunk/xsl/webhelp/build.properties trunk/xsl/webhelp/build.xml trunk/xsl/webhelp/docsrc/readme.xml trunk/xsl/webhelp/template/common/css/ie.css trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/template/common/images/header-bg.gif trunk/xsl/webhelp/template/common/images/loading.gif trunk/xsl/webhelp/template/common/images/logo.png trunk/xsl/webhelp/template/common/images/main_bg_fade.png trunk/xsl/webhelp/template/common/images/next-arrow.png trunk/xsl/webhelp/template/common/images/previous-arrow.png trunk/xsl/webhelp/template/common/images/search-icon.png trunk/xsl/webhelp/template/common/images/showHideTreeIcons.png trunk/xsl/webhelp/template/common/images/sidebar.png trunk/xsl/webhelp/template/common/images/toc-icon.png trunk/xsl/webhelp/template/common/jquery/jquery-1.4.2.min.js trunk/xsl/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js trunk/xsl/webhelp/template/common/jquery/jquery.cookie.js trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png trunk/xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css trunk/xsl/webhelp/template/common/jquery/treeview/images/file.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/folder-closed.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/folder-closed2.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/folder.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/folder2.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/minus.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/plus.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-black-line.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-black.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-default-line.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-default.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam-line.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-gray-line.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-gray.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-red-line.gif trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-red.gif trunk/xsl/webhelp/template/common/jquery/treeview/jquery.treeview.css trunk/xsl/webhelp/template/common/jquery/treeview/jquery.treeview.min.js trunk/xsl/webhelp/template/common/main.js trunk/xsl/webhelp/template/content/images/sample.jpg trunk/xsl/webhelp/template/content/search/default.props trunk/xsl/webhelp/template/content/search/en-us.props trunk/xsl/webhelp/template/content/search/es-es.props trunk/xsl/webhelp/template/content/search/ja-jp.props trunk/xsl/webhelp/template/content/search/nwSearchFnt.js trunk/xsl/webhelp/template/content/search/punctuation.props trunk/xsl/webhelp/template/content/search/stemmers/de_stemmer.js trunk/xsl/webhelp/template/content/search/stemmers/en_stemmer.js trunk/xsl/webhelp/xsl/webhelp.xsl Property changes on: trunk/xsl/webhelp/LICENSE ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/build.properties ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/build.xml ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/docsrc/readme.xml ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/css/ie.css ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/css/positioning.css ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/header-bg.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/loading.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/logo.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/main_bg_fade.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/next-arrow.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/previous-arrow.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/search-icon.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/showHideTreeIcons.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/sidebar.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/images/toc-icon.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/jquery-1.4.2.min.js ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/jquery.cookie.js ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-anim_basic_16x16.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_flat_55_fbec88_40x100.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_75_d0e5f5_1x400.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_85_dfeffc_1x400.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_glass_95_fef1ec_1x400.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_217bc0_256x240.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_2e83ff_256x240.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_469bdd_256x240.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_6da8d5_256x240.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_d8e7f3_256x240.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/images/ui-icons_f9bd01_256x240.png ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/file.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/folder-closed.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/folder-closed2.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/folder.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/folder2.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/minus.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/plus.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-black-line.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-black.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-default-line.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-default.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam-line.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-famfamfam.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-gray-line.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-gray.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-red-line.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/images/treeview-red.gif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/jquery.treeview.css ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/jquery/treeview/jquery.treeview.min.js ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/common/main.js ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/content/images/sample.jpg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/content/search/default.props ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/content/search/en-us.props ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/content/search/es-es.props ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/content/search/ja-jp.props ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/content/search/nwSearchFnt.js ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/content/search/punctuation.props ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/content/search/stemmers/de_stemmer.js ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/template/content/search/stemmers/en_stemmer.js ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/xsl/webhelp/xsl/webhelp.xsl ___________________________________________________________________ Deleted: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-09-18 12:08:34
|
Revision: 9068 http://docbook.svn.sourceforge.net/docbook/?rev=9068&view=rev Author: kasunbg Date: 2011-09-18 12:08:27 +0000 (Sun, 18 Sep 2011) Log Message: ----------- adjustments to header title. Now output in Opera looks good. Modified Paths: -------------- trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-18 11:24:03 UTC (rev 9067) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-18 12:08:27 UTC (rev 9068) @@ -38,9 +38,19 @@ #header h1 { color: #fff; margin-left: 310px; + position: fixed; + top: 10px; + left: -15px; + color: white!important; } -#header h1, p.breadcrumbs { +/* +#header h1 { + margin-top: 2px; +} +*/ + +p.breadcrumbs { margin-top: 30px; margin-left: 310px; } @@ -282,12 +292,6 @@ FONT-SIZE: 1px; } -<!-- -#header h1 { - margin-top: 2px; -} ---> - table.navLinks { margin-right: 20px; } @@ -392,15 +396,6 @@ top: 0px; } -<!-- -#header h1 { - position: fixed; - top: 35px; - left: -15px; - color: white!important; -} ---> - body.sidebar #toolbar{ left: 0px; } Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-18 11:24:03 UTC (rev 9067) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-18 12:08:27 UTC (rev 9068) @@ -209,12 +209,14 @@ /* Overide jquery treeview's defaults for ul. */ .treeview ul { - background-color: #F0F0F0 !important; + background-color: transparent; margin-top: 4px; } #webhelp-currentid { background-color: #D8D8D8 !important; } +.treeview .hover { color: black; } +.filetree li span a { text-decoration: none; font-size: 12px; color: #517291; } /* Override jquery-ui's default css customizations. These are supposed to take precedence over those.*/ .ui-widget-content { @@ -248,6 +250,11 @@ -webkit-border-radius:15px; -moz-border-radius:10px; border: 1px solid #f1f1f1; } +.ui-corner-all { border-radius: 0 0 0 0; } + +.ui-tabs { padding: .2em;} +.ui-tabs .ui-tabs-nav li { top: 0px; margin: -2px 0 1px; text-transform: uppercase; font-size: 10.5px;} +.ui-tabs .ui-tabs-nav li a { padding: .25em 2em .25em 1em; margin: .5em; text-shadow: 0 1px 0 rgba(255,255,255,.5); } </style> <!-- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-09-21 18:14:56
|
Revision: 9076 http://docbook.svn.sourceforge.net/docbook/?rev=9076&view=rev Author: kasunbg Date: 2011-09-21 18:14:50 +0000 (Wed, 21 Sep 2011) Log Message: ----------- fix left navigation Modified Paths: -------------- trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-21 18:09:38 UTC (rev 9075) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-21 18:14:50 UTC (rev 9076) @@ -76,7 +76,7 @@ z-index: 1500; border-right:2px solid #bbc4c5; padding: 0px; - background-color: #f0f0f0!important; + background-color: #ededed!important; } #treeDiv { Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-21 18:09:38 UTC (rev 9075) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-21 18:14:50 UTC (rev 9076) @@ -230,6 +230,7 @@ border-right: 1px solid #e5e5e5; border-bottom: 1px solid #bbc4c5; border-top: 4px solid #e5e5e5; + border: medium none; background: #F4F4F4; /* old browsers */ background: -moz-linear-gradient(top, #F4F4F4 0%, #E6E4E5 100%); /* firefox */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F4F4F4), color-stop(100%,#E6E4E5)); /* webkit */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-09-21 18:32:10
|
Revision: 9077 http://docbook.svn.sourceforge.net/docbook/?rev=9077&view=rev Author: kasunbg Date: 2011-09-21 18:32:03 +0000 (Wed, 21 Sep 2011) Log Message: ----------- new header background image Modified Paths: -------------- trunk/xsl/webhelp/xsl/webhelp.xsl Added Paths: ----------- trunk/xsl/webhelp/template/common/images/header-bg.png Added: trunk/xsl/webhelp/template/common/images/header-bg.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/header-bg.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-21 18:14:50 UTC (rev 9076) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-21 18:32:03 UTC (rev 9077) @@ -695,7 +695,7 @@ </xsl:variable> <div> - <div id="leftnavigation" style="padding-top:3px; background-color:white;"> + <div id="leftnavigation" style="padding-top:3px;"> <div id="tabs"> <ul> <li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2011-09-22 22:04:36
|
Revision: 9086 http://docbook.svn.sourceforge.net/docbook/?rev=9086&view=rev Author: kosek Date: 2011-09-22 22:04:30 +0000 (Thu, 22 Sep 2011) Log Message: ----------- Minor cleanup, added extensibility hook, some styling moved into CSS for easier customization Modified Paths: -------------- trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-22 14:46:52 UTC (rev 9085) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-22 22:04:30 UTC (rev 9086) @@ -131,6 +131,7 @@ padding-left: 10px; right: 0px; top: 37px; + text-align: right; } #content h1, #content h2 { color: black; } Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-22 14:46:52 UTC (rev 9085) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-22 22:04:30 UTC (rev 9086) @@ -3,7 +3,8 @@ xmlns:exsl="http://exslt.org/common" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" - version="1.0" xmlns="http://www.w3.org/1999/xhtml"> + version="1.0" xmlns="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="exsl ng db"> <xsl:import href="../../xhtml/chunk.xsl"/> @@ -150,11 +151,13 @@ <meta http-equiv="X-UA-Compatible" content="IE=7" /> <xsl:text> </xsl:text> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> +<xsl:text> +</xsl:text> </xsl:template> <!-- HTML <head> section customizations --> <xsl:template name="user.head.content"> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <!-- <xsl:message> webhelp.tree.cookie.id = <xsl:value-of select="$webhelp.tree.cookie.id"/> +++ <xsl:value-of select="count(//node())"/> $webhelp.indexer.language = <xsl:value-of select="$webhelp.indexer.language"/> +++ <xsl:value-of select="count(//node())"/> @@ -545,7 +548,8 @@ </h1> <!-- Prev and Next links generation--> - <div id="navheader" align="right"> + <div id="navheader"> + <xsl:call-template name="user.webhelp.navheader.content"/> <xsl:comment> <!-- KEEP this code. In case of neither prev nor next links are available, this will help to keep the integrity of the DOM tree--> @@ -636,6 +640,8 @@ src='{$webhelp.common.dir}images/logo.png' alt="Company Logo"/> </xsl:template> + <xsl:template name="user.webhelp.navheader.content"/> + <xsl:template name="webhelptoc"> <xsl:param name="currentid"/> <xsl:choose> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-10-01 04:45:44
|
Revision: 9098 http://docbook.svn.sourceforge.net/docbook/?rev=9098&view=rev Author: kasunbg Date: 2011-10-01 04:45:37 +0000 (Sat, 01 Oct 2011) Log Message: ----------- webhelp xsl cleanup. Added the missing chapter title. Modified Paths: -------------- trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2011-09-30 19:21:02 UTC (rev 9097) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2011-10-01 04:45:37 UTC (rev 9098) @@ -141,12 +141,12 @@ /* Show Hide TOC tree */ .pointLeft { - padding-right: 5px; + padding-right: 15px; display: block; cursor: pointer; } .pointRight { - padding-right: 5px; + padding-right: 15px; display: block; cursor: pointer; } Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-09-30 19:21:02 UTC (rev 9097) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-10-01 04:45:37 UTC (rev 9098) @@ -47,8 +47,10 @@ <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="chunk.section.depth" select="100"/> <xsl:param name="chapter.autolabel" select="1"/> <xsl:param name="section.autolabel" select="0"/> + <xsl:param name="generate.section.toc.level" select="5"/> <!--xsl:param name="generate.toc">book toc</xsl:param--> <!-- Localizations of webhelp specific words. Your contributions for other languages are appreciated. @@ -66,8 +68,8 @@ <l:gentext key="txt_please_wait" text="Please wait. Search in progress..."/> <l:gentext key="txt_results_for" text="Results for: "/> <l:gentext key="TableofContents" text="Contents"/> - <l:gentext key="HighlightButton" text="Toggle search result highlighting"/> - <l:gentext key="Your_search_returned_no_results" text="Your search returned no results."/> + <l:gentext key="HighlightButton" text="Toggle search result highlighting"/> + <l:gentext key="Your_search_returned_no_results" text="Your search returned no results."/> </l10n> <!-- The fallback mechansim doesn't seem to work for local l10n stuff --> <l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ja"> @@ -541,12 +543,21 @@ <xsl:variable name="up" select="parent::*"/> <div id="header"> - <!--xsl:call-template name="webhelpheader.logo"/--> - <img style='margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px' align="right" - src='{$webhelp.common.dir}images/logo.png' alt="Company Logo"/> + <!--xsl:call-template name="webhelpheader.logo"/--> + <img style='margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px' align="right" + src='{$webhelp.common.dir}images/logo.png' alt="Company Logo"/> <!-- Display the page title and the main heading(parent) of it--> <h1 align="center"> - <xsl:call-template name="get.doc.title"/> + <xsl:call-template name="get.doc.title"/> + <br/> + <xsl:choose> + <xsl:when + test="count($up) > 0 and generate-id($up) != generate-id($home)"> + <xsl:apply-templates select="$up" mode="object.title.markup"/> + </xsl:when> + <xsl:otherwise> </xsl:otherwise> + </xsl:choose> + </h1> <!-- Prev and Next links generation--> @@ -566,18 +577,6 @@ class="pointLeft" title="Hide TOC tree">Sidebar </a> </td> - <td> - <!--xsl:if test="$webhelp.include.search.tab = 'true'"> - <img src="{$webhelp.common.dir}images/highlight-blue.gif" alt="H" height="25px" - onclick="toggleHighlight()" id="showHideHighlight" style="cursor:pointer"> - <xsl:attribute name="title"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'HighlightButton'"/> - </xsl:call-template> - </xsl:attribute> - </img> - </xsl:if--> - </td> <xsl:if test="count($prev) > 0 or (count($up) > 0 and generate-id($up) != generate-id($home) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-10-01 06:02:05
|
Revision: 9100 http://docbook.svn.sourceforge.net/docbook/?rev=9100&view=rev Author: kasunbg Date: 2011-10-01 06:01:59 +0000 (Sat, 01 Oct 2011) Log Message: ----------- webhelp xsl customization - logo Modified Paths: -------------- trunk/xsl/webhelp/build.properties trunk/xsl/webhelp/build.xml trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/build.properties =================================================================== --- trunk/xsl/webhelp/build.properties 2011-10-01 05:53:13 UTC (rev 9099) +++ trunk/xsl/webhelp/build.properties 2011-10-01 06:01:59 UTC (rev 9100) @@ -51,3 +51,5 @@ #Set the table of contents file. This file will not be indexed. #toc.file=dummy.html +branding=docbook +brandname=DocBook Modified: trunk/xsl/webhelp/build.xml =================================================================== --- trunk/xsl/webhelp/build.xml 2011-10-01 05:53:13 UTC (rev 9099) +++ trunk/xsl/webhelp/build.xml 2011-10-01 06:01:59 UTC (rev 9100) @@ -37,6 +37,8 @@ <param name="output_file_name" expression="${output_file_name}"/> <param name="webhelp.base.dir" expression="${output-dir}" if="output-dir"/> <param name="webhelp.indexer.language" expression="${webhelp.indexer.language}" if="webhelp.indexer.language"/> + <param name="branding" expression="${branding}" if="branding"/> + <param name="brandname" expression="${brandname}" if="brandname"/> </xslt> <delete file="${output-dir}/dummy.html"/> Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2011-10-01 05:53:13 UTC (rev 9099) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2011-10-01 06:01:59 UTC (rev 9100) @@ -163,7 +163,7 @@ } .searchresult li { color: #0050A0; } .shortdesclink { color: gray; font-size: 9pt; } -.searchText { width: 12em } +.searchText { width: 11em } .searchButton { margin-left: 3px; background: #F4F4F4; Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-10-01 05:53:13 UTC (rev 9099) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-10-01 06:01:59 UTC (rev 9100) @@ -47,12 +47,45 @@ <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="chunk.section.depth" select="100"/> + <xsl:param name="chunk.section.depth" select="1"/> + <xsl:param name="use.id.as.filename" select="1"/> + <xsl:param name="branding">not set</xsl:param> + <xsl:param name="brandname"> </xsl:param> + + <xsl:param name="section.autolabel" select="1"/> <xsl:param name="chapter.autolabel" select="1"/> - <xsl:param name="section.autolabel" select="0"/> + <xsl:param name="appendix.autolabel" select="1"/> + <xsl:param name="qandadiv.autolabel" select="1"/> + <xsl:param name="reference.autolabel" select="1"/> + <xsl:param name="part.autolabel" select="1"/> + <xsl:param name="section.autolabel.max.depth" select="3"/> + <xsl:param name="section.label.includes.component.label" select="1"/> + <xsl:param name="generate.section.toc.level" select="5"/> + <xsl:param name="component.label.includes.part.label" select="1"/> + <xsl:param name="suppress.footer.navigation">1</xsl:param> <!--xsl:param name="generate.toc">book toc</xsl:param--> +<xsl:param name="generate.toc"> +appendix toc,title +article/appendix nop +article toc,title +book title,figure,table,example,equation +chapter toc,title +part toc,title +preface toc,title +qandadiv toc +qandaset toc +reference toc,title +sect1 toc +sect2 toc +sect3 toc +sect4 toc +sect5 toc +section toc +set toc,title +</xsl:param> + <!-- Localizations of webhelp specific words. Your contributions for other languages are appreciated. Currently, only around 10 translations needed. --> <i18n xmlns="http://docbook.sourceforge.net/xmlns/l10n/1.0"> @@ -543,9 +576,16 @@ <xsl:variable name="up" select="parent::*"/> <div id="header"> - <!--xsl:call-template name="webhelpheader.logo"/--> + <a target="_blank"> + <xsl:attribute name="href"> + <xsl:choose> + <xsl:when test="$branding = 'docbook'">http://docbook.org/</xsl:when> + <xsl:otherwise>#</xsl:otherwise> + </xsl:choose> + </xsl:attribute> <img style='margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px' align="right" - src='{$webhelp.common.dir}images/logo.png' alt="Company Logo"/> + src='{$webhelp.common.dir}images/logo.png' alt="{$brandname} Documentation"/> + </a> <!-- Display the page title and the main heading(parent) of it--> <h1 align="center"> <xsl:call-template name="get.doc.title"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-10-02 05:44:28
|
Revision: 9104 http://docbook.svn.sourceforge.net/docbook/?rev=9104&view=rev Author: kasunbg Date: 2011-10-02 05:44:22 +0000 (Sun, 02 Oct 2011) Log Message: ----------- webhelp - animations for show/hide Sidebar Modified Paths: -------------- trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/template/common/main.js trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2011-10-01 17:07:47 UTC (rev 9103) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2011-10-02 05:44:22 UTC (rev 9104) @@ -18,9 +18,7 @@ h1 { font: 15pt Arial, Helvetica, geneva; color: black!important!; } -h2 { font: normal 12pt Arial, Helvetica, geneva; - color: black!important; -} +h2 { font: normal 12pt Arial, Helvetica, geneva; } #header { background: url("../images/header-bg.png") scroll top left repeat-x #4d8c83; @@ -36,12 +34,11 @@ } #header h1 { - color: #fff; margin-left: 310px; position: fixed; top: 10px; left: -15px; - color: black!important; + color: #404040 !important; } /* @@ -134,7 +131,11 @@ text-align: right; } -#content h1, #content h2 { color: black; } +#content h1, #content h2 { +color: #404040 !important; +font-size: 170%; +font-weight: normal; +} .navfooter { bottom: 2%; } .highlight { background-color: #c5d3c3; } .highlightButton{ font-size: 0; } Modified: trunk/xsl/webhelp/template/common/main.js =================================================================== --- trunk/xsl/webhelp/template/common/main.js 2011-10-01 17:07:47 UTC (rev 9103) +++ trunk/xsl/webhelp/template/common/main.js 2011-10-02 05:44:22 UTC (rev 9104) @@ -12,6 +12,9 @@ persist: "cookie" }; +//Turn ON and OFF the animations for Show/Hide Sidebar. Extend this to other anime as well if any. +var noAnimations=false; + $(document).ready(function() { @@ -189,21 +192,33 @@ */ function showHideToc() { var showHideButton = $("#showHideButton"); - var leftNavigation = $("#leftnavigation"); + var leftNavigation = $("#sidebar"); var content = $("#content"); + var animeTime=75 if (showHideButton != undefined && showHideButton.hasClass("pointLeft")) { //Hide TOC showHideButton.removeClass('pointLeft').addClass('pointRight'); - content.css("margin", "125px 0 0 0"); - leftNavigation.css("display", "none"); - showHideButton.attr("title", "Show the TOC tree"); + + if(noAnimations) { + leftNavigation.css("display", "none"); + content.css("margin", "125px 0 0 0"); + } else { + leftNavigation.hide(animeTime); + content.animate( { "margin-left": 0 }, animeTime); + } + showHideButton.attr("title", "Show Sidebar"); } else { //Show the TOC showHideButton.removeClass('pointRight').addClass('pointLeft'); - content.css("margin", "125px 0 0 280px"); - leftNavigation.css("display", "block"); - showHideButton.attr("title", "Hide the TOC Tree"); + if(noAnimations) { + content.css("margin", "125px 0 0 280px"); + leftNavigation.css("display", "block"); + } else { + content.animate( { "margin-left": '280px' }, animeTime); + leftNavigation.show(animeTime); + } + showHideButton.attr("title", "Hide Sidebar"); } } Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-10-01 17:07:47 UTC (rev 9103) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-10-02 05:44:22 UTC (rev 9104) @@ -741,7 +741,7 @@ </xsl:choose> </xsl:variable> - <div> + <div id="sidebar"> <!--#sidebar id is used for showing and hiding the side bar --> <div id="leftnavigation" style="padding-top:3px;"> <div id="tabs"> <ul> @@ -933,8 +933,7 @@ <head> <link rel="shortcut icon" href="favicon.ico"/> <meta http-equiv="Refresh" content="1; URL=content/{$default.topic}"/> - <title><xsl:value-of select="//title[1]"/>  - </title> + <title><xsl:value-of select="//title[1]"/> </title> </head> <body> If not automatically redirected, click <a href="content/{$default.topic}">content/<xsl:value-of select="$default.topic"/></a> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-10-02 08:42:19
|
Revision: 9106 http://docbook.svn.sourceforge.net/docbook/?rev=9106&view=rev Author: kasunbg Date: 2011-10-02 08:42:12 +0000 (Sun, 02 Oct 2011) Log Message: ----------- webhelp - adding callouts Modified Paths: -------------- trunk/xsl/webhelp/xsl/webhelp.xsl Added Paths: ----------- trunk/xsl/webhelp/template/common/images/callouts/ trunk/xsl/webhelp/template/common/images/callouts/1.png trunk/xsl/webhelp/template/common/images/callouts/10.png trunk/xsl/webhelp/template/common/images/callouts/11.png trunk/xsl/webhelp/template/common/images/callouts/12.png trunk/xsl/webhelp/template/common/images/callouts/13.png trunk/xsl/webhelp/template/common/images/callouts/14.png trunk/xsl/webhelp/template/common/images/callouts/15.png trunk/xsl/webhelp/template/common/images/callouts/16.png trunk/xsl/webhelp/template/common/images/callouts/17.png trunk/xsl/webhelp/template/common/images/callouts/18.png trunk/xsl/webhelp/template/common/images/callouts/19.png trunk/xsl/webhelp/template/common/images/callouts/2.png trunk/xsl/webhelp/template/common/images/callouts/20.png trunk/xsl/webhelp/template/common/images/callouts/21.png trunk/xsl/webhelp/template/common/images/callouts/22.png trunk/xsl/webhelp/template/common/images/callouts/23.png trunk/xsl/webhelp/template/common/images/callouts/24.png trunk/xsl/webhelp/template/common/images/callouts/25.png trunk/xsl/webhelp/template/common/images/callouts/26.png trunk/xsl/webhelp/template/common/images/callouts/27.png trunk/xsl/webhelp/template/common/images/callouts/28.png trunk/xsl/webhelp/template/common/images/callouts/29.png trunk/xsl/webhelp/template/common/images/callouts/3.png trunk/xsl/webhelp/template/common/images/callouts/30.png trunk/xsl/webhelp/template/common/images/callouts/4.png trunk/xsl/webhelp/template/common/images/callouts/5.png trunk/xsl/webhelp/template/common/images/callouts/6.png trunk/xsl/webhelp/template/common/images/callouts/7.png trunk/xsl/webhelp/template/common/images/callouts/8.png trunk/xsl/webhelp/template/common/images/callouts/9.png Added: trunk/xsl/webhelp/template/common/images/callouts/1.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/1.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/10.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/10.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/11.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/11.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/12.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/12.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/13.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/13.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/14.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/14.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/15.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/15.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/16.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/16.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/17.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/17.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/18.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/18.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/19.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/19.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/2.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/2.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/20.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/20.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/21.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/21.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/22.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/22.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/23.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/23.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/24.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/24.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/25.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/25.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/26.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/26.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/27.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/27.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/28.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/28.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/29.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/29.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/3.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/3.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/30.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/30.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/4.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/4.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/5.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/5.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/6.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/6.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/7.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/7.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/8.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/8.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/callouts/9.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/callouts/9.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-10-02 06:38:19 UTC (rev 9105) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-10-02 08:42:12 UTC (rev 9106) @@ -64,6 +64,8 @@ <xsl:param name="generate.section.toc.level" select="5"/> <xsl:param name="component.label.includes.part.label" select="1"/> <xsl:param name="suppress.footer.navigation">1</xsl:param> + <xsl:param name="callout.graphics.path"><xsl:value-of select="$webhelp.common.dir"/>images/callouts/</xsl:param> + <xsl:param name="callouts.extension">1</xsl:param> <!--xsl:param name="generate.toc">book toc</xsl:param--> <xsl:param name="generate.toc"> @@ -878,7 +880,7 @@ <xsl:template name="user.footer.content"> <script type="text/javascript" src="{$webhelp.common.dir}main.js"> - <xsl:comment></xsl:comment> + <xsl:comment> </xsl:comment> </script> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2011-10-03 19:13:33
|
Revision: 9110 http://docbook.svn.sourceforge.net/docbook/?rev=9110&view=rev Author: kasunbg Date: 2011-10-03 19:13:27 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Webhelp ant script changes - HTML transformation support for WebHelp - Uses Tagsoup for parsing the bad html. tagsoup-1.2.1.jar is added to trunk/xsl-webhelpindexer/lib/ Modified Paths: -------------- trunk/xsl/webhelp/build.xml trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/build.xml =================================================================== --- trunk/xsl/webhelp/build.xml 2011-10-03 19:07:29 UTC (rev 9109) +++ trunk/xsl/webhelp/build.xml 2011-10-03 19:13:27 UTC (rev 9110) @@ -10,6 +10,7 @@ <pathelement location="${extensions.dir}/webhelpindexer.jar"/> <pathelement location="${extensions.dir}/lucene-analyzers-3.0.0.jar"/> <pathelement location="${extensions.dir}/lucene-core-3.0.0.jar"/> + <pathelement location="${extensions.dir}/tagsoup-1.2.1.jar"/> </path> <condition property="perform-validation-dtd"> @@ -87,13 +88,25 @@ <echo>Indexing html files in ${output-dir}/content</echo> - <java classname="com.nexwave.nquindexer.IndexerMain"> + <java classname="com.nexwave.nquindexer.IndexerMain" fork="true"> <sysproperty key="htmlDir" value="${output-dir}/content"/> <sysproperty key="indexerLanguage" value="${webhelp.indexer.language}"/> <sysproperty key="htmlExtension" value="${html.extension}"/> <sysproperty key="doStem" value="${enable.stemming}"/> <sysproperty key="tocFile" value="${toc.file}"/> + <!--TagSoup SAX Parser for parsing even the bad html contents. see + http://sourceforge.net/tracker/?func=detail&aid=3401185&group_id=21935&atid=373750--> + <sysproperty key="org.xml.sax.driver" value="org.ccil.cowan.tagsoup.Parser"/> + <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.ccil.cowan.tagsoup.jaxp.SAXFactoryImpl"/> + + <!-- Uncomment the following if Xerces is your preference as the SAX XML Parser. Note that the indexing will fail with Xerces + if the html files are not XML-conformance --> + <!--sysproperty key="org.xml.sax.driver" value="org.apache.xerces.parsers.SAXParser"/> + <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/--> + + <!-- Debug the indexer on port 5005 via remote-debug --> + <!--jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/--> <classpath> <path refid="classpath"/> <pathelement location="/usr/share/java/xercesImpl.jar"/> @@ -104,8 +117,6 @@ </classpath> </java> - <!--indexertask htmldir="${output-dir}/content" indexerLanguage="${webhelp.indexer.language}"/--> - <delete> <fileset dir="${output-dir}/content/search" includes="*.props"/> </delete> Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2011-10-03 19:07:29 UTC (rev 9109) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2011-10-03 19:13:27 UTC (rev 9110) @@ -8,7 +8,6 @@ <xsl:import href="../../xhtml/chunk.xsl"/> - <xsl:output method="html" encoding="utf-8" @@ -20,7 +19,6 @@ <xsl:otherwise>html</xsl:otherwise> </xsl:choose> </xsl:param> - <!-- webhelp-specific params! --> <!-- To be added to normal params file someday --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-01-13 14:55:48
|
Revision: 9181 http://docbook.svn.sourceforge.net/docbook/?rev=9181&view=rev Author: dcramer Date: 2012-01-13 14:55:38 +0000 (Fri, 13 Jan 2012) Log Message: ----------- Webhelp: Turn on navfooter and fix related css Modified Paths: -------------- trunk/xsl/webhelp/template/common/css/positioning.css trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/template/common/css/positioning.css =================================================================== --- trunk/xsl/webhelp/template/common/css/positioning.css 2012-01-13 14:39:12 UTC (rev 9180) +++ trunk/xsl/webhelp/template/common/css/positioning.css 2012-01-13 14:55:38 UTC (rev 9181) @@ -350,3 +350,7 @@ #content table {margin-bottom: 20px;} *[align = 'center']{ text-align: center;} + +#content .navfooter table, #content .navfooter table td { + border: 0px solid; +} Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2012-01-13 14:39:12 UTC (rev 9180) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2012-01-13 14:55:38 UTC (rev 9181) @@ -73,7 +73,7 @@ <xsl:param name="generate.section.toc.level" select="5"/> <xsl:param name="component.label.includes.part.label" select="1"/> - <xsl:param name="suppress.footer.navigation">1</xsl:param> + <xsl:param name="suppress.footer.navigation">0</xsl:param> <xsl:param name="callout.graphics.path"><xsl:value-of select="$webhelp.common.dir"/>images/callouts/</xsl:param> <xsl:param name="callouts.extension">1</xsl:param> <!--xsl:param name="generate.toc">book toc</xsl:param--> @@ -552,15 +552,12 @@ <xsl:call-template name="user.footer.content"/> - <hr/> - <div class="legal"><a href="index.html">Legal notices</a></div> - <!-- Redundant since the upper navigation bar always visible --> - <!--xsl:call-template name="footer.navigation"> + <xsl:call-template name="footer.navigation"> <xsl:with-param name="prev" select="$prev"/> <xsl:with-param name="next" select="$next"/> <xsl:with-param name="nav.context" select="$nav.context"/> - </xsl:call-template--> + </xsl:call-template> <xsl:call-template name="user.webhelp.content.footer"/> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-01-13 15:31:49
|
Revision: 9182 http://docbook.svn.sourceforge.net/docbook/?rev=9182&view=rev Author: dcramer Date: 2012-01-13 15:31:40 +0000 (Fri, 13 Jan 2012) Log Message: ----------- Webhelp: Support admon graphics (still off by default) Modified Paths: -------------- trunk/xsl/webhelp/xsl/webhelp.xsl Added Paths: ----------- trunk/xsl/webhelp/template/common/images/admon/ trunk/xsl/webhelp/template/common/images/admon/caution.png trunk/xsl/webhelp/template/common/images/admon/important.png trunk/xsl/webhelp/template/common/images/admon/note.png trunk/xsl/webhelp/template/common/images/admon/tip.png trunk/xsl/webhelp/template/common/images/admon/warning.png Added: trunk/xsl/webhelp/template/common/images/admon/caution.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/admon/caution.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/admon/important.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/admon/important.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/admon/note.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/admon/note.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/admon/tip.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/admon/tip.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/xsl/webhelp/template/common/images/admon/warning.png =================================================================== (Binary files differ) Property changes on: trunk/xsl/webhelp/template/common/images/admon/warning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2012-01-13 14:55:38 UTC (rev 9181) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2012-01-13 15:31:40 UTC (rev 9182) @@ -76,6 +76,8 @@ <xsl:param name="suppress.footer.navigation">0</xsl:param> <xsl:param name="callout.graphics.path"><xsl:value-of select="$webhelp.common.dir"/>images/callouts/</xsl:param> <xsl:param name="callouts.extension">1</xsl:param> + <xsl:param name="admon.graphics.path"><xsl:value-of select="$webhelp.common.dir"/>images/admon/</xsl:param> + <xsl:param name="admon.graphics" select="0"/> <!--xsl:param name="generate.toc">book toc</xsl:param--> <xsl:param name="generate.toc"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-01-13 17:28:41
|
Revision: 9185 http://docbook.svn.sourceforge.net/docbook/?rev=9185&view=rev Author: dcramer Date: 2012-01-13 17:28:30 +0000 (Fri, 13 Jan 2012) Log Message: ----------- Webhelp: Support admon.graphics param in build.properties Modified Paths: -------------- trunk/xsl/webhelp/build.properties trunk/xsl/webhelp/build.xml Modified: trunk/xsl/webhelp/build.properties =================================================================== --- trunk/xsl/webhelp/build.properties 2012-01-13 16:05:13 UTC (rev 9184) +++ trunk/xsl/webhelp/build.properties 2012-01-13 17:28:30 UTC (rev 9185) @@ -55,3 +55,6 @@ #For example, the url docbook.org, Google Analytics id etc. branding=docbook brandname=DocBook + +# Set admon.graphics to 1 to user graphics for note, tip, etc. +admon.graphics=0 \ No newline at end of file Modified: trunk/xsl/webhelp/build.xml =================================================================== --- trunk/xsl/webhelp/build.xml 2012-01-13 16:05:13 UTC (rev 9184) +++ trunk/xsl/webhelp/build.xml 2012-01-13 17:28:30 UTC (rev 9185) @@ -66,6 +66,7 @@ <param name="webhelp.indexer.language" expression="${webhelp.indexer.language}" if="webhelp.indexer.language"/> <param name="branding" expression="${branding}" if="branding"/> <param name="brandname" expression="${brandname}" if="brandname"/> + <param name="admon.graphics" expression="${admon.graphics}" if="admon.graphics"/> </xslt> <!-- Copy common content such as js files of tree, css etc. to template folder. They will be copied to doc folder. They are NOT page specific! --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-01-13 17:34:03
|
Revision: 9186 http://docbook.svn.sourceforge.net/docbook/?rev=9186&view=rev Author: dcramer Date: 2012-01-13 17:33:56 +0000 (Fri, 13 Jan 2012) Log Message: ----------- Webhelp: Support setting suppress.footer.navigation from build.properties Modified Paths: -------------- trunk/xsl/webhelp/build.properties trunk/xsl/webhelp/build.xml Modified: trunk/xsl/webhelp/build.properties =================================================================== --- trunk/xsl/webhelp/build.properties 2012-01-13 17:28:30 UTC (rev 9185) +++ trunk/xsl/webhelp/build.properties 2012-01-13 17:33:56 UTC (rev 9186) @@ -57,4 +57,5 @@ brandname=DocBook # Set admon.graphics to 1 to user graphics for note, tip, etc. -admon.graphics=0 \ No newline at end of file +admon.graphics=0 +suppress.footer.navigation=1 \ No newline at end of file Modified: trunk/xsl/webhelp/build.xml =================================================================== --- trunk/xsl/webhelp/build.xml 2012-01-13 17:28:30 UTC (rev 9185) +++ trunk/xsl/webhelp/build.xml 2012-01-13 17:33:56 UTC (rev 9186) @@ -67,6 +67,7 @@ <param name="branding" expression="${branding}" if="branding"/> <param name="brandname" expression="${brandname}" if="brandname"/> <param name="admon.graphics" expression="${admon.graphics}" if="admon.graphics"/> + <param name="suppress.footer.navigation" expression="${suppress.footer.navigation}" if="suppress.footer.navigation"/> </xslt> <!-- Copy common content such as js files of tree, css etc. to template folder. They will be copied to doc folder. They are NOT page specific! --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-01-14 17:33:32
|
Revision: 9190 http://docbook.svn.sourceforge.net/docbook/?rev=9190&view=rev Author: dcramer Date: 2012-01-14 17:33:26 +0000 (Sat, 14 Jan 2012) Log Message: ----------- Webhelp: Cleanup related to en_stemmer.js changes Modified Paths: -------------- trunk/xsl/webhelp/docsrc/xinclude-test.xml trunk/xsl/webhelp/template/content/search/stemmers/en_stemmer.js Modified: trunk/xsl/webhelp/docsrc/xinclude-test.xml =================================================================== --- trunk/xsl/webhelp/docsrc/xinclude-test.xml 2012-01-13 17:53:36 UTC (rev 9189) +++ trunk/xsl/webhelp/docsrc/xinclude-test.xml 2012-01-14 17:33:26 UTC (rev 9190) @@ -3,14 +3,11 @@ <chapter> <title>Test section</title> <section> - <title>Some problematic search words</title> - <para>buy, say, by, vary, try, sky, nucleus, day, key, currency, currencies, build.xml, foo</para> + <title>Some search words for testing</title> + <para>arsenal, arsenic, buy, say, by, vary, try, sky, nucleus, day, key, currency, currencies, build.xml</para> </section> <section> - <title>Some problematic search words (inflected)</title> - <para>buys, says, varies, tries, skies, nuclei, days, keys, currencies, build.xml, foo.</para> - <note> - <para>Test of admon graphics</para> - </note> + <title>Some search words for testing (inflected)</title> + <para>arsenal, arsenic, buys, says, varies, tries, skies, nuclei, days, keys, currencies, build.xml</para> </section> </chapter> \ No newline at end of file Modified: trunk/xsl/webhelp/template/content/search/stemmers/en_stemmer.js =================================================================== --- trunk/xsl/webhelp/template/content/search/stemmers/en_stemmer.js 2012-01-13 17:53:36 UTC (rev 9189) +++ trunk/xsl/webhelp/template/content/search/stemmers/en_stemmer.js 2012-01-14 17:33:26 UTC (rev 9190) @@ -206,8 +206,7 @@ w = origword; } - // These are all overstemmed as gener- - // What about commun- words? + // Address words overstemmed as gener- re = /.*generate?s?d?(ing)?$/; if( re.test(origword) ){ w = w + 'at'; @@ -224,7 +223,7 @@ if( re.test(origword) ){ w = w + 'ous'; } - // These are overstemmed as commun- + // Address words overstemmed as commun- re = /.*communit(ies)?y?/; if( re.test(origword) ){ w = w + 'iti'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-01-14 21:57:48
|
Revision: 9192 http://docbook.svn.sourceforge.net/docbook/?rev=9192&view=rev Author: dcramer Date: 2012-01-14 21:57:41 +0000 (Sat, 14 Jan 2012) Log Message: ----------- Move paths to xercesImpl and xml-apis jars into build.properties Modified Paths: -------------- trunk/xsl/webhelp/build.properties trunk/xsl/webhelp/build.xml Modified: trunk/xsl/webhelp/build.properties =================================================================== --- trunk/xsl/webhelp/build.properties 2012-01-14 18:46:45 UTC (rev 9191) +++ trunk/xsl/webhelp/build.properties 2012-01-14 21:57:41 UTC (rev 9192) @@ -24,8 +24,14 @@ # and uncomment this line. #input-images-basedir=/path/to/image/location -# Modify this so that it points to your copy of the Saxon 6.5 jar. +# Modify the follosing so that they point to your local +# copy of the jars indicated: +# * Saxon 6.5 jar +# * Xerces 2: xercesImpl.jar +# * xml-commons: xml-apis.jar xslt-processor-classpath=/usr/share/java/saxon-6.5.5.jar +xercesImpl.jar=/usr/share/java/xercesImpl.jar +xml-apis.jar=/usr/share/java/xml-apis.jar # For non-ns version only, this validates the document # against a dtd. Modified: trunk/xsl/webhelp/build.xml =================================================================== --- trunk/xsl/webhelp/build.xml 2012-01-14 18:46:45 UTC (rev 9191) +++ trunk/xsl/webhelp/build.xml 2012-01-14 21:57:41 UTC (rev 9192) @@ -135,8 +135,10 @@ <!--jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/--> <classpath> <path refid="classpath"/> - <pathelement location="/usr/share/java/xercesImpl.jar"/> - <pathelement location="/usr/share/java/xml-apis.jar"/> + <pathelement location="${xercesImpl.jar}"/> + <pathelement location="${xml-apis.jar}"/> + <!-- <pathelement location="/usr/share/java/xercesImpl.jar"/> --> + <!-- <pathelement location="/usr/share/java/xml-apis.jar"/> --> <!-- Gentoo Linux friendly default classpath--> <pathelement location="/usr/share/xerces-2/lib/xercesImpl.jar"/> <pathelement location="/usr/share/xml-commons/lib/xml-apis.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2012-01-28 16:39:35
|
Revision: 9199 http://docbook.svn.sourceforge.net/docbook/?rev=9199&view=rev Author: kasunbg Date: 2012-01-28 16:39:29 +0000 (Sat, 28 Jan 2012) Log Message: ----------- If an user moved to another page by clicking on a toc link, and then clicked on #searchDiv, search should be performed if the cookie textToSearch is not empty. Modified Paths: -------------- trunk/xsl/webhelp/template/common/main.js trunk/xsl/webhelp/xsl/webhelp.xsl Modified: trunk/xsl/webhelp/template/common/main.js =================================================================== --- trunk/xsl/webhelp/template/common/main.js 2012-01-26 15:48:36 UTC (rev 9198) +++ trunk/xsl/webhelp/template/common/main.js 2012-01-28 16:39:29 UTC (rev 9199) @@ -62,7 +62,7 @@ }); //'ui-tabs-1' is the cookie name which is used for the persistence of the tabs.(Content/Search tab) - if ($.cookie('ui-tabs-1') === '1') { //search tab is visible + if ($.cookie('ui-tabs-1') === '1') { //search tab is active if ($.cookie('textToSearch') != undefined && $.cookie('textToSearch').length > 0) { document.getElementById('textToSearch').value = $.cookie('textToSearch'); Verifie('searchForm'); @@ -87,7 +87,20 @@ } }); + /** + * If an user moved to another page by clicking on a toc link, and then clicked on #searchDiv, + * search should be performed if the cookie textToSearch is not empty. + */ +function doSearch() { +//'ui-tabs-1' is the cookie name which is used for the persistence of the tabs.(Content/Search tab) + if ($.cookie('textToSearch') != undefined && $.cookie('textToSearch').length > 0) { + document.getElementById('textToSearch').value = $.cookie('textToSearch'); + Verifie('searchForm'); + } +} + +/** * Synchronize with the tableOfContents */ function syncToc() { Modified: trunk/xsl/webhelp/xsl/webhelp.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp.xsl 2012-01-26 15:48:36 UTC (rev 9198) +++ trunk/xsl/webhelp/xsl/webhelp.xsl 2012-01-28 16:39:29 UTC (rev 9199) @@ -765,7 +765,7 @@ </li> <xsl:if test="$webhelp.include.search.tab != 'false'"> <li> - <a href="#searchDiv" style="outline:0;" tabindex="1"> + <a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"> <span class="searchTab"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Search'"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-04-19 14:28:48
|
Revision: 9292 http://docbook.svn.sourceforge.net/docbook/?rev=9292&view=rev Author: dcramer Date: 2012-04-19 14:28:37 +0000 (Thu, 19 Apr 2012) Log Message: ----------- Webhelp: updating docs. Ant version, install instructions, handling of images. Modified Paths: -------------- trunk/xsl/webhelp/build.properties trunk/xsl/webhelp/docsrc/readme.xml Added Paths: ----------- trunk/xsl/webhelp/docsrc/images/ trunk/xsl/webhelp/docsrc/images/sample.jpg Removed Paths: ------------- trunk/xsl/webhelp/template/content/images/sample.jpg Modified: trunk/xsl/webhelp/build.properties =================================================================== --- trunk/xsl/webhelp/build.properties 2012-04-19 14:06:03 UTC (rev 9291) +++ trunk/xsl/webhelp/build.properties 2012-04-19 14:28:37 UTC (rev 9292) @@ -16,7 +16,7 @@ # to the output directory, you can list patterns here. # See the Ant documentation for fileset for documentation # on patterns. -#input-images-dirs=images/**,figures/**,graphics/** +input-images-dirs=images/**,figures/**,graphics/** # By default, the ant script assumes your images are stored # in the same directory as the input-xml. If you store your Copied: trunk/xsl/webhelp/docsrc/images/sample.jpg (from rev 9264, trunk/xsl/webhelp/template/content/images/sample.jpg) =================================================================== (Binary files differ) Modified: trunk/xsl/webhelp/docsrc/readme.xml =================================================================== --- trunk/xsl/webhelp/docsrc/readme.xml 2012-04-19 14:06:03 UTC (rev 9291) +++ trunk/xsl/webhelp/docsrc/readme.xml 2012-04-19 14:28:37 UTC (rev 9292) @@ -97,7 +97,7 @@ url="http://code.google.com/soc/">Google Summer of Code</ulink> project. </para> </legalnotice> <copyright> - <year>2008-2011</year> + <year>2008-2012</year> <holder>Kasun Gajasinghe</holder> <holder>David Cramer</holder> </copyright> @@ -111,7 +111,7 @@ <surname>Gajasinghe</surname> <email>kasunbg AT gmail DOT com</email> </author> - <pubdate>September 2011</pubdate> + <pubdate>January 2012</pubdate> </bookinfo> <chapter> <chapterinfo> @@ -310,9 +310,8 @@ </step> <step> <para>If necessary, install <ulink url="http://ant.apache.org/bindownload.cgi">Apache - Ant</ulink> 1.6.5 or higher. See <ulink - url="http://ant.apache.org/manual/install.html">Ant installation instructions</ulink>. - 2.x gives brief instructions.</para> + Ant</ulink> 1.8.0 or higher. See <ulink + url="http://ant.apache.org/manual/install.html">Ant installation instructions</ulink>.</para> <substeps> <step> <para>Unzip the Ant binary distribution to a convenient location on your system. For @@ -320,7 +319,7 @@ </step> <step> <para>Set the environment variable <envar>ANT_HOME</envar> to the top-level Ant - directory. For example: <filename>c:\Program Files\apache-ant-1.7.1</filename>. <tip> + directory. For example: <filename>c:\Program Files\apache-ant-1.8.0</filename>. <tip> <para>See <ulink url="http://support.microsoft.com/kb/310519">How To Manage Environment Variables in Windows XP</ulink> for information on setting environment variables.</para> @@ -328,7 +327,7 @@ </step> <step> <para>Add the Ant <filename>bin</filename> directory to your <envar>PATH</envar>. For - example: <filename>c:\Program Files\apache-ant-1.7.1\bin</filename></para> + example: <filename>c:\Program Files\apache-ant-1.8.0\bin</filename></para> </step> <step> <para>Confirm that Ant is installed by typing the following at a command prompt: @@ -351,19 +350,21 @@ <envar>CLASSPATH</envar>.</para> </note></para> </step> - <step> +<!-- <step> <para>If you are using Ant 1.8.1 or higher, you may need to add <filename>xercesImpl.jar</filename>, and <filename>xml-apis.jar</filename> to the classpath. See <function>index</function> target in the Ant script to see how it's currently added. <note> - <para>The way webhelp indexer get invoked is made easier after the XSL-1.76.1 release. - </para> + <para>The way webhelp indexer is invoked is made easier after the XSL-1.76.1 release. </para> </note></para> - </step> + </step>--> <step id="edit-build-properties"> <para>In a text editor, edit the <filename>build.properties</filename> file in the webhelp - directory and make the changes indicated by the - comments:<programlisting># The path (relative to the build.xml file) to your input document. + directory and make the changes indicated by the comments.<important> + <para>You must set appropriate values for <code>xslt-processor-classpath</code>, + <code>xercesImpl.jar</code>, and <code>xml-apis.jar</code>.</para> + </important><programlisting> +# The path (relative to the build.xml file) to your input document. # To use your own input document, create a build.xml file of your own # and import this build.xml. input-xml=docsrc/readme.xml @@ -388,13 +389,22 @@ # and uncomment this line. #input-images-basedir=/path/to/image/location -# Modify this so that it points to your copy of the Saxon 6.5 jar. -xslt-processor-classpath=/usr/share/java/saxon-6.5.5.jar +# Modify the follosing so that they point to your local +# copy of the jars indicated: +# * Saxon 6.5 jar +# * Xerces 2: xercesImpl.jar +# * xml-commons: xml-apis.jar +xslt-processor-classpath=/usr/share/java/saxon-6.5.5.jar +xercesImpl.jar=/usr/share/java/xercesImpl.jar +xml-apis.jar=/usr/share/java/xml-apis.jar # For non-ns version only, this validates the document # against a dtd. validate-against-dtd=true +# The extension for files to be indexed (html/htm/xhtml etc.) +html.extension=html + # Set this to false if you don't need a search tab. webhelp.include.search.tab=true @@ -403,7 +413,23 @@ # stemmer, and punctuations that differs from language to language. # see the documentation for details. en=English, fr=French, de=German, # zh=Chinese, ja=Japanese etc. -webhelp.indexer.language=en</programlisting></para> +webhelp.indexer.language=en + +# Enables/Disables stemming +# Stemming allows better querying for the search +enable.stemming=true + +#Set the table of contents file. This file will not be indexed. +#toc.file=dummy.html + +#Used for adding branding specific contents to the html files. +#For example, the url docbook.org, Google Analytics id etc. +branding=docbook +brandname=DocBook + +# Set admon.graphics to 1 to user graphics for note, tip, etc. +admon.graphics=0 +suppress.footer.navigation=0</programlisting></para> </step> <step> <para>Test the package by running the command <code>ant webhelp @@ -672,12 +698,13 @@ <title>Adding images</title> <para>This section shows how to add images to WebHelp. For that, follow the simple procedure given.<itemizedlist> <listitem> - <para>Add all the images to template/content folder.</para> + <para>Put the images in a subdirectory of your source file directory. For example + <filename>docsrc/images</filename>.</para> </listitem> <listitem> <para>Then refer to those images from your docbook document.</para> <para>Following image is from <emphasis role="bold" - >webhelp/template/content/images/sample.jpg</emphasis>. The docbook code is shown + >webhelp/docsrs/images/sample.jpg</emphasis>. The docbook code is shown below.</para> <para> <figure> @@ -701,6 +728,15 @@ </figure></programlisting> </example> </listitem> + <listitem> + <para> The <filename>build.properties</filename> file controls what directories are copied + over from the source tree to the output + tree:<programlisting># If your document has image directories that need to be copied +# to the output directory, you can list patterns here. +# See the Ant documentation for fileset for documentation +# on patterns. +input-images-dirs=images/**,figures/**,graphics/**</programlisting></para> + </listitem> </itemizedlist></para> </section> </chapter> @@ -965,5 +1001,5 @@ <primary>FAQ</primary> </indexterm> </chapter> - <xi:include href="xinclude-test.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -</book> \ No newline at end of file + <!--<xi:include href="xinclude-test.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>--> +</book> Deleted: trunk/xsl/webhelp/template/content/images/sample.jpg =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ka...@us...> - 2012-05-25 17:07:25
|
Revision: 9383 http://docbook.svn.sourceforge.net/docbook/?rev=9383&view=rev Author: kasunbg Date: 2012-05-25 17:07:19 +0000 (Fri, 25 May 2012) Log Message: ----------- Removed the script htmlFileList.js since it's content is in htmlFileInfoList.js Modified Paths: -------------- trunk/xsl/webhelp/template/content/search/nwSearchFnt.js trunk/xsl/webhelp/xsl/webhelp-common.xsl Modified: trunk/xsl/webhelp/template/content/search/nwSearchFnt.js =================================================================== --- trunk/xsl/webhelp/template/content/search/nwSearchFnt.js 2012-05-25 17:01:43 UTC (rev 9382) +++ trunk/xsl/webhelp/template/content/search/nwSearchFnt.js 2012-05-25 17:07:19 UTC (rev 9383) @@ -8,7 +8,7 @@ */ //string initialization -var htmlfileList = "htmlFileList.js"; +var htmlfileList = "htmlFileInfoList.js"; var htmlfileinfoList = "htmlFileInfoList.js"; var useCJKTokenizing = false; Modified: trunk/xsl/webhelp/xsl/webhelp-common.xsl =================================================================== --- trunk/xsl/webhelp/xsl/webhelp-common.xsl 2012-05-25 17:01:43 UTC (rev 9382) +++ trunk/xsl/webhelp/xsl/webhelp-common.xsl 2012-05-25 17:07:19 UTC (rev 9383) @@ -245,12 +245,9 @@ <script type="text/javascript" src="search/l10n.js"> <xsl:comment></xsl:comment> </script> - <script type="text/javascript" src="search/htmlFileList.js"> + <script type="text/javascript" src="search/htmlFileInfoList.js"> <xsl:comment> </xsl:comment> </script> - <script type="text/javascript" src="search/htmlFileInfoList.js"> - <xsl:comment> </xsl:comment> - </script> <script type="text/javascript" src="search/nwSearchFnt.js"> <xsl:comment> </xsl:comment> </script> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dc...@us...> - 2012-12-16 02:01:07
|
Revision: 9691 http://docbook.svn.sourceforge.net/docbook/?rev=9691&view=rev Author: dcramer Date: 2012-12-16 02:01:00 +0000 (Sun, 16 Dec 2012) Log Message: ----------- Webhelp: Improving sample Makefile to allow for profiling params and other params, removing content dir from template and making related adjustments in Makefile and build.xml Modified Paths: -------------- trunk/xsl/webhelp/Makefile trunk/xsl/webhelp/Makefile.sample trunk/xsl/webhelp/build.xml Added Paths: ----------- trunk/xsl/webhelp/template/search/ Removed Paths: ------------- trunk/xsl/webhelp/template/content/ Modified: trunk/xsl/webhelp/Makefile =================================================================== --- trunk/xsl/webhelp/Makefile 2012-12-15 03:37:18 UTC (rev 9690) +++ trunk/xsl/webhelp/Makefile 2012-12-16 02:01:00 UTC (rev 9691) @@ -47,7 +47,7 @@ -classpath $(classpath) \ com.nexwave.nquindexer.IndexerMain - cp -r template/content/search/* ${OUTPUT_DIR}/search + cp -r template/search/* ${OUTPUT_DIR}/search clean: $(RM) -r docs/* Modified: trunk/xsl/webhelp/Makefile.sample =================================================================== --- trunk/xsl/webhelp/Makefile.sample 2012-12-15 03:37:18 UTC (rev 9690) +++ trunk/xsl/webhelp/Makefile.sample 2012-12-16 02:01:00 UTC (rev 9691) @@ -1,13 +1,55 @@ # Configuration -DOCBOOK_DIST := ../$(pwd) +# The name of the source DocBook xml file +INPUT_XML = docsrc/readme.xml -DOCBOOK_EXTENSIONS_DIR = $(DOCBOOK_DIST)/extensions +# The makefile assumes that you have a +# directory named images that contains +# your images. It copies this to the +# output directory +USER_IMAGES_PARENT_DIR=docsrc -INPUT_XML = docsrc/readme.xml -USER_IMAGES_PARENT_DIR=docsrc +# Name of the desired output directory +# This will be created if it doesn't exist OUTPUT_DIR = docs + +# A list of files to exclude from indexing INDEXER_EXCLUDED_FILES = ix01.html +# Profiling params. For more information on +# profiling (conditional text) and DocBook documents, see +# http://www.sagehill.net/docbookxsl/Profiling.html +PROFILE.ARCH = "" +PROFILE.AUDIENCE = "" +PROFILE.CONDITION = "" +PROFILE.CONFORMANCE = "" +PROFILE.LANG = "" +PROFILE.OS = "" +PROFILE.REVISION = "" +PROFILE.REVISIONFLAG = "" +PROFILE.ROLE = "" +PROFILE.SECURITY = "" +PROFILE.STATUS = "" +PROFILE.USERLEVEL = "" +PROFILE.VENDOR = "" +PROFILE.WORDSIZE = "" +PROFILE.ATTRIBUTE = "" +PROFILE.VALUE = "" + +# Use this variable to pass in other stringparams +# to the xsltproc pass that generates DocBook output. +# For example: +# OTHER_XSLTPROC_ARGS = --stringparam example.param "" +OTHER_XSLTPROC_ARGS = + +# Path to the DocBook Distribution that +# contains the xslts etc. +DOCBOOK_DIST := ../$(pwd) + +# ================================================= +# You probably don't need to change anything below +# unless you choose to add a validation step. +# ================================================ +DOCBOOK_EXTENSIONS_DIR = $(DOCBOOK_DIST)/extensions INDEXER_JAR := $(DOCBOOK_EXTENSIONS_DIR)/webhelpindexer.jar TAGSOUP_JAR := $(DOCBOOK_EXTENSIONS_DIR)/tagsoup-1.2.1.jar LUCENE_ANALYZER_JAR := $(DOCBOOK_EXTENSIONS_DIR)/lucene-analyzers-3.0.0.jar @@ -28,11 +70,26 @@ chunk: xsltproc --output xincluded-profiled.xml \ - --stringparam profile.os "linux" \ + --stringparam profile.arch ${PROFILE.ARCH} \ + --stringparam profile.audience ${PROFILE.AUDIENCE} \ + --stringparam profile.condition ${PROFILE.CONDITION} \ + --stringparam profile.conformance ${PROFILE.CONFORMANCE} \ + --stringparam profile.lang ${PROFILE.LANG} \ + --stringparam profile.os ${PROFILE.OS} \ + --stringparam profile.revision ${PROFILE.REVISION} \ + --stringparam profile.revisionflag ${PROFILE.REVISIONFLAG} \ + --stringparam profile.role ${PROFILE.ROLE} \ + --stringparam profile.security ${PROFILE.SECURITY} \ + --stringparam profile.status ${PROFILE.STATUS} \ + --stringparam profile.userlevel ${PROFILE.USERLEVEL} \ + --stringparam profile.vendor ${PROFILE.VENDOR} \ + --stringparam profile.wordsize ${PROFILE.WORDSIZE} \ + --stringparam profile.attribute ${PROFILE.ATTRIBUTE} \ + --stringparam profile.value ${PROFILE.VALUE} \ ../profiling/profile.xsl \ ${INPUT_XML} - xsltproc --xinclude xsl/webhelp.xsl xincluded-profiled.xml + xsltproc ${OTHER_XSLTPROC_ARGS} --xinclude xsl/webhelp.xsl xincluded-profiled.xml rm xincluded-profiled.xml index: @@ -47,8 +104,8 @@ -classpath $(classpath) \ com.nexwave.nquindexer.IndexerMain - cp -r template/content/search/* ${OUTPUT_DIR}/search + cp -r template/search/* ${OUTPUT_DIR}/search clean: - $(RM) -r docs/* + $(RM) -r ${OUTPUT_DIR} Modified: trunk/xsl/webhelp/build.xml =================================================================== --- trunk/xsl/webhelp/build.xml 2012-12-15 03:37:18 UTC (rev 9690) +++ trunk/xsl/webhelp/build.xml 2012-12-16 02:01:00 UTC (rev 9691) @@ -75,7 +75,7 @@ <copy todir="${output-dir}"> <fileset dir="${ant.file.dir}/template"> <include name="**/*"/> - <exclude name="**/content/**"/> + <exclude name="**/search/**"/> </fileset> </copy> @@ -91,7 +91,7 @@ <target name="index" if="do-search-indexing"> <copy todir="${output-dir}/search"> - <fileset dir="${ant.file.dir}/template/content/search"> + <fileset dir="${ant.file.dir}/template/search"> <include name="**/*"/> <exclude name="**/*.props"/> <exclude name="**/stemmers/*"/> @@ -100,7 +100,7 @@ <!-- We separate this out so we only copy the stopwords list and stemmer for the indexer language --> <copy todir="${output-dir}/search"> - <fileset dir="${ant.file.dir}/template/content/search"> + <fileset dir="${ant.file.dir}/template/search"> <include name="**/default.props"/> <include name="**/punctuation.props"/> <include name="**/${webhelp.indexer.language}*.props"/> @@ -108,11 +108,6 @@ </fileset> </copy> - <!--taskdef name="indexertask" - classname="com.nexwave.nquindexer.IndexerMain"> - <classpath refid="classpath"/> - </taskdef--> - <echo>Indexing html files in ${output-dir}</echo> <java classname="com.nexwave.nquindexer.IndexerMain" fork="true"> @@ -121,7 +116,7 @@ <sysproperty key="htmlExtension" value="${html.extension}"/> <sysproperty key="doStem" value="${enable.stemming}"/> <sysproperty key="tocFile" value="${toc.file}"/> - <sysproperty key="indexerExcludedFiles" value="${indexer-excluded-files}"/> + <sysproperty key="indexerExcludedFiles" value="${indexer-excluded-files}"/> <!--TagSoup SAX Parser for parsing even the bad html contents. see http://sourceforge.net/tracker/?func=detail&aid=3401185&group_id=21935&atid=373750--> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |