Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 972 → Rev 973

/kickup/trunk/webapp/admin/event/list.jsp
50,25 → 50,25
 
<logic:iterate name="events" id="e">
<tr>
<td style="border-bottom: 1px dotted black;"><bean:write name="e" property="name" /></td>
<td style="border-bottom: 1px dotted black;"><bean:write name="e" property="place" />&nbsp;</td>
<td style="border-bottom: 1px dotted black;"><bean:write name="e" property="start" format="dd.MM.yyyy" />&nbsp;</td>
<td style="border-bottom: 1px dotted black;"><bean:write name="e" property="stop" format="dd.MM.yyyy" />&nbsp;</td>
<td align=middle style="border-bottom: 1px dotted black;">
<td class="listCell"><bean:write name="e" property="name" /></td>
<td class="listCell"><bean:write name="e" property="place" />&nbsp;</td>
<td class="listCell"><bean:write name="e" property="start" format="dd.MM.yyyy" />&nbsp;</td>
<td class="listCell"><bean:write name="e" property="stop" format="dd.MM.yyyy" />&nbsp;</td>
<td align=middle class="listCell">
<logic:equal name="e" property="enabled" value="true">да</logic:equal>
<logic:notEqual name="e" property="enabled" value="true">нет</logic:notEqual>
</td>
<td align=right style="border-bottom: 1px dotted black;"><bean:write name="e" property="participantCount" /></td>
<td align=right style="border-bottom: 1px dotted black;"><bean:write name="e" property="personCount" /></td>
<td align=right class="listCell"><bean:write name="e" property="participantCount" /></td>
<td align=right class="listCell"><bean:write name="e" property="personCount" /></td>
 
<td style="border-bottom: 1px dotted black;">&nbsp;</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">&nbsp;</td>
<td class="listCell">
<backpath:link action="/admin/event/edit" paramId="id" paramName="e" paramProperty="id"><img src="<strutsx:root />/images/edit.gif" alt="Редактировать" border=0></backpath:link>
</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">
<backpath:link action="/admin/event/delete" paramId="id" paramName="e" paramProperty="id" onclick="return confirmDelete();"><img src="<strutsx:root />/images/delete.gif" alt="Удалить" border=0></backpath:link>
</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">
<backpath:link action="/admin/participant/list" paramId="event" paramName="e" paramProperty="id"><img src="<strutsx:root />/images/participants-small.gif" alt="Участники" border=0></backpath:link>
</td>
</tr>
/kickup/trunk/webapp/admin/act/list.jsp
43,12 → 43,12
 
<logic:iterate name="acts" id="a">
<tr>
<td style="border-bottom: 1px dotted black;"><bean:write name="a" property="name" /></td>
<td style="border-bottom: 1px dotted black;">&nbsp;</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell"><bean:write name="a" property="name" /></td>
<td class="listCell">&nbsp;</td>
<td class="listCell">
<backpath:link action="/admin/act/edit" paramId="id" paramName="a" paramProperty="id"><img src="<strutsx:root />/images/edit.gif" alt="Редактировать" border=0></backpath:link>
</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">
<backpath:link action="/admin/act/delete" paramId="id" paramName="a" paramProperty="id" onclick="return confirmDelete();"><img src="<strutsx:root />/images/delete.gif" alt="Удалить" border=0></backpath:link>
</td>
</tr>
/kickup/trunk/webapp/admin/apartment/list.jsp
43,12 → 43,12
 
<logic:iterate name="apartments" id="a">
<tr>
<td style="border-bottom: 1px dotted black;"><bean:write name="a" property="name" /></td>
<td style="border-bottom: 1px dotted black;">&nbsp;</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell"><bean:write name="a" property="name" /></td>
<td class="listCell">&nbsp;</td>
<td class="listCell">
<backpath:link action="/admin/apartment/edit" paramId="id" paramName="a" paramProperty="id"><img src="<strutsx:root />/images/edit.gif" alt="Редактировать" border=0></backpath:link>
</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">
<backpath:link action="/admin/apartment/delete" paramId="id" paramName="a" paramProperty="id" onclick="return confirmDelete();"><img src="<strutsx:root />/images/delete.gif" alt="Удалить" border=0></backpath:link>
</td>
</tr>
/kickup/trunk/webapp/admin/participant/list.jsp
78,30 → 78,30
>payedNone</logic:equal><logic:equal name="p" property="payedStatus" value="2"
>payedLess</logic:equal><logic:equal name="p" property="payedStatus" value="3"
>payedExactly</logic:equal><logic:equal name="p" property="payedStatus" value="4"
>payedMore</logic:equal>" style="border-bottom: 1px dotted black;">
>payedMore</logic:equal>" class="listCell">
<bean:write name="p" property="ident" />
</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">
<bean:write name="p" property="nick" />&nbsp;
</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">
<a href="mailto:<bean:write name="p" property="email" />"><bean:write name="p" property="email" /></a>
</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">
<bean:write name="p" property="name" />&nbsp;
</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">
<bean:write name="p" property="persons" />&nbsp;
</td>
<td style="border-bottom: 1px dotted black;">
<td class="listCell">
<bean:write name="p" property="payed" format="0.00" />&nbsp;
</td>
 
<td class="standardCell" style="border-bottom: 1px dotted black;">&nbsp;</td>
<td class="standardCell" style="border-bottom: 1px dotted black;">
<td class="listCell">&nbsp;</td>
<td class="listCell">
<kickup:link action="/admin/participant/edit" paramId="id" paramName="p" paramProperty="id" paramId2="event" paramName2="event" paramProperty2="id"><img src="<strutsx:root />/images/edit.gif" alt="Редактировать" border=0></kickup:link>
</td>
<td class="standardCell" style="border-bottom: 1px dotted black;">
<td class="listCell">
<backpath:link action="/admin/participant/delete" paramId="id" paramName="p" paramProperty="id" onclick="return confirmDelete();"><img src="<strutsx:root />/images/delete.gif" alt="Удалить" border=0></backpath:link>
</td>
</tr>
/kickup/trunk/webapp/footer.jsp
0,0 → 1,26
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!-- footer begin -->
<table border=0>
<tr>
<td colspan=2><img src="<strutsx:root />/images/line.gif" alt=""></td>
</tr>
<tr>
<td>По всем вопросам обращайтесь к организаторам: <span class="eventAdmins"><bean:write name="event" property="admins" /></span></td>
<td align=right valign=top style="text-align: right; ">
<html:link page="/admin"><img src="<strutsx:root />/images/admin.gif" alt="Администрирование" border=0></html:link>
</td>
</tr>
<tr>
<td>Контактный e-mail: <a href="mailto:<bean:write name="event" property="email" />"><bean:write name="event" property="email" /></a></td>
<td align=right valign=top style="text-align: right; ">
<html:link page="/"><img src="<strutsx:root />/images/list.gif" alt="Администрирование" border=0></html:link>
</td>
<tr>
<logic:notEmpty name="event" property="phones" >
<tr>
<td>Телефоны: <bean:write name="event" property="phones" /></td>
<td align=right valign=top>&nbsp;</td>
<tr>
</logic:notEmpty>
</table>
<!-- footer end -->
/kickup/trunk/webapp/apartment/list.jsp
15,7 → 15,7
 
<body>
 
<h1>Пьянка XP - <bean:write name="event" property="name" /> - Где переночивать</h1>
<%@ include file="/header.jsp" %>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
30,49 → 30,59
 
<h2>Гостиницы в округе</h2>
 
<table border=1>
<tr>
<th>Название</th>
<th>Сайт</th>
<th>Цена за ночь на одного, евро</th>
<th>Расстояние до места</th>
<th>Адрес</th>
</tr>
<table border=0 cellspacing=0 cellpadding=4 width=860>
 
<logic:iterate name="apartments" id="a">
<tr>
<td>
<bean:write name="a" property="apartment.name" />&nbsp;
</td>
<td>
<td style="font-size: 12pt; font-weight: bold;" width=400>
<logic:empty name="a" property="apartment.url">
<bean:write name="a" property="apartment.name" />
</logic:empty>
<logic:notEmpty name="a" property="apartment.url">
<a href="<bean:write name="a" property="apartment.url" />"><bean:write name="a" property="apartment.url" /></a>
<a href="<bean:write name="a" property="apartment.url" />"><bean:write name="a" property="apartment.name" /></a>
</logic:notEmpty>
&nbsp;
</td>
<td>
<bean:write name="a" property="apartment.price" format="0.00" />&nbsp;
<td rowspan=3 class="listCell">
<kickup:write name="a" property="apartment.address" filterBr="true" />&nbsp;
</td>
</tr>
<tr>
<td>
<bean:write name="a" property="distance" />&nbsp;
<logic:empty name="a" property="apartment.price">
[цена не известна]
</logic:empty>
<logic:notEmpty name="a" property="apartment.price">
<bean:write name="a" property="apartment.price" format="0.00" />
евро за ночь на одного
</logic:notEmpty>
</td>
<td>
<kickup:write name="a" property="apartment.address" filterBr="true" />&nbsp;
</tr>
<tr>
<td class="listCell">
<logic:empty name="a" property="distance">
[расстояние не известно]
</logic:empty>
<logic:notEmpty name="a" property="distance">
<bean:write name="a" property="distance" />&nbsp;
</logic:notEmpty>
</td>
</tr>
</logic:iterate>
<tr>
<td colspan=2>&nbsp;</td>
</tr>
</table>
 
<h2>Свободные спальные места у участников</h2>
 
<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>Условия</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">
90,10 → 100,12
<td><bean:write name="p" property="sleepComment" />&nbsp;</td>
</tr>
</logic:iterate>
<tr>
<td colspan=6>&nbsp;</td>
</tr>
</table>
 
<br>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
<%@ include file="/footer.jsp" %>
 
</body>
 
/kickup/trunk/webapp/transport/list.jsp
15,7 → 15,7
 
<body>
 
<h1>Пьянка XP - <bean:write name="event" property="name" /> - Как добраться</h1>
<%@ include file="/header.jsp" %>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
69,8 → 69,7
</logic:iterate>
</table>
 
<br>
<backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty>
<%@ include file="/footer.jsp" %>
 
</body>
 
/kickup/trunk/webapp/participant/list.jsp
15,7 → 15,7
 
<body>
 
<h1>Пьянка XP - Участники пьянки "<bean:write name="event" property="name" />"</h1>
<%@ include file="/header.jsp" %>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
56,8 → 56,7
<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>
<%@ include file="/footer.jsp" %>
 
</body>
 
/kickup/trunk/webapp/style/general.css
3,12 → 3,12
h2 { font-weight: bold; font-size: 12pt; color: #5A2A9C; }
.smallHeader { font-weight: bold; font-size: 12pt; color: #5A2A9C; margin-top: 1em; }
.subHeader { font-weight: bold; font-size: 10pt; color: #5A2A9C; background-color: #EDD9F1; }
.standardCell { background-color: white; }
th { text-align: left; font-size: 10pt; vertical-align: top; }
td { text-align: left; font-size: 10pt; vertical-align: top; }
.even { background-color: #E0D3F1; }
.odd { background-color: #EDD9F1; }
 
.listCell { border-bottom: 1px solid #C0C0C0; }
.headerCell { border-bottom: 1px solid black; }
.error { color: red; }
 
.payedNull { background-color: white; }
23,5 → 23,5
.eventPlace { font-weight: bold; margin:4px; }
.eventAddress { margin:4px; }
.eventAdmins { font-weight: bold; }
.actParticipants { font-size: 10pt; text-decoration: none; }
.actParticipants { font-size: 8pt; text-decoration: none; }
 
/kickup/trunk/webapp/event/show.jsp
15,54 → 15,7
 
<body>
 
<!-- header begin -->
<table border=0>
<tr>
<td valign=top>
<div class="eventName"><bean:write name="event" property="name" /></div>
</td>
<td valign=top>
<div class="eventDate" style="text-align: right; ">
<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>
</div>
<div class="eventPlace" style="text-align: right; ">
<bean:write name="event" property="place" />
</div>
</td>
</tr>
<tr>
<td valign=bottom>
Уже зарегистрированно <span class="personCount"><bean:write name="event" property="personCount" /></span> участников
</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>
</logic:equal>
</td>
</tr>
<tr>
<td colspan=2>&nbsp;</td>
</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>
</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>
</td>
</tr>
<tr>
<td colspan=2><img src="<strutsx:root />/images/line.gif" alt=""></td>
</tr>
</table>
<!-- header end -->
<%@ include file="/header.jsp" %>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
100,31 → 53,7
</logic:notEmpty>
</p>
 
<!-- footer begin -->
<table border=0>
<tr>
<td colspan=2><img src="<strutsx:root />/images/line.gif" alt=""></td>
</tr>
<tr>
<td>По всем вопросам обращайтесь к организаторам: <span class="eventAdmins"><bean:write name="event" property="admins" /></span></td>
<td align=right valign=top style="text-align: right; ">
<html:link page="/admin"><img src="<strutsx:root />/images/admin.gif" alt="Администрирование" border=0></html:link>
</td>
</tr>
<tr>
<td>Контактный e-mail: <a href="mailto:<bean:write name="event" property="email" />"><bean:write name="event" property="email" /></a></td>
<td align=right valign=top style="text-align: right; ">
<html:link page="/"><img src="<strutsx:root />/images/list.gif" alt="Администрирование" border=0></html:link>
</td>
<tr>
<logic:notEmpty name="event" property="phones" >
<tr>
<td>Телефоны: <bean:write name="event" property="phones" /></td>
<td align=right valign=top>&nbsp;</td>
<tr>
</logic:notEmpty>
</table>
<!-- footer end -->
<%@ include file="/footer.jsp" %>
 
</body>
 
/kickup/trunk/webapp/header.jsp
0,0 → 1,49
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!-- header begin -->
<table border=0>
<tr>
<td valign=top>
<div class="eventName"><bean:write name="event" property="name" /></div>
</td>
<td valign=top>
<div class="eventDate" style="text-align: right; ">
<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>
</div>
<div class="eventPlace" style="text-align: right; ">
<bean:write name="event" property="place" />
</div>
</td>
</tr>
<tr>
<td valign=bottom>
Уже зарегистрированно <span class="personCount"><bean:write name="event" property="personCount" /></span> участников
</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>
</logic:equal>
</td>
</tr>
<tr>
<td colspan=2>&nbsp;</td>
</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>
</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>
</td>
</tr>
<tr>
<td colspan=2><img src="<strutsx:root />/images/line.gif" alt=""></td>
</tr>
</table>
<!-- header end -->
/kickup/trunk/webapp/images/line.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/kickup/trunk/src/ak/kickup/core/mail/Messages.java
17,7 → 17,7
public abstract class Messages
{
public static final String HOST = "localhost";
public static final String CHARSET = "UTF8";
public static final String CHARSET = "UTF-8";
 
public static void send(String from, String to, String subject, String body)
throws UserException