Subversion Repositories general

Compare Revisions

No changes between revisions

Ignore whitespace Rev 26 → Rev 27

/kickup/trunk/webapp/WEB-INF/lib/activation.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/kickup/trunk/webapp/WEB-INF/lib/mailapi.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/kickup/trunk/webapp/WEB-INF/lib/smtp.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/kickup/trunk/webapp/WEB-INF/struts-config.xml
30,8 → 30,10
<form-property name="account" type="java.lang.String" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
<form-property name="acts" type="ak.kickup.core.form.EventActBean[]" size="1" />
<form-property name="apartments" type="ak.kickup.core.form.EventApartmentBean[]" size="1" />
<form-property name="acts" type="ak.kickup.core.form.EventActBean[]"
size="1" />
<form-property name="apartments" type="ak.kickup.core.form.EventApartmentBean[]"
size="1" />
</form-bean>
 
<form-bean
106,6 → 108,8
<form-property name="payed" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
<form-property name="privateComment" type="java.lang.String" />
<form-property name="acts" type="ak.kickup.core.form.ParticipantActBean[]"
size="1" />
</form-bean>
 
<form-bean
126,6 → 130,8
<form-property name="freeSleep" type="java.lang.String" />
<form-property name="sleepComment" type="java.lang.String" />
<form-property name="comment" type="java.lang.String" />
<form-property name="acts" type="ak.kickup.core.form.ParticipantActBean[]"
size="1" />
</form-bean>
 
<form-bean
145,6 → 151,8
<form-property name="freeSleep" type="java.lang.String" />
<form-property name="sleepComment" type="java.lang.String" />
<form-property name="comment" type="java.lang.String" />
<form-property name="acts" type="ak.kickup.core.form.ParticipantActBean[]"
size="1" />
</form-bean>
</form-beans>
 
/kickup/trunk/webapp/admin/participant/edit.jsp
35,15 → 35,15
<table border=1>
<tr>
<th>Кодовый номер</th>
<td><bean:write name="participant" property="ident" />&nbsp;</td>
<td colspan=3><bean:write name="participant" property="ident" />&nbsp;</td>
</tr>
<tr>
<th>Ник</th>
<td><html:text property="nick" /></td>
<td colspan=3><html:text property="nick" /></td>
</tr>
<tr>
<th>e-mail</th>
<td><html:text property="email" /></td>
<td colspan=3><html:text property="email" /></td>
</tr>
<tr>
<th>Показ e-mail разрешен</th>
51,47 → 51,47
</tr>
<tr>
<th>Имя</th>
<td><html:text property="name" /></td>
<td colspan=3><html:text property="name" /></td>
</tr>
<tr>
<th>Телефон</th>
<td><html:text property="phone" /></td>
<td colspan=3><html:text property="phone" /></td>
</tr>
<tr>
<th>Количество человек</th>
<td><html:text property="persons" /></td>
<td colspan=3><html:text property="persons" /></td>
</tr>
<tr>
<th>Выезд из PLZ</th>
<td><html:text property="fromZip" /></td>
<td colspan=3><html:text property="fromZip" /></td>
</tr>
<tr>
<th>Выезд из города</th>
<td><html:text property="fromCity" /></td>
<td colspan=3><html:text property="fromCity" /></td>
</tr>
<tr>
<th>Время отправления</th>
<td><html:text property="departure" /></td>
<td colspan=3><html:text property="departure" /></td>
</tr>
<tr>
<th>Свободных мест в машине</th>
<td><html:text property="freeTransport" /></td>
<td colspan=3><html:text property="freeTransport" /></td>
</tr>
<tr>
<th>Условия транспортировки</th>
<td><html:textarea property="transportComment" /></td>
<td colspan=3><html:textarea property="transportComment" /></td>
</tr>
<tr>
<th>Свободных спальных мест</th>
<td><html:text property="freeSleep" /></td>
<td colspan=3><html:text property="freeSleep" /></td>
</tr>
<tr>
<th>Условия ночевки</th>
<td><html:textarea property="sleepComment" /></td>
<td colspan=3><html:textarea property="sleepComment" /></td>
</tr>
<tr>
<th>Дополнительная информация</th>
<td><html:textarea property="comment" /></td>
<td colspan=3><html:textarea property="comment" /></td>
</tr>
<tr>
<th>Оплачено</th>
99,10 → 99,34
</tr>
<tr>
<th>Комментарии организаторов</th>
<td><html:textarea property="privateComment" /></td>
<td colspan=3><html:textarea property="privateComment" /></td>
</tr>
 
<logic:notEmpty name="actList" property="objects">
<tr>
<th colspan=4>Участвует в</th>
</tr>
<tr>
<td>Название</td>
<td>Включить</td>
<td>Дополнительно</td>
<td>&nbsp;</td>
</tr>
<logic:iterate name="ParticipantEditForm" property="acts" id="acts" indexId="iid">
<tr>
<th>
<bean:write name="actList" property='<%= "objects[" + iid + "].act.name" %>' />
<html:hidden name="acts" property="actId" indexed="true" />
</th>
<td><html:checkbox name="acts" property="selected" indexed="true" /></td>
<td><html:text name="acts" property="comment" indexed="true" /></td>
<td>&nbsp;</td>
</tr>
</logic:iterate>
</logic:notEmpty>
 
<tr>
<td colspan=2>
<td colspan=4>
<html:submit>Сохранить</html:submit>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>
/kickup/trunk/webapp/participant/edit.jsp
35,70 → 35,91
<table border=1>
<tr>
<th>Ваш номер</th>
<td><bean:write name="participant" property="ident" /></td>
<td colspan=2><bean:write name="participant" property="ident" /></td>
</tr>
<tr>
<th>Ник на форуме</th>
<td><bean:write name="participant" property="nick" /></td>
<td colspan=2><bean:write name="participant" property="nick" /></td>
</tr>
<tr>
<th>Ваш e-mail</th>
<td><bean:write name="participant" property="email" /></td>
<td colspan=2><bean:write name="participant" property="email" /></td>
</tr>
<tr>
<th>Разрешить показ e-mail'а</th>
<td colspan=3><html:checkbox property="emailPublic" /></td>
<td colspan=2><html:checkbox property="emailPublic" /></td>
</tr>
<tr>
<th>Сколько вас</th>
<td><html:text property="persons" /></td>
<td colspan=2><html:text property="persons" /></td>
</tr>
 
<tr>
<th>Выезд из PLZ</th>
<td><html:text property="fromZip" /></td>
<td colspan=2><html:text property="fromZip" /></td>
</tr>
<tr>
<th>Выезд из города</th>
<td><html:text property="fromCity" /></td>
<td colspan=2><html:text property="fromCity" /></td>
</tr>
<tr>
<th>Время отправления</th>
<td><html:text property="departure" /></td>
<td colspan=2><html:text property="departure" /></td>
</tr>
<tr>
<th>Свободных мест в машине</th>
<td><html:text property="freeTransport" /></td>
<td colspan=2><html:text property="freeTransport" /></td>
</tr>
<tr>
<th>Условия транспортировки</th>
<td><html:textarea property="transportComment" /></td>
<td colspan=2><html:textarea property="transportComment" /></td>
</tr>
 
<tr>
<th>Свободных спальных мест</th>
<td><html:text property="freeSleep" /></td>
<td colspan=2><html:text property="freeSleep" /></td>
</tr>
<tr>
<th>Условия ночевки</th>
<td><html:textarea property="sleepComment" /></td>
<td colspan=2><html:textarea property="sleepComment" /></td>
</tr>
 
<tr>
<th>Ваше имя</th>
<td><html:text property="name" /></td>
<td colspan=2><html:text property="name" /></td>
</tr>
<tr>
<th>Телефон</th>
<td><html:text property="phone" /></td>
<td colspan=2><html:text property="phone" /></td>
</tr>
<tr>
<th>Дополнительная информация</th>
<td><html:textarea property="comment" /></td>
<td colspan=2><html:textarea property="comment" /></td>
</tr>
 
<logic:notEmpty name="actList" property="objects">
<tr>
<th colspan=3>В чем желаете поучаствовать</th>
</tr>
<tr>
<td>Название</td>
<td>Включить</td>
<td>Дополнительно</td>
</tr>
<logic:iterate name="ParticipantRegisterEditForm" property="acts" id="acts" indexId="iid">
<tr>
<th>
<bean:write name="actList" property='<%= "objects[" + iid + "].act.name" %>' />
<html:hidden name="acts" property="actId" indexed="true" />
</th>
<td><html:checkbox name="acts" property="selected" indexed="true" /></td>
<td><html:text name="acts" property="comment" indexed="true" /></td>
</tr>
</logic:iterate>
</logic:notEmpty>
 
<tr>
<td colspan=2>
<td colspan=3>
<html:submit>Сохранить</html:submit>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>
/kickup/trunk/webapp/participant/register.jsp
34,66 → 34,87
<table border=1>
<tr>
<th>Ник на форуме</th>
<td><html:text property="nick" /></td>
<td colspan=2><html:text property="nick" /></td>
</tr>
<tr>
<th>Ваш e-mail</th>
<td><html:text property="email" /></td>
<td colspan=2><html:text property="email" /></td>
</tr>
<tr>
<th>Разрешить показ e-mail'а</th>
<td colspan=3><html:checkbox property="emailPublic" /></td>
<td colspan=2><html:checkbox property="emailPublic" /></td>
</tr>
<tr>
<th>Сколько вас</th>
<td><html:text property="persons" /></td>
<td colspan=2><html:text property="persons" /></td>
</tr>
 
<tr>
<th>Выезд из PLZ</th>
<td><html:text property="fromZip" /></td>
<td colspan=2><html:text property="fromZip" /></td>
</tr>
<tr>
<th>Выезд из города</th>
<td><html:text property="fromCity" /></td>
<td colspan=2><html:text property="fromCity" /></td>
</tr>
<tr>
<th>Время отправления</th>
<td><html:text property="departure" /></td>
<td colspan=2><html:text property="departure" /></td>
</tr>
<tr>
<th>Свободных мест в машине</th>
<td><html:text property="freeTransport" /></td>
<td colspan=2><html:text property="freeTransport" /></td>
</tr>
<tr>
<th>Условия транспортировки</th>
<td><html:textarea property="transportComment" /></td>
<td colspan=2><html:textarea property="transportComment" /></td>
</tr>
 
<tr>
<th>Свободных спальных мест</th>
<td><html:text property="freeSleep" /></td>
<td colspan=2><html:text property="freeSleep" /></td>
</tr>
<tr>
<th>Условия ночевки</th>
<td><html:textarea property="sleepComment" /></td>
<td colspan=2><html:textarea property="sleepComment" /></td>
</tr>
 
<tr>
<th>Ваше имя</th>
<td><html:text property="name" /></td>
<td colspan=2><html:text property="name" /></td>
</tr>
<tr>
<th>Телефон</th>
<td><html:text property="phone" /></td>
<td colspan=2><html:text property="phone" /></td>
</tr>
<tr>
<th>Дополнительная информация</th>
<td><html:textarea property="comment" /></td>
<td colspan=2><html:textarea property="comment" /></td>
</tr>
 
<logic:notEmpty name="actList" property="objects">
<tr>
<th colspan=3>В чем желаете поучаствовать</th>
</tr>
<tr>
<td>Название</td>
<td>Включить</td>
<td>Дополнительно</td>
</tr>
<logic:iterate name="ParticipantRegisterForm" property="acts" id="acts" indexId="iid">
<tr>
<th>
<bean:write name="actList" property='<%= "objects[" + iid + "].act.name" %>' />
<html:hidden name="acts" property="actId" indexed="true" />
</th>
<td><html:checkbox name="acts" property="selected" indexed="true" /></td>
<td><html:text name="acts" property="comment" indexed="true" /></td>
</tr>
</logic:iterate>
</logic:notEmpty>
 
<tr>
<td colspan=2>
<td colspan=3>
<html:submit>Зарегистрироваться</html:submit>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>