You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/08/24 17:17:28 UTC
svn commit: r239689 - in /portals/jetspeed-2/trunk:
applications/demo/src/webapp/WEB-INF/
components/web-content/src/java/org/apache/jetspeed/portlet/
Author: ate
Date: Wed Aug 24 08:17:17 2005
New Revision: 239689
URL: http://svn.apache.org/viewcvs?rev=239689&view=rev
Log:
Resolving http://issues.apache.org/jira/browse/JS2-349:
IE6 IFRAME display problems with css based column layout and/or height="100%"
Modified:
portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFrameGenericPortlet.java
portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFramePortlet.java
Modified: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml?rev=239689&r1=239688&r2=239689&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml Wed Aug 24 08:17:17 2005
@@ -432,8 +432,12 @@
<value>http://portals.apache.org</value>
</preference>
<preference>
+<!-- Don't specify a HEIGHT if you want a normal filled out layout
+ because percentage values result in the content not to be displayed on IE6.
+ Specific values are ok though.
<name>HEIGHT</name>
- <value>100%</value>
+ <value>300</value>
+-->
</preference>
<preference>
<name>WIDTH</name>
@@ -445,7 +449,11 @@
</preference>
<preference>
<name>MAX-WIDTH</name>
- <value>100%</value>
+ <value>100%</value>
+ </preference>
+ <preference>
+ <name>SCROLLING</name>
+ <value>AUTO</value>
</preference>
</portlet-preferences>
<supported-locale>en</supported-locale>
Modified: portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFrameGenericPortlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFrameGenericPortlet.java?rev=239689&r1=239688&r2=239689&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFrameGenericPortlet.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFrameGenericPortlet.java Wed Aug 24 08:17:17 2005
@@ -55,7 +55,6 @@
attributes.put("MARGINWIDTH", "0");
attributes.put("NAME", "");
- attributes.put("HEIGHT", "100%");
attributes.put("WIDTH", "100%");
attributes.put("SCROLLING", "NO");
attributes.put("STYLE", "");
@@ -132,6 +131,10 @@
String source = getURLSource(request, response, prefs);
// generate HTML IFRAME content
StringBuffer content = new StringBuffer(4096);
+
+ // fix JS2-349
+ content.append("<TABLE WIDTH='100%'><TR><TD>");
+
content.append("<IFRAME");
// special case source
@@ -162,6 +165,9 @@
content.append("<P STYLE=\"textAlign:center\"><A HREF=\"").append(source).append("\">").append(source).append(
"</A></P>");
content.append("</IFRAME>");
+
+ // end fix JS2-349
+ content.append("</TD></TR></TABLE>");
// set required content type and write HTML IFRAME content
response.setContentType("text/html");
Modified: portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFramePortlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFramePortlet.java?rev=239689&r1=239688&r2=239689&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFramePortlet.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFramePortlet.java Wed Aug 24 08:17:17 2005
@@ -69,7 +69,7 @@
*/
public static final String ALIGN_ATTR_DEFAULT = "BOTTOM";
public static final String FRAME_BORDER_ATTR_DEFAULT = "0";
- public static final String HEIGHT_ATTR_DEFAULT = "100%";
+ public static final String HEIGHT_ATTR_DEFAULT = "";
public static final String MARGIN_HEIGHT_ATTR_DEFAULT = "0";
public static final String MARGIN_WIDTH_ATTR_DEFAULT = "0";
public static final String MAXIMIZED_HEIGHT_ATTR_DEFAULT = "100%";
@@ -255,6 +255,10 @@
{
// generate HTML IFRAME content
StringBuffer content = new StringBuffer(4096);
+
+ // fix JS2-349
+ content.append("<TABLE WIDTH='100%'><TR><TD>");
+
content.append("<IFRAME");
content.append(" SRC=\"").append(sourceAttr).append("\"");
if (alignAttr != null)
@@ -296,6 +300,9 @@
content.append(">");
content.append("<P STYLE=\"textAlign:center\"><A HREF=\"").append(sourceAttr).append("\">").append(sourceAttr).append("</A></P>");
content.append("</IFRAME>");
+
+ // end fix JS2-349
+ content.append("</TD></TR></TABLE>");
// set required content type and write HTML IFRAME content
response.setContentType("text/html");
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org