Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 9 → Rev 10

/it-ru/trunk/webapp/generalError.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" %>
8,15 → 8,16
 
<head>
<meta http-equiv="expires" content="0">
<title>Error</title>
<title>Пьянка XP - Ошибки</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Error</h1>
<h1>Пьянка XP - Ошибки</h1>
 
<p>There is a general error occured. Please go <backpath:backlink>back</backpath:backlink> and try again.</p>
<p>Ошибка сервера. То, что вы ищете - не найдено, или то, что вы хотите сделать - не делается.
<backpath:backlink>Попробуйте еще раз</backpath:backlink> и сообщите нам, если все равно не работает.</p>
 
</body>
 
/it-ru/trunk/webapp/error.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" %>
9,17 → 9,17
 
<head>
<meta http-equiv="expires" content="0">
<title>Error</title>
<title>Пьянка XP - Ошибки</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Error</h1>
<h1>Пьянка XP - Ошибки</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">There are some errors occured
<div class="error">
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
29,7 → 29,7
</strutsx:notEmpty>
 
<br>
<backpath:backlink>back</backpath:backlink>
<backpath:backlink>Назад</backpath:backlink>
 
</body>
 
/it-ru/trunk/webapp/admin/act/edit.jsp
8,17 → 8,17
 
<head>
<meta http-equiv="expires" content="0">
<title>Edit act</title>
<title>Пьянка XP - Администрирование - Редактирование мероприятия</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Edit act</h1>
<h1>Пьянка XP - Администрирование - Редактирование мероприятия</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Errors in input:
<div class="error">Ошибки:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
33,17 → 33,17
 
<table border=1>
<tr>
<th>Name</th>
<th>Название</th>
<td><html:text property="name" /></td>
</tr>
<tr>
<th>Comment</th>
<th>Описание</th>
<td><html:textarea property="comment" /></td>
</tr>
<tr>
<td colspan=2>
<html:submit>Submit</html:submit>
<backpath:backlink>Back</backpath:backlink>
<html:submit>Сохранить</html:submit>
<backpath:backlink>Отменить</backpath:backlink>
</td>
</tr>
</table>
/it-ru/trunk/webapp/admin/act/list.jsp
8,17 → 8,17
 
<head>
<meta http-equiv="expires" content="0">
<title>Acts</title>
<title>Пьянка XP - Администрирование - Мероприятия</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Acts</h1>
<h1>Пьянка XP - Администрирование - Мероприятия</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Errors in input:
<div class="error">Ошибки:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
29,7 → 29,7
 
<table border=1>
<tr>
<th>Name</th>
<th>Название</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
38,18 → 38,18
<tr>
<td><bean:write name="a" property="name" /></td>
<td>
<backpath:link action="/admin/act/edit" paramId="id" paramName="a" paramProperty="id">edit</backpath:link>
<backpath:link action="/admin/act/edit" paramId="id" paramName="a" paramProperty="id">редактировать</backpath:link>
</td>
<td>
<backpath:link action="/admin/act/delete" paramId="id" paramName="a" paramProperty="id">delete</backpath:link>
<backpath:link action="/admin/act/delete" paramId="id" paramName="a" paramProperty="id">удалить</backpath:link>
</td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/admin/act/edit">Add new act</backpath:link>
<backpath:link action="/admin/act/edit">Добавить мероприятие</backpath:link>
<br>
<backpath:backlink>Back</backpath:backlink>
<backpath:backlink>Назад</backpath:backlink>
 
</body>
 
/it-ru/trunk/webapp/admin/apartment/edit.jsp
8,17 → 8,17
 
<head>
<meta http-equiv="expires" content="0">
<title>Edit apartment</title>
<title>Пьянка XP - Администрирование - Редактирование гостиницы</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Edit apartment</h1>
<h1>Пьянка XP - Администрирование - Редактирование гостиницы</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Errors in input:
<div class="error">Ошибки:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
33,29 → 33,29
 
<table border=1>
<tr>
<th>Name</th>
<th>Название</th>
<td><html:text property="name" /></td>
</tr>
<tr>
<th>Address</th>
<th>Адрес и телефоны</th>
<td><html:textarea property="address" /></td>
</tr>
<tr>
<th>Price</th>
<th>Цена ночевки на одного человека</th>
<td><html:text property="price" /></td>
</tr>
<tr>
<th>URL</th>
<th>URL домашней странички</th>
<td><html:text property="url" /></td>
</tr>
<tr>
<th>Comment</th>
<th>Описание</th>
<td><html:textarea property="comment" /></td>
</tr>
<tr>
<td colspan=2>
<html:submit>Submit</html:submit>
<backpath:backlink>Back</backpath:backlink>
<html:submit>Сохранить</html:submit>
<backpath:backlink>Отменить</backpath:backlink>
</td>
</tr>
</table>
/it-ru/trunk/webapp/admin/apartment/list.jsp
8,17 → 8,17
 
<head>
<meta http-equiv="expires" content="0">
<title>Apartments</title>
<title>Пьянка XP - Администрирование - Гостиницы</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Apartments</h1>
<h1>Пьянка XP - Администрирование - Гостиницы</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Errors in input:
<div class="error">Ошибки:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
29,7 → 29,7
 
<table border=1>
<tr>
<th>Name</th>
<th>Название</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
38,18 → 38,18
<tr>
<td><bean:write name="a" property="name" /></td>
<td>
<backpath:link action="/admin/apartment/edit" paramId="id" paramName="a" paramProperty="id">edit</backpath:link>
<backpath:link action="/admin/apartment/edit" paramId="id" paramName="a" paramProperty="id">редактировать</backpath:link>
</td>
<td>
<backpath:link action="/admin/apartment/delete" paramId="id" paramName="a" paramProperty="id">delete</backpath:link>
<backpath:link action="/admin/apartment/delete" paramId="id" paramName="a" paramProperty="id">удалить</backpath:link>
</td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/admin/apartment/edit">Add new apartment</backpath:link>
<backpath:link action="/admin/apartment/edit">Добавить гостиницу</backpath:link>
<br>
<backpath:backlink>Back</backpath:backlink>
<backpath:backlink>Назад</backpath:backlink>
 
</body>
 
/it-ru/trunk/webapp/admin/participant/edit.jsp
8,17 → 8,17
 
<head>
<meta http-equiv="expires" content="0">
<title>Edit participant</title>
<title>Пьянка XP - Администрирование - Участник пьянки "<bean:write name="event" property="name" />"</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Edit participant</h1>
<h1>Пьянка XP - Администрирование - Участник пьянки "<bean:write name="event" property="name" />"</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Errors in input:
<div class="error">Ошибки:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
34,77 → 34,77
 
<table border=1>
<tr>
<th>Ident</th>
<td><bean:write name="participant" property="ident" /></td>
<th>Кодовый номер</th>
<td><bean:write name="participant" property="ident" />&nbsp;</td>
</tr>
<tr>
<th>Nick</th>
<th>Ник</th>
<td><html:text property="nick" /></td>
</tr>
<tr>
<th>Email</th>
<th>e-mail</th>
<td><html:text property="email" /></td>
</tr>
<tr>
<th>Email is public</th>
<th>Показ e-mail разрешен</th>
<td colspan=3><html:checkbox property="emailPublic" /></td>
</tr>
<tr>
<th>Name</th>
<th>Имя</th>
<td><html:text property="name" /></td>
</tr>
<tr>
<th>Phone</th>
<th>Телефон</th>
<td><html:text property="phone" /></td>
</tr>
<tr>
<th>Persons</th>
<th>Количество человек</th>
<td><html:text property="persons" /></td>
</tr>
<tr>
<th>From ZIP</th>
<th>Выезд из PLZ</th>
<td><html:text property="fromZip" /></td>
</tr>
<tr>
<th>From city</th>
<th>Выезд из города</th>
<td><html:text property="fromCity" /></td>
</tr>
<tr>
<th>Departure</th>
<th>Время отправления</th>
<td><html:text property="departure" /></td>
</tr>
<tr>
<th>Free places in transport</th>
<th>Свободных мест в машине</th>
<td><html:text property="freeTransport" /></td>
</tr>
<tr>
<th>Comment to free places in transport</th>
<th>Условия транспортировки</th>
<td><html:textarea property="transportComment" /></td>
</tr>
<tr>
<th>Free places to sleep</th>
<th>Свободных спальных мест</th>
<td><html:text property="freeSleep" /></td>
</tr>
<tr>
<th>Comment to free places to sleep</th>
<th>Условия ночевки</th>
<td><html:textarea property="sleepComment" /></td>
</tr>
<tr>
<th>Comment</th>
<th>Дополнительная информация</th>
<td><html:textarea property="comment" /></td>
</tr>
<tr>
<th>Payed</th>
<th>Оплачено</th>
<td colspan=3><html:checkbox property="payed" /></td>
</tr>
<tr>
<th>Private comment</th>
<th>Комментарии организаторов</th>
<td><html:textarea property="privateComment" /></td>
</tr>
<tr>
<td colspan=2>
<html:submit>Submit</html:submit>
<backpath:backlink>Back</backpath:backlink>
<html:submit>Сохранить</html:submit>
<backpath:backlink>Отменить</backpath:backlink>
</td>
</tr>
</table>
/it-ru/trunk/webapp/admin/participant/list.jsp
9,17 → 9,17
 
<head>
<meta http-equiv="expires" content="0">
<title>Participants</title>
<title>Пьянка XP - Администрирование - Участники пьянки "<bean:write name="event" property="name" />"</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Participants of <bean:write name="event" property="name" /></h1>
<h1>Пьянка XP - Администрирование - Участники пьянки "<bean:write name="event" property="name" />"</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Errors in input:
<div class="error">Ошибки:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
30,12 → 30,12
 
<table border=1>
<tr>
<th>Ident</th>
<th>Nick</th>
<th>Email</th>
<th>Name</th>
<th>Persons</th>
<th>Payed</th>
<th>Кодовый номер</th>
<th>Ник</th>
<th>e-mail</th>
<th>Имя</th>
<th>Количество</th>
<th>Оплачено</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
48,22 → 48,22
<td><bean:write name="p" property="name" />&nbsp;</td>
<td><bean:write name="p" property="persons" />&nbsp;</td>
<td>
<logic:equal name="p" property="payed" value="true">x</logic:equal>
<logic:notEqual name="p" property="payed" value="true">&nbsp;</logic:notEqual>
<logic:equal name="p" property="payed" value="true">да</logic:equal>
<logic:notEqual name="p" property="payed" value="true">нет</logic:notEqual>
</td>
<td>
<itru:link action="/admin/participant/edit" paramId="id" paramName="p" paramProperty="id" paramId2="event" paramName2="event" paramProperty2="id">edit</itru:link>
<itru:link action="/admin/participant/edit" paramId="id" paramName="p" paramProperty="id" paramId2="event" paramName2="event" paramProperty2="id">редактировать</itru:link>
</td>
<td>
<backpath:link action="/admin/participant/delete" paramId="id" paramName="p" paramProperty="id">delete</backpath:link>
<backpath:link action="/admin/participant/delete" paramId="id" paramName="p" paramProperty="id">удалить</backpath:link>
</td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/admin/participant/edit" paramId="event" paramName="event" paramProperty="id">Add new participant</backpath:link>
<backpath:link action="/admin/participant/edit" paramId="event" paramName="event" paramProperty="id">Добавить участника</backpath:link>
<br>
<backpath:backlink>Back</backpath:backlink>
<backpath:backlink>Назад</backpath:backlink>
 
</body>
 
/it-ru/trunk/webapp/admin/event/edit.jsp
8,17 → 8,17
 
<head>
<meta http-equiv="expires" content="0">
<title>Edit event</title>
<title>Пьянка XP - Администрирование - Редактирование пьянки</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Edit event</h1>
<h1>Пьянка XP - Администрирование - Редактирование пьянки</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Errors in input:
<div class="error">Ошибки:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
33,61 → 33,61
 
<table border=1>
<tr>
<th>Name</th>
<th>Название</th>
<td colspan=3><html:text property="name" /></td>
</tr>
<tr>
<th>Place</th>
<th>Место/город</th>
<td colspan=3><html:text property="place" /></td>
</tr>
<tr>
<th>Address</th>
<th>Точный адрес</th>
<td colspan=3><html:textarea property="address" /></td>
</tr>
<tr>
<th>Transport Description</th>
<th>Описание проезда</th>
<td colspan=3><html:textarea property="transport" /></td>
</tr>
<tr>
<th>Start</th>
<th>Начало</th>
<td colspan=3><html:text property="start" /></td>
</tr>
<tr>
<th>Stop</th>
<th>Окончание</th>
<td colspan=3><html:text property="stop" /></td>
</tr>
<tr>
<th>Last registration</th>
<th>Дата окончания регистрации</th>
<td colspan=3><html:text property="lastreg" /></td>
</tr>
<tr>
<th>Last unregistration</th>
<th>Последний срок отказа</th>
<td colspan=3><html:text property="lastunreg" /></td>
</tr>
<tr>
<th>Price per person</th>
<th>Цена с человека</th>
<td colspan=3><html:text property="price" /></td>
</tr>
<tr>
<th>Account to transfer money</th>
<th>Счет для перевода денег</th>
<td colspan=3><html:textarea property="account" /></td>
</tr>
<tr>
<th>Enabled</th>
<th>Разрешить регистрацию</th>
<td colspan=3><html:checkbox property="enabled" /></td>
</tr>
<tr>
<th>Comment</th>
<th>Описание</th>
<td colspan=3><html:textarea property="comment" /></td>
</tr>
 
<tr>
<th colspan=4>Acts for the event</th>
<th colspan=4>Планируемые мероприятия</th>
</tr>
<tr>
<td>Name</td>
<td>Include</td>
<td>Comment</td>
<td>Название</td>
<td>Включить</td>
<td>Описание</td>
<td>&nbsp;</td>
</tr>
<logic:iterate name="EventEditForm" property="acts" id="acts" indexId="iid">
103,13 → 103,13
</logic:iterate>
 
<tr>
<th colspan=4>Apartment for the event</th>
<th colspan=4>Ближайшие гостиницы</th>
</tr>
<tr>
<td>Name</td>
<td>Include</td>
<td>Comment</td>
<td>Distance</td>
<td>Название</td>
<td>Включить</td>
<td>Описание</td>
<td>Расстояние до место (км)</td>
</tr>
<logic:iterate name="EventEditForm" property="apartments" id="apartments" indexId="iid2">
<tr>
125,8 → 125,8
 
<tr>
<td colspan=4>
<html:submit>Submit</html:submit>
<backpath:backlink>Back</backpath:backlink>
<html:submit>Сохранить</html:submit>
<backpath:backlink>Отменить</backpath:backlink>
</td>
</tr>
</table>
/it-ru/trunk/webapp/admin/event/list.jsp
8,17 → 8,17
 
<head>
<meta http-equiv="expires" content="0">
<title>Events</title>
<title>Пьянка XP - Администрирование - Пьянки</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Events</h1>
<h1>Пьянка XP - Администрирование - Пьянки</h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error">Errors in input:
<div class="error">Ошибки:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
29,11 → 29,11
 
<table border=1>
<tr>
<th>Name</th>
<th>Place</th>
<th>Start</th>
<th>Stop</th>
<th>Enabled</th>
<th>Название</th>
<th>Место/город</th>
<th>Начало</th>
<th>Окончание</th>
<th>Регистрация разрешена</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
46,25 → 46,25
<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="enabled" value="true">x</logic:equal>
<logic:notEqual name="e" property="enabled" value="true">&nbsp;</logic:notEqual>
<logic:equal name="e" property="enabled" value="true">да</logic:equal>
<logic:notEqual name="e" property="enabled" value="true">нет</logic:notEqual>
</td>
<td>
<backpath:link action="/admin/event/edit" paramId="id" paramName="e" paramProperty="id">edit</backpath:link>
<backpath:link action="/admin/event/edit" paramId="id" paramName="e" paramProperty="id">редактировать</backpath:link>
</td>
<td>
<backpath:link action="/admin/event/delete" paramId="id" paramName="e" paramProperty="id">delete</backpath:link>
<backpath:link action="/admin/event/delete" paramId="id" paramName="e" paramProperty="id">удалить</backpath:link>
</td>
<td>
<backpath:link action="/admin/participant/list" paramId="event" paramName="e" paramProperty="id">participants</backpath:link>
<backpath:link action="/admin/participant/list" paramId="event" paramName="e" paramProperty="id">участники</backpath:link>
</td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/admin/event/edit">Add new event</backpath:link>
<backpath:link action="/admin/event/edit">Добавить пьянку</backpath:link>
<br>
<backpath:backlink>Back</backpath:backlink>
<backpath:backlink>Назад</backpath:backlink>
 
</body>
 
/it-ru/trunk/webapp/admin/index.jsp
8,17 → 8,19
 
<head>
<meta http-equiv="expires" content="0">
<title>Administration</title>
<title>Пьянка XP - Администрирование</title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
 
<h1>Administration</h1>
<h1>Пьянка XP - Администрирование</h1>
 
<p><backpath:link action="/admin/act/list">Acts</backpath:link></p>
<p><backpath:link action="/admin/apartment/list">Apartments</backpath:link></p>
<p><backpath:link action="/admin/event/list">Events</backpath:link></p>
<ul>
<li><backpath:link action="/admin/act/list">Мероприятия</backpath:link></li>
<li><backpath:link action="/admin/apartment/list">Гостиницы</backpath:link></li>
<li><backpath:link action="/admin/event/list">Пьянки</backpath:link></li>
</ul>
 
</body>
 
/it-ru/trunk/sql/00.tables.sql
20,6 → 20,30
);
*/
 
create table acts
(
id integer not null,
name varchar(255) not null,
comment text,
mod_stamp timestamp,
 
constraint acts_prim primary key (id),
constraint acts_name unique(name)
);
 
create table apartments
(
id integer not null,
name varchar(255) not null,
address text,
price decimal,
url varchar(4000),
comment text,
mod_stamp timestamp,
 
constraint apartments_prim primary key (id)
);
 
create table events
(
id integer not null,
54,19 → 78,6
constraint event_files_prim primary key (id)
);
 
create table apartments
(
id integer not null,
name varchar(255) not null,
address text,
price decimal,
url varchar(4000),
comment text,
mod_stamp timestamp,
 
constraint apartments_prim primary key (id)
);
 
create table event_apartments
(
id integer not null,
79,17 → 90,6
constraint event_apartments_prim primary key (event, apartment)
);
 
create table acts
(
id integer not null,
name varchar(255) not null,
comment text,
mod_stamp timestamp,
 
constraint acts_prim primary key (id),
constraint acts_name unique(name)
);
 
create table event_acts
(
id integer not null,