From 8f43e594c5cfe735afb7e44a42191946d76eef19 Mon Sep 17 00:00:00 2001
From: Kasun Gajasinghe <kasunbg@gmail.com>
Date: Tue, 10 Aug 2010 15:20:09 +0000
Subject: [PATCH] Add some styling to the web interface.

---
 .../com/nexwave/stemmer/snowball/TestApp.java |   9 +-
 .../template/common/css/positioning.css       |  16 +-
 xsl/webhelp/template/common/images/back.png   | Bin 169 -> 0 bytes
 xsl/webhelp/template/common/main.js           |   2 +-
 xsl/webhelp/xsl/webhelp.xsl                   | 141 ++++++++++--------
 5 files changed, 93 insertions(+), 75 deletions(-)
 delete mode 100755 xsl/webhelp/template/common/images/back.png

diff --git a/xsl/webhelp/indexer/src/com/nexwave/stemmer/snowball/TestApp.java b/xsl/webhelp/indexer/src/com/nexwave/stemmer/snowball/TestApp.java
index a274d8474..0a251a46a 100755
--- a/xsl/webhelp/indexer/src/com/nexwave/stemmer/snowball/TestApp.java
+++ b/xsl/webhelp/indexer/src/com/nexwave/stemmer/snowball/TestApp.java
@@ -2,6 +2,7 @@
 
 package com.nexwave.stemmer.snowball;
 import com.nexwave.stemmer.snowball.ext.EnglishStemmer;
+import com.nexwave.stemmer.snowball.ext.frenchStemmer;
 
 public class TestApp {
     private static void usage()
@@ -18,7 +19,7 @@ public class TestApp {
 	Class stemClass = Class.forName("com.nexwave.stemmer.snowball.ext." +
 					args[0] + "Stemmer");*/
     //    SnowballStemmer stemmer = (SnowballStemmer) stemClass.newInstance();
-        SnowballStemmer stemmer =new EnglishStemmer();//= new GermanStemmer();
+        SnowballStemmer stemmer = new frenchStemmer();//new EnglishStemmer();//= new GermanStemmer();
 
         StringBuffer input = new StringBuffer();
 	/*Reader reader;
@@ -48,7 +49,9 @@ public class TestApp {
 	}*/
 
 	Object [] emptyArgs = new Object[0];
-    char[] charArr = "testing runnable dogs ".toCharArray();    
+    //char[] charArr = "testing runnable dogs ".toCharArray();
+    char[] charArr = "complément ,é compliment, compliments , condiments ,".toCharArray();
+//char[] charArr = "complément , c: compl s:complé compliment, c: compl s:compli compliments, c: compl s:compli condiments, c: cond s:condi".toCharArray();
 //	int character;
 	for (char ch : charArr) {
         //    char ch = (char) character;
@@ -58,7 +61,7 @@ public class TestApp {
 
                 stemmer.stem();
 
-                System.out.print(stemmer.getCurrent()+" ");
+                System.out.print(stemmer.getCurrent()+".");
               /*  output.write(stemmer.getCurrent());
                 output.write('\n');*/
                 input.delete(0, input.length());
diff --git a/xsl/webhelp/template/common/css/positioning.css b/xsl/webhelp/template/common/css/positioning.css
index 0ce3262ca..ddc449321 100755
--- a/xsl/webhelp/template/common/css/positioning.css
+++ b/xsl/webhelp/template/common/css/positioning.css
@@ -1,13 +1,13 @@
 body { font: 12px Verdana, Geneva, sans-serif; }
 p, ul, ol, li { font: 10pt Verdana, Geneva, sans-serif; }
-h1 { font: bold 15pt Arial, Helvetica, geneva; } 
+h1 { font: bold 15pt Arial, Helvetica, geneva; }
 h2 { font: bold 14pt Arial, Helvetica, geneva; }
 
 #header {
-    background: white url(../images/gov-header-bg.gif) repeat-x;
+    background: white url(../images/header-bg.gif) repeat-x;
     position: fixed;
     width: 100%;
-    height: 90px;
+    height: 95px;
     top: 0;
     right: 0;
     bottom: auto;
@@ -46,9 +46,15 @@ h2 { font: bold 14pt Arial, Helvetica, geneva; }
     min-width:800px;
 }
 
+#navheader {
+    position: fixed;
+    top: 65px;
+    right:4px;
+}
+
 #content h1, #content h2 { color: #cc0000; }
 .navfooter { bottom: 2%; }
-.highlight { background-color: #FFFF88; }
+.highlight { background-color: #c5d3c3; }
 .highlightButton{ font-size: 0; }
 
 /*  Show Hide TOC tree */
@@ -66,7 +72,7 @@ h2 { font: bold 14pt Arial, Helvetica, geneva; }
     display: block;
     font-size: 0;
     cursor: pointer;
-} 
+}
 
 /* Search results Styling */
 .searchExpression {
diff --git a/xsl/webhelp/template/common/images/back.png b/xsl/webhelp/template/common/images/back.png
deleted file mode 100755
index 7d449559d4ac4faed897e3fb4fadd23e3480aa4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^Od!kwBL7~QRScvUi-X*q7}lMWc?slj7I;Jg1-XSm
zn2}-D90{Nxdx@v7EBh^0aXwKN2g#}(Kq1Kz*N775{M_8syb=cIqSVBa)D(sC%#sWR
zcTeAd@J2pypdv9(7sn8e>&bTte%UiKGYbPT5HQG2W~!S}wHl;?!PC{xWt~$(69C|t
BCn*2`

diff --git a/xsl/webhelp/template/common/main.js b/xsl/webhelp/template/common/main.js
index c7ecfde97..c38951d4c 100755
--- a/xsl/webhelp/template/common/main.js
+++ b/xsl/webhelp/template/common/main.js
@@ -6,7 +6,7 @@
  */
 
 $(document).ready(function() {  
-    $("#showHideHighlight").button(); //add jquery button styling to 'Go' button
+  //  $("#showHideHighlight").button(); //add jquery button styling to 'Go' button
     //Generate tabs in nav-pane with JQuery
     $(function() {
             $("#tabs").tabs({
diff --git a/xsl/webhelp/xsl/webhelp.xsl b/xsl/webhelp/xsl/webhelp.xsl
index 7738a0719..89a783d76 100755
--- a/xsl/webhelp/xsl/webhelp.xsl
+++ b/xsl/webhelp/xsl/webhelp.xsl
@@ -187,20 +187,7 @@
     </xsl:template>
 
     <xsl:template name="user.header.content">
-        <table>
-            <tr>
-                <td style="height: 28px; width: 16px;">
-                    <a id="showHideButton" onclick="showHideToc();"
-                       class="pointLeft" title="Hide TOC tree" style="padding-top:3px; padding-bottom:3px;">.
-                    </a>
-                </td>
-                <td>
-                    <input type="button" id="showHideHighlight"
-                           style="display:none;padding-top:3px; padding-bottom:3px;"
-                           class="highlightButton" value="H" onclick="toggleHighlight();"/>
-                </td>
-            </tr>
-        </table>
+        <xsl:comment> <!-- KEEP this code. --> </xsl:comment>
     </xsl:template>
 
     <xsl:template name="user.footer.navigation">
@@ -317,64 +304,82 @@
             <!-- Prev and Next links generation-->
             <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 this code. In case of neither prev nor next links are available, this will help to
                     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"/-->
-                <xsl:if test="count($prev) &gt; 0
-                                or (count($up) &gt; 0
-                                    and generate-id($up) != generate-id($home)
-                                    and $navig.showtitles != 0)
-                                or count($next) &gt; 0">
-                    <xsl:if test="count($prev)>0">
-                        <a accesskey="p">
-                            <xsl:attribute name="href">
-                                <xsl:call-template name="href.target">
-                                    <xsl:with-param name="object" select="$prev"/>
-                                </xsl:call-template>
-                            </xsl:attribute>
-                            <xsl:call-template name="navig.content">
-                                <xsl:with-param name="direction" select="'prev'"/>
-                            </xsl:call-template>
-                        </a>
-                    </xsl:if>
-
-                    <!-- "Up" link-->
-                    <xsl:choose>
-                        <xsl:when test="count($up)&gt;0
-                                  and generate-id($up) != generate-id($home)">
-                            |
-                            <a accesskey="u">
-                                <xsl:attribute name="href">
-                                    <xsl:call-template name="href.target">
-                                        <xsl:with-param name="object" select="$up"/>
-                                    </xsl:call-template>
-                                </xsl:attribute>
-                                <xsl:call-template name="navig.content">
-                                    <xsl:with-param name="direction" select="'up'"/>
-                                </xsl:call-template>
+                <table>
+                    <tr>
+                        <td style="height: 28px; width: 16px;">
+                            <a id="showHideButton" onclick="showHideToc();"
+                               class="pointLeft" title="Hide TOC tree">.
                             </a>
-                        </xsl:when>
-                        <xsl:otherwise>&#160;</xsl:otherwise>
-                    </xsl:choose>
+                        </td>
+                        <td>
+                            <img src="../common/images/highlight-blue.gif" alt="H" height="25px"
+                                 onclick="toggleHighlight()" id="showHideHighlight" style="cursor:pointer"/>
+                        </td>
+                        <xsl:if test="count($prev) &gt; 0
+                                        or (count($up) &gt; 0
+                                        and generate-id($up) != generate-id($home)
+                                        and $navig.showtitles != 0)
+                                        or count($next) &gt; 0">
+                            <td>
+                                <xsl:if test="count($prev)>0">
+                                    <a accesskey="p">
+                                        <xsl:attribute name="href">
+                                            <xsl:call-template name="href.target">
+                                                <xsl:with-param name="object" select="$prev"/>
+                                            </xsl:call-template>
+                                        </xsl:attribute>
+                                        <xsl:call-template name="navig.content">
+                                            <xsl:with-param name="direction" select="'prev'"/>
+                                        </xsl:call-template>
+                                    </a>
+                                </xsl:if>
+
+                                <!-- "Up" link-->
+                                <xsl:choose>
+                                    <xsl:when test="count($up)&gt;0
+                                              and generate-id($up) != generate-id($home)">
+                                        |
+                                        <a accesskey="u">
+                                            <xsl:attribute name="href">
+                                                <xsl:call-template name="href.target">
+                                                    <xsl:with-param name="object" select="$up"/>
+                                                </xsl:call-template>
+                                            </xsl:attribute>
+                                            <xsl:call-template name="navig.content">
+                                                <xsl:with-param name="direction" select="'up'"/>
+                                            </xsl:call-template>
+                                        </a>
+                                    </xsl:when>
+                                    <xsl:otherwise>&#160;</xsl:otherwise>
+                                </xsl:choose>
+                                
+                                <xsl:if test="count($next)>0">
+                                    |
+                                    <a accesskey="n">
+                                        <xsl:attribute name="href">
+                                            <xsl:call-template name="href.target">
+                                                <xsl:with-param name="object" select="$next"/>
+                                            </xsl:call-template>
+                                        </xsl:attribute>
+                                        <xsl:call-template name="navig.content">
+                                            <xsl:with-param name="direction" select="'next'"/>
+                                        </xsl:call-template>
+                                    </a>
+                                </xsl:if>
+                            </td>
+                        </xsl:if>
+
+                    </tr>
+                </table>
+
 
 
-                    <xsl:if test="count($next)>0">
-                        |
-                        <a accesskey="n">
-                            <xsl:attribute name="href">
-                                <xsl:call-template name="href.target">
-                                    <xsl:with-param name="object" select="$next"/>
-                                </xsl:call-template>
-                            </xsl:attribute>
-                            <xsl:call-template name="navig.content">
-                                <xsl:with-param name="direction" select="'next'"/>
-                            </xsl:call-template>
-                        </a>
-                    </xsl:if>
-                </xsl:if>
             </div>
 
         </div>
@@ -487,6 +492,7 @@
                                                 <center>
                                                     <input id="textToSearch" name="textToSearch" type="text"
                                                            class="searchText"/>
+                                                    <xsl:text disable-output-escaping="yes"> <![CDATA[&nbsp;]]> </xsl:text>
                                                     <input onclick="Verifie(ditaSearch_Form)" type="button"
                                                            class="searchButton"
                                                            value="Go" id="doSearch"/>
@@ -616,12 +622,15 @@
             <xsl:with-param name="content">
                 <html>
                     <head>
-			<link rel="shortcut icon" href="favicon.ico"/>
-                        <meta http-equiv="Refresh" content="0; URL=content/ch01.html"/>
+			            <link rel="shortcut icon" href="favicon.ico"/>
+                        <meta http-equiv="Refresh" content="1; URL=content/ch01.html"/>
                         <title><xsl:value-of select="//title[1]"/>&#160;
                         </title>
                         <!-- Call template "metatags" to add copyright and date meta tags:  -->
                     </head>
+                    <body>
+                        If not automatically redirected, click here: <a href="content/ch01.html">content/ch01.html</a>
+                    </body>
                 </html>
             </xsl:with-param>
         </xsl:call-template>
-- 
2.40.0