Subversion Repositories general

Compare Revisions

Regard whitespace Rev 958 → Rev 957

/sun/hostadmiral/trunk/webapp/style/general.css
File deleted
/sun/hostadmiral/trunk/webapp/WEB-INF/ak-strutsx.tld
File deleted
/sun/hostadmiral/trunk/webapp/WEB-INF/struts-config.xml
7,7 → 7,7
<struts-config>
<form-beans>
<form-bean
name="LoginForm"
name="ak.hostadmiral.core.form.LoginForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="login" type="java.lang.String" />
<form-property name="password" type="java.lang.String" />
14,7 → 14,7
</form-bean>
 
<form-bean
name="ChangePasswordForm"
name="ak.hostadmiral.core.form.ChangePasswordForm"
type="ak.hostadmiral.core.form.UserPasswordForm">
<form-property name="oldpassword" type="java.lang.String" />
<form-property name="password" type="java.lang.String" />
22,19 → 22,19
</form-bean>
 
<form-bean
name="UserForm"
name="ak.hostadmiral.core.form.UserForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="UserLoginsForm"
name="ak.hostadmiral.core.form.UserLoginsForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="UserEditForm"
name="ak.hostadmiral.core.form.UserEditForm"
type="ak.hostadmiral.core.form.UserPasswordForm">
<form-property name="id" type="java.lang.String" />
<form-property name="login" type="java.lang.String" />
48,7 → 48,7
</form-bean>
 
<form-bean
name="UserPartEditForm"
name="ak.hostadmiral.core.form.UserPartEditForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
<form-property name="locale" type="java.lang.String" />
55,13 → 55,13
</form-bean>
 
<form-bean
name="SystemUserForm"
name="ak.hostadmiral.core.form.SystemUserForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="SystemUserEditForm"
name="ak.hostadmiral.core.form.SystemUserEditForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
<form-property name="uid" type="java.lang.String" />
72,13 → 72,13
</form-bean>
 
<form-bean
name="InetDomainForm"
name="ak.hostadmiral.core.form.InetDomainForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="InetDomainEditForm"
name="ak.hostadmiral.core.form.InetDomainEditForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
<form-property name="name" type="java.lang.String" />
88,13 → 88,13
</form-bean>
 
<form-bean
name="MailboxForm"
name="ak.hostadmiral.core.form.MailboxForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="MailboxEditForm"
name="ak.hostadmiral.core.form.MailboxEditForm"
type="ak.hostadmiral.core.form.UserPasswordForm">
<form-property name="id" type="java.lang.String" />
<form-property name="login" type="java.lang.String" />
110,13 → 110,13
</form-bean>
 
<form-bean
name="MailAliasForm"
name="ak.hostadmiral.core.form.MailAliasForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="MailAliasEditForm"
name="ak.hostadmiral.core.form.MailAliasEditForm"
type="ak.strutsx.ResizeableDynaValidatorForm">
<form-property name="id" type="java.lang.String" />
<form-property name="address" type="java.lang.String" />
168,7 → 168,7
<action
path="/system/login/submit"
type="ak.hostadmiral.core.action.LoginAction"
name="LoginForm"
name="ak.hostadmiral.core.form.LoginForm"
validate="true"
scope="request"
input="/system/login.jsp"
197,7 → 197,7
path="/user/password/submit"
type="ak.hostadmiral.core.action.ChangePasswordAction"
parameter="submit"
name="ChangePasswordForm"
name="ak.hostadmiral.core.form.ChangePasswordForm"
validate="true"
scope="request"
input="/user/password/change.jsp"
207,7 → 207,7
<action
path="/user/logins"
type="ak.hostadmiral.core.action.UserLoginsAction"
name="UserLoginsForm"
name="ak.hostadmiral.core.form.UserLoginsForm"
validate="true"
scope="request"
>
233,7 → 233,7
path="/user/deleting"
type="ak.hostadmiral.core.action.UserAction"
parameter="deleting"
name="UserForm"
name="ak.hostadmiral.core.form.UserForm"
validate="true"
scope="request"
>
244,7 → 244,7
path="/user/delete"
type="ak.hostadmiral.core.action.UserAction"
parameter="delete"
name="UserForm"
name="ak.hostadmiral.core.form.UserForm"
validate="true"
scope="request"
>
254,7 → 254,7
path="/user/edit"
type="ak.hostadmiral.core.action.UserAction"
parameter="edit"
name="UserForm"
name="ak.hostadmiral.core.form.UserForm"
validate="true"
scope="request"
>
266,7 → 266,7
path="/user/submit"
type="ak.hostadmiral.core.action.UserAction"
parameter="submit"
name="UserEditForm"
name="ak.hostadmiral.core.form.UserEditForm"
validate="true"
scope="request"
input="/user/edit.jsp"
277,7 → 277,7
path="/user/partedit"
type="ak.hostadmiral.core.action.UserAction"
parameter="partedit"
name="UserForm"
name="ak.hostadmiral.core.form.UserForm"
validate="true"
scope="request"
>
288,7 → 288,7
path="/user/partsubmit"
type="ak.hostadmiral.core.action.UserAction"
parameter="partsubmit"
name="UserPartEditForm"
name="ak.hostadmiral.core.form.UserPartEditForm"
validate="true"
scope="request"
input="/user/partedit.jsp"
309,7 → 309,7
path="/user/system/delete"
type="ak.hostadmiral.core.action.SystemUserAction"
parameter="delete"
name="SystemUserForm"
name="ak.hostadmiral.core.form.SystemUserForm"
validate="true"
scope="request"
>
319,7 → 319,7
path="/user/system/edit"
type="ak.hostadmiral.core.action.SystemUserAction"
parameter="edit"
name="SystemUserForm"
name="ak.hostadmiral.core.form.SystemUserForm"
validate="true"
scope="request"
>
331,7 → 331,7
path="/user/system/submit"
type="ak.hostadmiral.core.action.SystemUserAction"
parameter="submit"
name="SystemUserEditForm"
name="ak.hostadmiral.core.form.SystemUserEditForm"
validate="true"
scope="request"
input="/user/system/edit.jsp"
352,7 → 352,7
path="/domain/delete"
type="ak.hostadmiral.core.action.InetDomainAction"
parameter="delete"
name="InetDomainForm"
name="ak.hostadmiral.core.form.InetDomainForm"
validate="true"
scope="request"
>
362,7 → 362,7
path="/domain/edit"
type="ak.hostadmiral.core.action.InetDomainAction"
parameter="edit"
name="InetDomainForm"
name="ak.hostadmiral.core.form.InetDomainForm"
validate="true"
scope="request"
>
374,7 → 374,7
path="/domain/submit"
type="ak.hostadmiral.core.action.InetDomainAction"
parameter="submit"
name="InetDomainEditForm"
name="ak.hostadmiral.core.form.InetDomainEditForm"
validate="true"
scope="request"
input="/domain/edit.jsp"
395,7 → 395,7
path="/mail/box/delete"
type="ak.hostadmiral.core.action.MailboxAction"
parameter="delete"
name="MailboxForm"
name="ak.hostadmiral.core.form.MailboxForm"
validate="true"
scope="request"
>
405,7 → 405,7
path="/mail/box/edit"
type="ak.hostadmiral.core.action.MailboxAction"
parameter="edit"
name="MailboxForm"
name="ak.hostadmiral.core.form.MailboxForm"
validate="true"
scope="request"
>
417,7 → 417,7
path="/mail/box/submit"
type="ak.hostadmiral.core.action.MailboxAction"
parameter="submit"
name="MailboxEditForm"
name="ak.hostadmiral.core.form.MailboxEditForm"
validate="true"
scope="request"
input="/mail/box/edit.jsp"
438,7 → 438,7
path="/mail/alias/delete"
type="ak.hostadmiral.core.action.MailAliasAction"
parameter="delete"
name="MailAliasForm"
name="ak.hostadmiral.core.form.MailAliasForm"
validate="true"
scope="request"
>
448,7 → 448,7
path="/mail/alias/edit"
type="ak.hostadmiral.core.action.MailAliasAction"
parameter="edit"
name="MailAliasForm"
name="ak.hostadmiral.core.form.MailAliasForm"
validate="true"
scope="request"
>
461,7 → 461,7
path="/mail/alias/submit"
type="ak.hostadmiral.core.action.MailAliasAction"
parameter="submit"
name="MailAliasEditForm"
name="ak.hostadmiral.core.form.MailAliasEditForm"
validate="true"
scope="request"
input="/mail/alias/edit.do"
/sun/hostadmiral/trunk/webapp/WEB-INF/validation.xml
9,7 → 9,7
</global>
 
<formset>
<form name="LoginForm">
<form name="ak.hostadmiral.core.form.LoginForm">
<field property="login" depends="required">
<msg name="required" key="ak.hostadmiral.core.login.required" />
</field>
18,7 → 18,7
</field>
</form>
 
<form name="ChangePasswordForm">
<form name="ak.hostadmiral.core.form.ChangePasswordForm">
<field property="oldpassword" depends="required">
<msg name="required" key="ak.hostadmiral.core.oldpassword.required" />
</field>
30,13 → 30,13
</field>
</form>
 
<form name="UserForm">
<form name="ak.hostadmiral.core.form.UserForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.user.id.wrong" />
</field>
</form>
 
<form name="UserLoginsForm">
<form name="ak.hostadmiral.core.form.UserLoginsForm">
<field property="id" depends="required,long">
<msg name="required" key="ak.hostadmiral.core.user.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.user.id.wrong" />
43,7 → 43,7
</field>
</form>
 
<form name="UserEditForm">
<form name="ak.hostadmiral.core.form.UserEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.user.id.wrong" />
</field>
58,7 → 58,7
</field>
</form>
 
<form name="UserPartEditForm">
<form name="ak.hostadmiral.core.form.UserPartEditForm">
<field property="id" depends="long,required">
<msg name="required" key="ak.hostadmiral.core.user.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.user.id.wrong" />
68,13 → 68,13
</field>
</form>
 
<form name="SystemUserForm">
<form name="ak.hostadmiral.core.form.SystemUserForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.user.system.edit.id.wrong" />
</field>
</form>
 
<form name="SystemUserEditForm">
<form name="ak.hostadmiral.core.form.SystemUserEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.user.system.edit.id.wrong" />
</field>
90,13 → 90,13
</field>
</form>
 
<form name="InetDomainForm">
<form name="ak.hostadmiral.core.form.InetDomainForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.domain.edit.id.wrong" />
</field>
</form>
 
<form name="InetDomainEditForm">
<form name="ak.hostadmiral.core.form.InetDomainEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.domain.edit.id.wrong" />
</field>
109,13 → 109,13
</field>
</form>
 
<form name="MailboxForm">
<form name="ak.hostadmiral.core.form.MailboxForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.mailbox.edit.id.wrong" />
</field>
</form>
 
<form name="MailboxEditForm">
<form name="ak.hostadmiral.core.form.MailboxEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.mailbox.edit.id.wrong" />
</field>
135,13 → 135,13
</field>
</form>
 
<form name="MailAliasForm">
<form name="ak.hostadmiral.core.form.MailAliasForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.mail.alias.edit.id.wrong" />
</field>
</form>
 
<form name="MailAliasEditForm">
<form name="ak.hostadmiral.core.form.MailAliasEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostadmiral.core.mail.alias.edit.id.wrong" />
</field>
/sun/hostadmiral/trunk/webapp/index.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.index.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
/sun/hostadmiral/trunk/webapp/user/edit.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.edit.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.edit.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<html:form action="/user/submit">
<backpath:current />
/sun/hostadmiral/trunk/webapp/user/list.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.list.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.list.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/user/partedit.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.partedit.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.partedit.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<html:form action="/user/partsubmit">
<backpath:current />
/sun/hostadmiral/trunk/webapp/user/view.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.view.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.view.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/user/logins.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.logins.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.logins.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<p>
<bean:message key="ak.hostadmiral.page.user.logins.login" />
/sun/hostadmiral/trunk/webapp/user/failedLogins.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.failedLogins.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.failedLogins.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/user/system/list.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.system.list.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.system.list.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/user/system/edit.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.system.edit.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.system.edit.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<html:form action="/user/system/submit">
<backpath:current />
/sun/hostadmiral/trunk/webapp/user/system/view.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.system.view.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.system.view.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/user/password/change.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.user.password.change.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.user.password.change.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<html:form action="/user/password/submit" focus="oldpassword">
<backpath:current/>
/sun/hostadmiral/trunk/webapp/deleting.jsp
1,10 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ page import="java.util.*,ak.hostadmiral.core.model.*" %>
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
11,7 → 10,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.index.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
20,6 → 18,7
 
<p>Object: <bean:write name="object" property="identKey" /></p>
<p>Action: <bean:write name="action" /></p>
<p>Cascade: <bean:write name="cascade" /></p>
 
<ul>
<%
29,20 → 28,7
CascadeDeleteElement e = (CascadeDeleteElement)i.next();
pageContext.setAttribute("e", e);
 
%><li>
<logic:equal name="e" property="effect" value="1">
FORBIDDEN
</logic:equal>
<logic:equal name="e" property="effect" value="2">
delete
</logic:equal>
<logic:equal name="e" property="effect" value="3">
change
</logic:equal>
<strutsx:message name="e" property="object.typeKey" />
<em><strutsx:message name="e" property="object.identKey" valuesProperty="object.identParams" /></em>
<bean:write name="e" property="cascade" />
</li><%
%><li><bean:write name="e" property="object.identKey" /></li><%
}
%>
</ul>
/sun/hostadmiral/trunk/webapp/generalError.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.generalError.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
/sun/hostadmiral/trunk/webapp/mail/box/edit.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.mail.box.edit.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.mail.box.edit.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<html:form action="/mail/box/submit">
<backpath:current />
/sun/hostadmiral/trunk/webapp/mail/box/view.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.mail.box.view.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.mail.box.view.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/mail/box/list.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.mail.box.list.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.mail.box.list.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/mail/alias/list.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.mail.alias.list.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.mail.alias.list.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/mail/alias/edit.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.mail.alias.edit.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
<script>
function submitForm()
{
63,16 → 61,7
 
<h1><bean:message key="ak.hostadmiral.page.mail.alias.edit.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<html:form action="/mail/alias/submit" onsubmit="submitForm()">
<backpath:current/>
133,7 → 122,7
<th>&nbsp;</th>
</tr>
 
<logic:iterate name="MailAliasEditForm" property="dests" id="dests" indexId="iid">
<logic:iterate name="ak.hostadmiral.core.form.MailAliasEditForm" property="dests" id="dests" indexId="iid">
<tr>
<td>
<html:hidden name="dests" property="id" indexed="true" />
/sun/hostadmiral/trunk/webapp/mail/alias/editdests.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.mail.alias.editdest.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
<script>
function submitForm()
{
63,16 → 61,7
 
<h1><bean:message key="ak.hostadmiral.page.mail.alias.editdest.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<html:form action="/mail/alias/submit" onsubmit="submitForm()">
<backpath:current/>
130,7 → 119,7
<th>&nbsp;</th>
</tr>
 
<logic:iterate name="MailAliasEditForm" property="dests" id="dests" indexId="iid">
<logic:iterate name="ak.hostadmiral.core.form.MailAliasEditForm" property="dests" id="dests" indexId="iid">
<tr>
<td>
<html:hidden name="dests" property="id" indexed="true" />
/sun/hostadmiral/trunk/webapp/mail/alias/view.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.mail.alias.view.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
19,16 → 17,7
 
<h2>FIXME: NOT IMPLEMENTED. DO WE REALLY NEED IT?</h2>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
</tr>
/sun/hostadmiral/trunk/webapp/error.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.error.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.error.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<br>
<backpath:backlink><bean:message key="ak.hostadmiral.page.error.back" /></backpath:backlink>
/sun/hostadmiral/trunk/webapp/system/general.css
File deleted
/sun/hostadmiral/trunk/webapp/system/login.jsp
1,9 → 1,8
<%@ 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" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/ak-strutsx.tld" prefix="strutsx" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.system.login.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/system/general.css">
</head>
 
<body>
17,18 → 15,9
 
<h1><bean:message key="ak.hostadmiral.page.system.login.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<html:form action="/system/login/submit" focus="login" onsubmit="return validateLoginForm(this);">
<html:form action="/system/login/submit" focus="username">
<backpath:current />
<table border=1>
<tr>
62,8 → 51,6
</table>
</html:form>
 
<html:javascript formName="LoginForm" />
 
</body>
 
</html>
/sun/hostadmiral/trunk/webapp/system/logout.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.system.logout.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/system/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.system.logout.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<p><bean:message key="ak.hostadmiral.page.system.logout.message" /></p>
 
/sun/hostadmiral/trunk/webapp/domain/view.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.domain.view.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.domain.view.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/domain/list.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.domain.list.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.domain.list.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<table border=1>
<tr>
/sun/hostadmiral/trunk/webapp/domain/edit.jsp
3,7 → 3,6
<%@ 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/hostadmiral-core.tld" prefix="core" %>
<html>
 
10,7 → 9,6
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostadmiral.page.domain.edit.title" /></title>
<link rel="stylesheet" type="text/css" href="<strutsx:root />/style/general.css">
</head>
 
<body>
17,16 → 15,7
 
<h1><bean:message key="ak.hostadmiral.page.domain.edit.title" /></h1>
 
<strutsx:errorsIterator id="errors" />
<strutsx:notEmpty name="errors">
<div class="error"><bean:message key="ak.hostadmiral.page.general.errors" />:
<ul>
<logic:iterate name="errors" id="error">
<li><strutsx:message name="error" property="key" valuesProperty="values" /></li>
</logic:iterate>
</ul>
</div>
</strutsx:notEmpty>
<html:errors/>
 
<html:form action="/domain/submit">
<backpath:current />
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/CoreResources_ru.properties
File deleted
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/InetDomainAction.java
62,7 → 62,7
Long domainId = StringConverter.parseLong(theForm.get("id"));
InetDomain domain;
DynaActionForm showForm = (DynaActionForm)RequestUtilsX.populateActionForm(
this, request, "InetDomainEditForm");
this, request, "ak.hostadmiral.core.form.InetDomainEditForm");
 
if(domainId == null) {
domain = InetDomainManager.getInstance().create(user);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/MailboxAction.java
63,7 → 63,7
Long boxId = StringConverter.parseLong(theForm.get("id"));
Mailbox mailbox;
DynaActionForm showForm = (DynaActionForm)RequestUtilsX.populateActionForm(
this, request, "MailboxEditForm");
this, request, "ak.hostadmiral.core.form.MailboxEditForm");
 
if(boxId == null) {
mailbox = MailboxManager.getInstance().create(user);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/MailAliasAction.java
72,7 → 72,7
List dests;
 
DynaActionForm showForm = (DynaActionForm)RequestUtilsX.populateActionForm(
this, request, "MailAliasEditForm");
this, request, "ak.hostadmiral.core.form.MailAliasEditForm");
 
if(aliasId == null) {
alias = MailAliasManager.getInstance().create(user);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/UserAction.java
77,7 → 77,7
Long userId = StringConverter.parseLong(theForm.get("id"));
User u;
DynaActionForm showForm = (DynaActionForm)RequestUtilsX.populateActionForm(
this, request, "UserEditForm");
this, request, "ak.hostadmiral.core.form.UserEditForm");
 
if(userId == null) {
u = UserManager.getInstance().create(user);
106,7 → 106,7
Long userId = StringConverter.parseLong(theForm.get("id"));
User u = UserManager.getInstance().get(user, userId);
DynaActionForm showForm = (DynaActionForm)RequestUtilsX.populateActionForm(
this, request, "UserPartEditForm");
this, request, "ak.hostadmiral.core.form.UserPartEditForm");
 
showForm.set("locale", u.getLocale().toString());
initUserList(request, user);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/SystemUserAction.java
62,7 → 62,7
Long userId = StringConverter.parseLong(theForm.get("id"));
SystemUser u;
DynaActionForm showForm = (DynaActionForm)RequestUtilsX.populateActionForm(
this, request, "SystemUserEditForm");
this, request, "ak.hostadmiral.core.form.SystemUserEditForm");
 
if(userId == null) {
u = SystemUserManager.getInstance().create(user);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/CoreResources.properties
57,8 → 57,6
 
ak.hostadmiral.core.mail.alias.edit.id.wrong=Please select an alias from the list
 
ak.hostadmiral.page.general.errors=There are errors in you input
 
ak.hostadmiral.page.error.title=Host Admiral - error
ak.hostadmiral.page.error.back=back
 
341,5 → 339,3
ak.hostadmiral.page.mail.alias.view.header.comment=Comment
ak.hostadmiral.page.mail.alias.view.external=external redirect
ak.hostadmiral.page.mail.alias.view.back=back
 
org.apache.struts.taglib.bean.format.sql.timestamp=dd-MM-yyyy HH:mm:ss.SSS
/sun/hostadmiral/trunk/src/ak/strutsx/taglib/RootTag.java
File deleted
/sun/hostadmiral/trunk/src/ak/strutsx/taglib/MessageTag.java
File deleted
/sun/hostadmiral/trunk/src/ak/strutsx/taglib/ErrorsIteratorTag.java
File deleted
/sun/hostadmiral/trunk/src/ak/strutsx/taglib/EmptyTag.java
File deleted
/sun/hostadmiral/trunk/src/ak/strutsx/taglib/NotEmptyTag.java
File deleted
/sun/hostadmiral/trunk/doc/todo.txt
33,7 → 33,7
Different user name schemes, not only user@domain. Define an interface to allow admin
implement an own one. Implement a few common ones.
 
+ Taglig to show ActionMessages in right way (add it to the StrutsX project).
Taglig to show ActionMessages in right way (add it to the StrutsX project).
 
Allow to use existing system users: enter uid or name only, check in system for full
information.
/sun/hostadmiral/trunk/build.xml
76,6 → 76,11
 
<copy todir="${classes.deploy}">
<fileset
dir="${src}"
includes="**/*.properties"
excludes="**/*_*.properties"
/>
<fileset
dir="${classes}"
includes="**/*.xml"
/>
88,13 → 93,24
/>
</copy>
 
<delete>
<fileset dir="${classes.deploy}" includes="**/*_*.properties" />
</delete>
 
<native2ascii
encoding="UTF8"
encoding="Cp1251"
src="${src}"
dest="${classes.deploy}"
includes="**/*.properties"
includes="**/*_ru.properties"
/>
 
<native2ascii
encoding="ISO8859_1"
src="${src}"
dest="${classes.deploy}"
includes="**/*_de.properties"
/>
 
<copy todir="${classes.deploy}" file="${conf}/log4j.properties" />
<copy todir="${classes.deploy}" file="${conf}/hibernate.cfg.xml" />