BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kickup/ @ 974

  → /kickup/ @ 975

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 974 → Rev 975

/kickup/trunk/webapp/header.jsp
39,7 → 39,7
<html:link action="/participant/list" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/participants.gif" alt="Программа" border=0></html:link>
</td>
<td valign=top style="text-align: right; ">
<kickup:currentLink action="/participant/ident" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/ident.gif" alt="Программа" border=0></kickup:currentLink>
<html:link action="/participant/ident" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/ident.gif" alt="Программа" border=0></html:link>
</td>
</tr>
<tr>

/kickup/trunk/webapp/admin/act/edit.jsp
34,7 → 34,7
<table border=0 cellspacing=0 cellpadding=4>
<tr class="even">
<th>Название</th>
<td><html:text property="name" style="width:100%" /></td>
<td><html:text property="name" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="odd">
<th>Описание</th>
50,6 → 50,8
</html:form>
<%@ include file="/admin/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/admin/act/list.jsp
63,6 → 63,8
<backpath:notEmpty><backpath:backlink><img src="<strutsx:root />/images/back-small.gif" alt="Назад" border=0></backpath:backlink></backpath:notEmpty>
</div>
<%@ include file="/admin/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/admin/footer.jsp
0,0 → 1,16
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!-- footer begin -->
<table border=0 cellspacing=0 cellpadding=4 width=840>
<tr>
<td colspan=2>&nbsp;</td>
</tr>
<tr>
<td style="font-size: 8pt; background-color:#E0E0E0">
Copyleft 2004 RusBook, toader, dev
</td>
<td style="font-size: 8pt; background-color:#E0E0E0; text-align: right">
Hosting: <a href="http://www.26th.net/public/hosting">26th.net</a>
</td>
</tr>
</table>
<!-- footer end -->

/kickup/trunk/webapp/admin/apartment/list.jsp
63,6 → 63,8
<backpath:notEmpty><backpath:backlink><img src="<strutsx:root />/images/back-small.gif" alt="Назад" border=0></backpath:backlink></backpath:notEmpty>
</div>
<%@ include file="/admin/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/admin/apartment/edit.jsp
34,7 → 34,7
<table border=0 cellspacing=0 cellpadding=4>
<tr class="even">
<th>Название</th>
<td><html:text property="name" style="width:100%" /></td>
<td><html:text property="name" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="odd">
<th>Адрес и телефоны</th>
42,11 → 42,11
</tr>
<tr class="even">
<th>Цена ночевки на одного человека</th>
<td><html:text property="price" style="width:100%" /></td>
<td><html:text property="price" style="width:100%" maxlength="10" /></td>
</tr>
<tr class="odd">
<th>URL домашней странички</th>
<td><html:text property="url" style="width:100%" /></td>
<td><html:text property="url" style="width:100%" maxlength="4000" /></td>
</tr>
<tr class="even">
<th>Описание</th>
62,6 → 62,8
</html:form>
<%@ include file="/admin/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/admin/participant/edit.jsp
1,4 → 1,4
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
¿<%@ 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" %>
39,11 → 39,11
</tr>
<tr class="odd">
<th>Ник</th>
<td colspan=2><html:text property="nick" style="width:100%" /></td>
<td colspan=2><html:text property="nick" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="even">
<th>e-mail</th>
<td colspan=2><html:text property="email" style="width:100%" /></td>
<td colspan=2><html:text property="email" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="odd">
<th>Показ e-mail разрешен</th>
51,31 → 51,31
</tr>
<tr class="even">
<th>Имя</th>
<td colspan=2><html:text property="name" style="width:100%" /></td>
<td colspan=2><html:text property="name" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="odd">
<th>Телефон</th>
<td colspan=2><html:text property="phone" style="width:100%" /></td>
<td colspan=2><html:text property="phone" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="even">
<th>Количество человек</th>
<td colspan=2><html:text property="persons" style="width:100%" /></td>
<td colspan=2><html:text property="persons" style="width:100%" maxlength="10" /></td>
</tr>
<tr class="odd">
<th>Выезд из PLZ</th>
<td colspan=2><html:text property="fromZip" style="width:100%" /></td>
<td colspan=2><html:text property="fromZip" style="width:100%" maxlength="10" /></td>
</tr>
<tr class="even">
<th>Выезд из города</th>
<td colspan=2><html:text property="fromCity" style="width:100%" /></td>
<td colspan=2><html:text property="fromCity" style="width:100%" maxlength="100" /></td>
</tr>
<tr class="odd">
<th>Время отправления</th>
<td colspan=2><html:text property="departure" style="width:100%" /></td>
<td colspan=2><html:text property="departure" style="width:100%" maxlength="100" /></td>
</tr>
<tr class="even">
<th>Свободных мест в машине</th>
<td colspan=2><html:text property="freeTransport" style="width:100%" /></td>
<td colspan=2><html:text property="freeTransport" style="width:100%" maxlength="10" /></td>
</tr>
<tr class="odd">
<th>Условия транспортировки</th>
83,7 → 83,7
</tr>
<tr class="even">
<th>Свободных спальных мест</th>
<td colspan=2><html:text property="freeSleep" style="width:100%" /></td>
<td colspan=2><html:text property="freeSleep" style="width:100%" maxlength="10" /></td>
</tr>
<tr class="odd">
<th>Условия ночевки</th>
95,7 → 95,7
</tr>
<tr class="odd">
<th>Оплачено, евро</th>
<td><html:text property="payed" style="width:100%" /></td>
<td><html:text property="payed" style="width:100%" maxlength="10" /></td>
<td>
<logic:notEmpty name="participant" property="mustPay">
(должен заплатить: <bean:write name="participant" property="mustPay" format="0.00" />)
138,6 → 138,8
</html:form>
<%@ include file="/admin/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/admin/participant/list.jsp
116,6 → 116,8
<backpath:notEmpty><backpath:backlink><img src="<strutsx:root />/images/back-small.gif" alt="Назад" border=0></backpath:backlink></backpath:notEmpty>
</div>
<%@ include file="/admin/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/admin/event/list.jsp
83,6 → 83,8
<backpath:notEmpty><backpath:backlink><img src="<strutsx:root />/images/back-small.gif" alt="Назад" border=0></backpath:backlink></backpath:notEmpty>
</div>
<%@ include file="/admin/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/admin/event/edit.jsp
34,23 → 34,23
<table border=0 cellspacing=0 cellpadding=4>
<tr class="even">
<th>Название</th>
<td colspan=3><html:text property="name" style="width:100%" /></td>
<td colspan=3><html:text property="name" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="odd">
<th>Контактный e-mail</th>
<td colspan=3><html:text property="email" style="width:100%" /></td>
<td colspan=3><html:text property="email" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="even">
<th>Организаторы</th>
<td colspan=3><html:text property="admins" style="width:100%" /></td>
<td colspan=3><html:text property="admins" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="odd">
<th>Контактные телефоны</th>
<td colspan=3><html:text property="phones" style="width:100%" /></td>
<td colspan=3><html:text property="phones" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="even">
<th>Место/город</th>
<td colspan=3><html:text property="place" style="width:100%" /></td>
<td colspan=3><html:text property="place" style="width:100%" maxlength="255" /></td>
</tr>
<tr class="odd">
<th>Точный адрес</th>
62,23 → 62,23
</tr>
<tr class="odd">
<th>Начало</th>
<td colspan=3><html:text property="start" style="width:100%" /></td>
<td colspan=3><html:text property="start" style="width:100%" maxlength="100" /></td>
</tr>
<tr class="even">
<th>Окончание</th>
<td colspan=3><html:text property="stop" style="width:100%" /></td>
<td colspan=3><html:text property="stop" style="width:100%" maxlength="100" /></td>
</tr>
<tr class="odd">
<th>Дата окончания регистрации</th>
<td colspan=3><html:text property="lastreg" style="width:100%" /></td>
<td colspan=3><html:text property="lastreg" style="width:100%" maxlength="100" /></td>
</tr>
<tr class="even">
<th>Последний срок отказа</th>
<td colspan=3><html:text property="lastunreg" style="width:100%" /></td>
<td colspan=3><html:text property="lastunreg" style="width:100%" maxlength="100" /></td>
</tr>
<tr class="odd">
<th>Цена с человека</th>
<td colspan=3><html:text property="price" style="width:100%" /></td>
<td colspan=3><html:text property="price" style="width:100%" maxlength="10" /></td>
</tr>
<tr class="even">
<th>Счет для перевода денег</th>
131,7 → 131,7
</td>
<td><html:checkbox name="apartments" property="selected" indexed="true" /></td>
<td><html:text name="apartments" property="comment" indexed="true" style="width:100%" /></td>
<td><html:text name="apartments" property="distance" indexed="true" style="width:100%" /></td>
<td><html:text name="apartments" property="distance" indexed="true" style="width:100%" maxlength="10" /></td>
</tr>
</logic:iterate>
145,6 → 145,8
</html:form>
<%@ include file="/admin/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/admin/index.jsp
23,6 → 23,8
<li><html:link page="/">На сайт</html:link></li>
</ul>
<%@ include file="/admin/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/footer.jsp
1,6 → 1,6
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!-- footer begin -->
<table border=0>
<table border=0 cellspacing=0 cellpadding=4>
<tr>
<td colspan=2><img src="<strutsx:root />/images/line.gif" alt=""></td>
</tr>
22,5 → 22,17
<td align=right valign=top>&nbsp;</td>
<tr>
</logic:notEmpty>
<tr>
<td colspan=2>&nbsp;</td>
</tr>
<tr>
<td style="font-size: 8pt; background-color:#E0E0E0">
Copyleft 2004 RusBook, toader, dev
</td>
<td style="font-size: 8pt; background-color:#E0E0E0; text-align: right">
Hosting: <a href="http://www.26th.net/public/hosting">26th.net</a>
</td>
</tr>
</table>
<!-- footer end -->

/kickup/trunk/webapp/participant/unregistered.jsp
14,7 → 14,7
<body>
<h1>Пьянка XP - <bean:write name="event" property="name" /> - Отказ</h1>
<%@ include file="/header.jsp" %>
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
27,9 → 27,9
</div>
</strutsx:notEmpty>
<p>Ваши данные удалены.</p>
<h2>Ваши данные удалены.</h2>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
<%@ include file="/footer.jsp" %>
</body>

/kickup/trunk/webapp/participant/ident.jsp
20,7 → 20,7
<body>
<h1>Пьянка XP - <bean:write name="event" property="name" /> - Идентификация</h1>
<%@ include file="/header.jsp" %>
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
38,14 → 38,17
<html:form action="/participant/login" method="GET">
<backpath:current />
<input type=hidden name="event" value="<bean:write name="event" property="id" />">
<table border=1>
<table border=0 cellspacing=0 cellpadding=4 width=500>
<tr>
<th>Ваш номер</th>
<td><html:text property="ident" /></td>
<th width=120>Ваш номер</th>
<td><html:text property="ident" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<td colspan=2><html:submit>Перейти к изменению</html:submit></td>
</tr>
<tr>
<td colspan=2>&nbsp;</td>
</tr>
</table>
</html:form>
55,23 → 58,53
<html:form action="/participant/unregister" onsubmit="return confirmUnregister();">
<backpath:current />
<input type=hidden name="event" value="<bean:write name="event" property="id" />">
<table border=1>
<table border=0 cellspacing=0 cellpadding=4 width=500>
<tr>
<th>Ваш номер</th>
<td><html:text property="ident" /></td>
<th width=120>Ваш номер</th>
<td><html:text property="ident" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<td colspan=2><html:submit>Я не еду</html:submit></td>
</tr>
<tr>
<td colspan=2>&nbsp;</td>
</tr>
</table>
</html:form>
</logic:equal>
<logic:equal name="event" property="unregistrationAvailable" value="true">
<logic:equal name="event" property="unregistrationAvailable" value="false">
<p>Срок отказа от регистрации прошел.</p>
</logic:equal>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
<!--
<h2>Напомнить ваш номер</h2>
<html:form action="/participant/login" method="GET">
<backpath:current />
<input type=hidden name="event" value="<bean:write name="event" property="id" />">
<table border=0 cellspacing=0 cellpadding=4 width=500>
<tr>
<td colspan=2>
Если вы забыли ваш номер, то укажите свой e-mail, который вы использовали при регистрации
и на него будет выслан номер
</td>
</tr>
<tr>
<th width=120>Ваш e-mail</th>
<td><html:text property="ident" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<td colspan=2><html:submit>Выслать</html:submit></td>
</tr>
<tr>
<td colspan=2>&nbsp;</td>
</tr>
</table>
</html:form>
-->
<%@ include file="/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/participant/register.jsp
31,15 → 31,23
<backpath:current />
<html:hidden property="event" />
<table border=1 width=600>
<table border=0 cellspacing=0 cellpadding=4 width=860>
<tr>
<td colspan=3><div class="smallHeader">Идентификация</div></td>
</tr>
<tr>
<th>Ник на форуме</th>
<td colspan=2><html:text property="nick" /></td>
<th">Ник на форуме</th>
<td colspan=2>
<html:text property="nick" style="width:240px" maxlength="255" />
<span class="obligatedText">обязательное поле</span><br>
Если вы не зарегистрированы на форуме - введите любой ник
</td>
</tr>
<tr>
<th>Ваш e-mail</th>
<td colspan=2>
<html:text property="email" /><br>
<html:text property="email" style="width:240px" maxlength="255" />
<span class="obligatedText">обязательное поле</span><br>
После регистрации на этот адрес будет выслан ваш регистрационный номер и счет для перевода денег.
Поэтому указывайте, пожалуйста, ваш реальный e-mail.
</td>
50,69 → 58,88
</tr>
<tr>
<th>Сколько вас</th>
<td colspan=2><html:text property="persons" /></td>
<td colspan=2>
<html:text property="persons" style="width:240px" maxlength="10" />
<span class="obligatedText">обязательное поле</span>
</td>
</tr>
<tr>
<td colspan=3><div class="smallHeader">Если берете попутчиков</div></td>
</tr>
<tr>
<th>Выезд из PLZ</th>
<td colspan=2><html:text property="fromZip" /></td>
<td colspan=2><html:text property="fromZip" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<th>Выезд из города</th>
<td colspan=2><html:text property="fromCity" /></td>
<td colspan=2><html:text property="fromCity" style="width:240px" maxlength="100" /></td>
</tr>
<tr>
<th>Время отправления</th>
<td colspan=2><html:text property="departure" /></td>
<td colspan=2><html:text property="departure" style="width:240px" maxlength="100" /></td>
</tr>
<tr>
<th>Свободных мест в машине</th>
<td colspan=2><html:text property="freeTransport" /></td>
<td colspan=2><html:text property="freeTransport" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<th>Условия транспортировки</th>
<td colspan=2><html:textarea property="transportComment" /></td>
<td colspan=2><html:textarea property="transportComment" cols="40" rows="5" style="width:240px;" /></td>
</tr>
<tr>
<td colspan=3>
<div class="smallHeader">Для живущих в месте проведения</div>
Если вы можете приютить приезжих
</td>
</tr>
<tr>
<th>Свободных спальных мест</th>
<td colspan=2><html:text property="freeSleep" /></td>
<td colspan=2><html:text property="freeSleep" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<th>Условия ночевки</th>
<td colspan=2><html:textarea property="sleepComment" /></td>
<td colspan=2><html:textarea property="sleepComment" cols="40" rows="5" style="width:240px;" /></td>
</tr>
<tr>
<td colspan=3>
<div class="smallHeader">Контактная информация</div>
Если вы согласны взять попутчиков или пустить переночевать, то
укажите, как с вами связаться
</td>
</tr>
<tr>
<th>Ваше имя</th>
<td colspan=2><html:text property="name" /></td>
<td colspan=2><html:text property="name" style="width:240px" maxlength="255" /></td>
</tr>
<tr>
<th>Телефон</th>
<td colspan=2><html:text property="phone" /></td>
<td colspan=2><html:text property="phone" style="width:240px" maxlength="255" /></td>
</tr>
<tr>
<th>Дополнительная информация</th>
<td colspan=2><html:textarea property="comment" /></td>
<td colspan=2><html:textarea property="comment" cols="40" rows="5" style="width:240px;" /></td>
</tr>
<logic:notEmpty name="actList" property="objects">
<tr>
<th colspan=3>В чем желаете поучаствовать</th>
<th colspan=3><div class="smallHeader">В чем желаете поучаствовать</div></th>
</tr>
<tr>
<td>Название</td>
<td>Включить</td>
<td>Дополнительно</td>
<th>Название</th>
<th>Включить</th>
<th>Дополнительно</th>
</tr>
<logic:iterate name="ParticipantRegisterForm" property="acts" id="acts" indexId="iid">
<tr>
<th>
<td>
<bean:write name="actList" property='<%= "objects[" + iid + "].act.name" %>' />
<html:hidden name="acts" property="actId" indexed="true" />
</th>
</td>
<td><html:checkbox name="acts" property="selected" indexed="true" /></td>
<td><html:text name="acts" property="comment" indexed="true" /></td>
<td><html:text name="acts" property="comment" indexed="true" style="width:240px" /></td>
</tr>
</logic:iterate>
</logic:notEmpty>

/kickup/trunk/webapp/participant/edit.jsp
32,7 → 32,10
<html:hidden property="event" />
<html:hidden property="ident" />
<table border=1>
<table border=0 cellspacing=0 cellpadding=4 width=860>
<tr>
<td colspan=3><div class="smallHeader">Идентификация</div></td>
</tr>
<tr>
<th>Ваш номер</th>
<td colspan=2><bean:write name="participant" property="ident" /></td>
51,46 → 54,62
</tr>
<tr>
<th>Сколько вас</th>
<td colspan=2><html:text property="persons" /></td>
<td colspan=2><html:text property="persons" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<td colspan=3><div class="smallHeader">Если берете попутчиков</div></td>
</tr>
<tr>
<th>Выезд из PLZ</th>
<td colspan=2><html:text property="fromZip" /></td>
<td colspan=2><html:text property="fromZip" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<th>Выезд из города</th>
<td colspan=2><html:text property="fromCity" /></td>
<td colspan=2><html:text property="fromCity" style="width:240px" maxlength="100" /></td>
</tr>
<tr>
<th>Время отправления</th>
<td colspan=2><html:text property="departure" /></td>
<td colspan=2><html:text property="departure" style="width:240px" maxlength="100" /></td>
</tr>
<tr>
<th>Свободных мест в машине</th>
<td colspan=2><html:text property="freeTransport" /></td>
<td colspan=2><html:text property="freeTransport" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<th>Условия транспортировки</th>
<td colspan=2><html:textarea property="transportComment" /></td>
<td colspan=2><html:textarea property="transportComment" cols="40" rows="5" style="width:240px;" /></td>
</tr>
<tr>
<td colspan=3>
<div class="smallHeader">Для живущих в месте проведения</div>
Если вы можете приютить приезжих
</td>
</tr>
<tr>
<th>Свободных спальных мест</th>
<td colspan=2><html:text property="freeSleep" /></td>
<td colspan=2><html:text property="freeSleep" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<th>Условия ночевки</th>
<td colspan=2><html:textarea property="sleepComment" /></td>
<td colspan=2><html:textarea property="sleepComment" cols="40" rows="5" style="width:240px;" /></td>
</tr>
<tr>
<td colspan=3>
<div class="smallHeader">Контактная информация</div>
Если вы согласны взять попутчиков или пустить переночевать, то
укажите, как с вами связаться
</td>
</tr>
<tr>
<th>Ваше имя</th>
<td colspan=2><html:text property="name" /></td>
<td colspan=2><html:text property="name" style="width:240px" maxlength="255" /></td>
</tr>
<tr>
<th>Телефон</th>
<td colspan=2><html:text property="phone" /></td>
<td colspan=2><html:text property="phone" style="width:240px" maxlength="255" /></td>
</tr>
<tr>
<th>Переведено и получено, евро</th>
98,26 → 117,26
</tr>
<tr>
<th>Дополнительная информация</th>
<td colspan=2><html:textarea property="comment" /></td>
<td colspan=2><html:textarea property="comment" cols="40" rows="5" style="width:240px;" /></td>
</tr>
<logic:notEmpty name="actList" property="objects">
<tr>
<th colspan=3>В чем желаете поучаствовать</th>
<th colspan=3><div class="smallHeader">В чем желаете поучаствовать</div></th>
</tr>
<tr>
<td>Название</td>
<td>Включить</td>
<td>Дополнительно</td>
<th>Название</th>
<th>Включить</th>
<th>Дополнительно</th>
</tr>
<logic:iterate name="ParticipantRegisterEditForm" property="acts" id="acts" indexId="iid">
<tr>
<th>
<td>
<bean:write name="actList" property='<%= "objects[" + iid + "].act.name" %>' />
<html:hidden name="acts" property="actId" indexed="true" />
</th>
</td>
<td><html:checkbox name="acts" property="selected" indexed="true" /></td>
<td><html:text name="acts" property="comment" indexed="true" /></td>
<td><html:text name="acts" property="comment" indexed="true" style="width:240px" /></td>
</tr>
</logic:iterate>
</logic:notEmpty>
125,7 → 144,6
<tr>
<td colspan=3>
<html:submit>Сохранить</html:submit>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>
</tr>
</table>
132,6 → 150,8
</html:form>
<%@ include file="/footer.jsp" %>
</body>
</html>

/kickup/trunk/webapp/style/general.css
10,6 → 10,8
.listCell { border-bottom: 1px solid #C0C0C0; }
.headerCell { border-bottom: 1px solid black; }
.error { color: red; }
.obligated { color: red; }
.obligatedText { color: red; font-size: 8pt; }
.payedNull { background-color: white; }
.payedNone { background-color: #FFC0C0; }

/kickup/trunk/sql/00.tables.sql
144,7 → 144,7
event integer not null,
persons integer not null,
from_zip varchar(10),
from_city varchar(10),
from_city varchar(100),
departure timestamp,
free_transport integer,
transport_comment text,

/kickup/trunk/doc/todo.txt
4,4 → 4,9
The bug 1 - edit an event if no apartments/acts defined
+ Max length
Send number to email
Image buttons: save, change, unregister, register

/kickup/trunk/src/ak/kickup/core/action/ParticipantAction.java
109,7 → 109,7
DynaActionForm theForm = (DynaActionForm)form;
Long eventId = StringConverter.parseLong(theForm.get("event"));
Event event = EventManager.getInstance().get(eventId, true);
String ident = (String)theForm.get("ident");
String ident = ((String)theForm.get("ident")).trim();
DynaActionForm showForm = (DynaActionForm)RequestUtilsX.populateActionForm(
this, request, "ParticipantRegisterEditForm");
154,7 → 154,7
DynaActionForm theForm = (DynaActionForm)form;
Long eventId = StringConverter.parseLong(theForm.get("event"));
Event event = EventManager.getInstance().get(eventId, true);
String ident = (String)theForm.get("ident");
String ident = ((String)theForm.get("ident")).trim();
Participant participant = ParticipantManager.getInstance().findForIdent(ident);
request.setAttribute("event", event);

/kickup/trunk/src/ak/kickup/core/model/ParticipantManager.java
164,6 → 164,7
throws ModelException
{
try {
participant.getEvent().removeParticipant(participant);
HibernateUtil.currentSession().delete(participant);
}
catch(HibernateException ex)

/kickup/trunk/src/ak/kickup/core/model/Event.java
445,4 → 445,9
{
this.participants = participants;
}
protected void removeParticipant(Participant participant)
{
participants.remove(participant);
}
}