Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 15 → Rev 16

/kickup/trunk/webapp/admin/participant/edit.jsp
104,7 → 104,7
<tr>
<td colspan=2>
<html:submit>Сохранить</html:submit>
<backpath:backlink>Отменить</backpath:backlink>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>
</tr>
</table>
/kickup/trunk/webapp/admin/participant/list.jsp
4,7 → 4,7
<%@ 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" %>
<%@ taglib uri="/WEB-INF/ak-kickup.tld" prefix="kickup" %>
<html>
 
<head>
63,7 → 63,7
 
<backpath:link action="/admin/participant/edit" paramId="event" paramName="event" paramProperty="id">Добавить участника</backpath:link>
<br>
<backpath:backlink>Назад</backpath:backlink>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
/kickup/trunk/webapp/admin/event/edit.jsp
126,7 → 126,7
<tr>
<td colspan=4>
<html:submit>Сохранить</html:submit>
<backpath:backlink>Отменить</backpath:backlink>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>
</tr>
</table>
/kickup/trunk/webapp/admin/event/list.jsp
64,7 → 64,7
 
<backpath:link action="/admin/event/edit">Добавить пьянку</backpath:link>
<br>
<backpath:backlink>Назад</backpath:backlink>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
/kickup/trunk/webapp/admin/act/edit.jsp
43,7 → 43,7
<tr>
<td colspan=2>
<html:submit>Сохранить</html:submit>
<backpath:backlink>Отменить</backpath:backlink>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>
</tr>
</table>
/kickup/trunk/webapp/admin/act/list.jsp
49,7 → 49,7
 
<backpath:link action="/admin/act/edit">Добавить мероприятие</backpath:link>
<br>
<backpath:backlink>Назад</backpath:backlink>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
/kickup/trunk/webapp/admin/apartment/edit.jsp
55,7 → 55,7
<tr>
<td colspan=2>
<html:submit>Сохранить</html:submit>
<backpath:backlink>Отменить</backpath:backlink>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>
</tr>
</table>
/kickup/trunk/webapp/admin/apartment/list.jsp
49,7 → 49,7
 
<backpath:link action="/admin/apartment/edit">Добавить гостиницу</backpath:link>
<br>
<backpath:backlink>Назад</backpath:backlink>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
/kickup/trunk/webapp/apartment/list.jsp
0,0 → 1,100
<%@ 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="event" property="name" /> - Где переночивать</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Пьянка XP - <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>
 
<h2>Гостиницы в округе</h2>
 
<table border=1>
<tr>
<th>Название</th>
<th>Сайт</th>
<th>Цена за ночь на одного, евро</th>
<th>Расстояние до места</th>
<th>Адрес</th>
</tr>
 
<logic:iterate name="apartments" id="a">
<tr>
<td>
<bean:write name="a" property="apartment.name" />&nbsp;
</td>
<td>
<logic:notEmpty name="a" property="apartment.url">
<a href="<bean:write name="a" property="apartment.url" />"><bean:write name="a" property="apartment.url" /></a>
</logic:notEmpty>
&nbsp;
</td>
<td>
<bean:write name="a" property="apartment.price" />&nbsp;
</td>
<td>
<bean:write name="a" property="distance" />&nbsp;
</td>
<td>
<kickup:write name="a" property="apartment.address" filterBr="true" />&nbsp;
</td>
</tr>
</logic:iterate>
</table>
 
<h2>Свободные спальные места у участников</h2>
 
<table border=1>
<tr>
<th>Ник</th>
<th>Имя</th>
<th>e-mail</th>
<th>Телефон</th>
<th>Свободных мест</th>
<th>Условия</th>
</tr>
 
<logic:iterate name="participants" id="p">
<tr>
<td><bean:write name="p" property="nick" />&nbsp;</td>
<td><bean:write name="p" property="name" />&nbsp;</td>
<td>
<logic:equal name="p" property="emailPublic" value="true">
<bean:write name="p" property="email" />
</logic:equal>
&nbsp;
</td>
<td><bean:write name="p" property="phone" />&nbsp;</td>
<td><bean:write name="p" property="freeSleep" />&nbsp;</td>
<td><bean:write name="p" property="sleepComment" />&nbsp;</td>
</tr>
</logic:iterate>
</table>
 
<br>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
</html>
/kickup/trunk/webapp/transport/list.jsp
0,0 → 1,77
<%@ 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="event" property="name" /> - Как добраться</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Пьянка XP - <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>
 
<h2>Адрес</h2>
<p><kickup:write name="event" property="address" filterBr="true" /></p>
 
<h2>Как проехать</h2>
<p><kickup:write name="event" property="transportDesc" filterBr="true" /></p>
 
<h2>Свободные места в машинах</h2>
 
<table border=1>
<tr>
<th>PLZ</th>
<th>Город</th>
<th>Отправление</th>
<th>Ник</th>
<th>Имя</th>
<th>e-mail</th>
<th>Телефон</th>
<th>Свободных мест</th>
<th>Условия</th>
</tr>
 
<logic:iterate name="participants" id="p">
<tr>
<td><bean:write name="p" property="fromZip" />&nbsp;</td>
<td><bean:write name="p" property="fromCity" />&nbsp;</td>
<td><bean:write name="p" property="departure" format="dd MMM yyyy HH:mm" />&nbsp;</td>
<td><bean:write name="p" property="nick" />&nbsp;</td>
<td><bean:write name="p" property="name" />&nbsp;</td>
<td>
<logic:equal name="p" property="emailPublic" value="true">
<bean:write name="p" property="email" />
</logic:equal>
&nbsp;
</td>
<td><bean:write name="p" property="phone" />&nbsp;</td>
<td><bean:write name="p" property="freeTransport" />&nbsp;</td>
<td><bean:write name="p" property="transportComment" />&nbsp;</td>
</tr>
</logic:iterate>
</table>
 
<br>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
</html>
/kickup/trunk/webapp/participant/list.jsp
0,0 → 1,64
<%@ 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="event" property="name" />"</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Пьянка XP - Участники пьянки "<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="participants" id="p">
<tr>
<td><bean:write name="p" property="nick" />&nbsp;</td>
<td><bean:write name="p" property="name" />&nbsp;</td>
<td>
<logic:equal name="p" property="emailPublic" value="true">
<bean:write name="p" property="email" />
</logic:equal>
&nbsp;
</td>
<td><bean:write name="p" property="phone" />&nbsp;</td>
<td><bean:write name="p" property="persons" />&nbsp;</td>
</tr>
</logic:iterate>
</table>
 
<p>Всего заявок: <bean:write name="event" property="participantCount" /></p>
<p>Всего участников: <bean:write name="event" property="personCount" /></p>
 
<br>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
</html>
/kickup/trunk/webapp/event/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" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title>Пьянка XP</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Пьянка XP</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>Начало</th>
<th>Окончание</th>
<th>Регистрация разрешена</th>
</tr>
 
<logic:iterate name="events" id="e">
<tr>
<td>
<backpath:link action="/event/show" paramId="id" paramName="e" paramProperty="id">
<bean:write name="e" property="name" />
</backpath:link>
</td>
<td><bean:write name="e" property="place" />&nbsp;</td>
<td><bean:write name="e" property="start" format="dd.MM.yyyy" />&nbsp;</td>
<td><bean:write name="e" property="stop" format="dd.MM.yyyy" />&nbsp;</td>
<td>
<logic:equal name="e" property="registrationAvailable" value="true">да</logic:equal>
<logic:notEqual name="e" property="registrationAvailable" value="true">нет</logic:notEqual>
</td>
</tr>
</logic:iterate>
</table>
 
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
</html>
/kickup/trunk/webapp/event/show.jsp
0,0 → 1,70
<%@ 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="event" property="name" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1><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>
 
<p><kickup:write name="event" property="comment" filterBr="true" /></p>
 
<p>Время проведения:
<logic:empty name="event" property="start">еще неизвестно</logic:empty>
<logic:notEmpty name="event" property="start">
<bean:write name="event" property="start" format="d MMM yyyy" />
<logic:notEmpty name="event" property="stop">- <bean:write name="event" property="stop" format="d MMM yyyy" /></logic:notEmpty>
</logic:notEmpty>
 
<h2>Место проведения</h2>
 
<p><bean:write name="event" property="place" /></p>
<p><kickup:write name="event" property="address" filterBr="true" /></p>
 
<h2>Планируемые мероприятия</h2>
 
<ul>
<logic:iterate name="acts" id="a">
<li><bean:write name="a" property="act.name" /></li>
</logic:iterate>
</ul>
 
<h2>Стоимость</h2>
 
<p>
<logic:empty name="event" property="price">пока не определена</logic:empty>
<logic:notEmpty name="event" property="price">
<bean:write name="event" property="price" format="0.00" /> евро с носа
</logic:notEmpty>
</p>
 
<backpath:link action="/participant/list" paramId="event" paramName="event" paramProperty="id">Участники</backpath:link>
<backpath:link action="/apartment/list" paramId="event" paramName="event" paramProperty="id">Где разместиться</backpath:link>
<backpath:link action="/transport/list" paramId="event" paramName="event" paramProperty="id">Как добраться</backpath:link>
 
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
</html>
/kickup/trunk/webapp/generalError.jsp
17,7 → 17,7
<h1>Пьянка XP - Ошибки</h1>
 
<p>Ошибка сервера. То, что вы ищете - не найдено, или то, что вы хотите сделать - не делается.
<backpath:backlink>Попробуйте еще раз</backpath:backlink> и сообщите нам, если все равно не работает.</p>
<backpath:notEmpty><backpath:backlink>Попробуйте еще раз</backpath:backlink> и сообщите нам, если все равно не работает.</backpath:notEmpty></p>
 
</body>
 
/kickup/trunk/webapp/error.jsp
29,7 → 29,7
</strutsx:notEmpty>
 
<br>
<backpath:backlink>Назад</backpath:backlink>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
 
</body>
 
/kickup/trunk/webapp/WEB-INF/ak-kickup.tld
270,4 → 270,60
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
 
<tag>
<name>write</name>
<tagclass>ak.kickup.core.taglib.ExtendedWriteTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
<name>bundle</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>filter</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>filterBr</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>format</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>formatKey</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>ignore</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>locale</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>scope</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
</taglib>
/kickup/trunk/webapp/WEB-INF/struts-config.xml
116,7 → 116,72
</global-forwards>
 
<action-mappings>
 
<!-- ** PARTICIPANTS ********************************************************************** -->
 
<!-- == event ============================================================================= -->
 
<action
path="/index"
type="ak.kickup.core.action.EventAction"
parameter="list"
>
<forward name="default" path="/event/list.jsp" />
</action>
 
<action
path="/event/show"
type="ak.kickup.core.action.EventAction"
parameter="show"
name="EventForm"
validate="true"
scope="request"
>
<forward name="default" path="/event/show.jsp" />
</action>
 
<!-- == participant ========================================================================= -->
 
<action
path="/participant/list"
type="ak.kickup.core.action.ParticipantAction"
parameter="list"
name="ParticipantListForm"
validate="true"
scope="request"
>
<forward name="default" path="/participant/list.jsp" />
</action>
 
<!-- == transport =========================================================================== -->
 
<action
path="/transport/list"
type="ak.kickup.core.action.TransportAction"
parameter="list"
name="ParticipantListForm"
validate="true"
scope="request"
>
<forward name="default" path="/transport/list.jsp" />
</action>
 
<!-- == apartment =========================================================================== -->
 
<action
path="/apartment/list"
type="ak.kickup.core.action.ApartmentAction"
parameter="list"
name="ParticipantListForm"
validate="true"
scope="request"
>
<forward name="default" path="/apartment/list.jsp" />
</action>
 
<!-- ** ADMINISTATION ********************************************************************* -->
 
<action
path="/admin/index"
forward="/admin/index.jsp"
/>