You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by id...@apache.org on 2007/05/03 18:03:09 UTC
svn commit: r534918 - in
/myfaces/tobago/trunk/example/addressbook/src/main/webapp:
WEB-INF/tags/layout/basic.tag application/list.jsp
Author: idus
Date: Thu May 3 09:03:08 2007
New Revision: 534918
URL: http://svn.apache.org/viewvc?view=rev&rev=534918
Log:
replaced javascript about box with popup
Modified:
myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag
myfaces/tobago/trunk/example/addressbook/src/main/webapp/application/list.jsp
Modified: myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag?view=diff&rev=534918&r1=534917&r2=534918
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag Thu May 3 09:03:08 2007
@@ -58,8 +58,9 @@
<tc:menu label="#{bundle.menuHelp}">
<tc:menuItem label="#{bundle.menuHelpAbout}"
- action="alert('#{bundle.aboutMessage}')"
- type="script" image="image/org/tango-project/tango-icon-theme/16x16/apps/help-browser.png"/>
+ image="image/org/tango-project/tango-icon-theme/16x16/apps/help-browser.png">
+ <tc:popupReference for=":page:about"/>
+ </tc:menuItem>
</tc:menu>
</tc:form>
</tc:menuBar>
@@ -68,6 +69,40 @@
<tc:cell>
<jsp:doBody/>
</tc:cell>
+
+ <tc:popup id="about" width="300px" height="220px" left="200px" top="200px">
+ <tc:box>
+ <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="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;*"/>
+ </f:facet>
+
+ <tc:out value="Addressbook Demo"/>
+ <tc:cell/>
+ <tc:out value="Version 1.0"/>
+ <tc:cell/>
+ </tc:panel>
+
+ <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>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/example/addressbook/src/main/webapp/application/list.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/webapp/application/list.jsp?view=diff&rev=534918&r1=534917&r2=534918
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/webapp/application/list.jsp (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/webapp/application/list.jsp Thu May 3 09:03:08 2007
@@ -23,7 +23,7 @@
<jsp:body>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout margin="10px" rows="fixed;fixed;1*;20px"/>
+ <tc:gridLayout margin="10px" rows="fixed;fixed;1*;fixed"/>
</f:facet>
<tc:toolBar iconSize="big">
<tc:button label="#{bundle.toolbarAddressList}" action="#{controller.search}" immediate="true"
@@ -31,10 +31,11 @@
disabled="#{facesContext.viewRoot.viewId == '/application/list.jsp'}"/>
<tc:button label="#{bundle.listNew}" action="#{controller.createAddress}"
image="image/org/tango-project/tango-icon-theme/32x32/actions/contact-new.png" />
- <tc:button onclick="alert('#{bundle.aboutMessage}')" label="#{bundle.toolbarAbout}"
- image="image/org/tango-project/tango-icon-theme/32x32/apps/help-browser.png"/>
+ <tc:button label="#{bundle.toolbarAbout}"
+ image="image/org/tango-project/tango-icon-theme/32x32/apps/help-browser.png">
+ <tc:popupReference for=":page:about"/>
+ </tc:button>
<tc:button label="#{bundle.admin}" action="#{admin.admin}"
- rendered="#{user.roles['admin']}"
image="image/org/tango-project/tango-icon-theme/32x32/categories/preferences-system.png" />
</tc:toolBar>