Changeset 23606 for main/branches/64_bit_Greenstone/greenstone3/web

Timestamp:

2011-01-17T17:42:35+13:00 (13 years ago)

Author:

sjm84

Message:

Merging the latest Greenstone 3 trunk changes into the 64-bit branch

Location:

main/branches/64_bit_Greenstone/greenstone3

Files:

• . (modified) (1 prop)
• web/interfaces/gs2/transform/about.xsl (modified) (1 diff)
• web/interfaces/oran/js/gui_div.js (modified) (1 diff)
• web/interfaces/oran/transform/layouts/main.xsl (modified) (4 diffs)
• web/interfaces/oran/transform/layouts/xml-to-gui.xsl (modified) (2 diffs)
• web/sites/localsite/collect/gs2mgppdemo/etc/collectionConfig.xml (modified) (1 diff)

main/branches/64_bit_Greenstone/greenstone3/web/interfaces/gs2/transform/about.xsl

@@ -61 +61 @@
     <div class="document">
       <xsl:if test="not(/page/pageRequest/paramList/param[@name='qt']) or /page/pageRequest/paramList/param[@name='qt']/@value = 0">
-      <xsl:apply-templates select="serviceList/service[@name='TextQuery']">
-    <xsl:with-param name="collName" select="$collName"/></xsl:apply-templates>
-      <xsl:call-template name="dividerBar"/>
+    <xsl:if test="serviceList/service[@name='TextQuery']">
+      <xsl:apply-templates select="serviceList/service[@name='TextQuery']">
+        <xsl:with-param name="collName" select="$collName"/></xsl:apply-templates>
+      <xsl:call-template name="dividerBar"/>
+    </xsl:if>
       </xsl:if>
     </div>

main/branches/64_bit_Greenstone/greenstone3/web/interfaces/oran/js/gui_div.js

@@ -3 +3 @@
 
 var initialised_iframe = "false";
+
+function onTextChange(item, text)
+{
+    item.setAttribute("value",text);
+}
+
 
 //function createFormatStatement()

main/branches/64_bit_Greenstone/greenstone3/web/interfaces/oran/transform/layouts/main.xsl

@@ -245 +245 @@
 
 <!-- *************************************************************************************** -->
-<H2>Preview</H2>
+<!--<H2>Preview</H2>
 
                     <div id="my_categories"><xsl:text> </xsl:text></div>
@@ -251 +251 @@
                     <iframe name="preview" id="iframe" width="98%" height="300">Your browser does not support iframes</iframe> 
 
-                    <xsl:variable name="preview"> 
+                    <xsl:variable name="preview"> -->
                     <!-- <button type="button" onclick="loadXMLDoc()">Change Content</button> -->
                     <div id="gs_content">
@@ -261 +261 @@
 
                     </div>
-                    </xsl:variable>
+   <!--                 </xsl:variable>
 
                     <script type="text/javascript">
@@ -269 +269 @@
                     <div id="result">
                     Here
-                    </div>
+                    </div>-->
 
                     <div id="gs_footer">

main/branches/64_bit_Greenstone/greenstone3/web/interfaces/oran/transform/layouts/xml-to-gui.xsl

@@ -236 +236 @@
             <xsl:variable name="mode">
                 <xsl:choose>
-                    <xsl:when test="not(@mode)">MODE=<input class="mode" type="text" name="rawtextinput" size="10" value="vertical"><xsl:text></xsl:text></input></xsl:when>
-                    <xsl:otherwise>MODE=<input class="mode" type="text" name="rawtextinput" size="10" value="{@mode}"/></xsl:otherwise>
+                    <xsl:when test="not(@mode)">MODE=<input class="mode" type="text" name="rawtextinput" size="10" value="vertical" onChange="onTextChange(this, this.value)"><xsl:text></xsl:text></input></xsl:when>
+                    <xsl:otherwise>MODE=<input class="mode" type="text" name="rawtextinput" size="10" value="{@mode}" onChange="onTextChange(this, this.value)"/></xsl:otherwise>
                 </xsl:choose>
             </xsl:variable>
     
-            <table class="header"><tbody><tr><td class="header">MATCH=<input class="match" type="text" name="rawtextinput" size="10" value="{@match}"/></td><td class="header"><xsl:copy-of select="$mode"/></td><td class="header"><a href="#" class="minmax ui-icon ui-icon-plusthick" title="Click me to expand">[+]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table>
+            <table class="header"><tbody><tr><td class="header">MATCH=<input class="match" type="text" name="rawtextinput" size="10" value="{@match}" onChange="onTextChange(this, this.value)"/></td><td class="header"><xsl:copy-of select="$mode"/></td><td class="header"><a href="#" class="minmax ui-icon ui-icon-plusthick" title="Click me to expand">[+]</a></td><td class="header"><a href="#" class="remove ui-icon ui-icon-closethick" title="Click me to remove"/></td></tr></tbody></table>
 
                 <table class="table" border="1">
@@ -356 +356 @@
         <div class="block leaf gsf_text" title="gsf:text">
                 <xsl:variable name="rawtext"><xsl:value-of select="."/></xsl:variable>
-                <table class="header"><tbody><tr><td class="header"><input class="text" type="text" name="rawtextinput" size="10" value="{$rawtext}"></input></td><td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table>
+                <table class="header"><tbody><tr><td class="header"><input class="text" type="text" name="rawtextinput" size="10" value="{$rawtext}" onChange="onTextChange(this, this.value)"></input></td><td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table>
         </div>
     </xsl:template>

main/branches/64_bit_Greenstone/greenstone3/web/sites/localsite/collect/gs2mgppdemo/etc/collectionConfig.xml

@@ -40 +40 @@
             <option name="stem"/>
         </indexOption>
-        <format name="searchType">plain,form</format>
+        <searchType name="plain"/>
+        <searchType name="simpleform"/>
+        <searchType name="advancedform"/>
         <format><gsf:template match="documentNode"><td valign="top"><gsf:link type="document"><gsf:icon type="document"/></gsf:link></td><td><gsf:switch><gsf:metadata name="Title" select="ancestors" separator=": "/><gsf:when test="exists"><gsf:metadata name="Title" select="ancestors" separator=": "/>:</gsf:when></gsf:switch><gsf:link type="document"><gsf:metadata name="Title"/></gsf:link></td></gsf:template></format>
     </search>