Changeset 23336 for main/trunk/greenstone3/web/interfaces/oran/transform/layouts/main.xsl

Timestamp:

2010-11-22T17:32:16+13:00 (13 years ago)

Author:

sjb48

Message:

Continued work on XHTML parsing for format statement saving. Found js code for ensuring XHTML (innerXHTML). Removed a few unneccessary bits of code from default servlet that were lingering around from when we first started playing with format statements.

File:

• main/trunk/greenstone3/web/interfaces/oran/transform/layouts/main.xsl (modified) (4 diffs)

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

@@ -2 +2 @@
 <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"
@@ -23 +24 @@
 
     <!-- the output format for this layout is html -->
-    <xsl:output method="html" omit-xml-declaration="yes"/>  
+    <!-- <xsl:output method="xml" version="1.0" encoding="UTF-8" doctype-public="-//W3C//DTD XHTML 1.1//EN" doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" indent="yes" omit-xml-declaration="yes"/> -->
+    <xsl:output method="html" omit-xml-declaration="yes"/> 
 
     <!-- the main layout is defined here -->
@@ -130 +132 @@
 <!-- Sam2's div code -->
 
+    <script type="text/javascript" src="interfaces/oran/js/innerxhtml.js"><xsl:text> </xsl:text></script>
     <script type="text/javascript" src="interfaces/oran/js/gui_div.js"><xsl:text> </xsl:text></script>
    
@@ -177 +180 @@
 
     <div id="formatStatement">
-
+        <div id="formatRoot">
+    
     <xsl:call-template name="xml-to-gui">
         <xsl:with-param name="node-set" select="//format"/> <!-- [@type='browse']"/>  -->
         <xsl:with-param name="metadataSets" select="//metadataSetList"/> 
     </xsl:call-template> 
-
+        </div>
     </div>
     </td>