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 2011/03/30 00:05:34 UTC
svn commit: r1086776 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp:
addressbook/layout/basic.xhtml auth/login.xhtml
Author: lofwyr
Date: Tue Mar 29 22:05:34 2011
New Revision: 1086776
URL: http://svn.apache.org/viewvc?rev=1086776&view=rev
Log:
fixing layout
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml?rev=1086776&r1=1086775&r2=1086776&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml Tue Mar 29 22:05:34 2011
@@ -66,44 +66,46 @@
</tc:menuBar>
</f:facet>
- <tc:cell>
+ <tc:panel>
<ui:insert/>
- </tc:cell>
+ </tc:panel>
- <tc:popup id="about" width="400" height="220" left="200" top="200">
- <tc:box label="About">
- <f:facet name="layout">
- <tc:gridLayout rows="150px;*;fixed" columns="150px;*"/>
- </f:facet>
-
- <tc:image value="image/org/tango-project/tango-icon-theme/address-book-splash-screen.png" width="150"
- height="150"/>
- <tc:panel>
+ <f:facet name="popup">
+ <tc:popup id="about" width="400" height="220" left="200" top="200">
+ <tc:box label="About">
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;*"/>
+ <tc:gridLayout rows="150px;*;fixed" columns="150px;*"/>
</f:facet>
- <tc:out markup="strong" value="Addressbook Demo"/>
- <tc:cell/>
- <tc:out value="Version #{controller.version}"/>
- <tc:cell/>
- </tc:panel>
-
- <tc:cell spanX="2"/>
-
- <tc:cell spanX="2">
+ <tc:image value="image/org/tango-project/tango-icon-theme/address-book-splash-screen.png" width="150"
+ height="150"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;fixed"/>
+ <tc:gridLayout rows="fixed;fixed;fixed;*"/>
</f:facet>
+
+ <tc:out markup="strong" value="Addressbook Demo"/>
+ <tc:cell/>
+ <tc:out value="Version #{controller.version}"/>
<tc:cell/>
- <tc:button label="OK">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
</tc:panel>
- </tc:cell>
- </tc:box>
- </tc:popup>
+
+ <tc:cell spanX="2"/>
+
+ <tc:cell spanX="2">
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed"/>
+ </f:facet>
+ <tc:cell/>
+ <tc:button label="OK">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+ </tc:panel>
+ </tc:cell>
+ </tc:box>
+ </tc:popup>
+ </f:facet>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml?rev=1086776&r1=1086775&r2=1086776&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml Tue Mar 29 22:05:34 2011
@@ -39,7 +39,7 @@
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed" columns="2*;*"/>
+ <tc:gridLayout rows="20px;20px" columns="2*;*"/>
</f:facet>
<tc:out value="#{bundle.loginIntro}"/>
<tc:link inline="true" onclick="fillInGuest()" label="guest/guest"