You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/11/05 16:01:36 UTC
svn commit: r1636887 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp:
layout/overview.xhtml menu.xhtml
Author: lofwyr
Date: Wed Nov 5 15:01:35 2014
New Revision: 1636887
URL: http://svn.apache.org/r1636887
Log:
TOBAGO-1421: MenuFacet should be usable in included facets
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml?rev=1636887&r1=1636886&r2=1636887&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml Wed Nov 5 15:01:35 2014
@@ -37,35 +37,7 @@
-->
<f:facet name="menuBar">
- <tc:menuBar>
- <tc:form>
- <tc:menu label="#{overviewBundle.menu_config}">
- <tc:menu label="Hier sind die themes">
- <tx:menuRadio action="#{clientConfigController.submit}" value="#{clientConfigController.theme}">
- <f:selectItems value="#{clientConfigController.themeItems}"/>
- </tx:menuRadio>
- </tc:menu>
- <tc:menu label="#{overviewBundle.menu_locale}">
- <tx:menuRadio action="#{clientConfigController.submit}" value="#{clientConfigController.locale}">
- <f:selectItems value="#{clientConfigController.localeItems}"/>
- </tx:menuRadio>
- </tc:menu>
- <tc:menuCommand action="#{demo.resetSession}" label="Reset"/>
- </tc:menu>
-
- <tc:menu label="#{overviewBundle.menu_help}">
- <tc:menuCommand label="#{overviewBundle.menu_about}" omit="true">
- <tc:dataAttribute name="alert-text"
- value="#{overviewBundle.pageTitle} - #{info.version} - #{overviewBundle.tobago_url}"/>
- </tc:menuCommand>
- <tc:menuCommand link="http://myfaces.apache.org/tobago" label="Tobago in the Web"/>
- <tc:menuCommand action="server-info" immediate="true"
- label="Server Info"
- disabled="#{! info.enabled}"/>
- </tc:menu>
- </tc:form>
- </tc:menuBar>
-
+ <ui:include src="/menu.xhtml"/>
</f:facet>
<f:facet name="layout">
Added: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1636887&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml Wed Nov 5 15:01:35 2014
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * 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.
+-->
+
+<tc:menuBar
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension">
+ <tc:form>
+ <tc:menu label="#{overviewBundle.menu_config}">
+ <tc:menu label="Hier sind die themes">
+ <tx:menuRadio action="#{clientConfigController.submit}" value="#{clientConfigController.theme}">
+ <f:selectItems value="#{clientConfigController.themeItems}"/>
+ </tx:menuRadio>
+ </tc:menu>
+ <tc:menu label="#{overviewBundle.menu_locale}">
+ <tx:menuRadio action="#{clientConfigController.submit}" value="#{clientConfigController.locale}">
+ <f:selectItems value="#{clientConfigController.localeItems}"/>
+ </tx:menuRadio>
+ </tc:menu>
+ <tc:menuCommand action="#{demo.resetSession}" label="Reset"/>
+ </tc:menu>
+
+ <tc:menu label="#{overviewBundle.menu_help}">
+ <tc:menuCommand label="#{overviewBundle.menu_about}" omit="true">
+ <tc:dataAttribute name="alert-text"
+ value="#{overviewBundle.pageTitle} - #{info.version} - #{overviewBundle.tobago_url}"/>
+ </tc:menuCommand>
+ <tc:menuCommand link="http://myfaces.apache.org/tobago" label="Tobago in the Web"/>
+ <tc:menuCommand action="server-info" immediate="true"
+ label="Server Info"
+ disabled="#{! info.enabled}"/>
+ </tc:menu>
+ </tc:form>
+</tc:menuBar>