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 2017/09/27 13:15:32 UTC

[myfaces-tobago] branch master updated: Nicer menu in demo

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new ee39ba6  Nicer menu in demo
ee39ba6 is described below

commit ee39ba6ff06f60aafd17b8a6bdbd70a636c2864b
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Sep 27 15:13:45 2017 +0200

    Nicer menu in demo
---
 .../tobago-example-demo/src/main/webapp/menu.xhtml | 49 ++++++++++++----------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
index 5b2c244..ce9c587 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
@@ -60,26 +60,31 @@
             <tc:link action="#{login.resetSession}" label="Reset Session"/>
           </tc:link>
 
-          <tc:link label="#{demoBundle.menu_help}" omit="true">
-            <tc:link label="#{demoBundle.menu_about}" omit="true">
-              <tc:dataAttribute name="alert-text"
-                                value="#{demoBundle.pageTitle} - #{info.version} - #{demoBundle.tobago_url}"/>
+          <tc:link label="#{demoBundle.menu_test}" omit="true">
+            <tc:link id="runtest" label="#{demoBundle.menu_runTest}" outcome="/test.xhtml"
+                     immediate="true" disabled="#{!testController.hasTest()}">
+              <f:param name="base" value="#{testController.base}"/>
             </tc:link>
-            <tc:link omit="true" label="Client Info" id="headerInfo">
-              <tc:operation name="show" for=":::info"/>
+            <tc:link id="closetest" label="#{demoBundle.menu_closeTest}" immediate="true"/>
+            <tc:link label="#{demoBundle.menu_runTestAll}" outcome="/testAll.xhtml" target="_blank"
+                     immediate="true" rendered="#{facesContext.isProjectStage('Development')}"/>
+            <tc:link label="#{demoBundle.menu_accessAllPages}" outcome="/testAccessAllPages.xhtml" target="_blank"
+                     immediate="true" rendered="#{facesContext.isProjectStage('Development')}"/>
+          </tc:link>
+
+          <tc:link label="Menu" omit="true">
+            <tc:link label="Menu Item" omit="true">
+              <tc:dataAttribute name="alert-text" value="Demo Message"/>
             </tc:link>
-            <tc:link action="/server-info.xhtml" immediate="true" label="Server Info" disabled="#{! info.enabled}"/>
-            <tc:link action="/logging-info.xhtml" immediate="true" label="Logging Info"
-                        disabled="#{! info.enabled}"/>
-            <tc:link link="http://myfaces.apache.org/tobago" label="Tobago in the Web"/>
             <tc:separator/>
-            <tc:link label="Sub-Menu" omit="true">
+            <tc:link label="Sub Menu" omit="true">
               <tc:link label="Sub 1" omit="true"/>
               <tc:link label="Sub 2" omit="true"/>
               <tc:link label="Sub 3" omit="true"/>
-              <tc:link action="doit" label="Sub 4 ich kann auch selber was" omit="true">
+              <tc:link action="doit" label="Sub 4" omit="true">
                 <tc:link label="Sub 4 1" omit="true"/>
                 <tc:link label="Sub 4 2" omit="true"/>
+                <tc:link label="Sub 4 3" omit="true"/>
               </tc:link>
               <tc:link label="Sub 5" omit="true">
                 <tc:link label="Sub 5 1" omit="true"/>
@@ -88,16 +93,18 @@
             </tc:link>
           </tc:link>
 
-          <tc:link label="#{demoBundle.menu_test}" omit="true">
-            <tc:link id="runtest" label="#{demoBundle.menu_runTest}" outcome="/test.xhtml"
-                     immediate="true" disabled="#{!testController.hasTest()}">
-              <f:param name="base" value="#{testController.base}"/>
+          <tc:link label="#{demoBundle.menu_help}" omit="true">
+            <tc:link label="#{demoBundle.menu_about}" omit="true">
+              <tc:dataAttribute name="alert-text"
+                                value="#{demoBundle.pageTitle} - #{info.version} - #{demoBundle.tobago_url}"/>
             </tc:link>
-            <tc:link id="closetest" label="#{demoBundle.menu_closeTest}" immediate="true"/>
-            <tc:link label="#{demoBundle.menu_runTestAll}" outcome="/testAll.xhtml" target="_blank"
-                     immediate="true" rendered="#{facesContext.isProjectStage('Development')}"/>
-            <tc:link label="#{demoBundle.menu_accessAllPages}" outcome="/testAccessAllPages.xhtml" target="_blank"
-                     immediate="true" rendered="#{facesContext.isProjectStage('Development')}"/>
+            <tc:link omit="true" label="Client Info" id="headerInfo">
+              <tc:operation name="show" for=":::info"/>
+            </tc:link>
+            <tc:link action="/server-info.xhtml" immediate="true" label="Server Info" disabled="#{! info.enabled}"/>
+            <tc:link action="/logging-info.xhtml" immediate="true" label="Logging Info"
+                     disabled="#{! info.enabled}"/>
+            <tc:link link="http://myfaces.apache.org/tobago" label="Tobago in the Web"/>
           </tc:link>
 
         </tc:links>

-- 
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].