Changeset 23360 for main/trunk/greenstone3/web/interfaces

Timestamp:

2010-11-30T17:26:36+13:00 (13 years ago)

Author:

sjb48

Message:

Starting working on new format statement save architecture. This involves a new action, FormatAction, which will be responsible for the XSL transform and will pass the format string to the Collection object via the Message Router,

Location:

main/trunk/greenstone3/web/interfaces/oran

Files:

• interfaceConfig.xml (modified) (1 diff)
• js/gui_div.js (modified) (1 diff)
• transform/formatString.xsl (added)
• transform/layouts/xml-to-gui.xsl (modified) (3 diffs)
• transform/system.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/oran/interfaceConfig.xml

@@ -21 +21 @@
     <action name='pr' class='ProcessAction' xslt='process.xsl'/>
     <action name='s' class='SystemAction' xslt='system.xsl'/>
+
+    <action name='f' class='FormatAction' xslt='formatString.xsl'/>
+
     <action name='g' class='GeneralAction'>
       <subaction name="authen" xslt='pages/authen.xsl'/>

main/trunk/greenstone3/web/interfaces/oran/js/gui_div.js

@@ -16 +16 @@
     //jQuery.post( url, [ data ], [ success(data, textStatus, XMLHttpRequest) ], [ dataType ] )
 
-    $.post("http://localhost:8080/greenstone3/format?a=s&sa=s", {data: formatStatement}, function(data) {
+    // How do I find out my collection name?
+
+    $.post("http://localhost:8080/greenstone3/format?a=f", {data: formatStatement}, function(data) {
         //$('.result').innerHTML = data; //html(data);
         console.log("Success, we have received data");

main/trunk/greenstone3/web/interfaces/oran/transform/layouts/xml-to-gui.xsl

@@ -391 +391 @@
         <!-- <xsl:text>&lt;br/&gt;</xsl:text> <br/> -->
         <div class="block leaf gsf_text" title="gsf:text">
-                <xsl:variable name="rawtext"><xsl:text disable-output-escaping='no'>&lt;br/&gt;</xsl:text></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>
+                <!-- <xsl:variable name="rawtext"><xsl:text disable-output-escaping='no'>br/</xsl:text></xsl:variable> -->
+                <table class="header"><tbody><tr><td class="header">&lt;<input class="text" type="text" name="rawtextinput" size="10" value="br/"></input>&gt;</td><td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table>
         </div>
     
@@ -408 +408 @@
         <!-- <xsl:text>&lt;br/&gt;</xsl:text> <br/> -->
         <div class="block leaf gsf_text" title="gsf:text">
-                <xsl:variable name="rawtext"><xsl:text disable-output-escaping='no'>&lt;i&gt;</xsl:text></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>
+                <!-- <xsl:variable name="rawtext"><xsl:text disable-output-escaping='no'>i</xsl:text></xsl:variable> -->
+                <table class="header"><tbody><tr><td class="header">&lt;<input class="text" type="text" name="rawtextinput" size="10" value="i"></input>&gt;</td><td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table>
         </div>
     
@@ -418 +418 @@
 
         <div class="block leaf gsf_text" title="gsf:text">
-                <xsl:variable name="rawtext"><xsl:text disable-output-escaping='no'>&lt;/i&gt;</xsl:text></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>
+                <xsl:variable name="rawtext"><xsl:text disable-output-escaping='no'>/i</xsl:text></xsl:variable>
+                <table class="header"><tbody><tr><td class="header">&lt;<input class="text" type="text" name="rawtextinput" size="10" value="{$rawtext}"></input>&gt;</td><td class="header"><a href="[myhref]" class="ui-icon ui-icon-closethick"/></td></tr></tbody></table>
         </div>
 

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

@@ -169 +169 @@
   <!-- Strip out any plain text -->
   <xsl:template match="text()" mode="text">
-    <xsl:text></xsl:text> <xsl:value-of select="."/><xsl:text></xsl:text>
+    <xsl:text></xsl:text><xsl:value-of select="." disable-output-escaping="yes"/><xsl:text></xsl:text>
     <xsl:apply-templates mode="text"/>
   </xsl:template>