cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin TreeControlTag.java
amyroh 2003/01/08 15:39:02
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TreeControlTag.java
Log:
Provide alt attribute for images for section 508 accessibility improvement.
Revision ChangesPath
1.8 +9 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TreeControlTag.java 13 Mar 2002 20:09:55 - 1.7
+++ TreeControlTag.java 8 Jan 2003 23:39:01 - 1.8
@@ -382,7 +382,7 @@
out.print(images);
out.print(/);
out.print(IMAGE_LINE_VERTICAL);
-out.print(\ border=\0\/td);
+out.print(\ alt=\\ border=\0\/td);
}
out.println();
}
@@ -418,16 +418,19 @@
out.print(IMAGE_LINE_LAST);
else
out.print(IMAGE_LINE_MIDDLE);
+out.print(\ alt=\);
} else if (node.isExpanded()) {
if (node.isLast())
out.print(IMAGE_HANDLE_DOWN_LAST);
else
out.print(IMAGE_HANDLE_DOWN_MIDDLE);
+out.print(\ alt=\close node);
} else {
if (node.isLast())
out.print(IMAGE_HANDLE_RIGHT_LAST);
else
out.print(IMAGE_HANDLE_RIGHT_MIDDLE);
+out.print(\ alt=\expand node);
}
out.print(\ border=\0\);
if ((action != null) !node.isLeaf())
@@ -465,6 +468,7 @@
out.print(images);
out.print(/);
out.print(node.getIcon());
+out.print(\ alt=\);
out.print(\ border=\0\);
if (hyperlink != null)
out.print(/a);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin TreeControlTag.java
craigmcc02/03/13 12:09:55
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TreeControlTag.java
Log:
Perform URL rewriting on the URL that is used to refresh the tree control.
Without this, the admin webapp won't work with cookies turned off -- clicking
any node of the tree would force you back to the login page.
Submitted by: Stephanie Bodoff Stephanie.Bodoff at sun.com
Revision ChangesPath
1.7 +7 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TreeControlTag.java 18 Dec 2001 22:59:41 - 1.6
+++ TreeControlTag.java 13 Mar 2002 20:09:55 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.6 2001/12/18 22:59:41 amyroh Exp $
- * $Revision: 1.6 $
- * $Date: 2001/12/18 22:59:41 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.7 2002/03/13 20:09:55 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/13 20:09:55 $
*
*
*
@@ -104,7 +104,7 @@
* strongFIXME/strong - Internationalize the exception messages!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/12/18 22:59:41 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/13 20:09:55 $
*/
public class TreeControlTag extends TagSupport {
@@ -400,6 +400,9 @@
String updateTreeAction =
replace(getAction(), tree=${name}, select= + encodedNodeName);
+updateTreeAction =
+((HttpServletResponse) pageContext.getResponse()).
+encodeURL(updateTreeAction);
out.print(td);
if ((action != null) !node.isLeaf()) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin TreeControlTag.java
amyroh 01/12/18 14:59:41
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TreeControlTag.java
Log:
The selected node does not get highlighted when the node is selected.
Made changes so that the tree also gets refreshed with each node selection,
along with loading the appropriate content in the content frame.
Submitted by Manveen Kaur.
Revision ChangesPath
1.6 +16 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TreeControlTag.java 2001/12/16 19:38:02 1.5
+++ TreeControlTag.java 2001/12/18 22:59:41 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.5 2001/12/16 19:38:02 patrickl Exp $
- * $Revision: 1.5 $
- * $Date: 2001/12/16 19:38:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.6 2001/12/18 22:59:41 amyroh Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/12/18 22:59:41 $
*
*
*
@@ -104,7 +104,7 @@
* strongFIXME/strong - Internationalize the exception messages!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2001/12/16 19:38:02 $
+ * @version $Revision: 1.6 $ $Date: 2001/12/18 22:59:41 $
*/
public class TreeControlTag extends TagSupport {
@@ -397,6 +397,10 @@
String action = replace(getAction(), ${name}, encodedNodeName);
+
+String updateTreeAction =
+replace(getAction(), tree=${name}, select= + encodedNodeName);
+
out.print(td);
if ((action != null) !node.isLeaf()) {
out.print(a href=\);
@@ -448,6 +452,10 @@
out.print(target);
out.print(\);
}
+// to refresh the tree in the same 'self' frame
+out.print( onclick=\);
+out.print(self.location.href=' + updateTreeAction + ');
+out.print(\);
out.print();
}
out.print(img src=\);
@@ -484,6 +492,10 @@
out.print(labelStyle);
out.print(\);
}
+// to refresh the tree in the same 'self' frame
+out.print( onclick=\);
+out.print(self.location.href=' + updateTreeAction + ');
+out.print(\);
out.print();
} else if (labelStyle != null) {
out.print(span class=\);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin TreeControlTag.java
patrickl01/11/17 13:20:54
Modified:webapps/admin index.jsp
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TreeControlTag.java
Log:
Look-and-feel patch to admin tool
Submitted by: Jazmin Jonson
Revision ChangesPath
1.5 +2 -2 jakarta-tomcat-4.0/webapps/admin/index.jsp
Index: index.jsp
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/index.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.jsp 2001/11/10 19:08:53 1.4
+++ index.jsp 2001/11/17 21:20:54 1.5
@@ -13,9 +13,9 @@
!-- Body --
-frameset rows=100,* border=0
+frameset rows=100,* border=1
frame name=banner src='%= response.encodeURL(banner.jsp) %' scrolling=no
- frameset cols=300,* border=0
+ frameset cols=300,* border=1
frame name=tree src='%= response.encodeURL(tree-control-test.jsp) %'
scrolling=auto
frame name=content src='%= response.encodeURL(sample.jsp) %'
scrolling=auto
/frameset
1.2 +9 -3
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TreeControlTag.java 2001/11/06 20:40:13 1.1
+++ TreeControlTag.java 2001/11/17 21:20:54 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.1 2001/11/06 20:40:13 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2001/11/06 20:40:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.2 2001/11/17 21:20:54 patrickl Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/11/17 21:20:54 $
*
*
*
@@ -103,7 +103,7 @@
* strongFIXME/strong - Internationalize the exception messages!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/11/06 20:40:13 $
+ * @version $Revision: 1.2 $ $Date: 2001/11/17 21:20:54 $
*/
public class TreeControlTag extends TagSupport {
@@ -429,6 +429,7 @@
}
// Render the label for this node (if any)
+
if (node.getLabel() != null) {
String labelStyle = null;
if (node.isSelected() (styleSelected != null))
@@ -439,6 +440,11 @@
out.print(a href=\);
out.print(hyperlink);
out.print(\);
+
+String target = node.getTarget();
+if(target != null)
+out.print( Target=\ + target + \);
+
if (labelStyle != null) {
out.print( class=\);
out.print(labelStyle);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin TreeControlTag.java
craigmcc01/11/17 17:40:37
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TreeControlTag.java
Log:
Add generation of the target attribute for the icon as well, so that
clicks there are treated the same as the label.
For compatibility with XHTML, make the attribute name target instead of
Target (must be all lower case).
Avoid String concatenations by unfolding the generation of the attribute.
Revision ChangesPath
1.3 +17 -9
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TreeControlTag.java 2001/11/17 21:20:54 1.2
+++ TreeControlTag.java 2001/11/18 01:40:37 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.2 2001/11/17 21:20:54 patrickl Exp $
- * $Revision: 1.2 $
- * $Date: 2001/11/17 21:20:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
1.3 2001/11/18 01:40:37 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/11/18 01:40:37 $
*
*
*
@@ -103,7 +103,7 @@
* strongFIXME/strong - Internationalize the exception messages!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/11/17 21:20:54 $
+ * @version $Revision: 1.3 $ $Date: 2001/11/18 01:40:37 $
*/
public class TreeControlTag extends TagSupport {
@@ -417,7 +417,14 @@
if (hyperlink != null) {
out.print(a href=\);
out.print(hyperlink);
-out.print(\);
+out.print(\);
+String target = node.getTarget();
+if(target != null) {
+out.print( target=\);
+out.print(target);
+out.print(\);
+}
+out.print();
}
out.print(img src=\);
out.print(images);
@@ -440,11 +447,12 @@
out.print(a href=\);
out.print(hyperlink);
out.print(\);
-
String target = node.getTarget();
-if(target != null)
-out.print( Target=\ + target + \);
-
+if(target != null) {
+out.print( target=\);
+out.print(target);
+out.print(\);
+}
if (labelStyle != null) {
out.print( class=\);
out.print(labelStyle);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
