Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 923 → Rev 924

/sun/hostcaptain/trunk/webapp/user/system/list.jsp
3,26 → 3,26
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.user.system.list.title" /></title>
<title><bean:message key="ak.hostadmiral.page.user.system.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.user.system.list.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.user.system.list.title" /></h1>
 
<html:errors/>
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.list.uid" /></th>
<th><bean:message key="ak.hostcaptain.page.user.system.list.name" /></th>
<th><bean:message key="ak.hostcaptain.page.user.system.list.owner" /></th>
<th><bean:message key="ak.hostcaptain.page.user.system.list.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.list.uid" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.list.name" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.list.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
45,11 → 45,11
</td>
<td>
<core:editable name="u">
<backpath:link action="/user/system/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.system.list.edit" /></backpath:link>
<backpath:link action="/user/system/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.system.list.edit" /></backpath:link>
</core:editable>
<core:notEditable name="u">
<core:viewable name="u">
<backpath:link action="/user/system/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.system.list.view" /></backpath:link>
<backpath:link action="/user/system/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.system.list.view" /></backpath:link>
</core:viewable>
<core:notViewable name="u">
&nbsp;
58,7 → 58,7
</td>
<td>
<core:deleteable name="u">
<backpath:link action="/user/system/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.system.list.delete" /></backpath:link>
<backpath:link action="/user/system/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.system.list.delete" /></backpath:link>
</core:deleteable>
<core:notDeleteable name="u">
&nbsp;
69,11 → 69,11
</table>
 
<logic:equal name="allowedToCreate" value="true">
<backpath:link action="/user/system/edit"><bean:message key="ak.hostcaptain.page.user.system.list.add" /></backpath:link>
<backpath:link action="/user/system/edit"><bean:message key="ak.hostadmiral.page.user.system.list.add" /></backpath:link>
</logic:equal>
 
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.system.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.system.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/user/system/edit.jsp
3,17 → 3,17
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.user.system.edit.title" /></title>
<title><bean:message key="ak.hostadmiral.page.user.system.edit.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.user.system.edit.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.user.system.edit.title" /></h1>
 
<html:errors/>
 
23,34 → 23,34
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.edit.uid" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.edit.uid" /></th>
<td><html:text property="uid" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.edit.name" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.edit.name" /></th>
<td><html:text property="name" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.edit.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.edit.owner" /></th>
<td>
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.user.system.edit.owner.empty"/>
<html:option value="" key="ak.hostadmiral.page.user.system.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.edit.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.edit.enabled" /></th>
<td><html:checkbox property="enabled" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.edit.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.edit.comment" /></th>
<td><html:textarea property="comment" /></td>
</tr>
<tr>
<td colspan=2>
<html:submit><bean:message key="ak.hostcaptain.page.user.system.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.system.edit.back" /></backpath:backlink>
<html:submit><bean:message key="ak.hostadmiral.page.user.system.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.system.edit.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/user/system/view.jsp
3,58 → 3,58
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.user.system.view.title" /></title>
<title><bean:message key="ak.hostadmiral.page.user.system.view.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.user.system.view.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.user.system.view.title" /></h1>
 
<html:errors/>
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.view.uid" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.view.uid" /></th>
<td><bean:write name="u" property="uid" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.view.name" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.view.name" /></th>
<td><bean:write name="u" property="name" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.view.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.view.owner" /></th>
<td>
<logic:present name="u" property="owner">
<bean:write name="u" property="owner.login" />
</logic:present>
<logic:notPresent name="u" property="owner">
<bean:message key="ak.hostcaptain.page.user.system.view.owner.empty" />
<bean:message key="ak.hostadmiral.page.user.system.view.owner.empty" />
</logic:notPresent>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.view.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.view.enabled" /></th>
<td>
<logic:equal name="u" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.user.system.view.enabled.true" />
<bean:message key="ak.hostadmiral.page.user.system.view.enabled.true" />
</logic:equal>
<logic:notEqual name="u" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.user.system.view.enabled.false" />
<bean:message key="ak.hostadmiral.page.user.system.view.enabled.false" />
</logic:notEqual>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.view.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.user.system.view.comment" /></th>
<td><bean:write name="u" property="comment" />&nbsp;</td>
</tr>
<tr>
<td colspan=2>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.system.view.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.system.view.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/user/view.jsp
3,65 → 3,65
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.user.view.title" /></title>
<title><bean:message key="ak.hostadmiral.page.user.view.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.user.view.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.user.view.title" /></h1>
 
<html:errors/>
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.view.login" /></th>
<th><bean:message key="ak.hostadmiral.page.user.view.login" /></th>
<td><bean:write name="u" property="login" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.view.boss" /></th>
<th><bean:message key="ak.hostadmiral.page.user.view.boss" /></th>
<td>
<logic:present name="u" property="boss">
<bean:write name="u" property="boss.login" />
</logic:present>
<logic:notPresent name="u" property="boss">
<bean:message key="ak.hostcaptain.page.user.view.boss.empty" />
<bean:message key="ak.hostadmiral.page.user.view.boss.empty" />
</logic:notPresent>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.view.superuser" /></th>
<th><bean:message key="ak.hostadmiral.page.user.view.superuser" /></th>
<td>
<logic:equal name="u" property="superuser" value="true">
<bean:message key="ak.hostcaptain.page.user.view.superuser.true" />
<bean:message key="ak.hostadmiral.page.user.view.superuser.true" />
</logic:equal>
<logic:notEqual name="u" property="superuser" value="true">
<bean:message key="ak.hostcaptain.page.user.view.superuser.false" />
<bean:message key="ak.hostadmiral.page.user.view.superuser.false" />
</logic:notEqual>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.view.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.user.view.enabled" /></th>
<td>
<logic:equal name="u" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.user.view.enabled.true" />
<bean:message key="ak.hostadmiral.page.user.view.enabled.true" />
</logic:equal>
<logic:notEqual name="u" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.user.view.enabled.false" />
<bean:message key="ak.hostadmiral.page.user.view.enabled.false" />
</logic:notEqual>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.view.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.user.view.comment" /></th>
<td><bean:write name="u" property="comment" />&nbsp;</td>
</tr>
<tr>
<td colspan=2>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.view.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.view.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/user/list.jsp
3,26 → 3,26
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.user.list.title" /></title>
<title><bean:message key="ak.hostadmiral.page.user.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.user.list.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.user.list.title" /></h1>
 
<html:errors/>
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.list.login" /></th>
<th><bean:message key="ak.hostcaptain.page.user.list.boss" /></th>
<th><bean:message key="ak.hostcaptain.page.user.list.superuser" /></th>
<th><bean:message key="ak.hostcaptain.page.user.list.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.user.list.login" /></th>
<th><bean:message key="ak.hostadmiral.page.user.list.boss" /></th>
<th><bean:message key="ak.hostadmiral.page.user.list.superuser" /></th>
<th><bean:message key="ak.hostadmiral.page.user.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
48,11 → 48,11
</td>
<td>
<core:editable name="u">
<backpath:link action="/user/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.list.edit" /></backpath:link>
<backpath:link action="/user/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.list.edit" /></backpath:link>
</core:editable>
<core:notEditable name="u">
<core:viewable name="u">
<backpath:link action="/user/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.list.view" /></backpath:link>
<backpath:link action="/user/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.list.view" /></backpath:link>
</core:viewable>
<core:notViewable name="u">
&nbsp;
61,7 → 61,7
</td>
<td>
<core:deleteable name="u">
<backpath:link action="/user/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.list.delete" /></backpath:link>
<backpath:link action="/user/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.list.delete" /></backpath:link>
</core:deleteable>
<core:notDeleteable name="u">
&nbsp;
71,9 → 71,9
</logic:iterate>
</table>
 
<backpath:link action="/user/edit"><bean:message key="ak.hostcaptain.page.user.list.add" /></backpath:link>
<backpath:link action="/user/edit"><bean:message key="ak.hostadmiral.page.user.list.add" /></backpath:link>
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/user/edit.jsp
3,17 → 3,17
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.user.edit.title" /></title>
<title><bean:message key="ak.hostadmiral.page.user.edit.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.user.edit.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.user.edit.title" /></h1>
 
<html:errors/>
 
23,28 → 23,28
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.login" /></th>
<th><bean:message key="ak.hostadmiral.page.user.edit.login" /></th>
<td><html:text property="login" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.password" /></th>
<th><bean:message key="ak.hostadmiral.page.user.edit.password" /></th>
<td><html:password property="password" redisplay="false" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.password_again" /></th>
<th><bean:message key="ak.hostadmiral.page.user.edit.password_again" /></th>
<td><html:password property="password2" redisplay="false" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.boss" /></th>
<th><bean:message key="ak.hostadmiral.page.user.edit.boss" /></th>
<td>
<html:select property="boss">
<html:option value="" key="ak.hostcaptain.page.user.edit.boss.empty"/>
<html:option value="" key="ak.hostadmiral.page.user.edit.boss.empty"/>
<core:options collection="users" property="id" />
</html:select>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.superuser" /></th>
<th><bean:message key="ak.hostadmiral.page.user.edit.superuser" /></th>
<td>
<core:rights name="u" method="mayChangeSuperuser">
<html:checkbox property="superuser" />
51,26 → 51,26
</core:rights>
<core:noRights name="u" method="mayChangeSuperuser">
<logic:equal name="u" property="superuser" value="true">
<bean:message key="ak.hostcaptain.page.user.edit.superuser.true" />
<bean:message key="ak.hostadmiral.page.user.edit.superuser.true" />
</logic:equal>
<logic:notEqual name="u" property="superuser" value="true">
<bean:message key="ak.hostcaptain.page.user.edit.superuser.false" />
<bean:message key="ak.hostadmiral.page.user.edit.superuser.false" />
</logic:notEqual>
</core:noRights>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.user.edit.enabled" /></th>
<td><html:checkbox property="enabled" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.user.edit.comment" /></th>
<td><html:textarea property="comment" /></td>
</tr>
<tr>
<td colspan=2>
<html:submit><bean:message key="ak.hostcaptain.page.user.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.edit.back" /></backpath:backlink>
<html:submit><bean:message key="ak.hostadmiral.page.user.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.edit.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/user/password/change.jsp
3,17 → 3,17
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.user.password.change.title" /></title>
<title><bean:message key="ak.hostadmiral.page.user.password.change.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.user.password.change.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.user.password.change.title" /></h1>
 
<html:errors/>
 
23,7 → 23,7
<table border=1>
<tr>
<th>
<bean:message key="ak.hostcaptain.page.user.password.change.old_password" />
<bean:message key="ak.hostadmiral.page.user.password.change.old_password" />
</th>
<td>
<html:password property="oldpassword" size="16" redisplay="false" />
31,7 → 31,7
</tr>
<tr>
<th>
<bean:message key="ak.hostcaptain.page.user.password.change.new_password" />
<bean:message key="ak.hostadmiral.page.user.password.change.new_password" />
</th>
<td>
<html:password property="password" size="16" redisplay="false" />
39,7 → 39,7
</tr>
<tr>
<th>
<bean:message key="ak.hostcaptain.page.user.password.change.new_password_again" />
<bean:message key="ak.hostadmiral.page.user.password.change.new_password_again" />
</th>
<td>
<html:password property="password2" size="16" redisplay="false" />
48,9 → 48,9
<tr>
<td colspan=2>
<html:submit>
<bean:message key="ak.hostcaptain.page.user.password.change.submit" />
<bean:message key="ak.hostadmiral.page.user.password.change.submit" />
</html:submit>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.password.change.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.password.change.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/generalError.jsp
3,23 → 3,23
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.generalError.title" /></title>
<title><bean:message key="ak.hostadmiral.page.generalError.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.generalError.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.generalError.title" /></h1>
 
<p><bean:message key="ak.hostcaptain.page.generalError.message" /></p>
<p><bean:message key="ak.hostadmiral.page.generalError.message" /></p>
 
<!-- FIXME: backpath:link><bean:message key="ak.hostcaptain.page.generalError.index" /></ backpath : link-->
<!-- FIXME: backpath:link><bean:message key="ak.hostadmiral.page.generalError.index" /></ backpath : link-->
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.generalError.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.generalError.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/index.jsp
3,39 → 3,39
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.index.title" /></title>
<title><bean:message key="ak.hostadmiral.page.index.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.index.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.index.title" /></h1>
 
<ul>
<li><backpath:link action="/user/password/show"><bean:message key="ak.hostcaptain.page.index.password_change" /></backpath:link></li>
<li><backpath:link action="/user/list"><bean:message key="ak.hostcaptain.page.index.user_list" /></backpath:link></li>
<li><backpath:link action="/user/password/show"><bean:message key="ak.hostadmiral.page.index.password_change" /></backpath:link></li>
<li><backpath:link action="/user/list"><bean:message key="ak.hostadmiral.page.index.user_list" /></backpath:link></li>
 
<logic:equal name="showSystemUsers" value="true">
<li><backpath:link action="/user/system/list"><bean:message key="ak.hostcaptain.page.index.system_user_list" /></backpath:link></li>
<li><backpath:link action="/user/system/list"><bean:message key="ak.hostadmiral.page.index.system_user_list" /></backpath:link></li>
</logic:equal>
<logic:equal name="showInetDomains" value="true">
<li><backpath:link action="/domain/list"><bean:message key="ak.hostcaptain.page.index.domain_list" /></backpath:link></li>
<li><backpath:link action="/domain/list"><bean:message key="ak.hostadmiral.page.index.domain_list" /></backpath:link></li>
</logic:equal>
<logic:equal name="showMailboxes" value="true">
<li><backpath:link action="/mail/box/list"><bean:message key="ak.hostcaptain.page.index.mail_box_list" /></backpath:link></li>
<li><backpath:link action="/mail/box/list"><bean:message key="ak.hostadmiral.page.index.mail_box_list" /></backpath:link></li>
</logic:equal>
<logic:equal name="showMailAliases" value="true">
<li><backpath:link action="/mail/alias/list"><bean:message key="ak.hostcaptain.page.index.mail_alias_list" /></backpath:link></li>
<li><backpath:link action="/mail/alias/list"><bean:message key="ak.hostadmiral.page.index.mail_alias_list" /></backpath:link></li>
</logic:equal>
 
<li><backpath:link action="/system/logout"><bean:message key="ak.hostcaptain.page.index.logout" /></backpath:link></li>
<li><backpath:link action="/system/logout"><bean:message key="ak.hostadmiral.page.index.logout" /></backpath:link></li>
</ul>
 
<p><bean:message key="ak.hostcaptain.page.index.login" />: <bean:write name="user" property="login" /></p>
<p><bean:message key="ak.hostadmiral.page.index.login" />: <bean:write name="user" property="login" /></p>
 
</body>
 
/sun/hostcaptain/trunk/webapp/mail/box/edit.jsp
3,17 → 3,17
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.mail.box.edit.title" /></title>
<title><bean:message key="ak.hostadmiral.page.mail.box.edit.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.mail.box.edit.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.mail.box.edit.title" /></h1>
 
<html:errors/>
 
23,7 → 23,7
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.login" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.login" /></th>
<td><html:text property="login" /></td>
</tr>
<tr>
30,60 → 30,60
<td colspan=2>FIXME: checkbox to get password from owner</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.password" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.password" /></th>
<td><html:password property="password" redisplay="false" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.password_again" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.password_again" /></th>
<td><html:password property="password2" redisplay="false" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.domain" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.domain" /></th>
<td>
<html:select property="domain">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.domain.empty"/>
<html:option value="" key="ak.hostadmiral.page.mail.box.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.owner" /></th>
<td>
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.owner.empty"/>
<html:option value="" key="ak.hostadmiral.page.mail.box.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.systemuser" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.systemuser" /></th>
<td>
<html:select property="systemuser">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.systemuser.empty"/>
<html:option value="" key="ak.hostadmiral.page.mail.box.edit.systemuser.empty"/>
<core:options collection="systemusers" property="id" />
</html:select>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.viruscheck" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.viruscheck" /></th>
<td><html:checkbox property="viruscheck" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.spamcheck" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.spamcheck" /></th>
<td><html:checkbox property="spamcheck" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.enabled" /></th>
<td><html:checkbox property="enabled" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.edit.comment" /></th>
<td><html:textarea property="comment" /></td>
</tr>
<tr>
<td colspan=2>
<html:submit><bean:message key="ak.hostcaptain.page.mail.box.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.box.edit.back" /></backpath:backlink>
<html:submit><bean:message key="ak.hostadmiral.page.mail.box.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostadmiral.page.mail.box.edit.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/mail/box/view.jsp
3,23 → 3,23
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.mail.box.view.title" /></title>
<title><bean:message key="ak.hostadmiral.page.mail.box.view.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.mail.box.view.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.mail.box.view.title" /></h1>
 
<html:errors/>
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.view.login" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.view.login" /></th>
<td><bean:write name="mailbox" property="login" /></td>
</tr>
<tr>
26,64 → 26,64
<td colspan=2>FIXME: show if password is get from owner</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.view.domain" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.view.domain" /></th>
<td><bean:write name="mailbox" property="domain.name" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.view.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.view.owner" /></th>
<td><bean:write name="mailbox" property="owner.login" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.view.systemuser" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.view.systemuser" /></th>
<td>
<logic:present name="mailbox" property="systemUser">
<bean:write name="mailbox" property="systemUser.name" /> (<bean:write name="mailbox" property="systemUser.uid" />)
</logic:present>
<logic:notPresent name="mailbox" property="systemUser">
<bean:message key="ak.hostcaptain.page.mail.box.view.systemuser.empty" />
<bean:message key="ak.hostadmiral.page.mail.box.view.systemuser.empty" />
</logic:notPresent>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.view.viruscheck" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.view.viruscheck" /></th>
<td>
<logic:equal name="mailbox" property="virusCheck" value="true">
<bean:message key="ak.hostcaptain.page.mail.box.view.viruscheck.true" />
<bean:message key="ak.hostadmiral.page.mail.box.view.viruscheck.true" />
</logic:equal>
<logic:notEqual name="mailbox" property="virusCheck" value="true">
<bean:message key="ak.hostcaptain.page.mail.box.view.viruscheck.false" />
<bean:message key="ak.hostadmiral.page.mail.box.view.viruscheck.false" />
</logic:notEqual>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.view.spamcheck" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.view.spamcheck" /></th>
<td>
<logic:equal name="mailbox" property="spamCheck" value="true">
<bean:message key="ak.hostcaptain.page.mail.box.view.spamcheck.true" />
<bean:message key="ak.hostadmiral.page.mail.box.view.spamcheck.true" />
</logic:equal>
<logic:notEqual name="mailbox" property="spamCheck" value="true">
<bean:message key="ak.hostcaptain.page.mail.box.view.spamcheck.false" />
<bean:message key="ak.hostadmiral.page.mail.box.view.spamcheck.false" />
</logic:notEqual>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.view.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.view.enabled" /></th>
<td>
<logic:equal name="mailbox" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.mail.box.view.enabled.true" />
<bean:message key="ak.hostadmiral.page.mail.box.view.enabled.true" />
</logic:equal>
<logic:notEqual name="mailbox" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.mail.box.view.enabled.false" />
<bean:message key="ak.hostadmiral.page.mail.box.view.enabled.false" />
</logic:notEqual>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.view.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.view.comment" /></th>
<td><bean:write name="mailbox" property="comment" />&nbsp;</td>
</tr>
<tr>
<td colspan=2>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.box.view.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.mail.box.view.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/mail/box/list.jsp
3,26 → 3,26
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.mail.box.list.title" /></title>
<title><bean:message key="ak.hostadmiral.page.mail.box.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.mail.box.list.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.mail.box.list.title" /></h1>
 
<html:errors/>
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.login" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.domain" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.owner" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.list.login" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.list.domain" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.list.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.box.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
38,11 → 38,11
</td>
<td>
<core:editable name="mailbox">
<backpath:link action="/mail/box/edit" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.box.list.edit" /></backpath:link>
<backpath:link action="/mail/box/edit" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostadmiral.page.mail.box.list.edit" /></backpath:link>
</core:editable>
<core:notEditable name="mailbox">
<core:viewable name="mailbox">
<backpath:link action="/mail/box/edit" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.box.list.view" /></backpath:link>
<backpath:link action="/mail/box/edit" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostadmiral.page.mail.box.list.view" /></backpath:link>
</core:viewable>
<core:notViewable name="mailbox">
&nbsp;
51,7 → 51,7
</td>
<td>
<core:deleteable name="mailbox">
<backpath:link action="/mail/box/delete" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.box.list.delete" /></backpath:link>
<backpath:link action="/mail/box/delete" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostadmiral.page.mail.box.list.delete" /></backpath:link>
</core:deleteable>
<core:notDeleteable name="mailbox">
&nbsp;
62,11 → 62,11
</table>
 
<logic:equal name="allowedToCreate" value="true">
<backpath:link action="/mail/box/edit"><bean:message key="ak.hostcaptain.page.mail.box.list.add" /></backpath:link>
<backpath:link action="/mail/box/edit"><bean:message key="ak.hostadmiral.page.mail.box.list.add" /></backpath:link>
</logic:equal>
 
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.box.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.mail.box.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/mail/alias/list.jsp
3,26 → 3,26
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.mail.alias.list.title" /></title>
<title><bean:message key="ak.hostadmiral.page.mail.alias.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.mail.alias.list.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.mail.alias.list.title" /></h1>
 
<html:errors/>
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.list.alias" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.list.domain" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.list.owner" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.list.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.list.alias" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.list.domain" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.list.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
38,15 → 38,15
</td>
<td>
<core:editable name="alias">
<backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.edit" /></backpath:link>
<backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostadmiral.page.mail.alias.list.edit" /></backpath:link>
</core:editable>
<core:notEditable name="alias">
<core:rights name="alias" method="mayChangeDestinations">
<backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.editdests" /></backpath:link>
<backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostadmiral.page.mail.alias.list.editdests" /></backpath:link>
</core:rights>
<core:noRights name="alias" method="mayChangeDestinations">
<core:viewable name="alias">
<backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.view" /></backpath:link>
<backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostadmiral.page.mail.alias.list.view" /></backpath:link>
</core:viewable>
<core:notViewable name="alias">
&nbsp;
56,7 → 56,7
</td>
<td>
<core:deleteable name="alias">
<backpath:link action="/mail/alias/delete" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.delete" /></backpath:link>
<backpath:link action="/mail/alias/delete" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostadmiral.page.mail.alias.list.delete" /></backpath:link>
</core:deleteable>
<core:notDeleteable name="alias">
&nbsp;
67,11 → 67,11
</table>
 
<logic:equal name="allowedToCreate" value="true">
<backpath:link action="/mail/alias/edit"><bean:message key="ak.hostcaptain.page.mail.alias.list.add" /></backpath:link>
<backpath:link action="/mail/alias/edit"><bean:message key="ak.hostadmiral.page.mail.alias.list.add" /></backpath:link>
</logic:equal>
 
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.alias.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.mail.alias.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/mail/alias/edit.jsp
3,12 → 3,12
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.mail.alias.edit.title" /></title>
<title><bean:message key="ak.hostadmiral.page.mail.alias.edit.title" /></title>
<script>
function submitForm()
{
59,7 → 59,7
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.mail.alias.edit.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.mail.alias.edit.title" /></h1>
 
<html:errors/>
 
69,7 → 69,7
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.address" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.edit.address" /></th>
<td><html:text property="address" /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
76,10 → 76,10
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.domain" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.edit.domain" /></th>
<td>
<html:select property="domain">
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.domain.empty"/>
<html:option value="" key="ak.hostadmiral.page.mail.alias.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
</td>
88,10 → 88,10
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.edit.owner" /></th>
<td>
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.owner.empty"/>
<html:option value="" key="ak.hostadmiral.page.mail.alias.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
</td>
100,7 → 100,7
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.edit.enabled" /></th>
<td><html:checkbox property="enabled" /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
107,7 → 107,7
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.edit.comment" /></th>
<td><html:textarea property="comment" /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
115,19 → 115,19
</tr>
 
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.header.tomailbox" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.header.toexternal" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.header.enabled" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.header.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.edit.header.tomailbox" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.edit.header.toexternal" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.edit.header.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.edit.header.comment" /></th>
<th>&nbsp;</th>
</tr>
 
<logic:iterate name="ak.hostcaptain.core.form.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" />
<html:select name="dests" property="mailbox" indexed="true" onchange="mailboxChanged(this)">
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.external"/>
<html:option value="" key="ak.hostadmiral.page.mail.alias.edit.external"/>
<html:options collection="mailboxes" property="id" labelProperty="login" />
</html:select>
</td>
134,17 → 134,17
<td><html:text name="dests" property="email" indexed="true" /></td>
<td><html:checkbox name="dests" property="enabled" indexed="true" /></td>
<td><html:text name="dests" property="comment" indexed="true" /></td>
<td><html:submit property="delete.dests" indexed="true"><bean:message key="ak.hostcaptain.page.mail.alias.edit.delete" /></html:submit></td>
<td><html:submit property="delete.dests" indexed="true"><bean:message key="ak.hostadmiral.page.mail.alias.edit.delete" /></html:submit></td>
</tr>
</logic:iterate>
 
<tr>
<td colspan=5><html:submit property="add"><bean:message key="ak.hostcaptain.page.mail.alias.edit.add" /></html:submit></td>
<td colspan=5><html:submit property="add"><bean:message key="ak.hostadmiral.page.mail.alias.edit.add" /></html:submit></td>
<tr>
</tr>
<td colspan=5>
<html:submit property="submit"><bean:message key="ak.hostcaptain.page.mail.alias.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.alias.edit.back" /></backpath:backlink>
<html:submit property="submit"><bean:message key="ak.hostadmiral.page.mail.alias.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostadmiral.page.mail.alias.edit.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/mail/alias/editdests.jsp
3,12 → 3,12
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.mail.alias.editdest.title" /></title>
<title><bean:message key="ak.hostadmiral.page.mail.alias.editdest.title" /></title>
<script>
function submitForm()
{
59,7 → 59,7
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.mail.alias.editdest.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.mail.alias.editdest.title" /></h1>
 
<html:errors/>
 
69,7 → 69,7
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.editdest.address" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.editdest.address" /></th>
<td><bean:write name="alias" property="address" /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
76,7 → 76,7
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.editdest.domain" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.editdest.domain" /></th>
<td><bean:write name="alias" property="domain.name" /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
83,7 → 83,7
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.editdest.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.editdest.owner" /></th>
<td><bean:write name="alias" property="owner.login" /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
90,13 → 90,13
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.editdest.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.editdest.enabled" /></th>
<td>
<logic:equal name="alias" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.mail.box.view.enabled.true" />
<bean:message key="ak.hostadmiral.page.mail.box.view.enabled.true" />
</logic:equal>
<logic:notEqual name="alias" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.mail.box.view.enabled.false" />
<bean:message key="ak.hostadmiral.page.mail.box.view.enabled.false" />
</logic:notEqual>
</td>
<td>&nbsp;</td>
104,7 → 104,7
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.editdest.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.editdest.comment" /></th>
<td><bean:write name="alias" property="comment" />&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
112,19 → 112,19
</tr>
 
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.editdest.header.tomailbox" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.editdest.header.toexternal" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.editdest.header.enabled" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.editdest.header.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.editdest.header.tomailbox" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.editdest.header.toexternal" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.editdest.header.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.mail.alias.editdest.header.comment" /></th>
<th>&nbsp;</th>
</tr>
 
<logic:iterate name="ak.hostcaptain.core.form.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" />
<html:select name="dests" property="mailbox" indexed="true" onchange="mailboxChanged(this)">
<html:option value="" key="ak.hostcaptain.page.mail.alias.editdest.external"/>
<html:option value="" key="ak.hostadmiral.page.mail.alias.editdest.external"/>
<html:options collection="mailboxes" property="id" labelProperty="login" />
</html:select>
</td>
131,17 → 131,17
<td><html:text name="dests" property="email" indexed="true" /></td>
<td><html:checkbox name="dests" property="enabled" indexed="true" /></td>
<td><html:text name="dests" property="comment" indexed="true" /></td>
<td><html:submit property="delete.dests" indexed="true"><bean:message key="ak.hostcaptain.page.mail.alias.editdest.delete" /></html:submit></td>
<td><html:submit property="delete.dests" indexed="true"><bean:message key="ak.hostadmiral.page.mail.alias.editdest.delete" /></html:submit></td>
</tr>
</logic:iterate>
 
<tr>
<td colspan=5><html:submit property="add"><bean:message key="ak.hostcaptain.page.mail.alias.editdest.add" /></html:submit></td>
<td colspan=5><html:submit property="add"><bean:message key="ak.hostadmiral.page.mail.alias.editdest.add" /></html:submit></td>
<tr>
</tr>
<td colspan=5>
<html:submit property="submit"><bean:message key="ak.hostcaptain.page.mail.alias.editdest.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.alias.editdest.back" /></backpath:backlink>
<html:submit property="submit"><bean:message key="ak.hostadmiral.page.mail.alias.editdest.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostadmiral.page.mail.alias.editdest.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/mail/alias/view.jsp
3,17 → 3,17
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.mail.alias.view.title" /></title>
<title><bean:message key="ak.hostadmiral.page.mail.alias.view.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.mail.alias.view.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.mail.alias.view.title" /></h1>
 
<h2>FIXME: NOT IMPLEMENTED. DO WE REALLY NEED IT?</h2>
 
22,7 → 22,7
<table border=1>
</tr>
<td colspan=5>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.alias.view.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.mail.alias.view.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/error.jsp
3,22 → 3,22
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.error.title" /></title>
<title><bean:message key="ak.hostadmiral.page.error.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.error.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.error.title" /></h1>
 
<html:errors/>
 
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.error.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.error.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/system/login.jsp
3,17 → 3,17
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.system.login.title" /></title>
<title><bean:message key="ak.hostadmiral.page.system.login.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.system.login.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.system.login.title" /></h1>
 
<html:errors/>
 
22,7 → 22,7
<table border=1>
<tr>
<th class="right">
<bean:message key="ak.hostcaptain.page.system.login.login" />
<bean:message key="ak.hostadmiral.page.system.login.login" />
</th>
<td class="left">
<html:text property="login" size="16"/>
30,7 → 30,7
</tr>
<tr>
<th class="right">
<bean:message key="ak.hostcaptain.page.system.login.password" />
<bean:message key="ak.hostadmiral.page.system.login.password" />
</th>
<td class="left">
<html:password property="password" size="16" redisplay="false" />
39,12 → 39,12
<tr>
<td class="right">
<html:submit>
<bean:message key="ak.hostcaptain.page.system.login.submit" />
<bean:message key="ak.hostadmiral.page.system.login.submit" />
</html:submit>
</td>
<td class="right">
<html:reset>
<bean:message key="ak.hostcaptain.page.system.login.reset" />
<bean:message key="ak.hostadmiral.page.system.login.reset" />
</html:reset>
</td>
</tr>
/sun/hostcaptain/trunk/webapp/system/logout.jsp
3,25 → 3,25
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.system.logout.title" /></title>
<title><bean:message key="ak.hostadmiral.page.system.logout.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.system.logout.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.system.logout.title" /></h1>
 
<html:errors/>
 
<p><bean:message key="ak.hostcaptain.page.system.logout.message" /></p>
<p><bean:message key="ak.hostadmiral.page.system.logout.message" /></p>
 
<p><html:link action="/system/login"><bean:message key="ak.hostcaptain.page.system.logout.login" /></html:link></p>
<p><html:link action="/system/login"><bean:message key="ak.hostadmiral.page.system.logout.login" /></html:link></p>
 
<backpath:backlink><bean:message key="ak.hostcaptain.page.system.logout.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.system.logout.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/WEB-INF/hostcaptain-core.tld
File deleted
/sun/hostcaptain/trunk/webapp/WEB-INF/hostadmiral-core.tld
0,0 → 1,186
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
<taglib>
<tlibversion>1.0</tlibversion>
<jspversion>1.1</jspversion>
<shortname>hostadmiral-core</shortname>
<uri>http://26th.net/hostadmiral/core</uri>
 
<tag>
<name>options</name>
<tagclass>ak.hostadmiral.core.taglib.ModelObjectOptionsTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
<name>collection</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>filter</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>style</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>styleClass</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
 
<tag>
<name>viewable</name>
<tagclass>ak.hostadmiral.core.taglib.ViewableTag</tagclass>
<bodycontent>JSP</bodycontent>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>notViewable</name>
<tagclass>ak.hostadmiral.core.taglib.NotViewableTag</tagclass>
<bodycontent>JSP</bodycontent>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>editable</name>
<tagclass>ak.hostadmiral.core.taglib.EditableTag</tagclass>
<bodycontent>JSP</bodycontent>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>notEditable</name>
<tagclass>ak.hostadmiral.core.taglib.NotEditableTag</tagclass>
<bodycontent>JSP</bodycontent>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>deleteable</name>
<tagclass>ak.hostadmiral.core.taglib.DeleteableTag</tagclass>
<bodycontent>JSP</bodycontent>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>notDeleteable</name>
<tagclass>ak.hostadmiral.core.taglib.NotDeleteableTag</tagclass>
<bodycontent>JSP</bodycontent>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>rights</name>
<tagclass>ak.hostadmiral.core.taglib.RightsTag</tagclass>
<bodycontent>JSP</bodycontent>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>method</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>noRights</name>
<tagclass>ak.hostadmiral.core.taglib.NoRightsTag</tagclass>
<bodycontent>JSP</bodycontent>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>method</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
 
<tag>
<name>write</name>
<tagclass>ak.hostadmiral.core.taglib.WriteTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
<name>bundle</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>filter</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>format</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>formatKey</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>ignore</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>locale</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>scope</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>default</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
</taglib>
/sun/hostcaptain/trunk/webapp/WEB-INF/struts-config.xml
7,7 → 7,7
<struts-config>
<form-beans>
<form-bean
name="ak.hostcaptain.core.form.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,8 → 14,8
</form-bean>
 
<form-bean
name="ak.hostcaptain.core.form.ChangePasswordForm"
type="ak.hostcaptain.core.form.UserPasswordForm">
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" />
<form-property name="password2" type="java.lang.String" />
22,14 → 22,14
</form-bean>
 
<form-bean
name="ak.hostcaptain.core.form.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="ak.hostcaptain.core.form.UserEditForm"
type="ak.hostcaptain.core.form.UserPasswordForm">
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" />
<form-property name="password" type="java.lang.String" />
41,13 → 41,13
</form-bean>
 
<form-bean
name="ak.hostcaptain.core.form.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="ak.hostcaptain.core.form.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" />
58,13 → 58,13
</form-bean>
 
<form-bean
name="ak.hostcaptain.core.form.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="ak.hostcaptain.core.form.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" />
74,14 → 74,14
</form-bean>
 
<form-bean
name="ak.hostcaptain.core.form.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="ak.hostcaptain.core.form.MailboxEditForm"
type="ak.hostcaptain.core.form.UserPasswordForm">
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" />
<form-property name="password" type="java.lang.String" />
96,13 → 96,13
</form-bean>
 
<form-bean
name="ak.hostcaptain.core.form.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="ak.hostcaptain.core.form.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" />
110,7 → 110,7
<form-property name="owner" type="java.lang.String" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
<form-property name="dests" type="ak.hostcaptain.core.form.MailAliasDestBean[]"
<form-property name="dests" type="ak.hostadmiral.core.form.MailAliasDestBean[]"
size="1" />
</form-bean>
</form-beans>
125,8 → 125,8
 
<exception
key="UserException"
type="ak.hostcaptain.util.UserException"
handler="ak.hostcaptain.core.action.UserExceptionHandler"
type="ak.hostadmiral.util.UserException"
handler="ak.hostadmiral.core.action.UserExceptionHandler"
/>
</global-exceptions>
 
140,7 → 140,7
<action-mappings>
<action
path="/index"
type="ak.hostcaptain.core.action.IndexAction"
type="ak.hostadmiral.core.action.IndexAction"
>
<forward name="success" path="/index.jsp" />
</action>
153,8 → 153,8
 
<action
path="/system/login/submit"
type="ak.hostcaptain.core.action.LoginAction"
name="ak.hostcaptain.core.form.LoginForm"
type="ak.hostadmiral.core.action.LoginAction"
name="ak.hostadmiral.core.form.LoginForm"
validate="true"
scope="request"
input="/system/login.jsp"
164,7 → 164,7
 
<action
path="/system/logout"
type="ak.hostcaptain.core.action.LogoutAction"
type="ak.hostadmiral.core.action.LogoutAction"
>
<forward name="default" path="/system/logout.jsp" />
</action>
173,7 → 173,7
 
<action
path="/user/password/show"
type="ak.hostcaptain.core.action.ChangePasswordAction"
type="ak.hostadmiral.core.action.ChangePasswordAction"
parameter="first"
>
<forward name="default" path="/user/password/change.jsp" />
181,9 → 181,9
 
<action
path="/user/password/submit"
type="ak.hostcaptain.core.action.ChangePasswordAction"
type="ak.hostadmiral.core.action.ChangePasswordAction"
parameter="submit"
name="ak.hostcaptain.core.form.ChangePasswordForm"
name="ak.hostadmiral.core.form.ChangePasswordForm"
validate="true"
scope="request"
input="/user/password/change.jsp"
192,7 → 192,7
 
<action
path="/user/list"
type="ak.hostcaptain.core.action.UserAction"
type="ak.hostadmiral.core.action.UserAction"
parameter="list"
>
<forward name="default" path="/user/list.jsp" />
200,9 → 200,9
 
<action
path="/user/delete"
type="ak.hostcaptain.core.action.UserAction"
type="ak.hostadmiral.core.action.UserAction"
parameter="delete"
name="ak.hostcaptain.core.form.UserForm"
name="ak.hostadmiral.core.form.UserForm"
validate="true"
scope="request"
>
210,9 → 210,9
 
<action
path="/user/edit"
type="ak.hostcaptain.core.action.UserAction"
type="ak.hostadmiral.core.action.UserAction"
parameter="edit"
name="ak.hostcaptain.core.form.UserForm"
name="ak.hostadmiral.core.form.UserForm"
validate="true"
scope="request"
>
222,9 → 222,9
 
<action
path="/user/submit"
type="ak.hostcaptain.core.action.UserAction"
type="ak.hostadmiral.core.action.UserAction"
parameter="submit"
name="ak.hostcaptain.core.form.UserEditForm"
name="ak.hostadmiral.core.form.UserEditForm"
validate="true"
scope="request"
input="/user/edit.jsp"
235,7 → 235,7
 
<action
path="/user/system/list"
type="ak.hostcaptain.core.action.SystemUserAction"
type="ak.hostadmiral.core.action.SystemUserAction"
parameter="list"
>
<forward name="default" path="/user/system/list.jsp" />
243,9 → 243,9
 
<action
path="/user/system/delete"
type="ak.hostcaptain.core.action.SystemUserAction"
type="ak.hostadmiral.core.action.SystemUserAction"
parameter="delete"
name="ak.hostcaptain.core.form.SystemUserForm"
name="ak.hostadmiral.core.form.SystemUserForm"
validate="true"
scope="request"
>
253,9 → 253,9
 
<action
path="/user/system/edit"
type="ak.hostcaptain.core.action.SystemUserAction"
type="ak.hostadmiral.core.action.SystemUserAction"
parameter="edit"
name="ak.hostcaptain.core.form.SystemUserForm"
name="ak.hostadmiral.core.form.SystemUserForm"
validate="true"
scope="request"
>
265,9 → 265,9
 
<action
path="/user/system/submit"
type="ak.hostcaptain.core.action.SystemUserAction"
type="ak.hostadmiral.core.action.SystemUserAction"
parameter="submit"
name="ak.hostcaptain.core.form.SystemUserEditForm"
name="ak.hostadmiral.core.form.SystemUserEditForm"
validate="true"
scope="request"
input="/user/system/edit.jsp"
278,7 → 278,7
 
<action
path="/domain/list"
type="ak.hostcaptain.core.action.InetDomainAction"
type="ak.hostadmiral.core.action.InetDomainAction"
parameter="list"
>
<forward name="default" path="/domain/list.jsp" />
286,9 → 286,9
 
<action
path="/domain/delete"
type="ak.hostcaptain.core.action.InetDomainAction"
type="ak.hostadmiral.core.action.InetDomainAction"
parameter="delete"
name="ak.hostcaptain.core.form.InetDomainForm"
name="ak.hostadmiral.core.form.InetDomainForm"
validate="true"
scope="request"
>
296,9 → 296,9
 
<action
path="/domain/edit"
type="ak.hostcaptain.core.action.InetDomainAction"
type="ak.hostadmiral.core.action.InetDomainAction"
parameter="edit"
name="ak.hostcaptain.core.form.InetDomainForm"
name="ak.hostadmiral.core.form.InetDomainForm"
validate="true"
scope="request"
>
308,9 → 308,9
 
<action
path="/domain/submit"
type="ak.hostcaptain.core.action.InetDomainAction"
type="ak.hostadmiral.core.action.InetDomainAction"
parameter="submit"
name="ak.hostcaptain.core.form.InetDomainEditForm"
name="ak.hostadmiral.core.form.InetDomainEditForm"
validate="true"
scope="request"
input="/domain/edit.jsp"
321,7 → 321,7
 
<action
path="/mail/box/list"
type="ak.hostcaptain.core.action.MailboxAction"
type="ak.hostadmiral.core.action.MailboxAction"
parameter="list"
>
<forward name="default" path="/mail/box/list.jsp" />
329,9 → 329,9
 
<action
path="/mail/box/delete"
type="ak.hostcaptain.core.action.MailboxAction"
type="ak.hostadmiral.core.action.MailboxAction"
parameter="delete"
name="ak.hostcaptain.core.form.MailboxForm"
name="ak.hostadmiral.core.form.MailboxForm"
validate="true"
scope="request"
>
339,9 → 339,9
 
<action
path="/mail/box/edit"
type="ak.hostcaptain.core.action.MailboxAction"
type="ak.hostadmiral.core.action.MailboxAction"
parameter="edit"
name="ak.hostcaptain.core.form.MailboxForm"
name="ak.hostadmiral.core.form.MailboxForm"
validate="true"
scope="request"
>
351,9 → 351,9
 
<action
path="/mail/box/submit"
type="ak.hostcaptain.core.action.MailboxAction"
type="ak.hostadmiral.core.action.MailboxAction"
parameter="submit"
name="ak.hostcaptain.core.form.MailboxEditForm"
name="ak.hostadmiral.core.form.MailboxEditForm"
validate="true"
scope="request"
input="/mail/box/edit.jsp"
364,7 → 364,7
 
<action
path="/mail/alias/list"
type="ak.hostcaptain.core.action.MailAliasAction"
type="ak.hostadmiral.core.action.MailAliasAction"
parameter="list"
>
<forward name="default" path="/mail/alias/list.jsp" />
372,9 → 372,9
 
<action
path="/mail/alias/delete"
type="ak.hostcaptain.core.action.MailAliasAction"
type="ak.hostadmiral.core.action.MailAliasAction"
parameter="delete"
name="ak.hostcaptain.core.form.MailAliasForm"
name="ak.hostadmiral.core.form.MailAliasForm"
validate="true"
scope="request"
>
382,9 → 382,9
 
<action
path="/mail/alias/edit"
type="ak.hostcaptain.core.action.MailAliasAction"
type="ak.hostadmiral.core.action.MailAliasAction"
parameter="edit"
name="ak.hostcaptain.core.form.MailAliasForm"
name="ak.hostadmiral.core.form.MailAliasForm"
validate="true"
scope="request"
>
395,9 → 395,9
 
<action
path="/mail/alias/submit"
type="ak.hostcaptain.core.action.MailAliasAction"
type="ak.hostadmiral.core.action.MailAliasAction"
parameter="submit"
name="ak.hostcaptain.core.form.MailAliasEditForm"
name="ak.hostadmiral.core.form.MailAliasEditForm"
validate="true"
scope="request"
input="/mail/alias/edit.do"
411,7 → 411,7
 
<controller processorClass="ak.strutsx.RequestProcessorX" />
 
<message-resources parameter="ak.hostcaptain.core.CoreResources" />
<message-resources parameter="ak.hostadmiral.core.CoreResources" />
 
<!-- ========== Plug-Ins Configuration ================================== -->
 
/sun/hostcaptain/trunk/webapp/WEB-INF/validation.xml
9,127 → 9,127
</global>
 
<formset>
<form name="ak.hostcaptain.core.form.LoginForm">
<form name="ak.hostadmiral.core.form.LoginForm">
<field property="login" depends="required">
<msg name="required" key="ak.hostcaptain.core.login.required" />
<msg name="required" key="ak.hostadmiral.core.login.required" />
</field>
<field property="password" depends="required">
<msg name="required" key="ak.hostcaptain.core.password.required" />
<msg name="required" key="ak.hostadmiral.core.password.required" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.ChangePasswordForm">
<form name="ak.hostadmiral.core.form.ChangePasswordForm">
<field property="oldpassword" depends="required">
<msg name="required" key="ak.hostcaptain.core.oldpassword.required" />
<msg name="required" key="ak.hostadmiral.core.oldpassword.required" />
</field>
<field property="password" depends="required">
<msg name="required" key="ak.hostcaptain.core.password.required" />
<msg name="required" key="ak.hostadmiral.core.password.required" />
</field>
<field property="password2" depends="required">
<msg name="required" key="ak.hostcaptain.core.password2.required" />
<msg name="required" key="ak.hostadmiral.core.password2.required" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.UserForm">
<form name="ak.hostadmiral.core.form.UserForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.user.password.change.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.user.password.change.id.wrong" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.UserEditForm">
<form name="ak.hostadmiral.core.form.UserEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.user.password.change.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.user.password.change.id.wrong" />
</field>
<field property="login" depends="required">
<msg name="required" key="ak.hostcaptain.core.login.required" />
<msg name="required" key="ak.hostadmiral.core.login.required" />
</field>
<field property="boss" depends="long">
<msg name="long" key="ak.hostcaptain.core.user.boss.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.user.boss.id.wrong" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.SystemUserForm">
<form name="ak.hostadmiral.core.form.SystemUserForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.user.system.edit.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.user.system.edit.id.wrong" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.SystemUserEditForm">
<form name="ak.hostadmiral.core.form.SystemUserEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.user.system.edit.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.user.system.edit.id.wrong" />
</field>
<field property="uid" depends="required,integer">
<msg name="required" key="ak.hostcaptain.core.user.system.edit.uid.wrong" />
<msg name="integer" key="ak.hostcaptain.core.user.system.edit.uid.wrong" />
<msg name="required" key="ak.hostadmiral.core.user.system.edit.uid.wrong" />
<msg name="integer" key="ak.hostadmiral.core.user.system.edit.uid.wrong" />
</field>
<field property="name" depends="required">
<msg name="required" key="ak.hostcaptain.core.user.system.edit.name.required" />
<msg name="required" key="ak.hostadmiral.core.user.system.edit.name.required" />
</field>
<field property="owner" depends="long">
<msg name="long" key="ak.hostcaptain.core.user.system.edit.owner.wrong" />
<msg name="long" key="ak.hostadmiral.core.user.system.edit.owner.wrong" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.InetDomainForm">
<form name="ak.hostadmiral.core.form.InetDomainForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.domain.edit.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.domain.edit.id.wrong" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.InetDomainEditForm">
<form name="ak.hostadmiral.core.form.InetDomainEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.domain.edit.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.domain.edit.id.wrong" />
</field>
<field property="name" depends="required">
<msg name="required" key="ak.hostcaptain.core.domain.edit.name.empty" />
<msg name="required" key="ak.hostadmiral.core.domain.edit.name.empty" />
</field>
<field property="owner" depends="required,long">
<msg name="long" key="ak.hostcaptain.core.domain.edit.owner.wrong" />
<msg name="required" key="ak.hostcaptain.core.domain.edit.owner.wrong" />
<msg name="long" key="ak.hostadmiral.core.domain.edit.owner.wrong" />
<msg name="required" key="ak.hostadmiral.core.domain.edit.owner.wrong" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.MailboxForm">
<form name="ak.hostadmiral.core.form.MailboxForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.mailbox.edit.id.wrong" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.MailboxEditForm">
<form name="ak.hostadmiral.core.form.MailboxEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.mailbox.edit.id.wrong" />
</field>
<field property="login" depends="required">
<msg name="required" key="ak.hostcaptain.core.mailbox.edit.login.empty" />
<msg name="required" key="ak.hostadmiral.core.mailbox.edit.login.empty" />
</field>
<field property="domain" depends="required,long">
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.domain.wrong" />
<msg name="required" key="ak.hostcaptain.core.mailbox.edit.domain.wrong" />
<msg name="long" key="ak.hostadmiral.core.mailbox.edit.domain.wrong" />
<msg name="required" key="ak.hostadmiral.core.mailbox.edit.domain.wrong" />
</field>
<field property="owner" depends="required,long">
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.owner.wrong" />
<msg name="required" key="ak.hostcaptain.core.mailbox.edit.owner.wrong" />
<msg name="long" key="ak.hostadmiral.core.mailbox.edit.owner.wrong" />
<msg name="required" key="ak.hostadmiral.core.mailbox.edit.owner.wrong" />
</field>
<field property="systemuser" depends="long">
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.systemuser.wrong" />
<msg name="long" key="ak.hostadmiral.core.mailbox.edit.systemuser.wrong" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.MailAliasForm">
<form name="ak.hostadmiral.core.form.MailAliasForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.mail.alias.edit.id.wrong" />
</field>
</form>
 
<form name="ak.hostcaptain.core.form.MailAliasEditForm">
<form name="ak.hostadmiral.core.form.MailAliasEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.id.wrong" />
<msg name="long" key="ak.hostadmiral.core.mail.alias.edit.id.wrong" />
</field>
<field property="domain" depends="long">
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.domain.wrong" />
<msg name="long" key="ak.hostadmiral.core.mail.alias.edit.domain.wrong" />
</field>
<field property="owner" depends="long">
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.owner.wrong" />
<msg name="long" key="ak.hostadmiral.core.mail.alias.edit.owner.wrong" />
</field>
</form>
</formset>
/sun/hostcaptain/trunk/webapp/WEB-INF/web.xml
8,26 → 8,26
 
<filter>
<filter-name>Encoding Filter</filter-name>
<filter-class>ak.hostcaptain.core.servlet.EncodingFilter</filter-class>
<filter-class>ak.hostadmiral.core.servlet.EncodingFilter</filter-class>
</filter>
<filter>
<filter-name>Hibernate Filter</filter-name>
<filter-class>ak.hostcaptain.core.servlet.HibernateFilter</filter-class>
<filter-class>ak.hostadmiral.core.servlet.HibernateFilter</filter-class>
<init-param>
<param-name>register</param-name>
<param-value>
ak.hostcaptain.core.model.UserManager;
ak.hostcaptain.core.model.MailboxManager;
ak.hostcaptain.core.model.MailAliasManager;
ak.hostcaptain.core.model.MailAliasDestinationManager;
ak.hostcaptain.core.model.SystemUserManager;
ak.hostcaptain.core.model.InetDomainManager
ak.hostadmiral.core.model.UserManager;
ak.hostadmiral.core.model.MailboxManager;
ak.hostadmiral.core.model.MailAliasManager;
ak.hostadmiral.core.model.MailAliasDestinationManager;
ak.hostadmiral.core.model.SystemUserManager;
ak.hostadmiral.core.model.InetDomainManager
</param-value>
</init-param>
</filter>
<filter>
<filter-name>Login Filter</filter-name>
<filter-class>ak.hostcaptain.core.servlet.LoginFilter</filter-class>
<filter-class>ak.hostadmiral.core.servlet.LoginFilter</filter-class>
<init-param>
<param-name>loginUrl</param-name>
<param-value>/system/login.do?backpath=</param-value>
117,8 → 117,8
</taglib>
 
<taglib>
<taglib-uri>/ak/hostcaptain/core</taglib-uri>
<taglib-location>/WEB-INF/hostcaptain-core.tld</taglib-location>
<taglib-uri>/ak/hostadmiral/core</taglib-uri>
<taglib-location>/WEB-INF/hostadmiral-core.tld</taglib-location>
</taglib>
 
</web-app>
/sun/hostcaptain/trunk/webapp/domain/view.jsp
3,47 → 3,47
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.domain.view.title" /></title>
<title><bean:message key="ak.hostadmiral.page.domain.view.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.domain.view.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.domain.view.title" /></h1>
 
<html:errors/>
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.view.name" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.view.name" /></th>
<td><bean:write name="domain" property="name" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.view.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.view.owner" /></th>
<td><bean:write name="domain" property="owner.login" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.view.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.view.enabled" /></th>
<td>
<logic:equal name="domain" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.domain.view.enabled.true" />
<bean:message key="ak.hostadmiral.page.domain.view.enabled.true" />
</logic:equal>
<logic:notEqual name="domain" property="enabled" value="true">
<bean:message key="ak.hostcaptain.page.domain.view.enabled.false" />
<bean:message key="ak.hostadmiral.page.domain.view.enabled.false" />
</logic:notEqual>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.view.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.view.comment" /></th>
<td><bean:write name="domain" property="comment" />&nbsp;</td>
</tr>
<tr>
<td colspan=2>
<backpath:backlink><bean:message key="ak.hostcaptain.page.domain.view.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.domain.view.back" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/domain/list.jsp
3,25 → 3,25
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.domain.list.title" /></title>
<title><bean:message key="ak.hostadmiral.page.domain.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.domain.list.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.domain.list.title" /></h1>
 
<html:errors/>
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.list.name" /></th>
<th><bean:message key="ak.hostcaptain.page.domain.list.owner" /></th>
<th><bean:message key="ak.hostcaptain.page.domain.list.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.list.name" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.list.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
36,11 → 36,11
</td>
<td>
<core:editable name="domain">
<backpath:link action="/domain/edit" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostcaptain.page.domain.list.edit" /></backpath:link>
<backpath:link action="/domain/edit" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostadmiral.page.domain.list.edit" /></backpath:link>
</core:editable>
<core:notEditable name="domain">
<core:viewable name="domain">
<backpath:link action="/domain/edit" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostcaptain.page.domain.list.view" /></backpath:link>
<backpath:link action="/domain/edit" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostadmiral.page.domain.list.view" /></backpath:link>
</core:viewable>
<core:notViewable name="domain">
&nbsp;
49,7 → 49,7
</td>
<td>
<core:deleteable name="domain">
<backpath:link action="/domain/delete" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostcaptain.page.domain.list.delete" /></backpath:link>
<backpath:link action="/domain/delete" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostadmiral.page.domain.list.delete" /></backpath:link>
</core:deleteable>
<core:notDeleteable name="domain">
&nbsp;
60,11 → 60,11
</table>
 
<logic:equal name="allowedToCreate" value="true">
<backpath:link action="/domain/edit"><bean:message key="ak.hostcaptain.page.domain.list.add" /></backpath:link>
<backpath:link action="/domain/edit"><bean:message key="ak.hostadmiral.page.domain.list.add" /></backpath:link>
</logic:equal>
 
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.domain.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostadmiral.page.domain.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/domain/edit.jsp
3,17 → 3,17
<%@ 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/hostcaptain-core.tld" prefix="core" %>
<%@ taglib uri="/WEB-INF/hostadmiral-core.tld" prefix="core" %>
<html>
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.hostcaptain.page.domain.edit.title" /></title>
<title><bean:message key="ak.hostadmiral.page.domain.edit.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.hostcaptain.page.domain.edit.title" /></h1>
<h1><bean:message key="ak.hostadmiral.page.domain.edit.title" /></h1>
 
<html:errors/>
 
23,30 → 23,30
 
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.edit.name" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.edit.name" /></th>
<td><html:text property="name" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.edit.owner" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.edit.owner" /></th>
<td>
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.domain.edit.owner.empty"/>
<html:option value="" key="ak.hostadmiral.page.domain.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.edit.enabled" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.edit.enabled" /></th>
<td><html:checkbox property="enabled" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.edit.comment" /></th>
<th><bean:message key="ak.hostadmiral.page.domain.edit.comment" /></th>
<td><html:textarea property="comment" /></td>
</tr>
<tr>
<td colspan=2>
<html:submit><bean:message key="ak.hostcaptain.page.domain.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostcaptain.page.domain.edit.back" /></backpath:backlink>
<html:submit><bean:message key="ak.hostadmiral.page.domain.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostadmiral.page.domain.edit.back" /></backpath:backlink>
</td>
</tr>
</table>