Changeset 9874 for trunk/gsdl3/web/interfaces

Timestamp:

2005-05-16T11:02:50+12:00 (19 years ago)

Author:

kjdon

Message:

merged from branch ant-install-branch: merge 1

Location:

trunk/gsdl3/web/interfaces

Files:

• classic/transform/document.xsl (modified) (1 diff)
• classic/transform/query-common.xsl (modified) (1 diff)
• default/transform/config_format.xsl (modified) (1 diff)
• default/transform/document.xsl (modified) (3 diffs)
• default/transform/query.xsl (modified) (1 diff)
• default/transform/style.xsl (modified) (2 diffs)

trunk/gsdl3/web/interfaces/classic/transform/document.xsl

@@ -4 +4 @@
   xmlns:java="http://xml.apache.org/xslt/java"
   xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  xmlns:gsf="http://www.greenstone.org/configformat"
+  xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
   extension-element-prefixes="java util"
   exclude-result-prefixes="java util gsf">

trunk/gsdl3/web/interfaces/classic/transform/query-common.xsl

@@ -14 +14 @@
       <input type="hidden" name="a" value="q"/>
       <input type="hidden" name="sa" value="{$subaction}"/>
-      <input type="hidden" name="rt" value="r"/>
+      <input type="hidden" name="rt" value="rd"/>
       <input type="hidden" name="s" value="{@name}"/>
       <input type="hidden" name="c" value="{$collName}"/>

trunk/gsdl3/web/interfaces/default/transform/config_format.xsl

@@ -4 +4 @@
   xmlns:xslt="output.xsl"
   xmlns:java="http://xml.apache.org/xslt/java"
-  xmlns:gsf="http://www.greenstone.org/configformat"
+  xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
   extension-element-prefixes="java">
   

trunk/gsdl3/web/interfaces/default/transform/document.xsl

@@ -4 +4 @@
   xmlns:java="http://xml.apache.org/xslt/java"
   xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-  xmlns:gsf="http://www.greenstone.org/configformat"
+  xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
   extension-element-prefixes="java util"
   exclude-result-prefixes="java util gsf">
@@ -64 +64 @@
     <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>
     <table><tr><td>
-      <a href="{$library_name}?a={$p.a}&amp;sa={$p.sa}&amp;s={$p.s}&amp;c={$p.c}&amp;rt=r"><xsl:call-template name="openbookimg"><xsl:with-param name="title">Close this book and return to search/browse</xsl:with-param>
+      <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">Close this book and return to search/browse</xsl:with-param>
       </xsl:call-template></a></td>
     <td valign='top'><b><font size="+1">&#160;
@@ -283 +283 @@
       <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=r</xsl:when>
+    <xsl:when test="@type='query'">a=q&amp;s=<xsl:value-of select="@service"/>&amp;rt=rd</xsl:when>
     <xsl:otherwise>
       p

trunk/gsdl3/web/interfaces/default/transform/query.xsl

@@ -77 +77 @@
       <input type="hidden" name="a" value="q"/>
       <input type="hidden" name="sa" value="{$subaction}"/>
-      <input type="hidden" name="rt" value="r"/>
+      <input type="hidden" name="rt" value="rd"/>
       <input type="hidden" name="s" value="{@name}"/>
       <input type="hidden" name="c" value="{$collName}"/>

trunk/gsdl3/web/interfaces/default/transform/style.xsl

@@ -29 +29 @@
           <tr><td>
           <xsl:apply-templates select="pageResponse"/>
-          <xsl:apply-templates select="descendant::error"/>
+          <xsl:if test="descendant::error">
+            <script language="Javascript">
+              <xsl:text disable-output-escaping="yes">
+            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("Hide Error"));
+              } else {
+            obj.style.display = "none";
+            hide_link = document.getElementById("hide");
+            removeAllChildren(hide_link);
+            hide_link.appendChild(document.createTextNode("Show Error"));
+            
+            }
+              }
+              </xsl:text>
+            </script>
+            <p align='right'><a id="hide" href="javascript:toggleHideError(error);">Show Error</a></p>
+            <div id="error" style="display: none;">
+              <xsl:apply-templates select="descendant::error"/>
+            </div>
+          </xsl:if>
           <xsl:call-template name="greenstoneFooter"/>
         </td></tr>
@@ -66 +95 @@
     Error: <xsl:value-of select="."/>
   </xsl:template>
+
   <xsl:template name="standardPageBanner">
     <xsl:param name="collName"/>