Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 967 → Rev 968

/kickup/trunk/webapp/WEB-INF/struts-config.xml
154,6 → 154,13
<form-property name="acts" type="ak.kickup.core.form.ParticipantActBean[]"
size="1" />
</form-bean>
 
<form-bean
name="ParticipantActListForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="act" type="java.lang.String" />
<form-property name="event" type="java.lang.String" />
</form-bean>
</form-beans>
 
<global-exceptions>
277,6 → 284,19
<forward name="default" path="/participant/unregistered.jsp" />
</action>
 
<!-- == act ================================================================================= -->
 
<action
path="/act/list"
type="ak.kickup.core.action.ActAction"
parameter="list"
name="ParticipantActListForm"
validate="true"
scope="request"
>
<forward name="default" path="/act/list.jsp" />
</action>
 
<!-- == transport =========================================================================== -->
 
<action
/kickup/trunk/webapp/WEB-INF/validation.xml
117,9 → 117,13
<msg name="required" key="ak.kickup.core.participant.edit.email.required" />
<msg name="email" key="ak.kickup.core.participant.edit.email.wrong" />
</field>
<field property="persons" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.persons.wrong" />
</field>
<field property="persons" depends="required,integer,intRange">
<msg name="required" key="ak.kickup.core.participant.edit.persons.required" />
<msg name="integer" key="ak.kickup.core.participant.edit.persons.wrong" />
<msg name="intRange" key="ak.kickup.core.participant.edit.persons.wrong" />
<var><var-name>min</var-name><var-value>1</var-value></var>
<var><var-name>max</var-name><var-value>1000</var-value></var>
</field>
<field property="freeTransport" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.freetransport.wrong" />
</field>
142,8 → 146,12
<msg name="required" key="ak.kickup.core.participant.edit.email.required" />
<msg name="email" key="ak.kickup.core.participant.edit.email.wrong" />
</field>
<field property="persons" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.persons.wrong" />
<field property="persons" depends="required,integer,intRange">
<msg name="required" key="ak.kickup.core.participant.edit.persons.required" />
<msg name="integer" key="ak.kickup.core.participant.edit.persons.wrong" />
<msg name="intRange" key="ak.kickup.core.participant.edit.persons.wrong" />
<var><var-name>min</var-name><var-value>1</var-value></var>
<var><var-name>max</var-name><var-value>1000</var-value></var>
</field>
<field property="freeTransport" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.freetransport.wrong" />
163,8 → 171,12
<field property="event" depends="long">
<msg name="long" key="ak.kickup.core.participant.edit.event.wrong" />
</field>
<field property="persons" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.persons.wrong" />
<field property="persons" depends="required,integer,intRange">
<msg name="required" key="ak.kickup.core.participant.edit.persons.required" />
<msg name="integer" key="ak.kickup.core.participant.edit.persons.wrong" />
<msg name="intRange" key="ak.kickup.core.participant.edit.persons.wrong" />
<var><var-name>min</var-name><var-value>1</var-value></var>
<var><var-name>max</var-name><var-value>1000</var-value></var>
</field>
<field property="freeTransport" depends="integer">
<msg name="integer" key="ak.kickup.core.participant.edit.freetransport.wrong" />
176,5 → 188,16
<msg name="integer" key="ak.kickup.core.participant.edit.freesleep.wrong" />
</field>
</form>
 
<form name="ParticipantActListForm">
<field property="event" depends="long,required">
<msg name="long" key="ak.kickup.core.participant.edit.event.wrong" />
<msg name="required" key="ak.kickup.core.participant.edit.event.wrong" />
</field>
<field property="act" depends="long,required">
<msg name="long" key="ak.kickup.core.act.edit.id.wrong" />
<msg name="required" key="ak.kickup.core.act.edit.id.wrong" />
</field>
</form>
</formset>
</form-validation>
/kickup/trunk/webapp/act/list.jsp
0,0 → 1,61
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/ak-strutsx.tld" prefix="strutsx" %>
<%@ taglib uri="/WEB-INF/ak-kickup.tld" prefix="kickup" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title>Пьянка XP - Участники "<bean:write name="act" property="act.name" />" на пьянке "<bean:write name="event" property="name" />"</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Пьянка XP - Участники "<bean:write name="act" property="act.name" />" на пьянке "<bean:write name="event" property="name" />"</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Ошибки:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
 
<table border=1>
<tr>
<th>Ник</th>
<th>Имя</th>
<th>e-mail</th>
<th>Телефон</th>
<th>Дополнительно</th>
</tr>
 
<logic:iterate name="list" id="p">
<tr>
<td><bean:write name="p" property="participant.nick" />&nbsp;</td>
<td><bean:write name="p" property="participant.name" />&nbsp;</td>
<td>
<logic:equal name="p" property="participant.emailPublic" value="true">
<bean:write name="p" property="participant.email" />
</logic:equal>
&nbsp;
</td>
<td><bean:write name="p" property="participant.phone" />&nbsp;</td>
<td><bean:write name="p" property="comment" />&nbsp;</td>
</tr>
</logic:iterate>
</table>
 
<br>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
</html>
/kickup/trunk/webapp/admin/participant/list.jsp
41,7 → 41,7
</tr>
 
<logic:iterate name="participants" id="p">
<tr>
<tr class="<logic:equal name="p" property="payed" value="true">payed</logic:equal><logic:notEqual name="p" property="payed" value="true">notpayed</logic:notEqual>">
<td><bean:write name="p" property="ident" /></td>
<td><bean:write name="p" property="nick" />&nbsp;</td>
<td><a href="mailto:<bean:write name="p" property="email" />"><bean:write name="p" property="email" /></a></td>
/kickup/trunk/webapp/participant/register.jsp
31,7 → 31,7
<backpath:current />
<html:hidden property="event" />
 
<table border=1>
<table border=1 width=600>
<tr>
<th>Ник на форуме</th>
<td colspan=2><html:text property="nick" /></td>
38,7 → 38,11
</tr>
<tr>
<th>Ваш e-mail</th>
<td colspan=2><html:text property="email" /></td>
<td colspan=2>
<html:text property="email" /><br>
После регистрации на этот адрес будет выслан ваш регистрационный номер и счет для перевода денег.
Поэтому указывайте, пожалуйста, ваш реальный e-mail.
</td>
</tr>
<tr>
<th>Разрешить показ e-mail'а</th>
/kickup/trunk/webapp/participant/edit.jsp
93,6 → 93,13
<td colspan=2><html:text property="phone" /></td>
</tr>
<tr>
<th>Деньги переведены и получены</th>
<td colspan=2>
<logic:equal name="participant" property="payed" value="true">да</logic:equal>
<logic:notEqual name="participant" property="payed" value="true">нет</logic:notEqual>
</td>
</tr>
<tr>
<th>Дополнительная информация</th>
<td colspan=2><html:textarea property="comment" /></td>
</tr>
/kickup/trunk/webapp/style/general.css
0,0 → 1,3
.error { color:red; }
.payed { background-color:white; }
.notpayed { background-color:#FFC0C0; }
/kickup/trunk/webapp/event/show.jsp
50,7 → 50,8
 
<ul>
<logic:iterate name="acts" id="a">
<li><bean:write name="a" property="act.name" /></li>
<li><bean:write name="a" property="act.name" />
<kickup:link action="/act/list" paramId="event" paramName="event" paramProperty="id" paramId2="act" paramName2="a" paramProperty2="act.id">(участники)</kickup:link></li>
</logic:iterate>
</ul>