svn commit: r405171 - in /tapestry/tapestry4/trunk/framework/src: documentation/content/xdocs/tapestry/ComponentReference/Shell.xml java/org/apache/tapestry/html/Shell.java java/org/apache/tapestry/html/Shell.jwc

[bw...@apache.org]

Author: bwallace
Date: Mon May  8 14:35:24 2006
New Revision: 405171

URL: http://svn.apache.org/viewcvs?rev=405171&view=rev
Log:
[TAPESTRY-268] Added raw attribute to allow generation of title from supplied text (not encoded)

Modified:
    tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml
    tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.java
    tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc

Modified: tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml?rev=405171&r1=405170&r2=405171&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Shell.xml Mon May  8 14:35:24 2006
@@ -74,6 +74,16 @@
   </tr>
   
   <tr>
+    <td>raw</td>
+    <td>boolean</td>
+    <td>in</td>
+    <td>no</td>
+    <td>false</td>
+    <td>If false (the default), then HTML characters in the title are escaped.  If
+  	true, then value is emitted exactly as is.</td>
+  </tr>
+  
+  <tr>
     <td>stylesheet</td>
     <td>&IAsset;</td>
     <td>in</td>
@@ -130,6 +140,16 @@
     <td>&nbsp;</td>
     <td>If specified, the delegate is rendered before the close of the &lt;head&gt;
       tag.  Typically, this is used to provide additional &meta; tags.</td>
+  </tr>
+  <tr>
+    <td>renderBaseTag</td>
+    <td>boolean</td>
+    <td>in</td>
+    <td>no</td>
+    <td>true</td>
+    <td>
+    	Specifies whether or not to render the html basetag element in the document head.
+    </td>
   </tr>
   
 

Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.java?rev=405171&r1=405170&r2=405171&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.java Mon May  8 14:35:24 2006
@@ -75,11 +75,16 @@
             if (getRenderContentType())
                 writeMetaTag(writer, "http-equiv", "Content-Type", writer.getContentType());
             
+            if (getRenderBaseTag())
             getBaseTagWriter().render(writer, cycle);
             
             writer.begin("title");
             
-            writer.print(getTitle());
+            if (getRaw()) {
+                writer.printRaw(getTitle());
+             } else {
+                writer.print(getTitle());
+             }
             writer.end(); // title
             writer.println();
             
@@ -213,4 +218,13 @@
     /** @since 4.0 */
 
     public abstract IRender getBaseTagWriter();
+    
+    /** @since 4.0.1 */
+    
+    public abstract boolean getRenderBaseTag();
+    
+    /** @since 4.0.3 */
+    
+    public abstract boolean getRaw();
+
 }

Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc?rev=405171&r1=405170&r2=405171&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/html/Shell.jwc Mon May  8 14:35:24 2006
@@ -32,6 +32,16 @@
     </description>
   </parameter>
   
+  <parameter 
+  	name="raw" 
+  	default-value="false">
+    <description>
+  	If false (the default), then HTML characters in the title are escaped.  If
+  	true, then value is emitted exactly as is.
+    </description>
+  </parameter>
+
+
   <parameter name="stylesheet">
     <description>
     If specified, provides an external stylesheet for the page.
@@ -80,6 +90,13 @@
     If specified, the delegate is rendered before the close of the &lt;head&gt;
     tag (typically used to provide &lt;meta&gt; tags).
     </description>
+  </parameter>
+  
+  <parameter name="renderBaseTag" default-value="true" >
+  	<description>
+  		Specifies whether or not to render the html basetag element in the document
+  		head.
+  	</description>
   </parameter>
   
   <parameter name="ajaxDelegate"