myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r911373 - /myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/toolbar.jsp
Date Thu, 18 Feb 2010 12:56:56 GMT
Author: lofwyr
Date: Thu Feb 18 12:56:56 2010
New Revision: 911373

URL: http://svn.apache.org/viewvc?rev=911373&view=rev
Log:
fixing layout

Modified:
    myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/toolbar.jsp

Modified: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/toolbar.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/toolbar.jsp?rev=911373&r1=911372&r2=911373&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/toolbar.jsp
(original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/overview/toolbar.jsp
Thu Feb 18 12:56:56 2010
@@ -21,194 +21,201 @@
 
 <layout:overview>
   <jsp:body>
-    <tc:panel id="pageToolbar" >
+    <tc:panel id="pageToolbar">
       <f:facet name="layout">
-        <tc:gridLayout rows="65px;fixed;1px;70px;fixed;50px"  id="pageToolbarLayout"/>
+        <tc:gridLayout rows="65px;fixed;1px;70px;*" id="pageToolbarLayout"/>
       </f:facet>
 
-      <tc:out escape="false" value="#{overviewBundle.toolbar_text1}" />
+      <tc:out escape="false" value="#{overviewBundle.toolbar_text1}"/>
 
-      <tc:box label="#{overviewBundle.toolbar_sampleTitle}" id="boxToolbar" >
+      <tc:box label="#{overviewBundle.toolbar_sampleTitle}" id="boxToolbar">
 
         <f:facet name="layout">
           <tc:gridLayout rows="fixed;fixed;fixed" columns="2*;1*;1*" id="boxToolbarLayout"/>
         </f:facet>
 
         <f:facet name="toolBar">
-        <tc:toolBar>
-          <tc:toolBarCommand id="button" action="overview/toolbar"
-              actionListener="#{overviewController.click}"
-              label="#{overviewBundle.toolbar_buttonAction}" />
-
-        <tc:toolBarCommand id="imageButton" action="#{overviewController.ping}"
-            actionListener="#{overviewController.click}"
-            label="#{overviewBundle.toolbar_imageButtonAction}"
-            image="image/toolbar_example_button.gif" />
-
-        <tc:toolBarCommand id="popupButton"
-            actionListener="#{overviewController.click}"
-            label="#{overviewBundle.toolbar_popupButtonAction}">
+          <tc:toolBar>
+            <tc:toolBarCommand id="button" action="overview/toolbar"
+                               actionListener="#{overviewController.click}"
+                               label="#{overviewBundle.toolbar_buttonAction}"/>
+
+            <tc:toolBarCommand id="imageButton" action="#{overviewController.ping}"
+                               actionListener="#{overviewController.click}"
+                               label="#{overviewBundle.toolbar_imageButtonAction}"
+                               image="image/toolbar_example_button.gif"/>
+
+            <tc:toolBarCommand id="popupButton"
+                               actionListener="#{overviewController.click}"
+                               label="#{overviewBundle.toolbar_popupButtonAction}">
+
+              <f:facet name="popup">
+                <tc:popup width="200" height="100" id="popup" modal="true">
+
+                  <f:facet name="layout">
+                    <tc:gridLayout rows="35px;1*;fixed"/>
+                  </f:facet>
+
+                  <tc:out value="#{overviewBundle.toolbar_popupText}"/>
+
+                  <tc:cell/>
+                  <tc:button id="popupCloseButton" label="#{overviewBundle.toolbar_closePopupAction}">
+                    <tc:attribute name="popupClose" value="immediate"/>
+                  </tc:button>
 
-          <f:facet name="popup">
-            <tc:popup width="200" height="100" id="popup" modal="true">
-
-              <f:facet name="layout">
-                <tc:gridLayout rows="35px;1*;fixed" />
+                </tc:popup>
               </f:facet>
+            </tc:toolBarCommand>
 
-              <tc:out value="#{overviewBundle.toolbar_popupText}"/>
-
-              <tc:cell/>
-              <tc:button id="popupCloseButton" label="#{overviewBundle.toolbar_closePopupAction}"
>
-                <tc:attribute name="popupClose" value="immediate"/>
-              </tc:button>
-
-            </tc:popup>
-          </f:facet>
-        </tc:toolBarCommand>
-
-        <tc:toolBarCommand id="DropDown"
-                           label="#{overviewBundle.toolbar_dropDownAction}" >
-          <f:facet name="menupopup">
-            <tc:menu>
-              <tc:menuItem onclick="alert('test 1')"  label="Alert 1"/>
-              <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
-              <tc:menuItem action="#{overviewController.ping}" id="dropdown3" actionListener="#{overviewController.click}"
label="Action 3"/>
-            </tc:menu>
-          </f:facet>
-        </tc:toolBarCommand>
+            <tc:toolBarCommand id="DropDown"
+                               label="#{overviewBundle.toolbar_dropDownAction}">
+              <f:facet name="menupopup">
+                <tc:menu>
+                  <tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
+                  <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
+                  <tc:menuItem action="#{overviewController.ping}" id="dropdown3"
+                               actionListener="#{overviewController.click}" label="Action
3"/>
+                </tc:menu>
+              </f:facet>
+            </tc:toolBarCommand>
 
-        </tc:toolBar>
+          </tc:toolBar>
         </f:facet>
 
         <tc:cell spanX="3">
-        <tc:toolBar iconSize="#{overviewController.toolbarIconSize}"
-                    labelPosition="#{overviewController.toolbarTextPosition}"
-                    orientation="left" >
-          <tc:toolBarCommand id="button2" action="overview/toolbar"
-              actionListener="#{overviewController.click}"
-              label="#{overviewBundle.toolbar_buttonAction}" />
-
-        <tc:toolBarCommand id="imageButton2" action="overview/toolbar"
-            actionListener="#{overviewController.click}"
-            label="#{overviewBundle.toolbar_imageButtonAction}"
-            image="image/toolbar_example_button.gif" />
-
-
-
-        <tc:toolBarCommand id="popupButton2"
-            actionListener="#{overviewController.click}"
-            label="#{overviewBundle.toolbar_popupButtonAction}">
-           <tc:popupReference for=":page:popup" />
-          <%--f:facet name="popup">
-            <tc:popup width="200" height="100" id="popup2" >
-
-              <f:facet name="layout">
-                <tc:gridLayout rows="35px;1*;fixed" />
+          <tc:toolBar iconSize="#{overviewController.toolbarIconSize}"
+                      labelPosition="#{overviewController.toolbarTextPosition}"
+                      orientation="left">
+            <tc:toolBarCommand id="button2" action="overview/toolbar"
+                               actionListener="#{overviewController.click}"
+                               label="#{overviewBundle.toolbar_buttonAction}"/>
+
+            <tc:toolBarCommand id="imageButton2" action="overview/toolbar"
+                               actionListener="#{overviewController.click}"
+                               label="#{overviewBundle.toolbar_imageButtonAction}"
+                               image="image/toolbar_example_button.gif"/>
+
+
+            <tc:toolBarCommand id="popupButton2"
+                               actionListener="#{overviewController.click}"
+                               label="#{overviewBundle.toolbar_popupButtonAction}">
+              <tc:popupReference for=":page:popup"/>
+              <%--f:facet name="popup">
+                <tc:popup width="200" height="100" id="popup2" >
+    
+                  <f:facet name="layout">
+                    <tc:gridLayout rows="35px;1*;fixed" />
+                  </f:facet>
+    
+                  <tc:out value="#{overviewBundle.toolbar_popupText}"/>
+    
+                  <tc:cell/>
+                  <tc:button id="popupCloseButton2" label="#{overviewBundle.toolbar_closePopupAction}"
>
+                    <tc:attribute name="popupClose" value="immediate"/>
+                  </tc:button>
+    
+                </tc:popup>
+              </f:facet--%>
+            </tc:toolBarCommand>
+
+            <tc:toolBarCommand id="DropDown2" action="overview/toolbar"
+                               actionListener="#{overviewController.click}"
+                               label="#{overviewBundle.toolbar_dropDownAction}">
+              <f:facet name="menupopup">
+                <tc:menu>
+                  <tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
+                  <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
+                  <tc:menuItem id="dropdown3_2" actionListener="#{overviewController.click}"
label="Action 3"/>
+                </tc:menu>
               </f:facet>
+            </tc:toolBarCommand>
 
-              <tc:out value="#{overviewBundle.toolbar_popupText}"/>
-
-              <tc:cell/>
-              <tc:button id="popupCloseButton2" label="#{overviewBundle.toolbar_closePopupAction}"
>
-                <tc:attribute name="popupClose" value="immediate"/>
-              </tc:button>
-
-            </tc:popup>
-          </f:facet--%>
-        </tc:toolBarCommand>
-
-        <tc:toolBarCommand id="DropDown2" action="overview/toolbar"
-          actionListener="#{overviewController.click}" label="#{overviewBundle.toolbar_dropDownAction}"
>
-          <f:facet name="menupopup">
-            <tc:menu>
-              <tc:menuItem onclick="alert('test 1')"  label="Alert 1"/>
-              <tc:menuItem onclick="alert('test 2')"  label="Alert 2"/>
-              <tc:menuItem id="dropdown3_2" actionListener="#{overviewController.click}"
label="Action 3"/>
-            </tc:menu>
-          </f:facet>
-        </tc:toolBarCommand>
-
-        </tc:toolBar>
+          </tc:toolBar>
         </tc:cell>
 
         <tx:in value="#{overviewController.lastAction}" readonly="true"
-            label="#{overviewBundle.basic_lastActionLabel}" />
+               label="#{overviewBundle.basic_lastActionLabel}"/>
 
-        <tc:selectOneChoice value="#{overviewController.toolbarTextPosition}" >
+        <tc:selectOneChoice value="#{overviewController.toolbarTextPosition}">
           <f:selectItems value="#{overviewController.toolbarTextItems}"/>
         </tc:selectOneChoice>
-        <tc:selectOneChoice value="#{overviewController.toolbarIconSize}" >
+        <tc:selectOneChoice value="#{overviewController.toolbarIconSize}">
           <f:selectItems value="#{overviewController.toolbarIconItems}"/>
         </tc:selectOneChoice>
 
         <tc:cell/>
         <tc:cell spanX="2">
-          <tc:button label="updateView"  />
+          <tc:button label="updateView"/>
         </tc:cell>
 
       </tc:box>
 
       <tc:cell/>
 
-      <tc:out escape="false" value="#{overviewBundle.toolbar_text2}" />
+      <tc:out escape="false" value="#{overviewBundle.toolbar_text2}"/>
 
       <tc:box label="#{overviewBundle.toolbar_sampleTitle2}" id="boxMenu">
-        <tc:menuBar >
+        <f:facet name="layout">
+          <tc:gridLayout rows="fixed;*"/>
+        </f:facet>
+        <tc:menuBar>
 
-          <tc:menu label="Menu 1" >
+          <tc:menu label="Menu 1">
 
-            <tc:menuItem onclick="alert('action 1')"  label="alert 1" />
+            <tc:menuItem onclick="alert('action 1')" label="alert 1"/>
 
             <tc:menuItem action="/" type="navigate" label="#{overviewBundle.toolbar_linkClickme}"
-                image="image/config.gif" >
-              <f:facet name="confirmation"><tc:out value="Do you really want leave
this demo?" /></f:facet>
+                         image="image/config.gif">
+              <f:facet name="confirmation"><tc:out value="Do you really want leave
this demo?"/></f:facet>
             </tc:menuItem>
 
-            <tc:menuItem link="http://www.atanion.com" disabled="true" label="disabled"
/>
+            <tc:menuItem link="http://www.atanion.com" disabled="true" label="disabled"/>
 
-            <tx:menuCheckbox action="#{demo.clickButton}"  label="#{overviewBundle.toolbar_linkClickme}"
value="#{demo.boolTest}" />
+            <tx:menuCheckbox action="#{demo.clickButton}" label="#{overviewBundle.toolbar_linkClickme}"
+                             value="#{demo.boolTest}"/>
           </tc:menu>
           <tc:menu label="Menu 2">
 
-            <tc:menuItem onclick="alert('action 1')"  label="alert 1" />
+            <tc:menuItem onclick="alert('action 1')" label="alert 1"/>
 
             <tc:menu label="Menu 3">
 
-              <tc:menuItem onclick="alert('action 1')"  label="alert 1" image="image/date.gif"
/>
+              <tc:menuItem onclick="alert('action 1')" label="alert 1" image="image/date.gif"/>
 
-              <tc:menuItem link="/" label="#{overviewBundle.toolbar_linkClickme}" image="image/config.gif"
>
-                <f:facet name="confirmation"><tc:out value="Do you really want leave
this demo?" /></f:facet>
+              <tc:menuItem link="/" label="#{overviewBundle.toolbar_linkClickme}" image="image/config.gif">
+                <f:facet name="confirmation"><tc:out value="Do you really want leave
this demo?"/></f:facet>
               </tc:menuItem>
 
-              <tc:menuItem link="http://www.atanion.com" disabled="true" label="#{overviewBundle.toolbar_linkClickme}"
image="image/remove.gif" />
+              <tc:menuItem link="http://www.atanion.com" disabled="true" label="#{overviewBundle.toolbar_linkClickme}"
+                           image="image/remove.gif"/>
 
-            <tc:menu label="#{overviewBundle.toolbar_selectSingleselect}">
+              <tc:menu label="#{overviewBundle.toolbar_selectSingleselect}">
 
-              <tx:menuRadio value="#{overviewController.radioValue}" converter="salutationId"
>
-                <f:selectItems value="#{overviewController.items}" />
-              </tx:menuRadio>
+                <tx:menuRadio value="#{overviewController.radioValue}" converter="salutationId">
+                  <f:selectItems value="#{overviewController.items}"/>
+                </tx:menuRadio>
 
-            </tc:menu>
+              </tc:menu>
 
-              <tc:menuItem action="#{demo.clickButton}"  label="#{overviewBundle.toolbar_linkClickme}"
/>
+              <tc:menuItem action="#{demo.clickButton}" label="#{overviewBundle.toolbar_linkClickme}"/>
             </tc:menu>
 
             <tc:menuSeparator/>
 
-            <tc:menuItem label="#{overviewBundle.toolbar_linkClickme}" >
+            <tc:menuItem label="#{overviewBundle.toolbar_linkClickme}">
               <f:facet name="items">
-                <tc:selectBooleanCheckbox value="#{demo.bool[0]}" />
+                <tc:selectBooleanCheckbox value="#{demo.bool[0]}"/>
               </f:facet>
             </tc:menuItem>
-            <tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[1]}"
/>
-            <tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[2]}"
/>
+            <tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[1]}"/>
+            <tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[2]}"/>
 
           </tc:menu>
 
         </tc:menuBar>
+
+        <tc:cell/>
       </tc:box>
-      <tc:cell/>
     </tc:panel>
   </jsp:body>
 </layout:overview>



Mime
View raw message