svn commit: r918363 - in /myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp: WEB-INF/tags/layout/overview.tag menu.jsp

[lo...@apache.org]

Author: lofwyr
Date: Wed Mar  3 08:26:59 2010
New Revision: 918363

URL: http://svn.apache.org/viewvc?rev=918363&view=rev
Log:
fixing naming container issues (important for JSP 1.2)

Removed:
    myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/menu.jsp
Modified:
    myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag

Modified: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag?rev=918363&r1=918362&r2=918363&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag Wed Mar  3 08:26:59 2010
@@ -1,11 +1,3 @@
-<%@ tag import="org.apache.myfaces.tobago.example.reference.SimpleBean" %>
-<%@ tag import="org.apache.myfaces.tobago.model.TreeState" %>
-<%@ tag import="javax.faces.application.FacesMessage" %>
-<%@ tag import="javax.faces.context.FacesContext" %>
-<%@ tag import="javax.swing.tree.DefaultMutableTreeNode" %>
-<%@ tag import="java.io.PrintWriter" %>
-<%@ tag import="java.io.StringWriter" %>
-<%@ tag import="java.util.Date" %>
 <%--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -23,19 +15,58 @@
  * limitations under the License.
 --%>
 
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
+<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
+
 <f:view locale="#{clientConfigController.locale}">
   <tc:loadBundle basename="overview" var="overviewBundle"/>
   <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page" width="1000px" height="750px">
 
-    <jsp:include page="/menu.jsp" />
     <%--f:facet name="backButtonDetector">
       <tc:hidden value="#{overviewNavigation.currentRequestTime}"
                  converter="org.apache.myfaces.tobago.converter.BackButtonDetection" >
         <f:validator validatorId="org.apache.myfaces.tobago.validator.BackButtonDetection" />
       </tc:hidden>
     </f:facet--%>
+    <f:facet name="menuBar" >
+      <tc:menuBar >
+        <tc:menu label="#{overviewBundle.menu_config}" >
+          <tc:menu label="#{overviewBundle.menu_themes}" >
+            <tc:menuItem action="#{clientConfigController.submit}">
+              <f:facet name="items">
+                <tc:selectOneRadio value="#{clientConfigController.theme}" >
+                  <f:selectItems value="#{clientConfigController.themeItems}" />
+                </tc:selectOneRadio>
+              </f:facet>
+            </tc:menuItem>
+          </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>
+          <%-- todo: may have something like immediate="true", but in this case, the value will not switched --%>
+          <tc:menuCheckbox action="#{clientConfigController.submit}"
+              label="#{overviewBundle.menu_debug}"
+              value="#{clientConfigController.debugMode}"/>
+          <tc:menuItem action="#{demo.resetSession}" label="Reset" />
+        </tc:menu>
+
+        <tc:menu label="#{overviewBundle.menu_help}">
+          <tc:menuItem onclick="alert('#{overviewBundle.pageTitle}' + String.fromCharCode(10) + '#{info.version}' + String.fromCharCode(10) + '#{overviewBundle.tobago_url}' + String.fromCharCode(10))"
+                       label="#{overviewBundle.menu_about}" />
+          <tc:menuItem onclick="LOG.show();"
+                       label="#{overviewBundle.menu_showLog}"
+                       rendered="#{clientConfigController.debugMode}"/>
+          <tc:menuItem action="server-info" immediate="true"
+                       label="Server Info"
+                       disabled="#{! info.enabled}"/>
+        </tc:menu>
+      </tc:menuBar>
+
+    </f:facet>
     <f:facet name="layout">
       <tc:gridLayout border="0" columns="*;4*"
         margin="10px" rows="100px;*;fixed"  />
@@ -50,7 +81,9 @@
     </tc:cell>
 
     <tc:cell>
-      <jsp:doBody/>
+      <f:subview id="content" >
+        <jsp:doBody/>
+      </f:subview>
     </tc:cell>
 
     <tc:cell>