tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andy...@apache.org
Subject svn commit: r506807 - in /tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages: Exception.html Exception.java Exception.page
Date Tue, 13 Feb 2007 02:06:11 GMT
Author: andyhot
Date: Mon Feb 12 18:06:11 2007
New Revision: 506807

URL: http://svn.apache.org/viewvc?view=rev&rev=506807
Log:
TAPESTRY-1261: if req is dynamic, also add the dynamic css

Modified:
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.html
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.page

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.html?view=diff&rev=506807&r1=506806&r2=506807
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.html
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.html
Mon Feb 12 18:06:11 2007
@@ -14,8 +14,10 @@
    limitations under the License.
 -->
 <span jwcid="$content$">
-<html jwcid="@Shell" title="Exception" stylesheet="ognl:assets.stylesheet" 
+<html jwcid="@Shell" title="Exception" stylesheet="asset:stylesheet" 
 	  disableCaching="true" doctype="ognl:''">
+  <head jwcid="@If" condition="ognl:dynamic"
+        renderTag="false"><style jwcid="@Style" href="asset:dynamicStylesheet"/></head>
 <body>
 
 <span class="exception-top">

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.java?view=diff&rev=506807&r1=506806&r2=506807
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.java
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.java
Mon Feb 12 18:06:11 2007
@@ -39,4 +39,9 @@
 
         setExceptions(exceptions);
     }
+
+    public boolean isDynamic()
+    {
+        return getRequestCycle().getResponseBuilder().isDynamic();
+    }
 }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.page
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.page?view=diff&rev=506807&r1=506806&r2=506807
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.page
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pages/Exception.page
Mon Feb 12 18:06:11 2007
@@ -26,5 +26,6 @@
   </component>
   
   <asset name="stylesheet" path="Exception.css"/>
+  <asset name="dynamicStylesheet" path="Exception-Dynamic.css"/>
   
 </page-specification>



Mime
View raw message