You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/09/19 23:10:11 UTC
svn commit: r290267 - in /beehive/trunk/samples/netui-samples/ui/popup:
getcolor/confirm.jsp getcolor/index.jsp index.jsp
Author: rich
Date: Mon Sep 19 14:10:03 2005
New Revision: 290267
URL: http://svn.apache.org/viewcvs?rev=290267&view=rev
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-927 : NETUI Samples: in popup window sample, the "samples home" link inside the popup window for color selection load the home page in popup
BB: run.tests agaist the dist (linux)
Modified:
beehive/trunk/samples/netui-samples/ui/popup/getcolor/confirm.jsp
beehive/trunk/samples/netui-samples/ui/popup/getcolor/index.jsp
beehive/trunk/samples/netui-samples/ui/popup/index.jsp
Modified: beehive/trunk/samples/netui-samples/ui/popup/getcolor/confirm.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/popup/getcolor/confirm.jsp?rev=290267&r1=290266&r2=290267&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/popup/getcolor/confirm.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/popup/getcolor/confirm.jsp Mon Sep 19 14:10:03 2005
@@ -22,17 +22,16 @@
<netui-data:declarePageInput name="chosenColor" type="java.lang.String" required="true"/>
-<netui-template:template templatePage="/resources/template/template.jsp">
-
- <netui-template:setAttribute name="sampleTitle" value="Popup Windows"/>
-
- <netui-template:section name="main">
+<netui:html>
+ <head>
+ <title>Choose Color</title>
+ </head>
+ <netui:body>
<netui:form action="done">
You chose <span style="color:${pageInput.chosenColor}">${pageInput.chosenColor}</span>.
<br/>
<netui:button value="OK"/>
<netui:button value="try again" action="begin"/>
</netui:form>
- </netui-template:section>
-
-</netui-template:template>
+ </netui:body>
+</netui:html>
Modified: beehive/trunk/samples/netui-samples/ui/popup/getcolor/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/popup/getcolor/index.jsp?rev=290267&r1=290266&r2=290267&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/popup/getcolor/index.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/popup/getcolor/index.jsp Mon Sep 19 14:10:03 2005
@@ -20,13 +20,13 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui-template:template templatePage="/resources/template/template.jsp">
-
- <netui-template:setAttribute name="sampleTitle" value="Popup Windows"/>
-
- <netui-template:section name="main">
+<netui:html>
+ <head>
+ <title>Choose Color</title>
+ </head>
+ <netui:body>
<netui:form action="submitColor">
- Color:<br/>
+ Choose a color:<br/>
<netui:select dataSource="actionForm.color" size="5" defaultValue="red">
<netui:selectOption value="red" />
<netui:selectOption value="blue" />
@@ -38,6 +38,5 @@
<netui:button value="submit"/>
<netui:button value="cancel" action="cancel"/>
</netui:form>
- </netui-template:section>
-
-</netui-template:template>
+ </netui:body>
+</netui:html>
Modified: beehive/trunk/samples/netui-samples/ui/popup/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/ui/popup/index.jsp?rev=290267&r1=290266&r2=290267&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/ui/popup/index.jsp (original)
+++ beehive/trunk/samples/netui-samples/ui/popup/index.jsp Mon Sep 19 14:10:03 2005
@@ -59,7 +59,7 @@
}
}
--%>
- <netui:configurePopup location="false" width="585" height="243">
+ <netui:configurePopup location="false" width="170" height="150">
<netui:retrievePopupOutput dataSource="outputFormBean.color" tagIdRef="colorField"/>
</netui:configurePopup>
</netui:button>