Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 973 → Rev 974

/kickup/trunk/webapp/header.jsp
24,7 → 24,7
</td>
<td valign=bottom style="text-align: right; ">
<logic:equal name="event" property="registrationAvailable" value="true">
<backpath:link action="/participant/register" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/register.gif" alt="Зарегистрироваться" border=0></backpath:link>
<html:link action="/participant/register" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/register.gif" alt="Зарегистрироваться" border=0></html:link>
</logic:equal>
</td>
</tr>
33,10 → 33,10
</tr>
<tr>
<td valign=top>
<kickup:currentLink action="/event/show" paramId="id" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/show.gif" alt="Программа" border=0></kickup:currentLink>
<kickup:currentLink action="/apartment/list" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/apartments.gif" alt="Программа" border=0></kickup:currentLink>
<kickup:currentLink action="/transport/list" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/transport.gif" alt="Программа" border=0></kickup:currentLink>
<kickup:currentLink action="/participant/list" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/participants.gif" alt="Программа" border=0></kickup:currentLink>
<html:link action="/event/show" paramId="id" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/show.gif" alt="Программа" border=0></html:link>
<html:link action="/apartment/list" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/apartments.gif" alt="Программа" border=0></html:link>
<html:link action="/transport/list" paramId="event" paramName="event" paramProperty="id"><img src="<strutsx:root />/images/transport.gif" alt="Программа" border=0></html:link>
<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>
/kickup/trunk/webapp/WEB-INF/ak-kickup.tld
269,6 → 269,11
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>backpath</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
 
<tag>
/kickup/trunk/webapp/act/list.jsp
9,14 → 9,16
 
<head>
<meta http-equiv="expires" content="0">
<title>Пьянка XP - Участники "<bean:write name="act" property="act.name" />" на пьянке "<bean:write name="event" property="name" />"</title>
<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>
<%@ include file="/header.jsp" %>
 
<h2>Участники мероприятия "<bean:write name="act" property="act.name" />"</h2>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Ошибки:
28,33 → 30,35
</div>
</strutsx:notEmpty>
 
<table border=1>
<table border=0 cellspacing=0 cellpadding=4 width=860>
<tr>
<th>Ник</th>
<th>Имя</th>
<th>e-mail</th>
<th>Телефон</th>
<th>Дополнительно</th>
<th class="headerCell">Ник</th>
<th class="headerCell">Имя</th>
<th class="headerCell">e-mail</th>
<th class="headerCell">Телефон</th>
<th class="headerCell">Дополнительно</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>
<td class="listCell"><bean:write name="p" property="participant.nick" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="participant.name" />&nbsp;</td>
<td class="listCell">
<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>
<td class="listCell"><bean:write name="p" property="participant.phone" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="comment" />&nbsp;</td>
</tr>
</logic:iterate>
<tr>
<td colspan=5>&nbsp;</td>
</tr>
</table>
 
<br>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
<%@ include file="/footer.jsp" %>
 
</body>
 
/kickup/trunk/webapp/apartment/list.jsp
87,17 → 87,17
 
<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>
<td class="listCell"><bean:write name="p" property="nick" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="name" />&nbsp;</td>
<td class="listCell">
<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>
<td class="listCell"><bean:write name="p" property="phone" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="freeSleep" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="sleepComment" />&nbsp;</td>
</tr>
</logic:iterate>
<tr>
/kickup/trunk/webapp/transport/list.jsp
36,37 → 36,40
 
<h2>Свободные места в машинах</h2>
 
<table border=1>
<table border=0 cellspacing=0 cellpadding=4 width=860>
<tr>
<th>PLZ</th>
<th>Город</th>
<th>Отправление</th>
<th>Ник</th>
<th>Имя</th>
<th>e-mail</th>
<th>Телефон</th>
<th>Свободных мест</th>
<th>Условия</th>
<th class="headerCell">PLZ</th>
<th class="headerCell">Город</th>
<th class="headerCell">Отправление</th>
<th class="headerCell">Ник</th>
<th class="headerCell">Имя</th>
<th class="headerCell">e-mail</th>
<th class="headerCell">Телефон</th>
<th class="headerCell">Свободных мест</th>
<th class="headerCell">Условия</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>
<td class="listCell"><bean:write name="p" property="fromZip" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="fromCity" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="departure" format="dd MMM yyyy HH:mm" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="nick" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="name" />&nbsp;</td>
<td class="listCell">
<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>
<td class="listCell"><bean:write name="p" property="phone" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="freeTransport" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="transportComment" />&nbsp;</td>
</tr>
</logic:iterate>
<tr>
<td colspan=9>&nbsp;</td>
</tr>
</table>
 
<%@ include file="/footer.jsp" %>
/kickup/trunk/webapp/participant/list.jsp
28,33 → 28,38
</div>
</strutsx:notEmpty>
 
<table border=1>
<table border=0 cellspacing=0 cellpadding=4 width=860>
<tr>
<th>Ник</th>
<th>Имя</th>
<th>e-mail</th>
<th>Телефон</th>
<th>Количество</th>
<th class="headerCell">Ник</th>
<th class="headerCell">Имя</th>
<th class="headerCell">e-mail</th>
<th class="headerCell">Телефон</th>
<th class="headerCell">Количество</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>
<td class="listCell"><bean:write name="p" property="nick" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="name" />&nbsp;</td>
<td class="listCell">
<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>
<td class="listCell"><bean:write name="p" property="phone" />&nbsp;</td>
<td class="listCell"><bean:write name="p" property="persons" />&nbsp;</td>
</tr>
</logic:iterate>
<tr>
<td colspan=5>&nbsp;</td>
</tr>
</table>
 
<p>Всего заявок: <bean:write name="event" property="participantCount" /></p>
<p>Всего участников: <bean:write name="event" property="personCount" /></p>
<p>
Всего заявок: <span class="personCount"><bean:write name="event" property="participantCount" /></span>
Всего участников: <span class="personCount"><bean:write name="event" property="personCount" /></span>
</p>
 
<%@ include file="/footer.jsp" %>
 
/kickup/trunk/webapp/participant/register.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">
120,7 → 120,6
<tr>
<td colspan=3>
<html:submit>Зарегистрироваться</html:submit>
<backpath:notEmpty><backpath:backlink>Отменить</backpath:backlink></backpath:notEmpty>
</td>
</tr>
</table>
127,6 → 126,8
 
</html:form>
 
<%@ include file="/footer.jsp" %>
 
</body>
 
</html>
/kickup/trunk/webapp/participant/edit.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">
/kickup/trunk/webapp/event/list.jsp
39,9 → 39,9
<logic:iterate name="events" id="e">
<tr>
<td>
<backpath:link action="/event/show" paramId="id" paramName="e" paramProperty="id">
<html:link action="/event/show" paramId="id" paramName="e" paramProperty="id">
<bean:write name="e" property="name" />
</backpath:link>
</html:link>
</td>
<td><bean:write name="e" property="place" />&nbsp;</td>
<td><bean:write name="e" property="start" format="dd.MM.yyyy" />&nbsp;</td>
/kickup/trunk/src/ak/kickup/core/taglib/ExtendedLinkTag.java
13,6 → 13,18
public class ExtendedLinkTag
extends ForwardLinkTag
{
protected boolean backpath = false;
 
public boolean getBackpath()
{
return this.backpath;
}
 
public void setBackpath(boolean backpath)
{
this.backpath = backpath;
}
 
protected String paramId2 = null;
 
public String getParamId2()
160,6 → 172,7
public void release()
{
super.release();
backpath = false;
paramId2 = null;
paramName2 = null;
paramProperty2 = null;
216,7 → 229,7
throw new JspException(messages.getMessage("rewrite.url", ex.toString()));
}
 
if(url == null) return null;
if(url == null || !backpath) return url;
 
// add backpath
String forwardParams = findBackPath().getForwardParams();