You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ck...@apache.org on 2010/05/03 15:07:21 UTC
svn commit: r940441 [3/3] - in
/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main:
java/org/apache/myfaces/trinidaddemo/
java/org/apache/myfaces/trinidaddemo/feature/
java/org/apache/myfaces/trinidaddemo/f...
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/fragment/navigationBar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/fragment/navigationBar.xhtml?rev=940441&r1=940440&r2=940441&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/fragment/navigationBar.xhtml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/fragment/navigationBar.xhtml Mon May 3 13:07:19 2010
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -14,7 +32,7 @@
</tr:goLink>
</li>
<li>
- <tr:goLink destination="/faces/pages/notImplemented.xhtml">
+ <tr:goLink destination="/faces/pages/featureDemo.xhtml">
<tr:outputText id="demosId" value="Feature Demos"/>
</tr:goLink>
</li>
@@ -25,7 +43,7 @@
<div class="submenu_container">
<table class="submenu">
<tr><td>
- <tr:goLink destination="/faces/feature/e-mailTemplate.xhtml">
+ <tr:goLink destination="/faces/samples/email/e-mailTemplate.xhtml">
<tr:outputText id="emailId" value="Email"/>
</tr:goLink>
</td></tr>
@@ -58,17 +76,7 @@
<tr:outputText id="casablancaId" value="Casablanca"/>
<f:setPropertyActionListener value="Casablanca" target="#{skinFamilySelection.skinFamily}"/>
</tr:commandLink>
- </td></tr>
- <tr><td>
- <tr:goLink destination="/faces/pages/notImplemented.xhtml">
- <tr:outputText id="suedeId" value="Suede"/>
- </tr:goLink>
- </td></tr>
- <tr><td>
- <tr:goLink destination="/faces/pages/notImplemented.xhtml">
- <tr:outputText id="purpleId" value="Purple"/>
- </tr:goLink>
- </td></tr>
+ </td></tr>
</table>
</div><!-- cloase submenu container -->
</span>
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/fragment/searchBar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/fragment/searchBar.xhtml?rev=940441&r1=940440&r2=940441&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/fragment/searchBar.xhtml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/template/fragment/searchBar.xhtml Mon May 3 13:07:19 2010
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"