You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/04/20 00:51:55 UTC
cvs commit: incubator-myfaces/webapps/simple/images blue-folder-open.gif person.png blue-folder-closed.png blue-folder-open.png
schof 2005/04/19 15:51:55
Modified: webapps/simple home.jsp tree2.jsp
webapps/simple/images blue-folder-closed.png
Added: webapps/simple tree2HideRoot.jsp tree2NiceWrap.jsp
webapps/simple/images blue-folder-open.gif person.png
Removed: webapps/simple/images blue-folder-open.png
Log:
new tree2 examples; replaced some png with gif b/c of the PNG bug in IE (avoids unecessary confusion/explanations)
Revision Changes Path
1.5 +4 -1 incubator-myfaces/webapps/simple/home.jsp
Index: home.jsp
===================================================================
RCS file: /home/cvs/incubator-myfaces/webapps/simple/home.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- home.jsp 13 Apr 2005 20:08:38 -0000 1.4
+++ home.jsp 19 Apr 2005 22:51:55 -0000 1.5
@@ -43,7 +43,10 @@
<h:outputLink value="dataList.jsf" ><f:verbatim>Dynamic Lists</f:verbatim></h:outputLink> <br/>
<h:outputLink value="tree.jsf" ><f:verbatim>Tree</f:verbatim></h:outputLink> <br/>
<h:outputLink value="treeTable.jsf" ><f:verbatim>Tree Table</f:verbatim></h:outputLink> <br/>
- <h:outputLink value="tree2.jsf" ><f:verbatim>Tree2</f:verbatim></h:outputLink> <br/>
+ Tree2<br/>
+ <h:outputLink value="tree2.jsf" ><f:verbatim>Tree2 (client-side toggle, server-side toggle)</f:verbatim></h:outputLink><br/>
+ <h:outputLink value="tree2HideRoot.jsf" ><f:verbatim>Tree2 (hide root node)</f:verbatim></h:outputLink><br/>
+ <h:outputLink value="tree2NiceWrap.jsf" ><f:verbatim>Tree2 (nice wrap)</f:verbatim></h:outputLink><br/>
<h:outputLink value="rssTicker.jsf" ><f:verbatim>RSS Ticker</f:verbatim></h:outputLink> <br/>
<h:outputLink value="panelstack.jsf" ><f:verbatim>Panel Stack</f:verbatim></h:outputLink> <br/>
<h:outputLink value="css.jsf" ><f:verbatim>Style Sheet</f:verbatim></h:outputLink> <br/>
1.5 +10 -5 incubator-myfaces/webapps/simple/tree2.jsp
Index: tree2.jsp
===================================================================
RCS file: /home/cvs/incubator-myfaces/webapps/simple/tree2.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tree2.jsp 4 Apr 2005 22:31:29 -0000 1.4
+++ tree2.jsp 19 Apr 2005 22:51:55 -0000 1.5
@@ -37,7 +37,9 @@
First child in the expand/collapse facet should be image (if any)
--%>
- <b>Client-Side Tree</b>
+ <span style="font-family:verdana">
+ <b>Tree2 w/client-side (default) toggle</b><br/>
+ </span>
<br/>
<x:tree2 id="clientTree" value="#{treeBacker.treeData}" var="node" varNodeToggler="t">
@@ -67,7 +69,7 @@
<f:facet name="bar-folder">
<h:panelGroup>
<f:facet name="expand">
- <h:graphicImage value="images/blue-folder-open.png" rendered="#{t.nodeExpanded}" border="0"/>
+ <h:graphicImage value="images/blue-folder-open.gif" rendered="#{t.nodeExpanded}" border="0"/>
</f:facet>
<f:facet name="collapse">
<h:graphicImage value="images/blue-folder-closed.png" rendered="#{!t.nodeExpanded}" border="0"/>
@@ -87,9 +89,12 @@
</f:facet>
</x:tree2>
- <b>Server-Side Tree</b>
<br/>
-
+ <span style="font-family:verdana">
+ <b>Tree2 w/server-side toggle</b><br/>
+ </span>
+ <br/>
+
<!-- Expand/Collapse Handled By Server -->
<x:tree2 id="serverTree" value="#{treeBacker.treeData}" var="node" varNodeToggler="t" clientSideToggle="false">
<f:facet name="person">
@@ -114,7 +119,7 @@
<f:facet name="bar-folder">
<h:panelGroup>
<h:commandLink immediate="true" action="#{t.toggleExpanded}">
- <h:graphicImage value="/images/blue-folder-open.png" rendered="#{t.nodeExpanded}" border="0"/>
+ <h:graphicImage value="/images/blue-folder-open.gif" rendered="#{t.nodeExpanded}" border="0"/>
<h:graphicImage value="/images/blue-folder-closed.png" rendered="#{!t.nodeExpanded}" border="0"/>
</h:commandLink>
<h:outputText value="#{node.description}" styleClass="nodeFolder"/>
1.1 incubator-myfaces/webapps/simple/tree2HideRoot.jsp
Index: tree2HideRoot.jsp
===================================================================
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
<!--
/*
* Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
//-->
<html>
<%@include file="inc/head.inc" %>
<body>
<f:view>
<span style="font-family:verdana">
<b>Tree2 w/showRootNode=false</b><br/>
</span>
<br/>
<x:tree2 id="clientTree" value="#{treeBacker.treeData}" var="node" varNodeToggler="t" showRootNode="false">
<f:facet name="person">
<h:panelGroup>
<f:facet name="expand">
<h:graphicImage value="images/person.png" rendered="#{t.nodeExpanded}" border="0"/>
</f:facet>
<f:facet name="collapse">
<h:graphicImage value="images/person.png" rendered="#{!t.nodeExpanded}" border="0"/>
</f:facet>
<h:outputText value="#{node.description}" styleClass="nodeFolder"/>
</h:panelGroup>
</f:facet>
<f:facet name="foo-folder">
<h:panelGroup>
<f:facet name="expand">
<h:graphicImage value="images/yellow-folder-open.png" rendered="#{t.nodeExpanded}" border="0"/>
</f:facet>
<f:facet name="collapse">
<h:graphicImage value="images/yellow-folder-closed.png" rendered="#{!t.nodeExpanded}" border="0"/>
</f:facet>
<h:outputText value="#{node.description}" styleClass="nodeFolder"/>
<h:outputText value=" (#{node.childCount})" styleClass="childCount" rendered="#{!empty node.children}"/>
</h:panelGroup>
</f:facet>
<f:facet name="bar-folder">
<h:panelGroup>
<f:facet name="expand">
<h:graphicImage value="images/blue-folder-open.gif" rendered="#{t.nodeExpanded}" border="0"/>
</f:facet>
<f:facet name="collapse">
<h:graphicImage value="images/blue-folder-closed.png" rendered="#{!t.nodeExpanded}" border="0"/>
</f:facet>
<h:outputText value="#{node.description}" styleClass="nodeFolder"/>
<h:outputText value=" (#{node.childCount})" styleClass="childCount" rendered="#{!empty node.children}"/>
</h:panelGroup>
</f:facet>
<f:facet name="document">
<h:panelGroup>
<h:commandLink immediate="true" styleClass="#{t.nodeSelected ? 'documentSelected':'document'}" actionListener="#{t.setNodeSelected}">
<h:graphicImage value="images/document.png" border="0"/>
<h:outputText value="#{node.description}"/>
<f:param name="docNum" value="#{node.identifier}"/>
</h:commandLink>
</h:panelGroup>
</f:facet>
</x:tree2>
</f:view>
<%@include file="inc/page_footer.jsp" %>
</body>
</html>
1.1 incubator-myfaces/webapps/simple/tree2NiceWrap.jsp
Index: tree2NiceWrap.jsp
===================================================================
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
<!--
/*
* Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
//-->
<html>
<%@include file="inc/head.inc" %>
<body>
<f:view>
<span style="font-family:verdana">
<b>Tree2 w/nice wrap</b><br/>
</span>
<br/>
<h:panelGrid width="200">
<x:tree2 id="wrapTree" value="#{treeBacker.treeData}" var="node" varNodeToggler="t" clientSideToggle="false">
<f:facet name="person">
<h:panelGrid columns="2" cellpadding="0" cellspacing="0">
<h:commandLink immediate="true" action="#{t.toggleExpanded}">
<h:graphicImage value="/images/yellow-folder-open.png" rendered="#{t.nodeExpanded}" border="0"/>
<h:graphicImage value="/images/yellow-folder-closed.png" rendered="#{!t.nodeExpanded}" border="0"/>
</h:commandLink>
<h:outputText value="#{node.description}" styleClass="nodeFolder"/>
</h:panelGrid>
</f:facet>
<f:facet name="foo-folder">
<h:panelGrid columns="2" cellpadding="2" cellspacing="0">
<h:commandLink immediate="true" action="#{t.toggleExpanded}">
<h:graphicImage value="/images/yellow-folder-open.png" rendered="#{t.nodeExpanded}" border="0"/>
<h:graphicImage value="/images/yellow-folder-closed.png" rendered="#{!t.nodeExpanded}" border="0"/>
</h:commandLink>
<h:panelGroup>
<h:outputText value="#{node.description}" styleClass="nodeFolder"/>
<h:outputText value=" (#{node.childCount})" styleClass="childCount" rendered="#{!empty node.children}"/>
</h:panelGroup>
</h:panelGrid>
</f:facet>
<f:facet name="bar-folder">
<h:panelGrid columns="2" cellpadding="2" cellspacing="0">
<h:commandLink immediate="true" action="#{t.toggleExpanded}">
<h:graphicImage value="/images/blue-folder-open.gif" rendered="#{t.nodeExpanded}" border="0"/>
<h:graphicImage value="/images/blue-folder-closed.png" rendered="#{!t.nodeExpanded}" border="0"/>
</h:commandLink>
<h:panelGroup>
<h:outputText value="#{node.description}" styleClass="nodeFolder"/>
<h:outputText value=" (#{node.childCount})" styleClass="childCount" rendered="#{!empty node.children}"/>
</h:panelGroup>
</h:panelGrid>
</f:facet>
<f:facet name="document">
<h:panelGroup>
<h:commandLink immediate="true" styleClass="#{t.nodeSelected ? 'documentSelected':'document'}" actionListener="#{t.setNodeSelected}">
<h:graphicImage value="/images/document.png" border="0"/>
<h:outputText value="#{node.description}"/>
<f:param name="docNum" value="#{node.identifier}"/>
</h:commandLink>
</h:panelGroup>
</f:facet>
</x:tree2>
</h:panelGrid>
</f:view>
<%@include file="inc/page_footer.jsp" %>
</body>
</html>
1.2 +2 -1 incubator-myfaces/webapps/simple/images/blue-folder-closed.png
<<Binary file>>
1.1 incubator-myfaces/webapps/simple/images/blue-folder-open.gif
<<Binary file>>
1.1 incubator-myfaces/webapps/simple/images/person.png
<<Binary file>>