You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by to...@apache.org on 2005/09/23 03:33:38 UTC
svn commit: r291053 - in /myfaces/examples/trunk/simple: ./ WEB-INF/ css/
inc/ src/java/org/apache/myfaces/examples/resource/
Author: tomsp
Date: Thu Sep 22 18:33:26 2005
New Revision: 291053
URL: http://svn.apache.org/viewcvs?rev=291053&view=rev
Log:
JSCookMenu was broken - fixed bug in encode children
Added:
myfaces/examples/trunk/simple/panelnavigation.jsp
Modified:
myfaces/examples/trunk/simple/WEB-INF/examples-config.xml
myfaces/examples/trunk/simple/css/basic.css
myfaces/examples/trunk/simple/home.jsp
myfaces/examples/trunk/simple/inc/navigation.jsp
myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages.properties
myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_ca.properties
myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_de.properties
myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_es.properties
myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_fr.properties
myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_pt_BR.properties
Modified: myfaces/examples/trunk/simple/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/WEB-INF/examples-config.xml?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
--- myfaces/examples/trunk/simple/WEB-INF/examples-config.xml (original)
+++ myfaces/examples/trunk/simple/WEB-INF/examples-config.xml Thu Sep 22 18:33:26 2005
@@ -482,6 +482,12 @@
<to-view-id>/selectOneCountry.jsp</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>go_panelnavigation</from-outcome>
+ <to-view-id>/panelnavigation.jsp</to-view-id>
+ </navigation-case>
+
+
</navigation-rule>
<navigation-rule>
Modified: myfaces/examples/trunk/simple/css/basic.css
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/css/basic.css?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
Binary files - no diff available.
Modified: myfaces/examples/trunk/simple/home.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/home.jsp?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
Binary files - no diff available.
Modified: myfaces/examples/trunk/simple/inc/navigation.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/inc/navigation.jsp?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
Binary files - no diff available.
Added: myfaces/examples/trunk/simple/panelnavigation.jsp
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/panelnavigation.jsp?rev=291053&view=auto
==============================================================================
--- myfaces/examples/trunk/simple/panelnavigation.jsp (added)
+++ myfaces/examples/trunk/simple/panelnavigation.jsp Thu Sep 22 18:33:26 2005
@@ -0,0 +1,60 @@
+
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
+
+<html>
+
+<%@include file="inc/head.inc"%>
+
+<!--
+/*
+ * Copyright 2004 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.
+ */
+//-->
+
+<body>
+<f:view>
+ <f:loadBundle
+ basename="org.apache.myfaces.examples.resource.example_messages"
+ var="example_messages" />
+ <t:div id="subnavigation_outer">
+ <t:div id="subnavigation">
+
+ <t:panelNavigation2 layout="list" itemClass="mypage" activeItemClass="selected" openItemClass="selected" >
+ <t:commandNavigation2 id="nav_1" value="Marken" action="go_panelnavigation" >
+ <t:commandNavigation2 id="nav_1_1" action="go_panelnavigation" >
+ <f:verbatim>› </f:verbatim>
+ <t:outputText value="Suche Register" />
+ </t:commandNavigation2>
+ <t:commandNavigation2 id="nav_1_2" action="go_panelnavigation" >
+ <f:verbatim>› </f:verbatim>
+ <t:outputText value="Suche Publikation" />
+ </t:commandNavigation2>
+ <t:commandNavigation2 id="nav_1_3" action="go_panelnavigation" >
+ <f:verbatim>› </f:verbatim>
+ <t:outputText value="Erweiterte Suche" />
+ </t:commandNavigation2>
+ </t:commandNavigation2>
+ <t:commandNavigation2 id="nav_2" value="Patente" action="go_panelnavigation" />
+ <t:commandNavigation2 id="nav_3" value="ESZ" action="go_panelnavigation" />
+ </t:panelNavigation2>
+ </t:div>
+ </t:div>
+</f:view>
+<%@include file="inc/page_footer.jsp"%>
+
+</body>
+
+</html>
Modified: myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages.properties
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages.properties?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
--- myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages.properties (original)
+++ myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages.properties Thu Sep 22 18:33:26 2005
@@ -38,6 +38,7 @@
nav_InputTextHelp = Input Text Help
nav_forceId = ForceId
nav_selectOneCountry= Select a country box
+nav_panelnavigation = PanelNavigation Menu
nav_swapimage = SwapImage
nav_crossDataTable = Crosstable
Modified: myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_ca.properties
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_ca.properties?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
--- myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_ca.properties (original)
+++ myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_ca.properties Thu Sep 22 18:33:26 2005
@@ -37,6 +37,7 @@
nav_InputHtml = Editor Html
nav_forceId = ForceId
nav_selectOneCountry= Selecciona un país
+nav_panelnavigation = PanelNavigation Menu
nav_swapimage = SwapImage
nav_crossDataTable = Taula creuada
Modified: myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_de.properties
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_de.properties?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
--- myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_de.properties (original)
+++ myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_de.properties Thu Sep 22 18:33:26 2005
@@ -33,6 +33,7 @@
nav_forceId = ForceId
nav_swapimage = SwapImage
nav_crossDataTable = Kreuztabelle
+nav_panelnavigation = PanelNavigation Menu
# buttons
Modified: myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_es.properties
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_es.properties?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
--- myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_es.properties (original)
+++ myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_es.properties Thu Sep 22 18:33:26 2005
@@ -25,7 +25,6 @@
nav_JsListener = JavaScript Listener
nav_dataList = Listas Dinámicas
nav_tree = Árbol
-nav_tree = Árbol2
nav_treeTable = Tabla en Árbol
nav_Validate = Validaciones
nav_rssTicker = RssTicker
@@ -37,6 +36,7 @@
nav_InputHtml = Editor Html
nav_forceId = ForceId
nav_selectOneCountry= Selecciona una casilla de país
+nav_panelnavigation = PanelNavigation Menu
nav_swapimage = SwapImage
nav_crossDataTable = Tabla cruzada
Modified: myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_fr.properties
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_fr.properties?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
--- myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_fr.properties (original)
+++ myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_fr.properties Thu Sep 22 18:33:26 2005
@@ -31,6 +31,7 @@
nav_newspaperTable = Newspaper Table
nav_forceId = ForceId
nav_swapimage = SwapImage
+nav_panelnavigation = PanelNavigation Menu
# buttons
Modified: myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_pt_BR.properties
URL: http://svn.apache.org/viewcvs/myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_pt_BR.properties?rev=291053&r1=291052&r2=291053&view=diff
==============================================================================
--- myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_pt_BR.properties (original)
+++ myfaces/examples/trunk/simple/src/java/org/apache/myfaces/examples/resource/example_messages_pt_BR.properties Thu Sep 22 18:33:26 2005
@@ -33,7 +33,7 @@
nav_newspaperTable = Newspaper Table
nav_forceId = ForceId
nav_swapimage = SwapImage
-nav_forceId = Force ID
+nav_panelnavigation = PanelNavigation Menu
# buttons