WebSVN – general – Path Comparison – / – /kickup/ Rev 975 and /kickup/ Rev 976

Ignore whitespace Rev 975 → Rev 976

/kickup/trunk/webapp/WEB-INF/struts-config.xml
237,6 → 237,7
scope="request"
input="/participant/register.jsp"
>
<forward name="default" path="/participant/registered.jsp" />
</action>

<action
271,6 → 272,7
scope="request"
input="/participant/edit.jsp"
>
<forward name="default" path="/participant/updated.jsp" />
</action>

<action

 /kickup/trunk/webapp/WEB-INF/validation.xml
 ,7 → 133,7
                         <field property="freeSleep" depends="integer">
                                 <msg name="integer" key="ak.kickup.core.participant.edit.freesleep.wrong" />
                         </field>
-                        <field property="price" depends="currency">
+                        <field property="payed" depends="currency">
                                 <msg name="currency" key="ak.kickup.core.participant.edit.payed.wrong" />
                         </field>
                 </form>

/kickup/trunk/webapp/act/list.jsp
2,7 → 2,6
<%@ 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>

 /kickup/trunk/webapp/admin/participant/list.jsp
 ,7 → 99,7
                 <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>
+                        <kickup:link action="/admin/participant/edit" paramId="id" paramName="p" paramProperty="id" paramId2="event" paramName2="event" paramProperty2="id" backpath="true"><img src="<strutsx:root />/images/edit.gif" alt="Редактировать" border=0></kickup:link>
                 </td>
                 <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>

/kickup/trunk/webapp/apartment/list.jsp
2,7 → 2,6
<%@ 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>

/kickup/trunk/webapp/transport/list.jsp
2,7 → 2,6
<%@ 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>

/kickup/trunk/webapp/participant/ident.jsp
2,7 → 2,6
<%@ 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>

36,7 → 35,6
<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>
56,7 → 54,6

<logic:equal name="event" property="unregistrationAvailable" value="true">
<html:form action="/participant/unregister" onsubmit="return confirmUnregister();">
<backpath:current />
<input type=hidden name="event" value="<bean:write name="event" property="id" />">
<table border=0 cellspacing=0 cellpadding=4 width=500>
<tr>
80,7 → 77,6
<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>
94,7 → 90,7
<td><html:text property="ident" style="width:240px" maxlength="10" /></td>
</tr>
<tr>
<td colspan=2><html:submit>Выслать</html:submit></td>
<td colspan=2><html:submit>Выслать номер</html:submit></td>
</tr>
<tr>
<td colspan=2> </td>

/kickup/trunk/webapp/participant/register.jsp
2,7 → 2,6
<%@ 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>

28,7 → 27,6
</strutsx:notEmpty>

<html:form action="/participant/submit">
<backpath:current />
<html:hidden property="event" />

<table border=0 cellspacing=0 cellpadding=4 width=860>

/kickup/trunk/webapp/participant/edit.jsp
2,7 → 2,6
<%@ 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>

28,7 → 27,6
</strutsx:notEmpty>

<html:form action="/participant/update">
<backpath:current />
<html:hidden property="event" />
<html:hidden property="ident" />

 /kickup/trunk/webapp/participant/updated.jsp
 ,0 → 1,35
+ï»¿<%@ 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-strutsx.tld"       prefix="strutsx"  %>
+<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>
+<%@ include file="/header.jsp" %>
+<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>
+<%@ include file="/footer.jsp" %>
+</body>
+</html>

/kickup/trunk/webapp/participant/list.jsp
2,7 → 2,6
<%@ 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>

 /kickup/trunk/webapp/participant/registered.jsp
 ,0 → 1,38
+ï»¿<%@ 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-strutsx.tld"       prefix="strutsx"  %>
+<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>
+<%@ include file="/header.jsp" %>
+<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>Ваш регистрационный номер <span class="important"><bean:write name="participant" property="ident" /></span></p>
+<p>Номер счета выслан на адрес <span class="important"><bean:write name="participant" property="email" /></span></p>
+<%@ include file="/footer.jsp" %>
+</body>
+</html>

 /kickup/trunk/webapp/participant/unregistered.jsp
 ,7 → 2,6
 <%@ 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>
 ,7 → 26,7
         </div>
 </strutsx:notEmpty>
-<h2>Ваши данные удалены.</h2>
+<h2>Ваши данные удалены</h2>
 <%@ include file="/footer.jsp" %>

/kickup/trunk/webapp/style/general.css
20,6 → 20,7
.payedMore { background-color: #E476F8; }

.eventName { font-weight: bold; font-size: 16pt; }
.important { font-weight: bold; }
.personCount { font-weight: bold; }
.eventDate { font-weight: bold; margin:4px; }
.eventPlace { font-weight: bold; margin:4px; }

 /kickup/trunk/webapp/event/list.jsp
 ,7 → 2,6
 <%@ 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>
 ,8 → 53,6
 </logic:iterate>
 </table>
-<p><backpath:notEmpty><backpath:backlink>Назад</backpath:backlink></backpath:notEmpty></p>
 <p><html:link page="/admin">Администрирование</html:link></<>
 </body>

/kickup/trunk/webapp/event/show.jsp
2,7 → 2,6
<%@ 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>

 /kickup/trunk/src/ak/kickup/core/action/ParticipantAction.java
 ,7 → 18,6
 import ak.strutsx.RequestUtilsX;
 import ak.strutsx.ErrorHandlerX;
-import ak.backpath.BackPath;
 import ak.kickup.util.StringConverter;
 import ak.kickup.util.UserException;
 ,7 → 54,7
                 if("update".equals(mapping.getParameter())) {
                         DynaActionForm theForm = (DynaActionForm)form;
-                        String         ident   = (String)theForm.get("ident");
+                        String         ident   = ((String)theForm.get("ident")).trim();
                         request.setAttribute("participant",
                                 (ident == null) ? null : ParticipantManager.getInstance().findForIdent(ident));
         }
 ,14 → 244,15
                         throw ex;
             }
-                        response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl());
-                        return null;
+                        request.setAttribute("event",       event);
+                        request.setAttribute("participant", participant);
+                        return mapping.findForward("default");
                 }
                 else if("update".equals(mapping.getParameter())) {
                         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);
                         if(participant == null) {
 ,8 → 299,9
                         ParticipantManager.getInstance().save(participant);
-                        response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl());
-                        return null;
+                        request.setAttribute("event",       event);
+                        request.setAttribute("participant", participant);
+                        return mapping.findForward("default");
                 }
                 else {
                         throw new Exception("unknown mapping parameter");

/kickup/trunk/src/ak/kickup/core/action/EventAction.java
18,7 → 18,6

import ak.strutsx.RequestUtilsX;
import ak.strutsx.ErrorHandlerX;
import ak.backpath.BackPath;

import ak.kickup.util.StringConverter;
import ak.kickup.util.UserException;

/kickup/trunk/src/ak/kickup/core/action/ActAction.java
18,7 → 18,6

import ak.strutsx.RequestUtilsX;
import ak.strutsx.ErrorHandlerX;
import ak.backpath.BackPath;

import ak.kickup.util.StringConverter;
import ak.kickup.util.UserException;

 /kickup/trunk/src/ak/kickup/core/mail/Messages.java
 ,7 → 17,7
 public abstract class Messages
 {
         public static final String HOST    = "localhost";
-        public static final String CHARSET = "UTF-8";
+        public static final String CHARSET = "windows-1251";
         public static void send(String from, String to, String subject, String body)
                 throws UserException

Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 975 → Rev 976