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 jf...@apache.org on 2005/05/25 07:50:05 UTC
cvs commit: jakarta-jetspeed-2/taglibs/treecontrol/src/java/org/apache/webapp/admin TreeControlTag.java
jford 2005/05/24 22:50:05
Modified: taglibs/treecontrol/src/java/org/apache/jetspeed/portlets/tags
PortletTreeControlTag.java
taglibs/treecontrol/src/java/org/apache/webapp/admin
TreeControlTag.java
Log:
Another attempt to fix tree display issues in multiple browsers
Revision Changes Path
1.12 +42 -29 jakarta-jetspeed-2/taglibs/treecontrol/src/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java
Index: PortletTreeControlTag.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/taglibs/treecontrol/src/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PortletTreeControlTag.java 1 May 2005 19:26:31 -0000 1.11
+++ PortletTreeControlTag.java 25 May 2005 05:50:04 -0000 1.12
@@ -61,8 +61,8 @@
this.scope = scope;
}
-
- /**
+
+ /**
* Return the <code>TreeControl</code> instance for the tree control that
* we are rendering.
*
@@ -82,7 +82,7 @@
{
treeControl = renderRequest.getPortletSession().getAttribute(tree);
}
-
+
if (treeControl == null)
{
treeControl = super.getTreeControl();
@@ -115,9 +115,8 @@
PortletRequest renderRequest = (PortletRequest)pageContext.getRequest().getAttribute("javax.portlet.request");
RenderResponse renderResponse = (RenderResponse)pageContext.getRequest().getAttribute("javax.portlet.response");
PortletConfig portletConfig = (PortletConfig)pageContext.getRequest().getAttribute("javax.portlet.config");
-
-
-
+
+
// if the node is root node and the label value is
// null, then do not render root node in the tree.
@@ -134,7 +133,8 @@
}
// Render the beginning of this node
- out.println("<div style=\"display:block; white-space:nowrap; vertical-align: middle; margin-top:-3px;\">");
+ out.println(" <tr valign=\"middle\">");
+ out.print("<td><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\"><tr><td>");
// Create the appropriate number of indents
for (int i = 0; i < level; i++) {
@@ -143,13 +143,13 @@
for (int j = 1; j <= levels; j++)
parent = parent.getParent();
if (parent.isLast())
- out.print("<div style=\"display:inline; vertical-align: middle;\"> </div>");
+ out.print(" <td> </td>");
else {
- out.print("<div style=\"display:inline; vertical-align: middle;\"><img src=\"");
+ out.print(" <td><img src=\"");
out.print(images);
out.print("/");
out.print(IMAGE_LINE_VERTICAL);
- out.print("\" alt=\"\" border=\"0\" /></div>");
+ out.print("\" alt=\"\" border=\"0\"></td>");
}
out.println();
}
@@ -174,12 +174,14 @@
// ((HttpServletResponse) pageContext.getResponse()).
// encodeURL(updateTreeAction);
- out.print("<div style=\"display:inline; vertical-align: middle; padding:0; margin-top:0px;\">");
- //add an anchor so that we can return to this node
+ out.print(" <td>");
+
+
+ //add an anchor so that we can return to this node
out.print("<a name=\"");
out.print(node.getName());
- out.print("\" />");
+ out.print("\">");
if ((action != null) && !node.isLeaf()) {
out.print("<a href=\"");
@@ -208,10 +210,12 @@
out.print(IMAGE_HANDLE_RIGHT_MIDDLE);
out.print("\" alt=\"expand node");
}
- out.print("\" border=\"0\" />");
+ out.print("\" border=\"0\">");
if ((action != null) && !node.isLeaf())
out.print("</a>");
- out.println("</div>");
+ out.println("</td>");
+
+
// Calculate the hyperlink for this node (if any)
String hyperlink = null;
@@ -230,14 +234,24 @@
}
else
{
- hyperlink = ((HttpServletResponse) pageContext.getResponse()).
- encodeURL(node.getAction());
+ hyperlink = ((HttpServletResponse) pageContext.getResponse()).
+ encodeURL(node.getAction());
}
}
+
// Render the icon for this node (if any)
- out.print("<div style=\"display:inline; white-space:nowrap; vertical-align: top; padding:0; margin-top:-2px;\">");
+ out.print(" <td ");
+
+ if(node.getLabel() != null)
+ {
+ //make sure text does not wrap
+ out.print(" style=\"");
+ out.print("white-space:nowrap;");
+ out.print("\"");
+ }
+ out.print(">");
if (node.getIcon() != null) {
if (hyperlink != null) {
out.print("<a href=\"");
@@ -257,18 +271,15 @@
*/
out.print(">");
}
- out.print("<div style=\"display:inline; white-space:nowrap; vertical-align: middle; padding:0; margin-top:-2px;\">");
out.print("<img src=\"");
out.print(images);
out.print("/");
out.print(node.getIcon());
out.print("\" alt=\"");
- out.print("\" border=\"0\" />");
- out.print("</div>");
+ out.print("\" border=\"0\">");
if (hyperlink != null)
- out.print("</a> ");
+ out.print("</a>");
}
-
// Render the label for this node (if any)
@@ -311,7 +322,7 @@
*/
out.print(">");
} else if (labelStyle != null) {
- out.print("<div style=\"display:inline; vertical-align: top;\" class=\"");
+ out.print("<span class=\"");
out.print(labelStyle);
out.print("\">");
}
@@ -319,13 +330,16 @@
if (hyperlink != null)
out.print("</a>");
else if (labelStyle != null)
- out.print("</div>");
+ out.print("</span>");
}
- out.println("</div>");
+ out.println("</td>");
+
+
// Render the end of this node
- out.println("</div>");
-
+ out.println(" </tr>");
+ out.println("</table></td></tr>");
+
// Render the children of this node
if (node.isExpanded()) {
TreeControlNode children[] = node.findChildren();
@@ -340,6 +354,5 @@
{
out.print(e.getLocalizedMessage());
}
-
}
}
1.6 +30 -20 jakarta-jetspeed-2/taglibs/treecontrol/src/java/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/taglibs/treecontrol/src/java/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TreeControlTag.java 20 Apr 2005 04:04:02 -0000 1.5
+++ TreeControlTag.java 25 May 2005 05:50:04 -0000 1.6
@@ -214,7 +214,8 @@
TreeControl treeControl = getTreeControl();
JspWriter out = pageContext.getOut();
try {
- out.print("<div style=\"padding:0; margin:-2px; vertical-align: middle;\" ");
+ out.print
+ ("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"");
if (style != null) {
out.print(" class=\"");
out.print(style);
@@ -224,7 +225,7 @@
int level = 0;
TreeControlNode node = treeControl.getRoot();
render(out, node, level, treeControl.getWidth(), true);
- out.println("</div>");
+ out.println("</table>");
} catch (IOException e) {
throw new JspException(e);
}
@@ -323,7 +324,8 @@
}
// Render the beginning of this node
- out.println("<div style=\"display:block; white-space:nowrap;\">");
+ out.println(" <tr valign=\"middle\">");
+ out.print("<td><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\"><tr><td>");
// Create the appropriate number of indents
for (int i = 0; i < level; i++) {
@@ -332,13 +334,13 @@
for (int j = 1; j <= levels; j++)
parent = parent.getParent();
if (parent.isLast())
- out.print("<div style=\"display:inline;\"> </div>");
+ out.print(" <td> </td>");
else {
- out.print("<div style=\"display:inline;\"><img src=\"");
+ out.print(" <td><img src=\"");
out.print(images);
out.print("/");
out.print(IMAGE_LINE_VERTICAL);
- out.print("\" alt=\"\" border=\"0\" /></div>");
+ out.print("\" alt=\"\" border=\"0\"></td>");
}
out.println();
}
@@ -360,12 +362,12 @@
((HttpServletResponse) pageContext.getResponse()).
encodeURL(updateTreeAction);
- out.print("<div style=\"display:inline;\">");
+ out.print(" <td>");
// add an anchor so that we can return to this node
out.print("<a name=\"");
out.print(node.getName());
- out.print("\" />");
+ out.print("\">");
if ((action != null) && !node.isLeaf()) {
out.print("<a href=\"");
@@ -394,10 +396,10 @@
out.print(IMAGE_HANDLE_RIGHT_MIDDLE);
out.print("\" alt=\"expand node");
}
- out.print("\" border=\"0\" />");
+ out.print("\" border=\"0\">");
if ((action != null) && !node.isLeaf())
out.print("</a>");
- out.println("</div>");
+ out.println("</td>");
// Calculate the hyperlink for this node (if any)
String hyperlink = null;
@@ -411,8 +413,17 @@
encodeURL(node.getAction());
// Render the icon for this node (if any)
- out.print("<div style=\"display:inline; white-space:nowrap;\">");
+ out.print(" <td ");
+ if(node.getLabel() != null)
+ {
+ //make sure text does not wrap
+ out.print(" style=\"");
+ out.print("white-space:nowrap;");
+ out.print("\"");
+ }
+
+ out.print(">");
if (node.getIcon() != null) {
if (hyperlink != null) {
out.print("<a href=\"");
@@ -435,7 +446,7 @@
out.print("/");
out.print(node.getIcon());
out.print("\" alt=\"");
- out.print("\" border=\"0\" />");
+ out.print("\" border=\"0\">");
if (hyperlink != null)
out.print("</a>");
}
@@ -443,7 +454,7 @@
// Render the label for this node (if any)
if (node.getLabel() != null) {
- String labelStyle = node.getCSSClass();
+ String labelStyle = null;
if (node.isSelected() && (styleSelected != null))
labelStyle = styleSelected;
else if (!node.isSelected() && (styleUnselected != null))
@@ -479,7 +490,7 @@
out.print("\"");
out.print(">");
} else if (labelStyle != null) {
- out.print("<div style=\"display:inline;\" class=\"");
+ out.print("<span class=\"");
out.print(labelStyle);
out.print("\">");
}
@@ -487,12 +498,13 @@
if (hyperlink != null)
out.print("</a>");
else if (labelStyle != null)
- out.print("</div>");
+ out.print("</span>");
}
- out.println("</div>");
+ out.println("</td>");
// Render the end of this node
- out.println("</div>");
+ out.println(" </tr>");
+ out.println("</table></td></tr>");
// Render the children of this node
if (node.isExpanded()) {
@@ -534,6 +546,4 @@
return (template);
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org