Changeset 23779

Timestamp:

2011-03-15T16:13:12+13:00 (13 years ago)

Author:

davidb

Message:

Two new interfaces - 'default' now tries to use the client's XSLT capabilities of the web browser, falling back to the 'traditional' interface if this fails.

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• style/berry.css (modified) (1 diff)
• style/core.css (modified) (1 diff)
• transform/about.xsl (modified) (3 diffs)
• transform/applet.xsl (modified) (1 diff)
• transform/authen.xsl (modified) (22 diffs)
• transform/berry.xsl (modified) (18 diffs)
• transform/berrytools.xsl (modified) (10 diffs)
• transform/classifier.xsl (modified) (7 diffs)
• transform/classifiertools.xsl (modified) (3 diffs)
• transform/document.xsl (modified) (26 diffs)
• transform/gli4gs3.xsl (modified) (1 diff)
• transform/help.xsl (modified) (4 diffs)
• transform/home.xsl (modified) (5 diffs)
• transform/html.xsl (modified) (2 diffs)
• transform/icons.xsl (modified) (6 diffs)
• transform/library.xsl (modified) (1 diff)
• transform/nav.xsl (modified) (1 diff)
• transform/pref.xsl (modified) (9 diffs)
• transform/process.xsl (modified) (2 diffs)
• transform/query.xsl (modified) (6 diffs)
• transform/querytools.xsl (modified) (6 diffs)
• transform/service-params.xsl (modified) (14 diffs)
• transform/style.xsl (modified) (9 diffs)
• transform/system.xsl (modified) (3 diffs)
• transform/util.xsl (modified) (14 diffs)

main/trunk/greenstone3/web/interfaces/default/style/berry.css

@@ -1 @@
-
-
-div.globalwrapper{
-  font-family: sans-serif, arial, helvetica;
-  margin: 0 2em 0 4em; 
-  padding:0;
- 
-}
-
-div#content{
-  font-family: sans-serif, arial, helvetica;
-  margin: 0.5em 0 0.5em 0;
-  padding: 0; 
-
-}
-
-div.banner{
- margin:0;
- padding:0;
-
-}
-
-div.pageinfo{
-  float:right;
-  text-align: right;
-  padding: 0;
-  margin:0 0 3px 0; 
-  width: 50%;
-}
-
-div.basketimage{
-  float:left;
-  width: 45%;
-  padding:0;
-  margin:0;
-
-}
-
-
-div.bannerextra {
-   clear: both;
-   padding: 0.2em 0 0 0;
-}
-
-/* home, help, preferences links */
-p.bannerlinks {
-  font-weight: bold;
-  margin:0;
-  padding:0;
-}
-
-
-p.bannertitle {
-  font-family: sans-serif, arial, helvetica;
-  font-size: 24px;
-  font-weight: bold;
-  white-space: nowrap;
-  margin: 0;
-  padding: 0.5em 0 0.5em 0em;
-  background: url("../images/tile13.jpeg") 0 0 repeat-y;
- 
-}
-
-
-a.navlink{
-  vertical-align: top;
-  padding: 0.2em 0.5em 0 0;
-  color: black;
-  text-decoration: none; 
-  background-image: url("../images/bg_off.png");
- }
-
-a.navlink:hover {
-   background-image: url("../images/bg_on.png");
- }
-
-p.navbar{
-  text-align: center;
-   background: url("../images/bg_green.png") 0 0 repeat-x;
-   font-weight: bold;
-}
-
-span.navlink{
-   margin:0 3em  0 3em;
-   padding:0 0.5em 0 0.5em;
-   background-image: url("../images/bg_off.png");
-   cursor: pointer;
-}
-
-span.navlink:hover {
-   background-image: url("../images/bg_on.png");
- }
-
-img#trashbin{
- float:right;
-}
-
-span.berryradio{
- cursor: pointer;
- margin:0 3em  0 3em;
- font-weight: bold;
-}
-
-.berrycheck{
- font-size: 80%;  
- cursor: pointer;
- font-weight: bold;
- margin: 0 0 0 0.5em;
-}
-
-#urlcheck{
- float: left;
- padding: 0;
- margin: 0;
- 
-}
-
-.pick {
-  visibility:hidden;
-}
-
-div#berrybasket {
-   float:right;
-   font-family:sans-serif;
-   height:120px;
-   width: 100px;
-   padding: 4px 5px 4px 4px;
-   background-color:#E0F0E0;
-   background: url("../images/berrybasket.png") 0 0 no-repeat;
-   margin:0;
-   font-size:100%;
-   text-align:center;
-   #border:1px solid #2E8B57;   
-   z-index:10;
-   cursor: pointer;
- }
-
-div#baskethandle {
-  padding: 0;
-  cursor:move;
-  height: 30px;
-  width:auto;
-  #background-color:#eeeeee;
-   background:transparent;
-   margin:0 ;
-  }
-
-div#berries {
-  text-align:left;
-  height: auto;
-  margin: 0;
-  padding:0;
-  overflow: hidden;   
-}
-
-
-p#documentberries {
-   font-weight: bold;
-   font-size:90%;
-}
-
-.documentberry {
-  margin:0 2em 0 0;
-  padding:0;
-  visibility:hidden;
-}
-
-
-#doclist{
-  margin: 0;
- 
-}
-
-.content{
- font-family:sans-serif;
- text-align:left;
-}
-
-li.berryitem {
-   padding: 0;
-   margin: 0 ;
-   color: black;
-   font-size: 90%;
-}
-
-li.berrydoc {
-  font-size: 90%;
-  cursor: pointer;
-  padding: 0 ;
-  margin: 0 1em 0 0; 
-}
-
-a.expandcontract {
-  font-size: 90%;
-  color: red
-}
-
-
-.item {
-  font-size: 90%;
- 
-}
-
-a.fullview:visited{
- color:red;
-}
-
-a#hideview:visited{
- color:red;
-}
-
-a.fullview{
-  float:left;
-  font-size: 90%;
-  margin: 0 0 0 20px;
-  padding:0;
-  cursor: pointer;
-  color:red;  
-  text-decoration:none;
- }
-
-a#hideView{
-  float:right;
-  font-size: 90%;
-  margin:0 20px 0 0;
-  padding:0;
-  color: red;
-  cursor: pointer;
-  text-decoration:none;
-}
-
-
-.berrydelete{
-   font-family:sans-serif;
-   background-color:#E0F0E0;
-   border:1px solid #2E8B57;   
-   padding: 4px  4px 4px 4px; 
-   font-weight: bold;
-   cursor: pointer;
-   width: 6em;
-   color: red;
-   font-size: 90%;
-}
-
-.sendbutton{
-   font-family:sans-serif;
-   background-color:#E0F0E0;
-   border:1px solid #2E8B57;   
-   padding: 4px  4px 4px 4px; 
-   font-weight: bold;
-   cursor: pointer;
-   width: 5em;
-   font-size: 90%;
-   margin: 1em 0 0 0;
-}
-
-.berrybutton{
-   font-family:sans-serif;
-   background-color:#E0F0E0;
-   border:1px solid #2E8B57;   
-   padding: 4px  4px 4px 4px; 
-   font-weight: bold;
-   cursor: pointer;
-   width: 10em;
-   font-size: 90%;
-}
-
-.mailinput {
-  border:1px solid #2E8B57; 
-  width: 20em;
-  height: 1.5em;
-  font-size: 90%
-}
-
-.mailitem{
-   text-align: left;
- }
-
-
-textarea#pretextarea {
-  font-family:sans-serif;
-  border:1px solid #2E8B57; 
-  width: 100%;
-  height: 25em;
-  font-size: 90%;
-  margin: 0.5em 0 0 0;
-  padding:0;
-}
-
-div#trashbin{
-   float: right;
-   height: 60px;
-   width:  55px;
-   padding: 0;
-   background: url("../images/trash-empty.png") 0 0 no-repeat;
-   margin:0;
-   z-index:10;
-}
-
-div#binhandle{
- height: 60px;
- width:  55px;
- cursor: move;
-}
-
-span.extralink {
-  cursor:pointer;
-  font-size:80%;
-  font-weight:bold;
-  margin:0 2em 0 0;
-  color:black;
-}
-
-span.extralink:hover {
-   color: #2E8B57;
-}
-
+div.globalwrapper{font-family:sans-serif,arial,helvetica;margin:0 2em 0 4em;padding:0}div#content{font-family:sans-serif,arial,helvetica;margin:.5em 0 .5em 0;padding:0}div.banner{margin:0;padding:0}div.pageinfo{float:right;text-align:right;padding:0;margin:0 0 3px 0;width:50%}div.basketimage{float:left;width:45%;padding:0;margin:0}div.bannerextra{clear:both;padding:.2em 0 0 0}p.bannerlinks{font-weight:bold;margin:0;padding:0}p.bannertitle{font-family:sans-serif,arial,helvetica;font-size:24px;font-weight:bold;white-space:nowrap;margin:0;padding:.5em 0 .5em 0;background:url("../images/tile13.jpeg") 0 0 repeat-y}a.navlink{vertical-align:top;padding:.2em .5em 0 0;color:black;text-decoration:none;background-image:url("../images/bg_off.png")}a.navlink:hover{background-image:url("../images/bg_on.png")}p.navbar{text-align:center;background:url("../images/bg_green.png") 0 0 repeat-x;font-weight:bold}span.navlink{margin:0 3em 0 3em;padding:0 .5em 0 .5em;background-image:url("../images/bg_off.png");cursor:pointer}span.navlink:hover{background-image:url("../images/bg_on.png")}img#trashbin{float:right}span.berryradio{cursor:pointer;margin:0 3em 0 3em;font-weight:bold}.berrycheck{font-size:80%;cursor:pointer;font-weight:bold;margin:0 0 0 .5em}#urlcheck{float:left;padding:0;margin:0}.pick{visibility:hidden}div#berrybasket{float:right;font-family:sans-serif;height:120px;width:100px;padding:4px 5px 4px 4px;background-color:#e0f0e0;background:url("../images/berrybasket.png") 0 0 no-repeat;margin:0;font-size:100%;text-align:center;#border:1px solid #2e8b57;z-index:10;cursor:pointer}div#baskethandle{padding:0;cursor:move;height:30px;width:auto;#background-color:#eee;background:transparent;margin:0}div#berries{text-align:left;height:auto;margin:0;padding:0;overflow:hidden}p#documentberries{font-weight:bold;font-size:90%}.documentberry{margin:0 2em 0 0;padding:0;visibility:hidden}#doclist{margin:0}.content{font-family:sans-serif;text-align:left}li.berryitem{padding:0;margin:0;color:black;font-size:90%}li.berrydoc{font-size:90%;cursor:pointer;padding:0;margin:0 1em 0 0}a.expandcontract{font-size:90%;color:red}.item{font-size:90%}a.fullview:visited{color:red}a#hideview:visited{color:red}a.fullview{float:left;font-size:90%;margin:0 0 0 20px;padding:0;cursor:pointer;color:red;text-decoration:none}a#hideView{float:right;font-size:90%;margin:0 20px 0 0;padding:0;color:red;cursor:pointer;text-decoration:none}.berrydelete{font-family:sans-serif;background-color:#e0f0e0;border:1px solid #2e8b57;padding:4px 4px 4px 4px;font-weight:bold;cursor:pointer;width:6em;color:red;font-size:90%}.sendbutton{font-family:sans-serif;background-color:#e0f0e0;border:1px solid #2e8b57;padding:4px 4px 4px 4px;font-weight:bold;cursor:pointer;width:5em;font-size:90%;margin:1em 0 0 0}.berrybutton{font-family:sans-serif;background-color:#e0f0e0;border:1px solid #2e8b57;padding:4px 4px 4px 4px;font-weight:bold;cursor:pointer;width:10em;font-size:90%}.mailinput{border:1px solid #2e8b57;width:20em;height:1.5em;font-size:90%}.mailitem{text-align:left}textarea#pretextarea{font-family:sans-serif;border:1px solid #2e8b57;width:100%;height:25em;font-size:90%;margin:.5em 0 0 0;padding:0}div#trashbin{float:right;height:60px;width:55px;padding:0;background:url("../images/trash-empty.png") 0 0 no-repeat;margin:0;z-index:10}div#binhandle{height:60px;width:55px;cursor:move}span.extralink{cursor:pointer;font-size:80%;font-weight:bold;margin:0 2em 0 0;color:black}span.extralink:hover{color:#2e8b57}

main/trunk/greenstone3/web/interfaces/default/style/core.css

@@ -1 @@
-
-body {
-  padding:0;
-  margin:0;
-  font-family: sans-serif, arial, helvetica;   
-  background: #fff url('../images/chalk.gif') scroll repeat-y left top;
-  color: #000000 
-}
-
-/* this contains everything - all the other divs */
-#page-wrapper {
-  margin: .5em 3em 0 5em;
-}
-
-a:link
-{
-color: #339966;
-}
-
-a:visited
-{
-color: #066;
-}
-
-a:hover, a:active
-{
-color: #99CC33;
-}
-
-div#banner ul, ul#resultlist, ul#tocnodes, ul#docbuttons, ul.tocnode, ul#bannerlist, ul#navbarlist, ul#collectionlist, ul#servicelist, ul#classifierlist, ul#classifiernodelist, ul#queryitemlist{
-  list-style-type:none;
-  margin:0;
-  padding:0;
-}
-
-div#banner ul li, ul#bannerlist li, ul#navbarlist li {
-  display: inline;
-  margin:0;
-  padding:0;    
-}
-
-
-ul li>select, ul li>input {
-  padding: 0;
-  margin-left:5px;
-}
-
-
-div#banner {
-  margin: 0;
-  padding:0;
-  overflow: hidden;
-}
-
-div#banner p {
-  margin:0;
-  padding: 0;
-  float:left;
-  font-size: 16px;
-  text-align: left;
-  overflow:hidden   
-}
-
-div#banner p a {
-  background-image: url('../images/banner_bg.png');
-  background-repeat: repeat-y;
-}
-
-
-div#banner ul{
-  margin:0;
-  padding:0; 
-  float:right; 
-  font-size: 12px;  
-}
-
-div#banner a{
-  text-decoration: none;
-  color:#000000;
-}
-
-
-ul#bannerlist li a {
-  padding: 0 10px 0 10px; 
-  text-decoration: none;
-}
-
-ul#bannerlist li a:link, ul#bannerlist li a:visited
-{
- background-color: #DEE79C;
- background-image: url('../images/bg_off.png');
- text-decoration: none
-}
-
-ul#bannerlist li a:hover{
- background-color: #FFFF66;
- background-image: url('../images/bg_on.png') ;
- text-decoration: none
-}
-
-
-div#navbar{
-  clear:both;
-}
-
-ul#navbarlist{
-  margin:0;
-  padding:0; 
-  list-style-type: none; 
-  text-align:center;
-  width: 100%;
-  font-size: 80%;
-  background-image: url('../images/bg_green.png');    
-  background-color: #99CC99
- }
-
-ul#navbarlist li a {
-  padding: 0 20px 0 20px; 
-  margin: 0;
-  color: #000000; 
-  text-decoration: none;
-}
-
-ul#navbarlist li a:link, ul#navbarlist li a:visited{
-   background-image: url('../images/bg_off.png') ;
- }
-
-ul#navbarlist li a:hover{
-  background-image: url('../images/bg_on.png') ;
-}
-
-
-ul#collectionlist li, ul#servicelist li{
-  display:block;
-  padding:0;
-  margin: .2em 0 0 0;
-  overflow:hidden;
-}
-
-
-ul#collectionlist img{
-  margin:0;
-  padding:0;
-  width: 150px;
-  height: 45px;
-  border: 1px solid black;
-  background-image: url('../images/collectimg_bg.png');
-  background-repeat: repeat-y;
-  overflow:hidden
-}
-
-ul#collectionlist li a.noimage{
-  display: block;
-  margin:0;
-  width: 145px;
-  height: 40px;
-  border: 1px solid black;
-  background-image: url('../images/collectimg_bg.png');
-  background-repeat: repeat-y;
-  overflow:hidden; padding-left:5px; padding-right:0; padding-top:5px; padding-bottom:0
-
-}
-
-ul#collectionlist li a{
-  font-size: 16px;
-  color: #000000;
-  text-decoration: none;  
-  font-weight: bold;
-}
-
-ul#servicelist li a{
-  margin:0 .5em 0 0;
-}
-
-ul#queryitemlist li{
-  display:block;
-  margin: .2em 0 .2em 0;
-}
-
-ul#classifierlist li{
-  list-style: none;
-  margin: 0 0 5px 0;
-  padding: 0;
-  display: block;
-  color:#000;
-}
-
-ul#classifierlist li#activeclassifier{
-  font-weight:bold;
-  padding: 0 0 0 5px;
-  margin:0 0 5px 0;
-}
-
- ul#classifierlist li a:link, ul#classifierlist li a:visited  
-{
-   display:block;
-   margin:0;
-   background-image: url('../images/bg_off.png');
-   text-decoration: none; 
-   color:#000;
-   width:100%; padding-left:5px; padding-right:0; padding-top:2px; padding-bottom:2px
- } 
-
-ul#classifierlist li a:hover, ul#classifierlist li a:active
-{
-  display:block;
-  margin:0;
-  background-image: url('../images/bg_on.png');
-  text-decoration: none; padding-left:5px; padding-right:0; padding-top:2px; padding-bottom:2px
-  
-}
-
-ul#classifierlist{
-   float:left;
-   font-size: 14px;
-   text-align: left;
-   width: 15%;
-   margin:0;
-   padding:0;
-}
-
-div#classifiers{
-  float:left;
-  width: 75%;
-  margin:0;
-  padding:0 0 0 10px;
- }
-
-ul#classifiernodelist li{
-  list-style: none;
-  margin: 0;
-  padding: 5px 0 0 0;
-  display: block;
- }
-
-ul.childrenlist{
-  margin: 0 0 0 0;
-  padding: 0 0 0 20px;
-  display: block;
-  width: 100%;
-}
-
-div#content{
- clear: both;
- overflow: hidden;
- margin: .2em 0 0 0;
-}
-
-/* bg image set in style macro */
-div.divbar { 
-  clear: both; 
-  background-image: url('../images/bg_green.png'); 
-  width: 100%; 
-  text-align: center;
-  font-size:80%
-}
-
-
-/** query form style**/
-div#queryform{
-
-}
-
-/** search result style */
-div#terminfo{
-
-}
-
-div#matchdocs{
-
-}
-
-div.resultnavigation{
- margin: 0;
- padding:0;
-}
-
-ul#resultlist li{
-  display:block;
-}
-
-
-div.documenttext { clear: both; } /* come after any floating divs */
-
-div#documentheading{
-  font-size: 16pt;
-  font-weight: bold;
-}
-
-div#documentinfo { 
-  float:left;
-  padding:0;
-  margin:0;
-  width:24%;
-} 
-
-div#toc{
-  float:left;
-  text-align:left;
-  width:60%;
-  padding:0;
-  margin:0; 
-}
-
-ul#docbuttons li {
-   display: block;
-  font-size: 11px;
-  font-weight: bold;
-  background: #f7e7c5;
-  margin: 1px;
-  border: 1px solid #eeddbb;
-  text-align: center;
-  vertical-align: middle;
-  height: 30px; /* IE6 and NS4 treat width/height as min-width/min-height */
-  width: 110px;
-}
-
-
-ul#tocnodes li{
- margin: 0;
- padding: 5px 0 0 0;
- display:block;
-}
-
-ul.tocnode {
-  margin:0;
-  padding:5px 0 0 20px;
-}
-
-ul.tocnode  a{
- margin: 0;
- padding:0 5px 0 0;
- }
-
-span.bold{
-  font-weight: bold;       
-}
-
-div.documentarrows{
-  clear: both; 
-  margin: 0 0 0 0;
-  padding: 1em 0 0 0;   
-}
-
-img.lessarrow{
-  float:left;
-  border: none;  
-}
-
-img.morearrow{
-  float:right;
-  border:none; 
-}
-
-div.formheading{
-  font-size: 16pt;
-  font-weight: bold;
-  margin: .5em 0 0;
-  padding:0;
-}
-
-ul#presprefs li, ul#berrybasketprefs li, ul#searchprefs li{
-  display: block;
-} 
-
-
-div.phrasebrowse{
-  text-align:center;
-  padding:0;
-  margin: .5em 0 .5em 0;   
-}
-
-div.QuickSearch {
-  float: right;
-}
-
+body{padding:0;margin:0;font-family:sans-serif,arial,helvetica;background:#fff url('../images/chalk.gif') scroll repeat-y left top;color:#000}#page-wrapper{margin:.5em 3em 0 5em}a:link{color:#396}a:visited{color:#066}a:hover,a:active{color:#9c3}div#banner ul,ul#resultlist,ul#tocnodes,ul#docbuttons,ul.tocnode,ul#bannerlist,ul#navbarlist,ul#collectionlist,ul#servicelist,ul#classifierlist,ul#classifiernodelist,ul#queryitemlist{list-style-type:none;margin:0;padding:0}div#banner ul li,ul#bannerlist li,ul#navbarlist li{display:inline;margin:0;padding:0}ul li>select,ul li>input{padding:0;margin-left:5px}div#banner{margin:0;padding:0;overflow:hidden}div#banner p{margin:0;padding:0;float:left;font-size:16px;text-align:left;overflow:hidden}div#banner p a{background-image:url('../images/banner_bg.png');background-repeat:repeat-y}div#banner ul{margin:0;padding:0;float:right;font-size:12px}div#banner a{text-decoration:none;color:#000}ul#bannerlist li a{padding:0 10px 0 10px;text-decoration:none}ul#bannerlist li a:link,ul#bannerlist li a:visited{background-color:#dee79c;background-image:url('../images/bg_off.png');text-decoration:none}ul#bannerlist li a:hover{background-color:#ff6;background-image:url('../images/bg_on.png');text-decoration:none}div#navbar{clear:both}ul#navbarlist{margin:0;padding:0;list-style-type:none;text-align:center;width:100%;font-size:80%;background-image:url('../images/bg_green.png');background-color:#9c9}ul#navbarlist li a{padding:0 20px 0 20px;margin:0;color:#000;text-decoration:none}ul#navbarlist li a:link,ul#navbarlist li a:visited{background-image:url('../images/bg_off.png')}ul#navbarlist li a:hover{background-image:url('../images/bg_on.png')}ul#collectionlist li,ul#servicelist li{display:block;padding:0;margin:.2em 0 0 0;overflow:hidden}ul#collectionlist img{margin:0;padding:0;width:150px;height:45px;border:1px solid black;background-image:url('../images/collectimg_bg.png');background-repeat:repeat-y;overflow:hidden}ul#collectionlist li a.noimage{display:block;margin:0;width:145px;height:40px;border:1px solid black;background-image:url('../images/collectimg_bg.png');background-repeat:repeat-y;overflow:hidden;padding-left:5px;padding-right:0;padding-top:5px;padding-bottom:0}ul#collectionlist li a{font-size:16px;color:#000;text-decoration:none;font-weight:bold}ul#servicelist li a{margin:0 .5em 0 0}ul#queryitemlist li{display:block;margin:.2em 0 .2em 0}ul#classifierlist li{list-style:none;margin:0 0 5px 0;padding:0;display:block;color:#000}ul#classifierlist li#activeclassifier{font-weight:bold;padding:0 0 0 5px;margin:0 0 5px 0}ul#classifierlist li a:link,ul#classifierlist li a:visited{display:block;margin:0;background-image:url('../images/bg_off.png');text-decoration:none;color:#000;width:100%;padding-left:5px;padding-right:0;padding-top:2px;padding-bottom:2px}ul#classifierlist li a:hover,ul#classifierlist li a:active{display:block;margin:0;background-image:url('../images/bg_on.png');text-decoration:none;padding-left:5px;padding-right:0;padding-top:2px;padding-bottom:2px}ul#classifierlist{float:left;font-size:14px;text-align:left;width:15%;margin:0;padding:0}div#classifiers{float:left;width:75%;margin:0;padding:0 0 0 10px}ul#classifiernodelist li{list-style:none;margin:0;padding:5px 0 0 0;display:block}ul.childrenlist{margin:0;padding:0 0 0 20px;display:block;width:100%}div#content{clear:both;overflow:hidden;margin:.2em 0 0 0}div.divbar{clear:both;background-image:url('../images/bg_green.png');width:100%;text-align:center;font-size:80%}div.resultnavigation{margin:0;padding:0}ul#resultlist li{display:block}div.documenttext{clear:both}div#documentheading{font-size:16pt;font-weight:bold}div#documentinfo{float:left;padding:0;margin:0;width:24%}div#toc{float:left;text-align:left;width:60%;padding:0;margin:0}ul#docbuttons li{display:block;font-size:11px;font-weight:bold;background:#f7e7c5;margin:1px;border:1px solid #edb;text-align:center;vertical-align:middle;height:30px;width:110px}ul#tocnodes li{margin:0;padding:5px 0 0 0;display:block}ul.tocnode{margin:0;padding:5px 0 0 20px}ul.tocnode a{margin:0;padding:0 5px 0 0}span.bold{font-weight:bold}div.documentarrows{clear:both;margin:0;padding:1em 0 0 0}img.lessarrow{float:left;border:none}img.morearrow{float:right;border:none}div.formheading{font-size:16pt;font-weight:bold;margin:.5em 0 0;padding:0}ul#presprefs li,ul#berrybasketprefs li,ul#searchprefs li{display:block}div.phrasebrowse{text-align:center;padding:0;margin:.5em 0 .5em 0}div.QuickSearch{float:right}

main/trunk/greenstone3/web/interfaces/default/transform/about.xsl

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet version="1.0"
+  xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
   xmlns:gslib="http://www.greenstone.org/skinning"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
 
   
@@ -51 +51 @@
       </xsl:choose>
       
-      <div id="content"> 
+      <div id="content" class="moz-output-escape"> 
         <!--Display the description text of the current collection,
         and if some services are available then create a list
@@ -62 +62 @@
       </div>
     </div>
+        <span id="language" style="display: none;"><xsl:value-of select="/page/@lang" /></span>
+        <span id="interface" style="display: none;"><xsl:value-of select="$interface_name" /></span>
+        
+        <script type="text/javascript"><xsl:text>var placeholder = false;</xsl:text></script>
+        <script type="text/javascript" src="jquery.js"><xsl:comment>jQuery</xsl:comment></script>
+        <script type="text/javascript" src="test.js"><xsl:comment>Client side transforms</xsl:comment></script>
+        
       </body>
     </html>

main/trunk/greenstone3/web/interfaces/default/transform/applet.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
   
   <!-- style includes global params interface_name, library_name -->
   <xsl:include href="style.xsl"/>
   
-  <xsl:output method="html"/>  
+  <xsl:output method="html"/>
   
   <!-- the main page layout template is here -->

main/trunk/greenstone3/web/interfaces/default/transform/authen.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
 
   <!-- style includes global params interface_name, library_name -->
@@ -14 +13 @@
 
   <xsl:template name="pageTitle">
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.authentication')"/>
+    <!-- differred for page title --> <span class="getTextFor null document.title.authen.authentication"></span>
   </xsl:template>
 
@@ -21 +20 @@
     <head>
       <title>
-    <xsl:call-template name="pageTitle"/><xsl:text> </xsl:text>
+        <xsl:text> </xsl:text>
       </title>
       <xsl:call-template name="globalStyle"/>
@@ -35 +34 @@
       <xsl:call-template name="addGroup" />
       <body>
+   
+    <xsl:call-template name="pageTitle"/>
     <xsl:attribute name="dir"><xsl:call-template name="direction"/></xsl:attribute>
     <div id="page-wrapper">
@@ -53 +54 @@
         <table align="left" border="0" width="100%">
           <tr align="left">
-        <td><h2><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.authentication')"/></h2></td>
+        <td><h2 class="getTextFor authen.authentication"></h2></td>
         <td><xsl:if test="$un_s!=''">
             <xsl:if test="$asn!='' and $asn!='0'">
-              <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.username')"/>  :  <xsl:value-of select="$un_s"/>
+              <span class="getTextFor authen.username"></span>  :  <xsl:value-of select="$un_s"/>
             </xsl:if>
           </xsl:if></td>
@@ -66 +67 @@
         <ul id="navbarlist">
           <!--greenstone home-->
-          <li><a href="{$library_name}"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.greenstone_home')"/></a></li>
+          <li><a href="{$library_name}"><span class="getTextFor authen.greenstone_home"></span></a></li>
           
           <!--list users-->
@@ -72 +73 @@
         <xsl:choose>
           <xsl:when test="$asn!='' and $asn!='0' and $un_s!=''">
-            <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s=Authentication&amp;s1.aup=ListUsers&amp;s1.asn={$asn}&amp;s1.uan=1&amp;s1.un={$un_s}&amp;s1.pw="><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.list_users')"/></a>
+            <a href="{$library_name}?a=g&amp;amp;rt=r&amp;amp;sa=authen&amp;amp;s=Authentication&amp;amp;s1.aup=ListUsers&amp;amp;s1.asn={$asn}&amp;amp;s1.uan=1&amp;amp;s1.un={$un_s}&amp;amp;s1.pw="><span class="getTextFor authen.list_users"></span></a>
           </xsl:when>
           <xsl:otherwise>
-            <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s=Authentication&amp;s1.asn=&amp;s1.aup=Login"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.list_users')"/></a>
+            <a href="{$library_name}?a=g&amp;amp;rt=r&amp;amp;sa=authen&amp;amp;s=Authentication&amp;amp;s1.asn=&amp;amp;s1.aup=Login"><span class="getTextFor authen.list_users"></span></a>
           </xsl:otherwise>
         </xsl:choose></li>
@@ -83 +84 @@
         <xsl:choose>
           <xsl:when test="$asn!='' and $asn!='0' and $un_s!=''">
-            <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s=Authentication&amp;s1.aup=AddUser&amp;s1.asn={$asn}&amp;s1.uan=1&amp;s1.un={$un_s}&amp;s1.pw=&amp;s1.umun=&amp;s1.umpw=&amp;s1.umgp=&amp;s1.umas=&amp;s1.umc="><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.add_a_new_user')"/></a> 
+            <a href="{$library_name}?a=g&amp;amp;rt=r&amp;amp;sa=authen&amp;amp;s=Authentication&amp;amp;s1.aup=AddUser&amp;amp;s1.asn={$asn}&amp;amp;s1.uan=1&amp;amp;s1.un={$un_s}&amp;amp;s1.pw=&amp;amp;s1.umun=&amp;amp;s1.umpw=&amp;amp;s1.umgp=&amp;amp;s1.umas=&amp;amp;s1.umc="><span class="getTextFor authen.add_a_new_user"></span></a> 
           </xsl:when>
           <xsl:otherwise>
-            <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s=Authentication&amp;s1.asn=&amp;s1.aup=Login"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.add_a_new_user')"/></a>
+            <a href="{$library_name}?a=g&amp;amp;rt=r&amp;amp;sa=authen&amp;amp;s=Authentication&amp;amp;s1.asn=&amp;amp;s1.aup=Login"><span class="getTextFor authen.add_a_new_user"></span></a>
           </xsl:otherwise>
         </xsl:choose>
@@ -95 +96 @@
         <xsl:choose>
           <xsl:when test="$asn!='' and $asn!='0' and $un_s!=''">
-            <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s=Authentication&amp;s1.aup=ModifyPassword&amp;s1.asn={$asn}&amp;s1.uan=1&amp;s1.un={$un_s}&amp;s1.pw=&amp;s1.umpw1=&amp;s1.umpw2=&amp;s1.umpw="><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.change_password')"/></a>
+            <a href="{$library_name}?a=g&amp;amp;rt=r&amp;amp;sa=authen&amp;amp;s=Authentication&amp;amp;s1.aup=ModifyPassword&amp;amp;s1.asn={$asn}&amp;amp;s1.uan=1&amp;amp;s1.un={$un_s}&amp;amp;s1.pw=&amp;amp;s1.umpw1=&amp;amp;s1.umpw2=&amp;amp;s1.umpw="><span class="getTextFor authen.change_password"></span></a>
           </xsl:when>
           <xsl:otherwise>
-            <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s=Authentication&amp;s1.asn=&amp;s1.aup=Login"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.change_password')"/></a>
+            <a href="{$library_name}?a=g&amp;amp;rt=r&amp;amp;sa=authen&amp;amp;s=Authentication&amp;amp;s1.asn=&amp;amp;s1.aup=Login"><span class="getTextFor authen.change_password"></span></a>
           </xsl:otherwise>
         </xsl:choose>
@@ -106 +107 @@
         <xsl:choose>
           <xsl:when test="$un_s!='' and $asn!='' and $asn!='0'">
-            <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s=Authentication&amp;s1.asn=&amp;s1.aup=Login&amp;s1.un=&amp;s1.pw="><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.logout')"/></a>
+            <a href="{$library_name}?a=g&amp;amp;rt=r&amp;amp;sa=authen&amp;amp;s=Authentication&amp;amp;s1.asn=&amp;amp;s1.aup=Login&amp;amp;s1.un=&amp;amp;s1.pw="><span class="getTextFor authen.logout"></span></a>
           </xsl:when>
           <xsl:otherwise>
-            <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s=Authentication&amp;s1.asn=&amp;s1.aup=Login"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.login')"/></a>
+            <a href="{$library_name}?a=g&amp;amp;rt=r&amp;amp;sa=authen&amp;amp;s=Authentication&amp;amp;s1.asn=&amp;amp;s1.aup=Login"><span class="getTextFor authen.login"></span></a>
           </xsl:otherwise>
         </xsl:choose>
@@ -124 +125 @@
             <xsl:choose>
               <xsl:when test="$asn!='' and $asn!='0'">
-            <p align="left"> <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.login_successfully')"/></p>
+            <p align="left"> <span class="getTextFor authen.login_successfully"></span></p>
               </xsl:when>
               <xsl:otherwise>
 
             <p align="left">
-              <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.login_descibe_line_3')"/><br/></p>
+              <span class="getTextFor authen.login_describe_line_3"></span><br/></p>
             <xsl:if test="$err='un-pw-err'">
-              <p align="left"><font color='red'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.wrong_password_warning')"/></font></p>
+              <p align="left"><font color='red'><span class="getTextFor authen.wrong_password_warning"></span></font></p>
             </xsl:if>
             <xsl:if test="$err='no-permission' and $info='Login'">
-              <p align="left"><font color='red'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.no_permission')"/></font></p>
+              <p align="left"><font color='red'><span class="getTextFor authen.no_permission"></span></font></p>
             </xsl:if>
             <xsl:if test="$err='as-false'">
-              <p align="left"><font color='red'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.account_status_false')"/></font></p>
+              <p align="left"><font color='red'><span class="getTextFor authen.account_status_false"></span></font></p>
             </xsl:if>
             <xsl:call-template name="login">
@@ -159 +160 @@
             <xsl:if test="$info='Login'">
               <p align="left">
-            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.login_descibe_line_2')"/><br/></p>
+            <span class="getTextFor authen.login_describe_line_2"></span><br/></p>
               <xsl:if test="$err='no-permission' and $info='Login'">
-            <p align="left"><font color='red'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.no_permission')"/></font></p>
+            <p align="left"><font color='red'><span class="getTextFor authen.no_permission"></span></font></p>
               </xsl:if>
             </xsl:if>
@@ -174 +175 @@
             <xsl:if test="$asn!='1'">
               <p align="left">
-            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.login_descibe_line_2')"/><br/>
+            <span class="getTextFor authen.login_describe_line_2"></span><br/>
               </p>
               <xsl:if test="$err='no-permission'">
-            <p align="left"><font color='red'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.no_permission')"/></font></p>
+            <p align="left"><font color='red'><span class="getTextFor authen.no_permission"></span></font></p>
               </xsl:if>
             </xsl:if>
@@ -187 +188 @@
             
             <xsl:if test="$info='adduser_interface'">
-              <h2 align="left"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.add_a_new_user_title')"/></h2>
+              <h2 align="left"><span class="getTextFor authen.add_a_new_user_title"></span></h2>
               <xsl:if test="$err='pw-err'">
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.password_err')"/></font></p>
+            <p align="left"><font color="red"><span class="getTextFor authen.password_err"></span></font></p>
               </xsl:if> 
               <xsl:if test="$err='un-err'">
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.unsername_err')"/></font></p>
+              <!-- not sure if this is meant to be unsername_err; if it is, disregard -->
+            <p align="left"><font color="red"><span class="getTextFor authen.unsername_err"></span></font></p>
               </xsl:if> 
               <xsl:if test="$err='un-exist'">
-            <p align="left"><font color='red'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.user_has_existed')"/></font></p>
+            <p align="left"><font color='red'><span class="getTextFor authen.user_has_existed"></span></font></p>
               </xsl:if>
               <xsl:call-template name="edituser" >
@@ -222 +224 @@
 
             <xsl:if test="$err=''">
-              <h2 align="left"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.change_password_title')"/></h2>
-              <p align="left"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.change_password_successed_content')"/></p>
+              <h2 align="left"><span class="getTextFor authen.change_password_title"></span></h2>
+              <p align="left"><span class="getTextFor authen.change_password_successed_content"></span></p>
             </xsl:if>
             
             <xsl:if test="$asn!='0' and $info='modify_interface'">
-              <h2 align="left"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.change_password_title')"/></h2>
-              <p align="left"><font color="grey"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.change_password_describe_line_1')"/></font></p>
+              <h2 align="left"><span class="getTextFor authen.change_password_title"></span></h2>
+              <p align="left"><font color="grey"><span class="getTextFor authen.change_password_describe_line_1"></span></font></p>
 
               <xsl:if test="$err='umpw1-err'">
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.new_password_invalid')"/></font></p>
+            <p align="left"><font color="red"><span class="getTextFor authen.new_password_invalid"></span></font></p>
               </xsl:if>
               <xsl:if test="$err='umpw2-err'">
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.retyped_password_invalid')"/></font></p>
+            <p align="left"><font color="red"><span class="getTextFor authen.retyped_password_invalid"></span>></font></p>
               </xsl:if>
               <xsl:if test="$err='pw-umpw-nm-err' or $err='umpw-null-err'">
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.old_password_warning')"/></font></p>
+            <p align="left"><font color="red"><span class="getTextFor authen.old_password_warning"></span></font></p>
               </xsl:if>  
               <xsl:if test="$err='umpw1-umpw2-nm-err'">
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.two_password_not_match')"/></font></p>
+            <p align="left"><font color="red"><span class="getTextFor authen.two_password_not_match"></span></font></p>
               </xsl:if> 
               <xsl:if test="$err='umpw1-umpw2-null-err'">
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.password_empty_warning')"/></font></p>
+            <p align="left"><font color="red"><span class="getTextFor authen.password_empty_warning"></span></font></p>
               </xsl:if> 
               
@@ -286 +288 @@
 
             <xsl:if test="$info='edituser-interface'"> 
-              <h2 align="left"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.edit_user_information')"/></h2>
+              <h2 align="left"><span class="getTextFor authen.edit_user_information"></span></h2>
               <xsl:if test="$err='umpw-err'"> 
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.password_err')"/></font></p>
+            <p align="left"><font color="red"><span class="getTextFor authen.password_err"></span></font></p>
               </xsl:if>
               <xsl:if test="$err='umun-err'"> 
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.unsername_err')"/></font></p>
+            <p align="left"><font color="red"><span class="getTextFor authen.username_err"></span></font></p>
               </xsl:if>
               <xsl:if test="$err='ini-umpw-err'"> 
-            <p align="left"><font color="red"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.password_initial')"/></font></p>
+            <p align="left"><font color="red"><span class="getTextFor authen.password_initial"></span></font></p>
               </xsl:if>
               <xsl:if test="$err='un-exist'">
-            <p align="left"><font color='red'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.user_has_existed')"/></font></p>
+            <p align="left"><font color='red'><span class="getTextFor authen.user_has_existed"></span></font></p>
               </xsl:if>
               <xsl:call-template name="edituser" >
@@ -358 +360 @@
     <table align="center">
       <tr>
-        <td><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.username')"/></td><td><input type="string" name="s1.un" size="10" value=""/></td><td></td>
+        <td><span class="getTextFor authen.username"></span></td><td><input type="string" name="s1.un" size="10" value=""/></td><td></td>
       </tr>
       <tr>
-        <td><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.password')"/></td><td><input type="password" name="s1.pw" size="10" value=""/></td><td>
+        <td><span class="getTextFor authen.password"></span></td><td><input type="password" name="s1.pw" size="10" value=""/></td><td>
           <input type="submit" value="submit"></input></td>
       </tr>
@@ -371 +373 @@
   <!--template name="listusers"-->
   <xsl:template name="listusers" >
-    <h2 align="left"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.list_of_current_users_title')"/></h2>
+    <h2 align="left"><span class="getTextFor authen.list_of_current_users_title"></span></h2>
 
     <table id='mainTable' align="left" border="0" cellspacing="1" cellpadding="3" width="100%" >
       <tr>
-    <th bgcolor="#d0d0d0"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.username')"/></th>
-    <th bgcolor="#d0d0d0"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.account_status')"/></th>
-    <th bgcolor="#d0d0d0"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.groups')"/></th>
-    <th bgcolor="#d0d0d0"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.comment')"/></th>
+    <th bgcolor="#d0d0d0" class="getTextFor authen.username"></th>
+    <th bgcolor="#d0d0d0" class="getTextFor authen.account_status"></th>
+    <th bgcolor="#d0d0d0" class="getTextFor authen.groups"></th>
+    <th bgcolor="#d0d0d0" class="getTextFor authen.comment"></th>
     <th bgcolor="#d0d0d0"></th>
       </tr>
@@ -453 +455 @@
     <input type='hidden' name='s1.aup' value='{$pro_action}'/>
     
-    <table align="center"><tr><td align="right">
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.old_password')"/></td><td><input type="password" name="s1.umpw" size="10" value=""/></td></tr>
-      <tr><td align="right">
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.new_password')"/></td><td><input type="password" name="s1.umpw1" size="10" value=""/></td></tr>
-      <tr><td align="right">
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.retype_new_password')"/></td><td><input type="password" name="s1.umpw2" size="10" value=""/></td></tr>
+    <table align="center"><tr><td align="right" class="getTextFor authen.old_password">
+          </td><td><input type="password" name="s1.umpw" size="10" value=""/></td></tr>
+      <tr><td align="right" class="getTextFor authen.new_password">
+          </td><td><input type="password" name="s1.umpw1" size="10" value=""/></td></tr>
+      <tr><td align="right" class="getTextFor authen.retype_new_password">
+          </td><td><input type="password" name="s1.umpw2" size="10" value=""/></td></tr>
       <tr><td></td><td>
           <input type="submit" value="submit"></input></td>
@@ -485 +487 @@
     <input type='hidden' name='s1.uan' value='1'/>
     <input type='hidden' name='s1.umun' value='{$umun_s}'/>
-    <p><font color='red'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.do_you_really_want_to_permanently_remove_user')"/> <xsl:value-of select="$umun_s"/>" ?</font></p>
+    <p><font color='red' class="getTextFor authen.do_you_really_want_to_permanently_remove_user"> <xsl:value-of select="$umun_s"/>" ?</font></p>
     <input type="submit" value="yes"><xsl:attribute name="name">s1.cm</xsl:attribute></input>
     <input type="submit" value="no"><xsl:attribute name="name">s1.cm</xsl:attribute></input>
@@ -518 +520 @@
     <input type='hidden' name='s1.pw' value='{$pw_s}'/>
     
-    <table align="left" ><tr><td>
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.username')"/></td><td><input type="text" name="s1.umun" size="15" value="{$umun_s}"/></td><td><font color="gray"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.username_describe')"/></font></td></tr>
-      <tr><td>
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.password')"/></td><td><input type="password" name="s1.umpw" size="15" value="{$umpw_s}"/></td><td><font color="gray"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.password_describe')"/></font></td></tr>
-      <tr><td>
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.account_status')"/></td><td>    
+    <table align="left" ><tr><td class="getTextFor authen.username">
+          </td><td><input type="text" name="s1.umun" size="15" value="{$umun_s}"/></td><td><font color="gray" class="getTextFor authen.username_describe"></font></td></tr>
+      <tr><td class="getTextFor authen.password">
+          </td><td><input type="password" name="s1.umpw" size="15" value="{$umpw_s}"/></td><td><font color="gray" class="getTextFor authen.password_describe"></font></td></tr>
+      <tr><td class="getTextFor authen.account_status">
+          </td><td> 
           <select name="s1.umas">
         <xsl:if test="$umas_s=''">
-          <option value="true" selected="selected"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.enabled')"/></option>
-          <option value="false"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.disabled')"/></option>
+          <option value="true" selected="selected" class="getTextFor authen.enabled"></option>
+          <option value="false" class="getTextFor authen.disabled"></option>
         </xsl:if> 
         <xsl:if test="$umas_s='true'">
-          <option value="true" selected="selected"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.enabled')"/></option>
-          <option value="false"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.disabled')"/></option>
+          <option value="true" selected="selected" class="getTextFor authen.enabled"></option>
+          <option value="false" class="getTextFor authen.disabled"></option>
         </xsl:if> 
         <xsl:if test="$umas_s='false'">
-          <option value="true"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.enabled')"/></option>
-          <option value="false" selected="selected"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.disabled')"/></option>
+          <option value="true" class="getTextFor authen.enabled"></option>
+          <option value="false" selected="selected" class="getTextFor authen.disabled"></option>
         </xsl:if> 
           </select></td><td></td></tr>
-      <tr><td>
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.groups')"/></td><td><input type="text" id="group" name="s1.umgp" size="70" value="{$umgp_s}"/></td><td><font color="gray"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.groups_describe')"/></font></td></tr>
+      <tr><td class="getTextFor authen.groups">
+          </td><td><input type="text" id="group" name="s1.umgp" size="70" value="{$umgp_s}"/></td><td><font color="gray" class="getTextFor authen.groups_describe"></font></td></tr>
       <tr>
         <td></td>
@@ -597 +599 @@
         <td><input type="button" name="addGroupButton" value="add" onClick="addGroup('collects')"/></td>
       </tr>
-      <tr><td>
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.comment')"/></td><td colspan="2"><div><textarea cols="40" rows="5" name="s1.umc"><xsl:value-of select="$umc_s"/>
+      <tr><td class="getTextFor authen.comment">
+          </td><td colspan="2"><div><textarea cols="40" rows="5" name="s1.umc"><xsl:value-of select="$umc_s"/>
 
         </textarea></div></td></tr> 

main/trunk/greenstone3/web/interfaces/default/transform/berry.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
 
   <!--<xsl:include href="style.xsl"/>-->
@@ -115 +114 @@
            
 
-            if (target.id.toLowerCase() == 'urlcheck' &amp;&amp; urlonly){
+            if (target.id.toLowerCase() == 'urlcheck' &amp;amp;&amp;amp; urlonly){
                var urlcheck = YAHOO.util.Dom.get('urlcheck');
                urlcheck.src = 'interfaces/default/images/check3.gif';              
@@ -125 +124 @@
             }
 
-            if (target.id.toLowerCase() == 'urlcheck' &amp;&amp; !urlonly ){ 
+            if (target.id.toLowerCase() == 'urlcheck' &amp;amp;&amp;amp; !urlonly ){ 
                 var urlcheck = YAHOO.util.Dom.get('urlcheck');
                 urlcheck.src = 'interfaces/default/images/check4.gif';                       
@@ -211 +210 @@
                var a = document.createElement('a'); 
                var text ="";
-               a.href ="?a=d&amp;c="+doc['collection']+"&amp;d="+doc['name'];
+               a.href ="?a=d&amp;amp;c="+doc['collection']+"&amp;amp;d="+doc['name'];
                a.appendChild(document.createTextNode(doc['title'])); 
                 if (doc['root_title'] != ""){
@@ -218 +217 @@
                li.appendChild(a);
                var metadata = "";
-               for (var metaItem in doc &amp;&amp; metaItem != 'title'){
+               for (var metaItem in doc &amp;amp;&amp;amp; metaItem != 'title'){
                     metadata = "\n"+metaItem+": "+ doc[metaItem]+"\n";
                }
@@ -249 +248 @@
              var textview =  YAHOO.util.Dom.get('textview');
 
-              if (previousView != null &amp;&amp; textview !=null){
+              if (previousView != null &amp;amp;&amp;amp; textview !=null){
                  previousView.style.backgroundImage =  'url("interfaces/default/images/bg_on.png")'; 
               } 
@@ -326 +325 @@
              var email =  YAHOO.util.Dom.get('email');
 
-              if (previousView != null &amp;&amp; email !=null ){
+              if (previousView != null &amp;amp;&amp;amp; email !=null ){
                  previousView.style.backgroundImage =  'url("interfaces/default/images/bg_on.png")'; 
               } 
@@ -437 +436 @@
           for (var i in docList){
               var doc = docList[i];
-              urls +=root_url+"?a=d&amp;c="+doc["collection"]+"&amp;d="+doc["name"]+"\n\n";  
+              urls +=root_url+"?a=d&amp;amp;c="+doc["collection"]+"&amp;amp;d="+doc["name"]+"\n\n";  
                      
           }
@@ -453 +452 @@
               for (var i in docList){
                    var doc = docList[i];
-                   var url =root_url+"?a=d&amp;c="+doc['collection']+"&amp;d="+doc['name']+"\n";  
+                   var url =root_url+"?a=d&amp;amp;c="+doc['collection']+"&amp;amp;d="+doc['name']+"\n";  
                     for (var metaItem in doc){
                         var metadata = metaItem+": "+ doc[metaItem]+"\n";
@@ -466 +465 @@
                          
           function sendMail(){
-              var  url = "?a=pr&amp;rt=r&amp;ro=1&amp;s=SendMail&amp;c=";
+              var  url = "?a=pr&amp;amp;rt=r&amp;amp;ro=1&amp;amp;s=SendMail&amp;amp;c=";
                      var request_type = "POST";
                      var postdata = ""; 
@@ -476 +475 @@
                           var input = YAHOO.util.Dom.get(i);  
                           var value = input.value;  
-              postdata +="&amp;s1."+i+"="+value;    
+              postdata +="&amp;amp;s1."+i+"="+value;    
             }                                   
 
@@ -482 +481 @@
                        var content = YAHOO.util.Dom.get('pretextarea').value;
                        
-                       content = content.replace(/&amp;/g,'-------');  
-                       postdata +="&amp;s1.content="+content;
+                       content = content.replace(/&amp;amp;/g,'-------');  
+                       postdata +="&amp;amp;s1.content="+content;
                                                                 
                       
@@ -530 +529 @@
     function mailBoxUpdate(e) {
         var target = e.target;
-        if (target.id.toLowerCase() == 'sendasemail' &amp;&amp; !show){
+        if (target.id.toLowerCase() == 'sendasemail' &amp;amp;&amp;amp; !show){
                 showMailBox();
                     show = true;
                 }
                 else{
-                    if (target.id.toLowerCase() == 'sendasemail' &amp;&amp; show){
+                    if (target.id.toLowerCase() == 'sendasemail' &amp;amp;&amp;amp; show){
                        hideMailBox();
                        show = false;
@@ -551 +550 @@
        function showMailBox(){
            var mailbox = YAHOO.util.Dom.get('mailbox');  
-           if (table != null &amp;&amp; !show){
+           if (table != null &amp;amp;&amp;amp; !show){
                mailbox.appendChild(table);
               return;
@@ -669 +668 @@
       
          function sendMail(){
-              var  url = "?a=pr&amp;rt=r&amp;ro=1&amp;s=SendMail&amp;c=";
+              var  url = "?a=pr&amp;amp;rt=r&amp;amp;ro=1&amp;amp;s=SendMail&amp;amp;c=";
                      var request_type = "POST";
                      var postdata = ""; 
@@ -679 +678 @@
                           var input = YAHOO.util.Dom.get(i);  
                           var value = input.value;  
-              postdata +="&amp;s1."+i+"="+value;    
+              postdata +="&amp;amp;s1."+i+"="+value;    
             }                                   
 
@@ -686 +685 @@
                           var input = YAHOO.util.Dom.get(i);  
                           var value = input.value; 
-                           postdata +="&amp;s1."+i+"="+value;
+                           postdata +="&amp;amp;s1."+i+"="+value;
                         }
 
                        var content = YAHOO.util.Dom.get('pretextarea').value;
                        
-                       content = content.replace(/&amp;/g,'-------');  
-                       postdata +="&amp;s1.content="+content;
+                       content = content.replace(/&amp;amp;/g,'-------');  
+                       postdata +="&amp;amp;s1.content="+content;
                                                                 
                       
@@ -721 +720 @@
       <div class='pageinfo'>
     <p class='bannerlinks'>
-      <a class='navlink' href='{$library_name}?a=p&amp;sa=home' title='Library home page' >HOME</a>
-      <a class='navlink' href='{$library_name}?a=p&amp;sa=help&amp;c='  title='Help pages' >HELP</a>
-      <a class='navlink' href='{$library_name}?a=p&amp;sa=pref&amp;c=' title='Change your interface preferences'>PREFERENCES</a>
+      <a class='navlink' href='{$library_name}?a=p&amp;amp;sa=home' title='Library home page' >HOME</a>
+      <a class='navlink' href='{$library_name}?a=p&amp;amp;sa=help&amp;amp;c='  title='Help pages' >HELP</a>
+      <a class='navlink' href='{$library_name}?a=p&amp;amp;sa=pref&amp;amp;c=' title='Change your interface preferences'>PREFERENCES</a>
     </p>      
       </div>

main/trunk/greenstone3/web/interfaces/default/transform/berrytools.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
 
   <xsl:param name="berryBaskets"/>
@@ -79 +78 @@
      var checkout = function(){
        var request_type = "GET";
-       var url = "?a=pr&amp;rt=r&amp;ro=1&amp;s=ItemNum&amp;o=XML&amp;c="; 
+       var url = "?a=pr&amp;amp;rt=r&amp;amp;ro=1&amp;amp;s=ItemNum&amp;amp;o=XML&amp;amp;c="; 
  
          var responseSuccess = function(o){
@@ -97 +96 @@
                     parent.removeChild(item);
                    
-                   if (parent !=null &amp;&amp; parent.id == "documentberries"){
+                   if (parent !=null &amp;amp;&amp;amp; parent.id == "documentberries"){
                          var root = YAHOO.util.Dom.get(itemID+":root");
                          var section = YAHOO.util.Dom.get(itemID+":section");
-                         if(root!=null &amp;&amp; root.id.indexOf(itemID) !=-1){
+                         if(root!=null &amp;amp;&amp;amp; root.id.indexOf(itemID) !=-1){
                              parent.removeChild(root);
                           }
      
-                      if(section!=null &amp;&amp; section.id.indexOf(itemID) !=-1){
+                      if(section!=null &amp;amp;&amp;amp; section.id.indexOf(itemID) !=-1){
                              parent.removeChild(section);
                       }
@@ -130 +129 @@
                    
                    
-                   if (parent !=null &amp;&amp; parent.id == "documentberries"){
+                   if (parent !=null &amp;amp;&amp;amp; parent.id == "documentberries"){
                          var root = YAHOO.util.Dom.get(berry.id+":root");
                          var section = YAHOO.util.Dom.get(berry.id+":section");
-                         if(root!=null &amp;&amp; root.id.indexOf(berry.id) !=-1){
+                         if(root!=null &amp;amp;&amp;amp; root.id.indexOf(berry.id) !=-1){
                              root.style.visibility ="visible" ;
                           }
      
-                      if(section!=null &amp;&amp; section.id.indexOf(berry.id) !=-1){
+                      if(section!=null &amp;amp;&amp;amp; section.id.indexOf(berry.id) !=-1){
                              section.style.visibility ="visible" ;
                       }
@@ -144 +143 @@
                      }  
 
-               if (berry.className  &amp;&amp;  berry.className  == 'pick')
+               if (berry.className  &amp;amp;&amp;amp;  berry.className  == 'pick')
                   { 
                     berry.style.visibility = "visible";
@@ -168 +167 @@
     function updateBerryImages(){
      
-      for (var i =0;i &lt; berryList.length &amp;&amp; i &lt;12 ; i++ ){
+      for (var i =0;i &lt; berryList.length &amp;amp;&amp;amp; i &lt;12 ; i++ ){
                var berries = YAHOO.util.Dom.get('berries');
                var img = document.createElement('img');
@@ -183 +182 @@
         var target = e.target;
                
-        if ((target.id.toLowerCase() == 'berrybasket' || target.id.toLowerCase() == 'berries')  &amp;&amp; !show){
+        if ((target.id.toLowerCase() == 'berrybasket' || target.id.toLowerCase() == 'berries')  &amp;amp;&amp;amp; !show){
                 showBasket();
                     show = true;
                 }
                 else{
-                    if (target.id.toLowerCase() == 'hideview' &amp;&amp; show){
+                    if (target.id.toLowerCase() == 'hideview' &amp;amp;&amp;amp; show){
                        hideBasket();
                        show = false;
@@ -264 +263 @@
         fullView.appendChild(document.createTextNode("Full View"));
         hideView.setAttribute("id","hideview");
-        fullView.setAttribute("href","?a=g&amp;sa=berry&amp;c=&amp;s=DisplayList&amp;rt=r");
+        fullView.setAttribute("href","?a=g&amp;amp;sa=berry&amp;amp;c=&amp;amp;s=DisplayList&amp;amp;rt=r");
         fullView.setAttribute("class","fullview");
 
@@ -293 +292 @@
 
      function addBerry(el){
-      var  addurl = "?a=pr&amp;rt=r&amp;ro=1&amp;s=AddItem&amp;c=&amp;s1.id=2&amp;o=XML&amp;s1.item=" + el.id;     
+      var  addurl = "?a=pr&amp;amp;rt=r&amp;amp;ro=1&amp;amp;s=AddItem&amp;amp;c=&amp;amp;s1.id=2&amp;amp;o=XML&amp;amp;s1.item=" + el.id;     
       var addSuccess = function(o){ 
          var result = o.responseXML;
@@ -307 +306 @@
                
                      var itemID = item.getAttribute('collection')+":"+item.getAttribute('name'); 
-                    if (parent !=null  &amp;&amp; parent.id == "documentberries"){
+                    if (parent !=null  &amp;amp;&amp;amp; parent.id == "documentberries"){
                          var root = YAHOO.util.Dom.get(itemID+":root");
                          var section = YAHOO.util.Dom.get(itemID+":section");
-                         if(root!=null  &amp;&amp; root.id.indexOf(itemID) !=-1){
+                         if(root!=null  &amp;amp;&amp;amp; root.id.indexOf(itemID) !=-1){
                              parent.removeChild(root);
                           }
      
-                      if(section!=null  &amp;&amp; section.id.indexOf(itemID) !=-1){
+                      if(section!=null  &amp;amp;&amp;amp; section.id.indexOf(itemID) !=-1){
                              parent.removeChild(section);
                       }                                                
                      }
 
-                    if (!YAHOO.util.Dom.get('hideview') &amp;&amp;  berryList.length &lt; 13){
+                    if (!YAHOO.util.Dom.get('hideview') &amp;amp;&amp;amp;  berryList.length &lt; 13){
                       while (berries.hasChildNodes()) {
                            berries.removeChild(berries.firstChild);

main/trunk/greenstone3/web/interfaces/default/transform/classifier.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
   
   <!-- style includes global params interface_name, library_name -->
@@ -20 +19 @@
     <title>
       <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->
-      <xsl:call-template name="pageTitle"/><xsl:text> </xsl:text>
+      <xsl:text> </xsl:text>
     </title>
     <xsl:call-template name="globalStyle"/>
@@ -31 +30 @@
       <xsl:call-template name="greenstoneFooter"/>
     </div>
+    <xsl:call-template name="pageTitle"/>
       </body>
     </html>
@@ -38 +38 @@
 
   <xsl:template name="pageTitle">
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'gsdl')"/>
+    <span class="getTextFor null document.title.gsdl">&amp;amp;nbsp;</span>
   </xsl:template>
 
@@ -48 +48 @@
     </xsl:if>
   </xsl:template>
-
 
   <xsl:template match="pageResponse">
@@ -61 +60 @@
     </xsl:call-template>      
   
-    <div id="content">
+    <div id="content" class="moz-output-escape">
       <xsl:apply-templates select="service/classifierList">
         <xsl:with-param name="collName" select="$collName"/>
@@ -88 +87 @@
       </xsl:when>
       <xsl:otherwise>
-        <li><a href="{$library_name}?a=b&amp;rt=r&amp;s={$serviceName}&amp;c={$collName}&amp;cl={@name}"><xsl:value-of select="displayItem[@name='name']"/></a></li></xsl:otherwise></xsl:choose>
+        <li><a href="{$library_name}?a=b&amp;amp;rt=r&amp;amp;s={$serviceName}&amp;amp;c={$collName}&amp;amp;cl={@name}"><xsl:value-of select="displayItem[@name='name']"/></a></li></xsl:otherwise></xsl:choose>
     
       </xsl:for-each>

main/trunk/greenstone3/web/interfaces/default/transform/classifiertools.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
   
   <xsl:template match="classifier">
@@ -95 +94 @@
     <xsl:param name="collName"/>
     <xsl:param name="serviceName"/>
-    <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@nodeID}&amp;dt={@docType}&amp;p.a=b&amp;p.s={$serviceName}"><xsl:apply-templates select="." mode="displayNodeIcon"/></a><xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/>
+    <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@nodeID}&amp;dt={@docType}&amp;p.a=b&amp;p.s={$serviceName}"><xsl:apply-templates select="." mode="displayNodeIcon"/></a><xsl:text>Test</xsl:text><xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/>
   </xsl:template>
 
@@ -105 +104 @@
     <xsl:param name="serviceName"/>
     <a><xsl:attribute name='href'><xsl:value-of select='$library_name'/>?a=b&amp;rt=r&amp;s=<xsl:value-of select='$serviceName'/>&amp;c=<xsl:value-of select='$collName'/>&amp;cl=<xsl:value-of select='@nodeID'/><xsl:if test="classifierNode|documentNode">.pr</xsl:if></xsl:attribute><xsl:call-template name="bookshelfimg"/></a><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name='Title']"/>
+
   </xsl:template>
   

main/trunk/greenstone3/web/interfaces/default/transform/document.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
   xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util gsf">
-
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java gsf">
 
   <!-- style includes global params interface_name, library_name -->
@@ -56 +54 @@
   <xsl:template name="pageTitle">
     <xsl:variable name="docID" select="/page/pageResponse/document/@selectedNode"/>
-    <xsl:for-each select='/page/pageResponse/document/descendant::documentNode[@nodeID=$docID]/ancestor-or-self::documentNode'><xsl:if test='position()!=1'>::</xsl:if><xsl:value-of select="metadataList/metadata[@name='Title']"/></xsl:for-each>
+    <xsl:for-each select="/page/pageResponse/document/descendant::documentNode[@nodeID=$docID]/ancestor-or-self::documentNode"><xsl:if test='position()!=1'>::</xsl:if><xsl:value-of select="metadataList/metadata[@name='Title']"/></xsl:for-each>
   </xsl:template>
 
@@ -70 +68 @@
       </xsl:text>
     </style>
+
     <!--TODO: add berry basket switch-->
     <!--<xsl:if test="$berryBaskets = 'true'">-->
@@ -138 +137 @@
         <xsl:text disable-output-escaping="yes">
           var doc_url = document.URL; 
-          doc_url = doc_url.replace(/(&amp;|\?)book=[a-z]+/gi,'');
-          doc_url += '&amp;book=flashxml';
+          doc_url = doc_url.replace(/(&amp;amp;|\?)book=[a-z]+/gi,'');
+          doc_url += '&amp;amp;book=flashxml';
 
           var flash_plug_html = ""
-          flash_plug_html += '&lt;OBJECT align="middle" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" \n';
+          flash_plug_html += '&amp;lt;OBJECT align="middle" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" \n';
           flash_plug_html += '  codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" \n';
           flash_plug_html += '  height="100%" id="Book" swLiveConnect="true" \n';
-          flash_plug_html += '  width="100%"&gt;\n';
-          flash_plug_html += '    &lt;PARAM name="allowScriptAccess" value="always" /&gt;\n';
-          flash_plug_html += '    &lt;PARAM name="movie" value="Book.swf';
+          flash_plug_html += '  width="100%"&amp;gt;\n';
+          flash_plug_html += '    &amp;lt;PARAM name="allowScriptAccess" value="always" /&amp;gt;\n';
+          flash_plug_html += '    &amp;lt;PARAM name="movie" value="Book.swf';
           flash_plug_html += '?src_image=' + escape(img_cover);
-          flash_plug_html += '&amp;doc_url=' + escape(doc_url)
-          flash_plug_html += '" /&gt;\n';
-          flash_plug_html += '    &lt;PARAM name="quality" value="high" /&gt;\n';
-          flash_plug_html += '    &lt;PARAM name="bgcolor" value="#FFFFFF" /&gt;\n';
-          flash_plug_html += '    &lt;EMBED align="middle" \n';
+          flash_plug_html += '&amp;amp;doc_url=' + escape(doc_url)
+          flash_plug_html += '" /&amp;gt;\n';
+          flash_plug_html += '    &amp;lt;PARAM name="quality" value="high" /&amp;gt;\n';
+          flash_plug_html += '    &amp;lt;PARAM name="bgcolor" value="#FFFFFF" /&amp;gt;\n';
+          flash_plug_html += '    &amp;lt;EMBED align="middle" \n';
           flash_plug_html += '      allowScriptAccess="always" swLiveConnect="true" \n';
           flash_plug_html += '      bgcolor="#FFFFFF" height="100%" name="Book" \n';
@@ -160 +159 @@
           flash_plug_html += '      src="Book.swf';
           flash_plug_html += '?src_image=' + escape(img_cover);
-          flash_plug_html += '&amp;doc_url=' + escape(doc_url);
+          flash_plug_html += '&amp;amp;doc_url=' + escape(doc_url);
           flash_plug_html += '"\n'; 
-          flash_plug_html += '      type="application/x-shockwave-flash" width="100%" /&gt;\n';
-          flash_plug_html += '&lt;/OBJECT&gt;\n';
+          flash_plug_html += '      type="application/x-shockwave-flash" width="100%" /&amp;gt;\n';
+          flash_plug_html += '&amp;lt;/OBJECT&amp;gt;\n';
           var flash_div = document.getElementById("bookdiv");
           flash_div.innerHTML = flash_plug_html;
@@ -199 +198 @@
     <xsl:variable name="p.c"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='p.c']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='p.c']/@value"/></xsl:when><xsl:otherwise><xsl:value-of select="$collName"/></xsl:otherwise></xsl:choose></xsl:variable>
     <div id="documentheading">
-      <a href="{$library_name}?a={$p.a}&amp;sa={$p.sa}&amp;s={$p.s}&amp;c={$p.c}&amp;rt=rd"><xsl:call-template name="openbookimg"><xsl:with-param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'close_book')"/></xsl:with-param>
+      <a href="{$library_name}?a={$p.a}&amp;amp;sa={$p.sa}&amp;amp;s={$p.s}&amp;amp;c={$p.c}&amp;amp;rt=rd"><xsl:call-template name="openbookimg"><xsl:with-param name="title"><xsl:value-of select="'close_book'"/></xsl:with-param>
     </xsl:call-template></a>
       <xsl:choose><xsl:when test="@docType='simple'"><xsl:value-of select="metadataList/metadata[@name='Title']" disable-output-escaping="yes"/></xsl:when><xsl:otherwise><xsl:value-of select="documentNode/metadataList/metadata[@name='Title']" disable-output-escaping="yes"/></xsl:otherwise></xsl:choose>
@@ -253 +252 @@
       </xsl:when>
       <xsl:otherwise>
-    <img><xsl:attribute name='src'><xsl:value-of select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<xsl:value-of select="metadataList/metadata[@name='archivedir']"/>/cover.jpg</xsl:attribute></img>
+    <img><xsl:attribute name="src"><xsl:value-of select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<xsl:value-of select="metadataList/metadata[@name='archivedir']"/>/cover.jpg</xsl:attribute></img>
       </xsl:otherwise>
     </xsl:choose>
@@ -270 +269 @@
       <li>
         <xsl:choose><xsl:when test="string($ed)='1'">
-        <a href="{$library_name}?a=d&amp;d={$docID}&amp;c={$collName}&amp;sib={$sib}&amp;ed=0"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.contract_doc_tip')"/></xsl:attribute>
-          <xsl:value-of disable-output-escaping='yes' select="util:getInterfaceText($interface_name, /page/@lang, 'doc.contract_doc_b')"/>
-        </a>
+        <a href="{$library_name}?a=d&amp;amp;d={$docID}&amp;amp;c={$collName}&amp;amp;sib={$sib}&amp;amp;ed=0" class="getTextFor doc.contract_doc_b this.title.doc.contract_doc_tip"></a>
       </xsl:when>
       <xsl:otherwise>
-        <a href="{$library_name}?a=d&amp;d={$docID}&amp;c={$collName}&amp;sib={$sib}&amp;ed=1"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.expand_doc_tip')"/></xsl:attribute>
-          <xsl:value-of disable-output-escaping='yes' select="util:getInterfaceText($interface_name, /page/@lang, 'doc.expand_doc_b')"/>
-        </a>
+        <a href="{$library_name}?a=d&amp;amp;d={$docID}&amp;amp;c={$collName}&amp;amp;sib={$sib}&amp;amp;ed=1" class="getTextFor doc.expand_doc_b this.title.doc.expand_doc_tip"></a>
       </xsl:otherwise>
     </xsl:choose>
@@ -287 +282 @@
       <li>
     <xsl:choose><xsl:when test="string($ec)='1'">
-        <a href="{$library_name}?a=d&amp;d={$docID}&amp;c={$collName}&amp;sib={$sib}&amp;ec=0"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.contract_contents_tip')"/></xsl:attribute>
-          <xsl:value-of disable-output-escaping='yes' select="util:getInterfaceText($interface_name, /page/@lang, 'doc.contract_contents_b')"/></a>
+        <a href="{$library_name}?a=d&amp;amp;d={$docID}&amp;amp;c={$collName}&amp;amp;sib={$sib}&amp;amp;ec=0" class="getTextFor doc.contract_contents_b this.title.doc.contract_contents_tip"></a>
       </xsl:when>
       <xsl:otherwise>
-        <a  href="{$library_name}?a=d&amp;d={$docID}&amp;c={$collName}&amp;sib={$sib}&amp;ec=1"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.expand_contents_tip')"/></xsl:attribute>
-          <xsl:value-of disable-output-escaping='yes' select="util:getInterfaceText($interface_name, /page/@lang, 'doc.expand_contents_b')"/>
-        </a>
+        <a  href="{$library_name}?a=d&amp;amp;d={$docID}&amp;amp;c={$collName}&amp;amp;sib={$sib}&amp;amp;ec=1" class="getTextFor doc.expand_contents_b this.title.doc.expand_contents_tip"></a>
       </xsl:otherwise>
     </xsl:choose>
@@ -302 +294 @@
     <xsl:variable name="paramList" select="/page/pageRequest/paramList"/>
     <li>
-      <a target="_blank"><xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;d=<xsl:value-of select="$docID"/>&amp;c=<xsl:value-of select="$collName"/>&amp;sib=<xsl:value-of select="$sib"/>&amp;dt=<xsl:value-of select="$paramList/param[@name='dt']/@value"/>&amp;ec=<xsl:value-of select="$paramList/param[@name='ec']/@value"/>&amp;et=<xsl:value-of select="$paramList/param[@name='et']/@value"/>&amp;p.a=<xsl:value-of select="$paramList/param[@name='p.a']/@value"/>&amp;p.s=<xsl:value-of select="$paramList/param[@name='p.s']/@value"/>&amp;p.sa=<xsl:value-of select="$paramList/param[@name='p.sa']/@value"/></xsl:attribute><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.detach_page_tip')"/></xsl:attribute>
-    <xsl:value-of disable-output-escaping='yes' select="util:getInterfaceText($interface_name, /page/@lang, 'doc.detach_page_b')"/>
-      </a></li>
+      <a target="_blank" class="getTextFor doc.detach_page_b this.title.doc.detach_page_tip"><xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;amp;d=<xsl:value-of select="$docID"/>&amp;amp;c=<xsl:value-of select="$collName"/>&amp;amp;sib=<xsl:value-of select="$sib"/>&amp;amp;dt=<xsl:value-of select="$paramList/param[@name='dt']/@value"/>&amp;amp;ec=<xsl:value-of select="$paramList/param[@name='ec']/@value"/>&amp;amp;et=<xsl:value-of select="$paramList/param[@name='et']/@value"/>&amp;amp;p.a=<xsl:value-of select="$paramList/param[@name='p.a']/@value"/>&amp;amp;p.s=<xsl:value-of select="$paramList/param[@name='p.s']/@value"/>&amp;amp;p.sa=<xsl:value-of select="$paramList/param[@name='p.sa']/@value"/></xsl:attribute></a></li>
   </xsl:template>
 
@@ -333 +323 @@
     <xsl:variable name="p.a" select="/page/pageRequest/paramList/param[@name='p.a']/@value"/>
     <xsl:variable name="p.c"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='p.c']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='p.c']/@value"/></xsl:when><xsl:otherwise><xsl:value-of select="$collName"/></xsl:otherwise></xsl:choose></xsl:variable>
-    <xsl:if test="documentNode[@nodeID]">
+    <script type="text/javascript">
+      <xsl:text>
+        // Load up the initial document using AJAX!
+        var initialHash = '</xsl:text>
+      <xsl:value-of select="$d" /><xsl:text>';
+      </xsl:text>
+    </script>
+    <xsl:if test="documentNode[@nodeID]">      
       <ul id="tocnodes">
-    <li>
+    <li id="tocstart">
       <xsl:choose><xsl:when test="string($oc)='0'">
-          <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={$d}&amp;sib={$sib}&amp;oc=1&amp;p.s={$p.s}&amp;p.sa={$p.sa}&amp;p.a={$p.a}&amp;p.c={$p.c}"><xsl:call-template name="closedfolderimg"><xsl:with-param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.open_toc')"/></xsl:with-param></xsl:call-template></a>
+          <a href="{$library_name}?a=d&amp;amp;c={$collName}&amp;amp;d={$d}&amp;amp;sib={$sib}&amp;amp;oc=1&amp;amp;p.s={$p.s}&amp;amp;p.sa={$p.sa}&amp;amp;p.a={$p.a}&amp;amp;p.c={$p.c}"><xsl:call-template name="closedfolderimg"><xsl:with-param name="title"><xsl:value-of select="'doc.open_toc'"/></xsl:with-param></xsl:call-template></a>
         </xsl:when>
-        <xsl:otherwise><a href="{$library_name}?a=d&amp;c={$collName}&amp;d={$d}&amp;sib={$sib}&amp;oc=0&amp;p.s={$p.s}&amp;p.sa={$p.sa}&amp;p.a={$p.a}&amp;p.c={$p.c}"><xsl:call-template name="openfolderimg"><xsl:with-param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.close_toc')"/></xsl:with-param></xsl:call-template></a></xsl:otherwise></xsl:choose><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.table_of_contents')"/>
+        <xsl:otherwise><a href="{$library_name}?a=d&amp;amp;c={$collName}&amp;amp;d={$d}&amp;amp;sib={$sib}&amp;amp;oc=0&amp;amp;p.s={$p.s}&amp;amp;p.sa={$p.sa}&amp;amp;p.a={$p.a}&amp;amp;p.c={$p.c}"><xsl:call-template name="openfolderimg"><xsl:with-param name="title"><xsl:value-of select="'doc.close_toc'"/></xsl:with-param></xsl:call-template></a></xsl:otherwise></xsl:choose><span class="getTextFor doc.table_of_contents">&amp;amp;nbsp;</span>
       <xsl:if test="string($oc)!='0'">
         <ul class="tocnode">
@@ -362 +359 @@
     <!-- Display the appropriate image, depending on the node type -->
     <li>
-      <a><xsl:attribute name="href"><xsl:value-of select='$library_name'/>?a=d&amp;c=<xsl:value-of select='$collName'/>&amp;d=<xsl:value-of select='@nodeID'/><xsl:if test="documentNode">.pr</xsl:if>&amp;sib=1<xsl:if test="string($ec) = '1'">&amp;ec=1</xsl:if>&amp;p.a=<xsl:value-of select="$p.a"/>&amp;p.sa=<xsl:value-of select="$p.sa"/>&amp;p.s=<xsl:value-of select="$p.s"/>&amp;p.c=<xsl:value-of select="$p.c"/></xsl:attribute>
+      <a><xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;amp;c=<xsl:value-of select="$collName"/>&amp;amp;d=<xsl:value-of select="@nodeID"/><xsl:if test="documentNode">.pr</xsl:if>&amp;amp;sib=1<xsl:if test="string($ec) = '1'">&amp;amp;ec=1</xsl:if>&amp;amp;p.a=<xsl:value-of select="$p.a"/>&amp;amp;p.sa=<xsl:value-of select="$p.sa"/>&amp;amp;p.s=<xsl:value-of select="$p.s"/>&amp;amp;p.c=<xsl:value-of select="$p.c"/></xsl:attribute>
     <xsl:apply-templates select="." mode="displayNodeIcon"/>
       </a>
@@ -372 +369 @@
     </xsl:when>
     <xsl:otherwise>
-      <xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name='Title']"/>
+      <span><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name='Title']"/></span>
     </xsl:otherwise>
       </xsl:choose>
@@ -394 +391 @@
     <xsl:when test="@docType='simple'"><xsl:apply-templates select="nodeContent"/></xsl:when>
     <xsl:otherwise>
-      <xsl:apply-templates select="descendant-or-self::node()/documentNode" mode="content"/>
+      <!--<xsl:apply-templates select="descendant-or-self::node()/documentNode" mode="content"/>-->
     </xsl:otherwise>
       </xsl:choose>
@@ -411 +408 @@
   <!-- the actual text/content -->
   <xsl:template match="nodeContent">
-    <p/>
     <xsl:for-each select="node()">
       <xsl:choose>
     <xsl:when test="not(name())">
-      <xsl:value-of select="." disable-output-escaping="yes"/>
+      <xsl:value-of select="." disable-output-escaping="yes" />
     </xsl:when>
     <xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
@@ -444 +440 @@
       <xsl:when test="nodeContent">
     <xsl:text disable-output-escaping="yes">
-      &lt;Section&gt;
-      &lt;Description&gt;
-      &lt;Metadata name="Title"&gt;
+      &amp;lt;Section&amp;gt;
+      &amp;lt;Description&amp;gt;
+      &amp;lt;Metadata name="Title"&amp;gt;
     </xsl:text>
     <xsl:value-of select="normalize-space(metadataList/metadata[@name='Title'])"/>
     <xsl:text disable-output-escaping="yes">
-      &lt;/Metadata&gt;
-      &lt;/Description&gt;
+      &amp;lt;/Metadata&amp;gt;
+      &amp;lt;/Description&amp;gt;
     </xsl:text>
     <xsl:value-of select="normalize-space(nodeContent)" disable-output-escaping="yes"/>
-    <xsl:text disable-output-escaping="yes">&lt;/Sec&gt;</xsl:text>
+    <xsl:text disable-output-escaping="yes">&amp;lt;/Sec&amp;gt;</xsl:text>
       </xsl:when>
     </xsl:choose>
@@ -465 +461 @@
     <!-- end the section -->
     <xsl:text disable-output-escaping="yes">
-      &lt;/Section&gt;
+      &amp;lt;/Section&amp;gt;
     </xsl:text>
   </xsl:template>
@@ -473 +469 @@
     <xsl:variable name="httpPath" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>
     <xsl:choose>
-      <xsl:when test="util:isImage(@mimeType)">
+      <xsl:when test="starts-with(@mimeType, 'image/')">
     <img src="{$httpPath}/{@href}"/>
       </xsl:when>
@@ -488 +484 @@
       <xsl:choose>
     <xsl:when test="@type='document'">a=d</xsl:when>
-    <xsl:when test="@type='query'">a=q&amp;s=<xsl:value-of select="@service"/>&amp;rt=rd</xsl:when>
+    <xsl:when test="@type='query'">a=q&amp;amp;s=<xsl:value-of select="@service"/>&amp;amp;rt=rd</xsl:when>
     <xsl:otherwise>
     p
@@ -495 +491 @@
     </xsl:variable>
     <xsl:variable name="serviceargs">
-      <xsl:for-each select="param">&amp;s1.<xsl:value-of select="@name"/>=<xsl:value-of select="@value"/></xsl:for-each>
+      <xsl:for-each select="param">&amp;amp;s1.<xsl:value-of select="@name"/>=<xsl:value-of select="@value"/></xsl:for-each>
     </xsl:variable>
-    <a href="{$library_name}?{$actionargs}&amp;c={$collName}{$serviceargs}"><xsl:value-of disable-output-escaping="yes" select="."/></a>
+    <a href="{$library_name}?{$actionargs}&amp;amp;c={$collName}{$serviceargs}"><xsl:value-of disable-output-escaping="yes" select="."/></a>
   </xsl:template>
 
@@ -518 +514 @@
         </td>
         <td align="center"><center>
-        <b><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.pages', $children)"/></b>
+        <b class="getTextFor doc.pages"></b>
           </center></td>
         <td align="right">
-          <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@selectedNode}.fc"><img src="interfaces/default/images/more.gif" border="0" align="absbottom" /></a>
+          <a href="{$library_name}?a=d&amp;amp;c={$collName}&amp;amp;d={@selectedNode}.fc"><img src="interfaces/default/images/more.gif" border="0" align="absbottom" /></a>
         </td>
       </tr>
@@ -530 +526 @@
         <td align="left">
           <xsl:if test=" not ( $pos = 1 )">
-        <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@selectedNode}.ps"><img src="interfaces/default/images/less.gif" border="0" align="absbottom" /></a>
+        <a href="{$library_name}?a=d&amp;amp;c={$collName}&amp;amp;d={@selectedNode}.ps"><img src="interfaces/default/images/less.gif" border="0" align="absbottom" /></a>
           </xsl:if>
         </td>
         <td align="center"><center>
-        <b><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.pageof', concat($pos, ';', $length))"/></b>
+        <b><xsl:attribute name="class"><xsl:value-of select="concat('getTextFor null this.innerText.doc.pageof|', $pos, ';', $length)"/></xsl:attribute></b>
           </center></td>
         <td align="right">
           <xsl:if test=" not($pos = $length)">
-        <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@selectedNode}.ns"><img src="interfaces/default/images/more.gif" border="0" align="absbottom" /></a>
+        <a href="{$library_name}?a=d&amp;amp;c={$collName}&amp;amp;d={@selectedNode}.ns"><img src="interfaces/default/images/more.gif" border="0" align="absbottom" /></a>
           </xsl:if>
         </td>
@@ -551 +547 @@
         <input type='hidden' name='d' value='{@selectedNode}'/>
         <input type="text" name="gp" size="3" maxlength="4"/>
-        <input type="submit"><xsl:attribute name='value'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.gotopage')"/></xsl:attribute></input>
+        <input type="submit" class="getTextFor null this.value.doc.gotopage"></input>
       </form>
     </td>
@@ -568 +564 @@
         <form name="EnrichForm" method="get" action="{$library_name}">
           <xsl:apply-templates select="paramList"/>
-          <input type='hidden' name='a' value='d'/>
-          <input type='hidden' name='d' value='{$docID}'/>
-          <input type='hidden' name='c' value='{$collName}'/>
-          <xsl:if test='$request-params/param[@name="sib"]'>
-        <input type='hidden' name='sib'><xsl:attribute name='value'><xsl:value-of select='$request-params/param[@name="sib"]/@value'/></xsl:attribute></input></xsl:if>
-          <input type='hidden' name='s' value='{@name}'/>
-          <input type='hidden' name='p.a'><xsl:attribute name='value'><xsl:value-of select='$request-params/param[@name="p.a"]'/></xsl:attribute></input>
-          <input type='hidden' name='p.sa'><xsl:attribute name='value'><xsl:value-of select='$request-params/param[@name="p.sa"]'/></xsl:attribute></input>
-          <input type='hidden' name='p.s'><xsl:attribute name='value'><xsl:value-of select='$request-params/param[@name="p.s"]'/></xsl:attribute></input>
-          <input type='hidden' name='end' value='1'/>
+          <input type="hidden" name="a" value="d"/>
+          <input type="hidden" name="d" value="{$docID}"/>
+          <input type="hidden" name="c" value="{$collName}"/>
+          <xsl:if test="$request-params/param[@name='sib']">
+        <input type="hidden" name="sib"><xsl:attribute name="value"><xsl:value-of select="$request-params/param[@name='sib']/@value"/></xsl:attribute></input></xsl:if>
+          <input type="hidden" name="s" value="{@name}"/>
+          <input type="hidden" name="p.a"><xsl:attribute name="value"><xsl:value-of select="$request-params/param[@name='p.a']"/></xsl:attribute></input>
+          <input type="hidden" name="p.sa"><xsl:attribute name="value"><xsl:value-of select="$request-params/param[@name='p.sa']"/></xsl:attribute></input>
+          <input type="hidden" name="p.s"><xsl:attribute name="value"><xsl:value-of select="$request-params/param[@name='p.s']"/></xsl:attribute></input>
+          <input type="hidden" name="end" value='1'/>
           <input type="submit"><xsl:attribute name="value"><xsl:value-of select="displayItem[@name='submit']"/></xsl:attribute></input>
         </form>
@@ -615 +611 @@
     <xsl:param name="direction"/>
     <xsl:variable name="request-params" select="/page/pageRequest/paramList"/>
-    <xsl:if test='$request-params/param[@name="dt"]/@value != "simple"'>  
-      <a><xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;c=<xsl:value-of select="$collName"/>&amp;d=<xsl:value-of select="@selectedNode"/><xsl:choose><xsl:when test="$direction='back'">.pp</xsl:when><xsl:otherwise>.np</xsl:otherwise></xsl:choose>&amp;sib=1&amp;p.s=<xsl:value-of select='$request-params/param[@name="p.s"]/@value'/>&amp;p.sa=<xsl:value-of select='$request-params/param[@name="p.sa"]/@value'/>&amp;p.a=<xsl:value-of select='$request-params/param[@name="p.a"]/@value'/></xsl:attribute><xsl:choose><xsl:when test="$direction='back'"><img class="lessarrow" src="interfaces/default/images/less.gif" /></xsl:when><xsl:otherwise><img class="morearrow" src="interfaces/default/images/more.gif"  /></xsl:otherwise></xsl:choose></a>
+    <xsl:if test="$request-params/param[@name='dt']/@value != 'simple'">  
+      <a><xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;amp;c=<xsl:value-of select="$collName"/>&amp;amp;d=<xsl:value-of select="@selectedNode"/><xsl:choose><xsl:when test="$direction='back'">.pp</xsl:when><xsl:otherwise>.np</xsl:otherwise></xsl:choose>&amp;amp;sib=1&amp;amp;p.s=<xsl:value-of select="$request-params/param[@name='p.s']/@value"/>&amp;amp;p.sa=<xsl:value-of select="$request-params/param[@name='p.sa']/@value"/>&amp;amp;p.a=<xsl:value-of select="$request-params/param[@name='p.a']/@value"/></xsl:attribute><xsl:choose><xsl:when test="$direction='back'"><img class="lessarrow" src="interfaces/default/images/less.gif" /></xsl:when><xsl:otherwise><img class="morearrow" src="interfaces/default/images/more.gif"  /></xsl:otherwise></xsl:choose></a>
     </xsl:if> 
   </xsl:template>
@@ -622 +618 @@
   <xsl:template name="externalPage">
     <xsl:param name="external"/>
-    <xsl:variable name="go_forward_link"><a><xsl:attribute name="href"><xsl:value-of select="$external"/></xsl:attribute><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'external.go_forward')"/></a></xsl:variable>
-    <h2><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'external.title')"/></h2>
-    <p><xsl:value-of select="util:getInterfaceTextWithDOM($interface_name, /page/@lang, 'external.text', $go_forward_link)" disable-output-escaping="yes"/>
+    <xsl:variable name="go_forward_link"><a class="getTextfor external.go_forward"><xsl:attribute name="href"><xsl:value-of select="$external"/></xsl:attribute></a></xsl:variable>
+    <h2 class="getTextFor external.title"></h2>
+    <p><xsl:attribute name="class"><xsl:value-of select="concat('getTextFor null this.innerText.external.text|', $go_forward_link)" /></xsl:attribute>
     </p>
   </xsl:template>
 
 </xsl:stylesheet>
-
-
-
-

main/trunk/greenstone3/web/interfaces/default/transform/gli4gs3.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
   
   <!-- style includes global params interface_name, library_name -->

main/trunk/greenstone3/web/interfaces/default/transform/help.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
   
   <!-- style includes global params interface_name, library_name -->
@@ -18 +17 @@
     <title>
       <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->
-      <xsl:call-template name="pageTitle"/><xsl:text> </xsl:text>
+      <xsl:text> </xsl:text>
     </title>
     <xsl:call-template name="globalStyle"/>
@@ -29 +28 @@
       <xsl:call-template name="greenstoneFooter"/>
     </div>
+        <xsl:call-template name="pageTitle"/>
       </body>
     </html>
@@ -34 +34 @@
   
   <xsl:template name="pageTitle">
-    <xsl:choose><xsl:when test="/page/pageResponse/*/displayItem[@name='name']"><xsl:value-of select="/page/pageResponse/*/displayItem[@name='name']"/></xsl:when><xsl:otherwise><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'gsdl')"/></xsl:otherwise></xsl:choose>: <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_t')"/>
+    <xsl:choose>
+        <xsl:when test="/page/pageResponse/*/displayItem[@name='name']">
+            <span>
+                <xsl:attribute name="class">
+                    <xsl:text>getTextFor null document.title.text:'</xsl:text>
+                    <xsl:value-of select="/page/pageResponse/*/displayItem[@name='name']"/>
+                    <xsl:text>'</xsl:text>
+                </xsl:attribute>
+            </span>
+        </xsl:when>
+        <xsl:otherwise>
+            <span class="getTextFor null document.title.gsdl">&amp;amp;nbsp;</span>
+        </xsl:otherwise>
+    </xsl:choose>
+    <span class="getTextFor null document.title.text:'&#160;:&#160;'[a],document.title.help_t[a]">&amp;amp;nbsp;</span>
   </xsl:template>
 

main/trunk/greenstone3/web/interfaces/default/transform/home.xsl

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet version="1.0"
+xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
   xmlns:gslib="http://www.greenstone.org/skinning"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
 
   
@@ -16 +16 @@
       <head>
     <title>
-      <gslib:siteHomePageTitle/>
+      <xsl:text> </xsl:text>
     </title>
     <link rel="stylesheet" href="interfaces/default/style/core.css" type="text/css"/>
       </head>
       
-      <body><gslib:textDirectionAttribute/>
+      <body>
     
     <div id="page-wrapper">
@@ -29 +29 @@
       <div id="banner">
         <p>
-          <img src="interfaces/default/images/gsdlhead.gif"><xsl:attribute name="alt"><gslib:greenstoneLogoAlternateText/></xsl:attribute>
-          </img>
+          <img src="interfaces/default/images/gsdlhead.gif" class="getTextFor null this.alt.gsdl" />
         </p>
       </div>
       
-      <div id="content">
+      <div id="content" class="moz-output-escape">
         
         <div class="divbar"><gslib:selectACollectionTextBar/></div>
@@ -63 +62 @@
         <li><gslib:authenticationLink/></li>
           </xsl:for-each>
-          <!--uncomment the line below to display a library interface link inside a <li>-->
-          <!--<gslib:libraryInterfaceLink/>-->
         </ul>
         
@@ -71 +68 @@
       
       <div id="footer">
-        <div class="divbar"><gslib:poweredByGS3TextBar/></div>
+        <div class="divbar">
+            <span class="getTextFor gs3power">&amp;nbsp;</span> 
+        </div>
       </div>
       
     </div>
+    
+    <span class="getTextFor null document.title.gsdl">&amp;nbsp;</span>
+    
+        <span id="language" style="display: none;"><xsl:value-of select="/page/@lang" /></span>
+        <span id="interface" style="display: none;"><xsl:value-of select="$interface_name" /></span>
+    
+        <script type="text/javascript">var placeholder = false;</script>
+        <script type="text/javascript" src="jquery.js">
+            <xsl:comment>Filler for browser</xsl:comment>
+        </script>
+        <script type="text/javascript" src="test.js">
+            <xsl:comment>Filler for browser</xsl:comment>
+        </script>
     
       </body>

main/trunk/greenstone3/web/interfaces/default/transform/html.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
   
   <xsl:output method="html"/>  
@@ -11 +10 @@
   <xsl:template match="page">
     <html>
-      <head></head>
+      <head>
+        
+      </head>
+      <body>
       <frameset rows="68,*" noresize="" border="0">
-    <frame frameborder="0"><xsl:attribute name="src">?a=p&amp;sa=nav&amp;c=<xsl:value-of select="/page/pageRequest/paramList/param[@name='c']/@value" /></xsl:attribute></frame>
+    <frame frameborder="0"><xsl:attribute name="src">?a=p&amp;amp;sa=nav&amp;amp;c=<xsl:value-of select="/page/pageRequest/paramList/param[@name='c']/@value" /></xsl:attribute></frame>
     <frame frameborder="0"><xsl:attribute name="src"><xsl:value-of select="/page/pageRequest/paramList/param[@name='url']/@value"/></xsl:attribute></frame>
     <noframes>
-      <p><xsl:value-of select="util:getInterfaceText('default', /page/@lang, 'textframebrowser')"/></p>
+      <p class="getTextFor textframebrowser">&amp;amp;nbsp;</p>
     </noframes>
       </frameset>
+        <script type="text/javascript" src="jquery.js"><!-- jQuery --></script>
+        <script type="text/javascript" src="test.js"><!-- Scripts for client side XSL transformations --></script>
+      </body>
     </html>
   </xsl:template>

main/trunk/greenstone3/web/interfaces/default/transform/icons.xsl

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  
   <!-- some global parameters - these are set by whoever is invoking the transformation -->
@@ -19 +15 @@
       <xsl:when test="documentNode">
         <xsl:call-template name="openbookimg">
-          <xsl:with-param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'close_book')"/></xsl:with-param>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="closedbookimg">
-          <xsl:with-param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'open_book')"/></xsl:with-param>
         </xsl:call-template>
       </xsl:otherwise>
@@ -35 +29 @@
       <xsl:when test="documentNode">
         <xsl:call-template name="openfolderimg">
-          <xsl:with-param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'close_folder')"/></xsl:with-param>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="closedfolderimg">
-          <xsl:with-param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'open_folder')"/></xsl:with-param>
         </xsl:call-template>
       </xsl:otherwise>
@@ -49 +41 @@
       <xsl:otherwise>
     <xsl:call-template name="textpageimg">
-      <xsl:with-param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'view_document')"/></xsl:with-param>
     </xsl:call-template>
       </xsl:otherwise>
@@ -56 +47 @@
 
   <xsl:template name="openbookimg">
+    <xsl:param name="title"/>
     <xsl:param name="alt"/>
-    <xsl:param name="title"/>
     <img  border="0" width="28" height="23"
       src="interfaces/default/images/openbook.gif"
-      alt="{$alt}" title="{$title}"/>
+      alt="{$alt}" class="getTextFor null this.title.{$title}" />
   </xsl:template>
 
   <xsl:template name="closedbookimg">
     <xsl:param name="alt"/>
-    <xsl:param name="title"/>
     <img border="0" width="18" height="11"
       src="interfaces/default/images/book.gif"
-      alt="{$alt}" title="{$title}"/>
+      alt="{$alt}" class="getTextFor null this.title.open_book" />
   </xsl:template>
 
   <xsl:template name="openfolderimg">
+    <xsl:param name="title"/>
     <xsl:param name="alt"/>
-    <xsl:param name="title"/>
     <img border="0" width="23" height="15"
       src="interfaces/default/images/openfldr.gif"
-      alt="{$alt}" title="{$title}"/>
+      alt="{$alt}" class="getTextFor null this.title.{$title}" />
   </xsl:template>
 
   <xsl:template name="closedfolderimg">
+    <xsl:param name="title"/>
     <xsl:param name="alt"/>
-    <xsl:param name="title"/>
     <img  border="0" width="23" height="15"
       src="interfaces/default/images/clsdfldr.gif"
-      alt="{$alt}" title="{$title}"/>
+      alt="{$alt}" class="getTextFor null this.title.{$title}" />
   </xsl:template>
 
   <xsl:template name="textpageimg">
     <xsl:param name="alt"/>
-    <xsl:param name="title"/>
     <img  border="0" width="16" height="21"
       src="interfaces/default/images/itext.gif"
-      alt="{$alt}" title="{$title}"/>
+      alt="{$alt}" class="getTextFor null this.title.view_document,parent.class.text:'clientDocView'" />
+    <span><xsl:value-of select="$alt" /></span>
   </xsl:template>
 
@@ -105 +95 @@
   <xsl:template name="iconpdf">
     <xsl:param name="alt">PDF</xsl:param>
-    <xsl:param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'texticonpdf')"/></xsl:param>
     <img border="0" width='26' height='26' 
       src='interfaces/default/images/ipdf.gif' 
-      alt='{$alt}' title='{$title}'/>
+      alt='{$alt}' class="getTextFor null this.title.texticonpdf" />
   </xsl:template>
   
   <xsl:template name="icondoc">
     <xsl:param name="alt">Word</xsl:param>
-    <xsl:param name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'texticonmsword')"/></xsl:param>
     <img border="0" width='26' height='26' 
       src='interfaces/default/images/imsword.gif' 
-      alt='{$alt}' title='{$title}'/>
+      alt='{$alt}' class="getTextFor null this.title.texticonmsword" />
   </xsl:template>
 

main/trunk/greenstone3/web/interfaces/default/transform/library.xsl

@@ -4 +4 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   xmlns:gslib="http://www.greenstone.org/XSL/Library"
-  exclude-result-prefixes="util xalan gslib gsf xslt gs3">
-  
+  exclude-result-prefixes="gslib">
   
   <xsl:output

main/trunk/greenstone3/web/interfaces/default/transform/nav.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
   
   <!-- style includes global params interface_name, library_name -->

main/trunk/greenstone3/web/interfaces/default/transform/pref.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
   
   <!-- style includes global params interface_name, library_name -->
@@ -29 +28 @@
       <xsl:call-template name="greenstoneFooter"/>
     </div>
+        <xsl:call-template name="pageTitleDeferred" />
       </body>
     </html>
@@ -34 +34 @@
   
   <xsl:template name="pageTitle">
-    <xsl:choose><xsl:when test="/page/pageResponse/*/displayItem[@name='name']"><xsl:value-of select="/page/pageResponse/*/displayItem[@name='name']"/></xsl:when><xsl:otherwise><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'gsdl')"/></xsl:otherwise></xsl:choose>: <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_t')"/>
+    <xsl:choose><xsl:when test="/page/pageResponse/*/displayItem[@name='name']"><xsl:value-of select="/page/pageResponse/*/displayItem[@name='name']"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose>
+  </xsl:template>
+  
+  <xsl:template name="pageTitleDeferred">
+        <xsl:choose><xsl:when test="/page/pageResponse/*/displayItem[@name='name']"></xsl:when><xsl:otherwise><span class="getTextFor null document.title.gsdl,document.title.text:' : '[a],document.title.pref_t[a]"></span>:</xsl:otherwise></xsl:choose>
   </xsl:template>
 
@@ -59 +63 @@
     <input type='hidden' name='sa' value='pref'/>
     <input type='hidden' name='c' value="{$collName}"/>
-    <div class="formheading"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.prespref')"/></div>
+    <div class="formheading"><span class="getTextFor pref.prespref"></span></div>
     <ul id="presprefs"><xsl:call-template name="pres-prefs"/></ul>
     <ul id="berrybasketprefs" ><xsl:call-template name="berrybasket-prefs"/></ul>
@@ -67 +71 @@
     </xsl:if>
     
-    <div class="formheading"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.searchpref')"/></div>
+    <div class="formheading"><span class="getTextFor pref.searchpref"></span></div>
     <ul id="searchprefs"><xsl:call-template name="search-prefs"/></ul>
-    <input type='submit'><xsl:attribute name="value"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.set_prefs')"/></xsl:attribute></input>
+    <input type='submit' class="getTextFor null this.value.pref.set_prefs" id="test"></input>
       </form>
     </div>
@@ -75 +79 @@
   
   <xsl:template name="pres-prefs">
-    <li><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.interfacelang')"/> <xsl:call-template name="lang-list"/></li>
-    <li><span class="rightspace"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.encoding')"/></span>x</li>
+    <li><span class="getTextFor pref.interfacelang"></span></li>
+    <li><xsl:call-template name="lang-list"/></li>
+    <li><span class="rightspace"><span class="getTextFor pref.encoding"></span></span>x</li>
   </xsl:template>
   
@@ -90 +95 @@
   <xsl:template name="search-prefs">
     <xsl:variable name="hits"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='hitsPerPage']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='hitsPerPage']/@value"/></xsl:when><xsl:otherwise>20</xsl:otherwise></xsl:choose></xsl:variable> 
-    <li><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.hitsperpage')"/> 
+    <li><span class="getTextFor pref.hitsperpage">&amp;amp;nbsp;</span> 
       <select name="hitsPerPage">
     <option value="20"><xsl:if test="$hits=20"><xsl:attribute name="selected"></xsl:attribute></xsl:if>20</option> 
     <option value="50"><xsl:if test="$hits=50"><xsl:attribute name="selected"></xsl:attribute></xsl:if>50</option>
     <option value="100"><xsl:if test="$hits=100"><xsl:attribute name="selected"></xsl:attribute></xsl:if>100</option>
-    <option value="-1"><xsl:if test="$hits=-1"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.all')"/></option>
+    <option value="-1" class="getTextFor pref.all"><xsl:if test="$hits=-1"><xsl:attribute name="selected"></xsl:attribute></xsl:if></option>
       </select>
     </li>
@@ -103 +108 @@
     <xsl:variable name="berrybasket"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='berrybasket']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='berrybasket']/@value"/></xsl:when><xsl:otherwise>off</xsl:otherwise></xsl:choose></xsl:variable>
     
-    <li><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.berrybasket')"/> <select name="berrybasket">
-        <option value="on"><xsl:if test="$berrybasket='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.berrybasket.on')"/></option> 
-    <option value="off"><xsl:if test="$berrybasket='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.berrybasket.off')"/></option>
+    <li><span class="getTextFor pref.berrybasket">&amp;amp;nbsp;</span> <select name="berrybasket">
+        <option value="on" class="getTextFor pref.berrybasket.on"><xsl:if test="$berrybasket='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if></option> 
+    <option value="off" class="getTextFor pref.berrybasket.off"><xsl:if test="$berrybasket='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if></option>
       </select>
     </li>
@@ -113 +118 @@
     <xsl:variable name="book"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='book']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='book']/@value"/></xsl:when><xsl:otherwise>off</xsl:otherwise></xsl:choose></xsl:variable>
     
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.book')"/> <select name="book">
-      <option value="on"><xsl:if test="$book='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.berrybasket.on')"/></option> 
-      <option value="off"><xsl:if test="$book='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.berrybasket.off')"/></option>
+    <span class="getTextFor pref.book">&amp;amp;nbsp;</span> <select name="book">
+      <option value="on" class="getTextFor pref.berrybasket.on"><xsl:if test="$book='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if></option> 
+      <option value="off" class="getTextFor pref.berrybasket.off"><xsl:if test="$book='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if></option>
     </select>
     

main/trunk/greenstone3/web/interfaces/default/transform/process.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
 
   <!-- style includes global params interface_name, library_name -->
@@ -83 +82 @@
     <center/>
     <applet code="org.greenstone.gsdl3.build.StatusDisplay.class" codebase='lib' archive='gsdl3.jar, xercesImpl.jar, xml-apis.jar' width='600' height='150'>The status display applet.
-      <param name='library'><xsl:attribute name="value"><xsl:value-of select='$library_name'/>?a=pr&amp;rt=s&amp;c=<xsl:value-of select='$clusterName'/>&amp;s=<xsl:value-of select='/page/pageResponse/service/@name'/>&amp;o=xml&amp;ro=1&amp;l=<xsl:value-of select='/page/@lang'/>&amp;pid=<xsl:value-of select="@pid"/><xsl:apply-templates select="/page/pageResponse/service/paramList" mode="cgi"/></xsl:attribute></param>
+      <param name='library'><xsl:attribute name="value"><xsl:value-of select='$library_name'/>?a=pr&amp;amp;rt=s&amp;amp;c=<xsl:value-of select='$clusterName'/>&amp;amp;s=<xsl:value-of select='/page/pageResponse/service/@name'/>&amp;amp;o=xml&amp;amp;ro=1&amp;amp;l=<xsl:value-of select='/page/@lang'/>&amp;amp;pid=<xsl:value-of select="@pid"/><xsl:apply-templates select="/page/pageResponse/service/paramList" mode="cgi"/></xsl:attribute></param>
       <param name='initial_text'><xsl:attribute name="value"><xsl:value-of select="."/></xsl:attribute></param>
       <param name='initial_code'><xsl:attribute name="value"><xsl:value-of  select="@code"/></xsl:attribute></param></applet>

main/trunk/greenstone3/web/interfaces/default/transform/query.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
   
   <!-- style includes global params interface_name, library_name -->
@@ -21 +20 @@
     <title>
       <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->
-      <xsl:call-template name="pageTitle"/><xsl:text> </xsl:text>
+      <xsl:text> </xsl:text>
     </title>
     <xsl:call-template name="globalStyle"/>
@@ -27 +26 @@
       </head>
       <body>
+    
     <xsl:attribute name="dir"><xsl:call-template name="direction"/></xsl:attribute>
     <div id="page-wrapper">
@@ -32 +32 @@
       <xsl:call-template name="greenstoneFooter"/>
     </div>
+    <xsl:call-template name="pageTitle"/>
       </body>
     </html>
@@ -39 +40 @@
 
   <xsl:template name="pageTitle">
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'gsdl')"/>
+    <span class="getTextFor null document.title.gsdl"></span>
   </xsl:template>
 
@@ -81 +82 @@
   <xsl:template name="query-response">
     <xsl:param name="collName"/>
-    <xsl:call-template name="dividerBar"><xsl:with-param name='text'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.results')"/></xsl:with-param></xsl:call-template>
+    <xsl:call-template name="dividerBar"><xsl:with-param name='text'>query.results</xsl:with-param></xsl:call-template>
     
     <!-- If query term information is available, display it -->

main/trunk/greenstone3/web/interfaces/default/transform/querytools.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  extension-element-prefixes="java"
+  exclude-result-prefixes="java">
 
   <!-- have changed this so it uses service hitsPerPage and startPage if the service description has a param called hitsPerPage,  otherwise uses interface ones -->
@@ -61 +60 @@
     <div>   
       <div>
-        <xsl:if test="$here &gt; 1"><a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=rd&amp;{$page-param}={$prev}"><img src="interfaces/default/images/less.gif" width='30' height='16' border='0' align='top'/><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.matches')"/><xsl:text> </xsl:text><xsl:value-of select="number(($prev - 1)*$hpp + 1)"/> - <xsl:value-of select="number(($prev * $hpp))"/></a></xsl:if>
+        <xsl:if test="$here &gt; 1"><a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=rd&amp;{$page-param}={$prev}"><img src="interfaces/default/images/less.gif" width='30' height='16' border='0' align='top'/><span class="getTextFor query.matches"></span><xsl:text> </xsl:text><xsl:value-of select="number(($prev - 1)*$hpp + 1)"/> - <xsl:value-of select="number(($prev * $hpp))"/></a></xsl:if>
         
         
@@ -67 +66 @@
           <xsl:variable name='m' select="number($next * $hpp)"/>
           <xsl:variable name='mm'><xsl:choose><xsl:when test="$m &lt; $td"><xsl:value-of select='$m'/></xsl:when><xsl:otherwise><xsl:value-of select='$td'/></xsl:otherwise></xsl:choose></xsl:variable>
-          <a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=rd&amp;{$page-param}={$next}"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.matches')"/><xsl:text> </xsl:text><xsl:value-of select="number(($next - 1)*$hpp + 1)"/> - <xsl:value-of select="$mm"/><img src="interfaces/default/images/more.gif" width='30' height='16' border='0' align='top'/></a></xsl:if></div>
+          <a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=rd&amp;{$page-param}={$next}"><span class="getTextFor query.matches"></span><xsl:text> </xsl:text><xsl:value-of select="number(($next - 1)*$hpp + 1)"/> - <xsl:value-of select="$mm"/><img src="interfaces/default/images/more.gif" width='30' height='16' border='0' align='top'/></a></xsl:if></div>
     </div>
       </xsl:if>
@@ -80 +79 @@
       <xsl:choose>
     <xsl:when test="$numDocsMatched='0' or $numDocsReturned='0'">
-      <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.nodocsmatch')"/>
+        <span class="getTextFor query.nodocsmatch"></span>
     </xsl:when>
     <xsl:when test="$numDocsMatched='1' or $numDocsReturned='1'">
-      <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.onedocsmatch')"/>
+        <span class="getTextFor query.onedocsmatch"></span>
     </xsl:when>
     <xsl:when test="$numDocsMatched">
-      <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.manydocsmatch', $numDocsMatched)"/>
-      <xsl:if test="$numDocsReturned"> (<xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.docsreturned', $numDocsReturned)"/>)</xsl:if>
+      <span><xsl:attribute name="class"><xsl:value-of select="concat('getTextFor null this.innerText.query.manydocsmatch|', $numDocsMatched)"/></xsl:attribute></span>
+      <xsl:if test="$numDocsReturned"> (<span><xsl:attribute name="class"><xsl:value-of select="concat('getTextFor null this.innerText.query.docsreturned|', $numDocsReturned)" /></xsl:attribute></span>)</xsl:if>
     </xsl:when>
     <xsl:when test="$numDocsReturned">
-      <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.atleastdocsmatch', $numDocsReturned)"/>
+      <span><xsl:attribute name="class"><xsl:value-of select="concat('getTextFor null this.innerText.query.atleastdocsmatch|', $numDocsReturned)" /></xsl:attribute></span>
     </xsl:when>
       </xsl:choose>
@@ -136 +135 @@
     <xsl:param name="serviceName"/>
     <a><xsl:attribute name="href"><xsl:value-of select='$library_name'/>?a=d&amp;c=<xsl:value-of select='$collName'/>&amp;d=<xsl:value-of select='@nodeID'/><xsl:if test="@nodeType='leaf'">&amp;sib=1</xsl:if>&amp;dt=<xsl:value-of select='@docType'/>&amp;p.a=q&amp;&amp;p.sa=<xsl:value-of select="/page/pageRequest/@subaction"/>&amp;p.s=<xsl:value-of select="$serviceName"/></xsl:attribute>
-      <xsl:apply-templates select="." mode="displayNodeIcon"/>
+      <xsl:apply-templates select="." mode="displayNodeIcon"/><xsl:text>sample</xsl:text>
     </a>
-    <span><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name='Title']"/></span>
+    <span><xsl:text>Testing</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name='Title']"/></span>
   </xsl:template>
 
@@ -144 +143 @@
     <div class="terminfo">
       <xsl:if test="count(termList/term) > 0">
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.wordcount')"/>
+      <span class="getTextFor query.wordcount">&amp;nbsp;</span>
     <xsl:for-each select="termList/term">
       <xsl:if test="position() > 1">, </xsl:if>

main/trunk/greenstone3/web/interfaces/default/transform/service-params.xsl

@@ -4 +4 @@
   xmlns:java="http://xml.apache.org/xslt/java"
   extension-element-prefixes="java">
-
+  
   <!-- handling of the different types of params on a service form 
-  - these now only output the selection box/text box etc, not the name -->
-
+    - these now only output the selection box/text box etc, not the name -->
+  
   <!-- the default param list handling -->
   <xsl:template match="paramList">
@@ -13 +13 @@
     <ul id="queryitemlist">
       <xsl:for-each select="param">
-    <xsl:choose>
-      <xsl:when test="@type='multi'">
-        <li><xsl:apply-templates select='.'><xsl:with-param name="ns" select="$ns"/></xsl:apply-templates></li>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="pvalue"><xsl:apply-templates select="." mode="calculate-default"><xsl:with-param name="ns" select="$ns"/></xsl:apply-templates></xsl:variable>
-        <li><xsl:value-of select="displayItem[@name='name']"/><xsl:apply-templates select="."><xsl:with-param name="default" select="$pvalue"/><xsl:with-param name="ns" select="$ns"/></xsl:apply-templates></li>
-      </xsl:otherwise>
-    </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="@type='multi'">
+            <li><xsl:apply-templates select='.'><xsl:with-param name="ns" select="$ns"/></xsl:apply-templates></li>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:variable name="pvalue"><xsl:apply-templates select="." mode="calculate-default"><xsl:with-param name="ns" select="$ns"/></xsl:apply-templates></xsl:variable>
+            <li><xsl:value-of select="displayItem[@name='name']"/><xsl:apply-templates select="."><xsl:with-param name="default" select="$pvalue"/><xsl:with-param name="ns" select="$ns"/></xsl:apply-templates></li>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:for-each>
     </ul>
@@ -27 +27 @@
   
   <!-- puts all the params into a=p&p=h type form - need to change this if use 
-  multi params  -->
+    multi params  -->
   <xsl:template match="paramList" mode="cgi">
     <xsl:param name="ns">s1.</xsl:param>
@@ -35 +35 @@
     </xsl:for-each>
   </xsl:template>
-
+  
   <xsl:template match="param" mode="calculate-default">
     <xsl:param name="ns">s1.</xsl:param>
@@ -41 +41 @@
     <xsl:choose>
       <xsl:when test="/page/pageRequest/paramList/param[@name=$pname]">
-    <xsl:choose>
-      <xsl:when test="@type='enum_multi'"><xsl:text>,</xsl:text>
-        <xsl:for-each select="/page/pageRequest/paramList/param[@name=$pname]">
-          <xsl:value-of select="@value"/>,
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="/page/pageRequest/paramList/param[@name=$pname]/@value"/>
-      </xsl:otherwise>
-    </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="@type='enum_multi'"><xsl:text>,</xsl:text>
+            <xsl:for-each select="/page/pageRequest/paramList/param[@name=$pname]">
+              <xsl:value-of select="@value"/>,
+            </xsl:for-each>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="/page/pageRequest/paramList/param[@name=$pname]/@value"/>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
-    <xsl:value-of select="@default"/>
+        <xsl:value-of select="@default"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
+  
   <!-- invisible params - used by other stuff. in the query form, we set to teh default -->
   <xsl:template match="param[@type='invisible']">
     <xsl:param name="ns">s1.</xsl:param>
-    <input type='hidden' name='{$ns}{@name}' value='{@default}'/>
+    <input type='hidden' name='concat($ns, @name)' value='{@default}'/>
   </xsl:template>
   <!-- boolean params -->
@@ -67 +67 @@
     <xsl:param name="ns">s1.</xsl:param>
     <xsl:param name="default"/>
+    
     <select name='{$ns}{@name}'>
       <option value="0"><xsl:if test="$default='0'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="option[@name='0']/displayItem[@name='name']"/></option>
@@ -76 +77 @@
   <xsl:template match="param[@type='integer']">
     <xsl:param name="ns">s1.</xsl:param>
-    <xsl:param name="default"/>
+    <xsl:param name="default"/> 
+    
     <input type="text" name="{$ns}{@name}" size="3" value="{$default}"/>
   </xsl:template>
-
+  
   <!-- single selection enum params -->
   <xsl:template match="param[@type='enum_single']">
     <xsl:param name="ns">s1.</xsl:param>
     <xsl:param name="default"/>
+    
     <xsl:choose>
       <xsl:when test="count(option) = 1">
-    <xsl:text> </xsl:text><xsl:value-of select="option/displayItem[@name='name']"/>
-    <input type='hidden' name='{$ns}{@name}'><xsl:attribute name='value'><xsl:value-of  select='option/@name'/></xsl:attribute></input>
+        <xsl:text> </xsl:text><xsl:value-of select="option/displayItem[@name='name']"/>
+        <input type='hidden' name='{$ns}{@name}'><xsl:attribute name='value'><xsl:value-of  select='option/@name'/></xsl:attribute></input>
       </xsl:when>
       <xsl:otherwise>
-    <select name="{$ns}{@name}">
-      <xsl:for-each select="option">
-        <option value="{@name}"><xsl:if test="@name=$default"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="displayItem[@name='name']"/></option>
-      </xsl:for-each>
-    </select>
+        
+        <select name="{$ns}{@name}">
+          <xsl:for-each select="option">
+            <option value="{@name}"><!--<xsl:if test="@name=$default"><xsl:attribute name="selected"></xsl:attribute></xsl:if>--><xsl:value-of select="displayItem[@name='name']"/></option>
+          </xsl:for-each>
+        </select>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-
+  
+  
   <!-- multiple selection enum params -->
   <!-- how to do defaults for this?? -->
+  <!-- Don't need to do anything here, handled automatically in the list -->
   <xsl:template match="param[@type='enum_multi']">
     <xsl:param name="ns">s1.</xsl:param>
@@ -107 +112 @@
     <select name="{$ns}{@name}" size='2'><xsl:attribute name="multiple"></xsl:attribute>
       <xsl:for-each select="option">
-    <option value="{@name}"><xsl:if test="contains($default, concat(',', @name, ','))"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="displayItem[@name='name']"/></option>
+        <option value="{@name}"><xsl:if test="contains($default, concat(',', @name, ','))"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="displayItem[@name='name']"/></option>
       </xsl:for-each>
     </select>
@@ -116 +121 @@
     <xsl:param name="ns">s1.</xsl:param>
     <xsl:param name="default"/>
+    
     <input type="text" name="{$ns}{@name}" size="50" value="{$default}"/>
   </xsl:template>
@@ -122 +128 @@
   <xsl:template match="param[@type='text']">
     <xsl:param name="ns">s1.</xsl:param>
-    <xsl:param name="default"/>
+    <xsl:param name="default"/>    
+    
     <textarea name="{$ns}{@name}" cols="50" rows="3"><xsl:value-of select='$default'/></textarea>
   </xsl:template>
-
+  
   <!-- multi params - params that are combinations of other params -->
   <xsl:template match="param[@type='multi']">
@@ -132 +139 @@
     <table>
       <tr class="queryfieldheading"><xsl:value-of select="displayItem[@name='name']"/>
-        <xsl:for-each select="param">
-      <td class="queryfieldname"><xsl:value-of select="displayItem[@name='name']"/></td>
-    </xsl:for-each>
+        <xsl:for-each select="param">
+          <td class="queryfieldname"><xsl:value-of select="displayItem[@name='name']"/></td>
+        </xsl:for-each>
       </tr>
       
@@ -140 +147 @@
     </table>
   </xsl:template>
-
+  
   <xsl:template match="param[@type='multi']" mode="contents">
     <xsl:param name="ns">s1.</xsl:param>
@@ -146 +153 @@
     <xsl:variable name="pos" select="@occurs - $occurs"/>   
     <tr class="queryfieldrow"><xsl:for-each select="param">
-    <xsl:variable name="pname" select="@name"/>
-    <xsl:variable name="values" select="/page/pageRequest/paramList/param[@name=$pname]/@value"/>
-    <td class="queryfieldcell"><xsl:choose>
-        <xsl:when test="not(@ignore) or  @ignore != $pos">      
-          <xsl:apply-templates select='.'><xsl:with-param name="default" select="java:org.greenstone.gsdl3.util.XSLTUtil.getNumberedItem($values, $pos)"/><xsl:with-param name="ns" select="$ns"/></xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise><!-- put in a hidden placeholder -->
-          <input type="hidden" name='{$ns}{@name}' value=''/>
-        </xsl:otherwise>
-      </xsl:choose></td>
-      </xsl:for-each></tr>
+      <xsl:variable name="pname" select="@name"/>
+      <xsl:variable name="values" select="/page/pageRequest/paramList/param[@name=$pname]/@value"/>
+      <td class="queryfieldcell"><xsl:choose>
+        <xsl:when test="not(@ignore) or  @ignore != $pos">      
+          <xsl:apply-templates select='.'><xsl:with-param name="default" select="$values|$pos"/><xsl:with-param name="ns" select="$ns"/></xsl:apply-templates>
+        </xsl:when>
+        <xsl:otherwise><!-- put in a hidden placeholder -->
+          <input type="hidden" name='{$ns}{@name}' value=''/>
+        </xsl:otherwise>
+      </xsl:choose></td>
+    </xsl:for-each></tr>
     <!-- recursively call this template to get multiple entries -->
     <xsl:if test="$occurs &gt; 1">
@@ -162 +169 @@
     </xsl:if>
   </xsl:template>
-
+  
   
 </xsl:stylesheet>  
 
-  <!-- a param list that puts params in pairs- wont work as is with new
+<!-- a param list that puts params in pairs- wont work as is with new
   param handling stuff -->
-  <!--
+<!--
   <xsl:template match="paramList">
-    <p/><table width="537">
-      <xsl:choose>
-        <xsl:when test='count(param)>4'>
-          <xsl:for-each select="param[position() mod 2 = 1]"> 
-            <tr><xsl:apply-templates select="."/>
-              <xsl:if test="following-sibling::param[1]"><xsl:apply-templates select='following-sibling::param[1]'/></xsl:if></tr>
-          </xsl:for-each>
-        </xsl:when>
-    <xsl:otherwise>
-      <xsl:for-each select="param">
-        <tr><xsl:apply-templates select='.'/></tr>
-      </xsl:for-each>
-    </xsl:otherwise>
-      </xsl:choose>
-    </table>
+  <p/><table width="537">
+  <xsl:choose>
+  <xsl:when test='count(param)>4'>
+  <xsl:for-each select="param[position() mod 2 = 1]"> 
+  <tr><xsl:apply-templates select="."/>
+  <xsl:if test="following-sibling::param[1]"><xsl:apply-templates select='following-sibling::param[1]'/></xsl:if></tr>
+  </xsl:for-each>
+  </xsl:when>
+  <xsl:otherwise>
+  <xsl:for-each select="param">
+  <tr><xsl:apply-templates select='.'/></tr>
+  </xsl:for-each>
+  </xsl:otherwise>
+  </xsl:choose>
+  </table>
   </xsl:template>
-  -->
+-->

main/trunk/greenstone3/web/interfaces/default/transform/style.xsl

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  extension-element-prefixes="java util"
-  exclude-result-prefixes="java util">
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:include href="icons.xsl"/>
@@ -23 +19 @@
       <script language="Javascript">
     <xsl:text disable-output-escaping="yes">
-      function removeAllChildren(node) {
-        while (node.hasChildNodes()) {
-          node.removeChild(node.firstChild);
-        }
+          function removeAllChildren(node) {
+      while (node.hasChildNodes()) {
+      node.removeChild(node.firstChild);
       }
+      }
 
       function toggleHideError(obj) {
-        if (obj.style.display == "none") {
-          obj.style.display = "";
-          hide_link = document.getElementById("hide");
-          removeAllChildren(hide_link);
-          hide_link.appendChild(document.createTextNode("</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'hide_error')"/><xsl:text disable-output-escaping="yes">"));
-        } else {
-          obj.style.display = "none";
-          hide_link = document.getElementById("hide");
-          removeAllChildren(hide_link);
-          hide_link.appendChild(document.createTextNode("</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'show_error')"/><xsl:text disable-output-escaping="yes">"));
-        } 
+      if (obj.style.display == "none") {
+      obj.style.display = "";
+      hide_link = document.getElementById("hide");
+      removeAllChildren(hide_link);
+      var theText = getText('hide_error', null);
+      alert(theText);
+      var hide_text = document.createTextNode(theText);
+      hide_link.appendChild(hide_text));
+      } else {
+      obj.style.display = "none";
+      hide_link = document.getElementById("hide");
+      removeAllChildren(hide_link);
+      var theText = getText('show_error', null);
+      alert(theText);
+      var show_text = document.createTextNode(theText);
+      hide_link.appendChild(show_text);
+      } 
       }
     </xsl:text>
       </script>
-      <p align='right'><a id="hide" href="javascript:toggleHideError(error);"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'show_error')"/></a></p>
+      <p align='right'><a id="hide" href="javascript:toggleHideError($('#error'));"><xsl:call-template name="getTextFor"><xsl:with-param name="key" select="'show_error'" /><xsl:with-param name="affect" select="''" /></xsl:call-template></a></p>
       <div id="error" style="display: none;">
     <xsl:apply-templates select="descendant::error"/>
@@ -54 +56 @@
     <div id="footer">
       <xsl:call-template name="dividerBar">
-    <xsl:with-param name="text" select="util:getInterfaceText($interface_name, /page/@lang, 'gs3power')"/> 
+        <xsl:with-param name="text"><xsl:text>powered-by</xsl:text></xsl:with-param>
       </xsl:call-template>
+        <script type="text/javascript">var placeholder = false;</script>
+    <script type="text/javascript" src="jquery.js">
+        <xsl:comment>Filler for browser</xsl:comment>
+    </script>
+    <script type="text/javascript" src="test.js">
+        <xsl:comment>Filler for browser</xsl:comment>
+    </script>
     </div>
   </xsl:template>
   
   <xsl:template match="error">
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'error')"/> <xsl:value-of select="."/>
+    <span class="getTextFor error"></span> <xsl:value-of select="."/>
   </xsl:template>
 
@@ -67 +76 @@
     <xsl:param name="pageType"/>
     <xsl:variable name="this-element" select="/page/pageResponse/collection|/page/pageResponse/serviceCluster"/>
-    <div  id="banner">    
+    <div id="loading" style="display: none; position: fixed; top: 0; right: 0; padding: 10px;"><img src="interfaces/default/images/loading.gif" alt="Loading interface..." /></div>
+    <span id="language" style="display: none;"><xsl:value-of select="/page/@lang" /></span>
+    <span id="interface" style="display: none;"><xsl:value-of select="$interface_name" /></span>   
+    <div id="banner">    
       <p>
     <a href="{$library_name}?a=p&amp;sa=about&amp;c={$collName}">
@@ -78 +90 @@
         <xsl:attribute name="alt">
           <xsl:value-of select="$this-element/displayItem[@name='name']"/>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'aboutpage')"/>
-        </xsl:attribute>
-          </img>
+        </xsl:attribute></img>
         </xsl:when>
         <xsl:otherwise>
@@ -90 +98 @@
     </a>
       </p>
+        <xsl:call-template name="getTextFor">
+            <xsl:with-param name="key" select="'null'" />
+            <xsl:with-param name="affect" select="'parent.title.aboutpage'" />
+            <xsl:with-param name="display" select="'none'" />
+        </xsl:call-template>
       <ul id="bannerlist"> 
     <xsl:call-template name="top-buttons">
@@ -102 +115 @@
     <xsl:param name="collName"/>
     <xsl:param name="pageType"/>
-    <li><a  href="{$library_name}?a=p&amp;sa=home"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'home_tip')"/></xsl:attribute>
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'home_b')"/>
+    <li><a href="{$library_name}?a=p&amp;sa=home">
+        <xsl:call-template name="getTextFor">
+            <xsl:with-param name="key" select="'home_b'" />
+            <xsl:with-param name="parentTip" select="'home_tip'" />
+        </xsl:call-template>
       </a></li>
     <xsl:choose>
       <xsl:when test="$pageType='help'">
-    <li><a><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/></a></li>
-      </xsl:when>
-      <xsl:otherwise>
-    <li><a href="{$library_name}?a=p&amp;sa=help&amp;c={$collName}"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_tip')"/></xsl:attribute>
-        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/>
+    <li><a>
+          <xsl:call-template name="getTextFor">
+              <xsl:with-param name="key" select="'help_b'" />
+              <xsl:with-param name="affect" select="'parent.title.help_tip'" />
+          </xsl:call-template>  
+    </a></li>
+      </xsl:when>
+      <xsl:otherwise>
+    <li><a href="{$library_name}?a=p&amp;sa=help&amp;c={$collName}">
+          <xsl:call-template name="getTextFor">
+                <xsl:with-param name="key" select="'help_b'" />
+                <xsl:with-param name="affect" select="'parent.title.help_tip'" />
+            </xsl:call-template>
       </a></li>
       </xsl:otherwise>
@@ -117 +141 @@
     <xsl:choose>
       <xsl:when test="$pageType='pref'">
-    <li><a><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_b')"/></a></li>
-      </xsl:when>
-      <xsl:otherwise>
-    <li><a href="{$library_name}?a=p&amp;sa=pref&amp;c={$collName}"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_tip')"/></xsl:attribute>
-        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_b')"/>
+    <li><a><xsl:call-template name="getTextFor"><xsl:with-param name="key" select="'pref_b'" /><xsl:with-param name="affect" select="''" /></xsl:call-template></a></li>
+      </xsl:when>
+      <xsl:otherwise>
+    <li><a href="{$library_name}?a=p&amp;sa=pref&amp;c={$collName}">
+          <xsl:call-template name="getTextFor"><xsl:with-param name="key" select="'pref_b'" /><xsl:with-param name="affect" select="'parent.title.pref_tip'" /></xsl:call-template>
       </a></li>
       </xsl:otherwise>
     </xsl:choose>
+  </xsl:template>
+  
+  <xsl:template name="getTextFor">
+    <xsl:param name="key" />
+    <xsl:param name="affect" />
+    <xsl:param name="display" select="'yes'" />
+
+    <xsl:variable name="extra">
+    <xsl:choose>
+    <xsl:when test="$affect!=''">
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="$affect" />   
+    </xsl:when>     
+    <xsl:otherwise>
+        <xsl:value-of select="' '" />   
+    </xsl:otherwise>
+    </xsl:choose>
+    </xsl:variable>
+
+    <span class="getTextFor {$key}{$extra}"><xsl:if test="$display='none'"><xsl:attribute name="style"><xsl:text>display: </xsl:text><xsl:value-of select="$display" /><xsl:text>;</xsl:text></xsl:attribute></xsl:if><xsl:value-of select="$key" /></span>
   </xsl:template>
 
@@ -170 +214 @@
     <xsl:choose>
       <xsl:when test="$text">
-    <div class="divbar"><xsl:value-of select="$text"/></div>
-      </xsl:when>
-      <xsl:otherwise>
-    <div class="divbar"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></div>
+        <div class="divbar"><xsl:choose><xsl:when test="$text='powered-by'"><span class="getTextFor gs3power">&amp;nbsp;</span></xsl:when><xsl:when test="$text='query.results'"><span class="getTextFor query.results">&amp;nbsp;</span></xsl:when><xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise></xsl:choose></div>
+      </xsl:when>
+      <xsl:otherwise>
+    <div class="divbar"><xsl:text disable-output-escaping="yes">&#160;</xsl:text></div>
       </xsl:otherwise>
     </xsl:choose> 
   </xsl:template>
-
-
+    
   <xsl:template name="direction">
     <xsl:if test="/page/@lang='ar' or /page/@lang='fa' or /page/@lang='he' or /page/@lang='ur' or /page/@lang='ps' or /page/@lang='prs'">rtl</xsl:if>

main/trunk/greenstone3/web/interfaces/default/transform/system.xsl

@@ -14 +14 @@
     <title>
       <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->
-      <xsl:call-template name="pageTitle"/><xsl:text> </xsl:text>
+      <xsl:text> </xsl:text>
     </title>
     <xsl:call-template name="globalStyle"/>
@@ -24 +24 @@
       <xsl:call-template name="response" />
       <xsl:call-template name="greenstoneFooter"/>
+      <xsl:call-template name="pageTitle"/>
     </div>
       </body>
@@ -30 +31 @@
   
   <xsl:template name="pageTitle">
-    <xsl:value-of select="java:org.greenstone.gsdl3.util.XSLTUtil.getInterfaceText($interface_name, /page/@lang, 'gsdl')"/>
+    <span class="getTextFor null document.title.gsdl">&amp;nbsp;</span>
   </xsl:template>
   

main/trunk/greenstone3/web/interfaces/default/transform/util.xsl

@@ -4 +4 @@
   xmlns:gslib="http://www.greenstone.org/XSL/Library"
   xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
-  xmlns:util="http://org.greenstone.gsdl3.util.XSLTUtil"
-  exclude-result-prefixes="util gslib gsf">
+  exclude-result-prefixes="gslib gsf">
   
   <!-- some global parameters - these are set by whoever is invoking the transformation -->
@@ -11 +10 @@
   <xsl:param name="library_name"/>
 
+  <!-- Get rid of XSLT parameters from view -->
+  <xsl:template match="xsltparams/param">
+    <xsl:text></xsl:text>
+  </xsl:template>
+  
   <!-- every pages ................................................. -->
   
@@ -60 +64 @@
       hide_link = document.getElementById("hide");
       removeAllChildren(hide_link);
-      hide_link.appendChild(document.createTextNode("</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'hide_error')"/><xsl:text disable-output-escaping="yes">"));
+      var theText = getText('hide_error', null);
+      var hide_text = document.createTextNode(theText);
+      hide_link.appendChild(hide_text));
       } else {
       obj.style.display = "none";
       hide_link = document.getElementById("hide");
       removeAllChildren(hide_link);
-      hide_link.appendChild(document.createTextNode("</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'show_error')"/><xsl:text disable-output-escaping="yes">"));
+      var theText = getText('show_error', null);
+      var show_text = document.createTextNode(theText);
+      hide_link.appendChild(show_text);
       } 
       }
     </xsl:text>
       </script>
-      <p align='right'><a id="hide" href="javascript:toggleHideError(error);"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'show_error')"/></a></p>
+      <p align='right'><a id="hide" href="javascript:toggleHideError(error);"></a></p>
       <div id="error" style="display: none;">
     <xsl:apply-templates select="descendant::error"/>
@@ -84 +92 @@
   
   <xsl:template name="poweredByGS3TextBar">
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'gs3power')"/> 
+    <span class="getTextFor gs3power">&amp;nbsp;</span>
   </xsl:template>
   
@@ -92 +100 @@
   <xsl:template name="siteHomePageTitle">
     <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'gsdl')"/><xsl:text> </xsl:text>
+    <span class="getTextFor gsdl">&amp;nbsp;</span><xsl:text> </xsl:text>
   </xsl:template>
 
 
   <xsl:template name="selectACollectionTextBar">
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'home.select_a_collection')"/>
+    <span class="getTextFor home.select_a_collection">&amp;nbsp;</span>
   </xsl:template>
   
@@ -112 +120 @@
       <input type="hidden" name="s1.collection" value="all"/>
       <input type="text" name="s1.query" size="20"/>
-      <input type="submit"><xsl:attribute name="value"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'home.quick_search')"/></xsl:attribute></input>
+      <input type="submit" class="getTextFor null this.value.home.quick_search" />
     </form>
   </xsl:template>
@@ -162 +170 @@
   
   <xsl:template name="libraryInterfaceLink">
-    <li><a href="{$library_name}?a=p&amp;sa=gli4gs3"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'home.librarian_interface')"/></a></li>
+    <li><a href="{$library_name}?a=p&amp;sa=gli4gs3"><span class="getTextFor home.librarian_interface">&amp;nbsp;</span></a></li>
   </xsl:template> 
-  
-  
-  <xsl:template name="greenstoneLogoAlternateText">
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'gsdl')"/>
-  </xsl:template>
 
   <!-- about page - collection home ......................... -->
@@ -177 +180 @@
   <xsl:variable name="this-service" select="/page/pageResponse/service/@name"/>
 
-
   <xsl:template name="aboutCollectionPageTitle">
     <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->
@@ -188 +190 @@
       <xsl:choose>
     <xsl:when test="$this-element/displayItem[@name='icon']">
-      <img border="0">
+      <img border="0" class="getTextFor null this.title.aboutpage">
         <xsl:attribute name="src">
           <xsl:value-of select="$this-element/metadataList/metadata[@name='httpPath']"/>/images/<xsl:value-of select="$this-element/displayItem[@name='icon']"/>
@@ -194 +196 @@
         <xsl:attribute name="alt">
           <xsl:value-of select="$this-element/displayItem[@name='name']"/>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'aboutpage')"/>
         </xsl:attribute>
       </img>
@@ -209 +208 @@
 
   <xsl:template name="homeButtonTop">
-    <a href="{$library_name}?a=p&amp;sa=home"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'home_tip')"/></xsl:attribute>
-      <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'home_b')"/></a>
+    <a href="{$library_name}?a=p&amp;sa=home" class="getTextFor home_b this.title.home_tip">&amp;nbsp;</a>
   </xsl:template>
 
@@ -217 +215 @@
     <xsl:choose>
       <xsl:when test="$pageType='help'">
-    <li><a><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/></a></li>
-      </xsl:when>
-      <xsl:otherwise>
-    <li><a href="{$library_name}?a=p&amp;sa=help&amp;c={$collName}"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_tip')"/></xsl:attribute>
-        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/>
-      </a></li>
+    <li><a class="getTextFor help_b"></a></li>
+      </xsl:when>
+      <xsl:otherwise>
+    <li><a href="{$library_name}?a=p&amp;sa=help&amp;c={$collName}" class="getTextFor help_b this.title.help_tip">&amp;nbsp;</a></li>
       </xsl:otherwise>
     </xsl:choose>
@@ -231 +227 @@
     <xsl:choose>
       <xsl:when test="$pageType='pref'">
-    <li><a><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_b')"/></a></li>
-      </xsl:when>
-      <xsl:otherwise>
-    <li><a href="{$library_name}?a=p&amp;sa=pref&amp;c={$collName}"><xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_tip')"/></xsl:attribute>
-        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_b')"/>
-      </a></li>
+    <li><a class="getTextFor pref_b">&amp;nbsp;</a></li>
+      </xsl:when>
+      <xsl:otherwise>
+    <li><a href="{$library_name}?a=p&amp;sa=pref&amp;c={$collName}" class="getTextFor pref_b this.title.pref_tip">&amp;nbsp;</a></li>
       </xsl:otherwise>
     </xsl:choose>
@@ -279 +273 @@
   <xsl:template match="serviceList">
     <xsl:param name="collName"/>
-    <h3><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'about.services')"/></h3>
+    <h3 class="getTextFor about.services">&amp;nbsp;</h3>
     <xsl:choose>
       <xsl:when test="service">
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'about.servicehelp')"/>
-      </xsl:when>
-      <xsl:otherwise>
-    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'about.noservices')"/>
+        <span class="getTextFor about.servicehelp">&amp;nbsp;</span>
+      </xsl:when>
+      <xsl:otherwise>
+        <span class="getTextFor about.noservices">&amp;nbsp;</span>
       </xsl:otherwise>
     </xsl:choose>