[gee-svn] SF.net SVN: gabel: [121] trunk/gee/war
Status: Alpha
Brought to you by:
alllee
Menu
▾
▴
[gee-svn] SF.net SVN: gabel: [121] trunk/gee/war
|
From: <al...@us...> - 2006-02-28 04:34:19
|
Revision: 121 Author: alllee Date: 2006-02-27 20:34:13 -0800 (Mon, 27 Feb 2006) ViewCVS: http://svn.sourceforge.net/gabel/?rev=121&view=rev Log Message: ----------- presentation level changes, getting ajax theme to work with client-side validation, via dwr. Modified Paths: -------------- trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment-validation.xml trunk/gee/war/WEB-INF/classes/xwork.xml trunk/gee/war/WEB-INF/web.xml trunk/gee/war/css/gee.css trunk/gee/war/getConsent.jsp trunk/gee/war/template.jsp Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment-validation.xml =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment-validation.xml 2006-02-28 02:52:37 UTC (rev 120) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment-validation.xml 2006-02-28 04:34:13 UTC (rev 121) @@ -12,7 +12,7 @@ <field name="participantAge"> <field-validator type="int"> <param name="min">18</param> - <message>You must be 18 or older to participate.</message> + <message>You must be 18 or older.</message> </field-validator> </field> Modified: trunk/gee/war/WEB-INF/classes/xwork.xml =================================================================== --- trunk/gee/war/WEB-INF/classes/xwork.xml 2006-02-28 02:52:37 UTC (rev 120) +++ trunk/gee/war/WEB-INF/classes/xwork.xml 2006-02-28 04:34:13 UTC (rev 121) @@ -1,10 +1,11 @@ -<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" - "http://www.opensymphony.com/xwork/xwork-1.1.dtd"> - +<?xml version="1.0"?> +<!-- +vim:sts=2:sw=2: +--> +<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" "http://www.opensymphony.com/xwork/xwork-1.1.dtd"> <xwork> - <include file="webwork-default.xml"/> - - <!-- FIXME: cannot find the following + <include file="webwork-default.xml"/> +<!-- FIXME: cannot find the following <include file="config-browser.xml"/> <include file="xwork-validation.xml" /> <include file="xwork-actionchaining.xml" /> @@ -12,52 +13,44 @@ <include file="xwork-continuations.xml"/> <include file="xwork-tags.xml"/> --> - - <package name="default" extends="webwork-default"> - <default-interceptor-ref name="defaultStack"/> - <!-- the start page lists all available experiments --> - <action name="index" class="edu.indiana.psych.gee.action.ListExperiments"> - <result name="success">index.jsp</result> - </action> - <action name="start" class="edu.indiana.psych.gee.action.StartExperiment" method="start"> - <result name="success">startExperiment.jsp</result> - <result name="input">getConsent.jsp</result> - </action> - <action name="consent" class="edu.indiana.psych.gee.action.StartExperiment" method="prepare"> - <!-- FIXME: make sure the stack doesn't validate --> - <interceptor-ref name="basicStack"/> - <result name="success">getConsent.jsp</result> - <result name="input">getConsent.jsp</result> - </action> - </package> - <package name="admin" extends="default" namespace="/admin"> - <action name="index" class="edu.indiana.psych.gee.action.AdminAction" - method="authenticate"> - <result name="success" type="freemarker">listExperiments.jsp</result> - <result name="error">error.jsp</result> - </action> - <action name="configure" class="edu.indiana.psych.gee.action.AdminAction" - method="configure"> - <result name="success" type="freemarker">configureExperiment.jsp</result> - </action> - <action name="list" class="edu.indiana.psych.gee.action.AdminAction" - method="listExperiments"> - <result name="success" type="freemarker">listExperiments.jsp</result> - <result name="error">error.jsp</result> - </action> - <action name="create" class="edu.indiana.psych.gee.action.AdminAction" - method="createExperiment"> - <result name="success" type="redirect">listExperiments.jsp</result> - <result name="input">createExperiment.jsp</result> - </action> - <action name="start" class="edu.indiana.psych.gee.action.AdminAction" - method="start"> - <result name="success" type="freemarker">listExperiments.jsp</result> - </action> - <action name="stop" class="edu.indiana.psych.gee.action.AdminAction" - method="stop"> - <result name="success" type="freemarker">listExperiments.jsp</result> - </action> - </package> - + <package name="default" extends="webwork-default"> + <default-interceptor-ref name="defaultStack"/> +<!-- the start page lists all available experiments --> + <action name="index" class="edu.indiana.psych.gee.action.ListExperiments"> + <result name="success">index.jsp</result> + </action> + <action name="start" class="edu.indiana.psych.gee.action.StartExperiment" method="start"> + <result name="success">startExperiment.jsp</result> + <result name="input">getConsent.jsp</result> + </action> + <action name="consent" class="edu.indiana.psych.gee.action.StartExperiment" method="prepare"> +<!-- FIXME: make sure the stack doesn't validate --> + <interceptor-ref name="basicStack"/> + <result name="success">getConsent.jsp</result> + <result name="input">getConsent.jsp</result> + </action> + </package> + <package name="admin" extends="default" namespace="/admin"> + <action name="index" class="edu.indiana.psych.gee.action.AdminAction" method="authenticate"> + <result name="success" type="freemarker">listExperiments.jsp</result> + <result name="error">error.jsp</result> + </action> + <action name="configure" class="edu.indiana.psych.gee.action.AdminAction" method="configure"> + <result name="success" type="freemarker">configureExperiment.jsp</result> + </action> + <action name="list" class="edu.indiana.psych.gee.action.AdminAction" method="listExperiments"> + <result name="success" type="freemarker">listExperiments.jsp</result> + <result name="error">error.jsp</result> + </action> + <action name="create" class="edu.indiana.psych.gee.action.AdminAction" method="createExperiment"> + <result name="success" type="redirect">listExperiments.jsp</result> + <result name="input">createExperiment.jsp</result> + </action> + <action name="start" class="edu.indiana.psych.gee.action.AdminAction" method="start"> + <result name="success" type="freemarker">listExperiments.jsp</result> + </action> + <action name="stop" class="edu.indiana.psych.gee.action.AdminAction" method="stop"> + <result name="success" type="freemarker">listExperiments.jsp</result> + </action> + </package> </xwork> Modified: trunk/gee/war/WEB-INF/web.xml =================================================================== --- trunk/gee/war/WEB-INF/web.xml 2006-02-28 02:52:37 UTC (rev 120) +++ trunk/gee/war/WEB-INF/web.xml 2006-02-28 04:34:13 UTC (rev 121) @@ -1,54 +1,60 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- +vim:sts=2:sw=2: +--> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> - <display-name>Percepts and Concepts Laboratory</display-name> - <description> + <display-name>Percepts and Concepts Laboratory</display-name> + <description> Group Experiments Environment, a framework for building online Java experiments. </description> - + <servlet> + <servlet-name>dwr</servlet-name> + <servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>dwr</servlet-name> + <url-pattern>/dwr/*</url-pattern> + </servlet-mapping> + <filter> + <filter-name>webwork-cleanup</filter-name> + <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class> + </filter> +<!-- <filter> - <filter-name>webwork-cleanup</filter-name> - <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class> - </filter> - <!-- - <filter> <filter-name>sitemesh</filter-name> <filter-class>com.opensymphony.webwork.sitemesh.FreeMarkerPageFilter</filter-class> </filter> --> - <filter> - <filter-name>sitemesh</filter-name> - <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class> - </filter> - <filter> - <filter-name>webwork</filter-name> - <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class> - </filter> - - <filter-mapping> - <filter-name>webwork-cleanup</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>sitemesh</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>webwork</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> - </listener> - - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - - <taglib> - <taglib-uri>webwork</taglib-uri> - <taglib-location>/WEB-INF/webwork.tld</taglib-location> - </taglib> + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class> + </filter> + <filter> + <filter-name>webwork</filter-name> + <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class> + </filter> + <filter-mapping> + <filter-name>webwork-cleanup</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>sitemesh</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>webwork</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <listener> + <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> + </listener> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + <taglib> + <taglib-uri>webwork</taglib-uri> + <taglib-location>/WEB-INF/webwork.tld</taglib-location> + </taglib> </web-app> Modified: trunk/gee/war/css/gee.css =================================================================== --- trunk/gee/war/css/gee.css 2006-02-28 02:52:37 UTC (rev 120) +++ trunk/gee/war/css/gee.css 2006-02-28 04:34:13 UTC (rev 121) @@ -18,7 +18,7 @@ } #Content { - width:650px; + width:750px; margin:0px auto; text-align:left; padding:10px; Modified: trunk/gee/war/getConsent.jsp =================================================================== --- trunk/gee/war/getConsent.jsp 2006-02-28 02:52:37 UTC (rev 120) +++ trunk/gee/war/getConsent.jsp 2006-02-28 04:34:13 UTC (rev 121) @@ -16,9 +16,8 @@ <H3><ww:property value="experimentName"/> consent form</H3> </TD> <TD ALIGN="right" VALIGN="top" BGCOLOR="#A4B5C5" WIDTH="70%" style="white-space: nowrap;"> - <FONT SIZE="-2"> - Study #04-9064<br/> - Last Modified: <%= lastModifiedDate %></FONT> + <b>Study #04-9064</b><br/> + <small>Last Modified: <%= lastModifiedDate %></small> </TD> </TR> </TABLE> @@ -132,19 +131,18 @@ <p style="font-weight: bolder; background-color: #FFE303;">I have read and understand the information presented above. I agree to participate in this study.</p> -<ww:form action='start'> - <ww:textfield label="Name" name="participantName" required="true" /> +<ww:form method="post" validate="true" action='start'> <ww:select label="Age" name="participantAge" required="true" list="#{'17':'Under 18', '18':'18-24', '25':'25-36', '37':'37-55', '55':'Over 55'}" - value="18"/> - <ww:submit align="center" value='Begin the experiment!' /> - <ww:hidden name="experimentName" /> + value="'18'"/> + <ww:textfield label="Name" name="participantName" required="true" /> + <ww:hidden name="experimentName"/> + <ww:submit/> </ww:form> <hr /> <small> IRB Approved <br/> -<%-- FIXME: date approved is not getting reset appropriately after invalid input --%> <ww:text name="approval.date"> <ww:param name="value" value="%{consentForm.irbDateApproved}"/> </ww:text> Modified: trunk/gee/war/template.jsp =================================================================== --- trunk/gee/war/template.jsp 2006-02-28 02:52:37 UTC (rev 120) +++ trunk/gee/war/template.jsp 2006-02-28 04:34:13 UTC (rev 121) @@ -1,11 +1,13 @@ <!-- vim:sts=2:sw=2: --> +<%@ taglib prefix="ww" uri="webwork" %> <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %> <%@ include file="/includes/cache.jsp" %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> + <ww:head theme="ajax"/> <LINK REL="stylesheet" HREF="/gee/css/gee.css" TYPE="text/css" /> <title><decorator:title default="Group Experiments Environment" /></title> <decorator:head /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
