Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 912 → Rev 913

/sun/hostcaptain/trunk/webapp/WEB-INF/hostcaptain-core.tld
0,0 → 1,47
<?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>hostcaptain-core</shortname>
<uri>http://26th.net/hostcaptain/core</uri>
 
<tag>
<name>options</name>
<tagclass>ak.hostcaptain.core.taglib.ModelObjectOptionsTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
<name>collection</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>filter</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>name</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>
</taglib>
 
 
 
/sun/hostcaptain/trunk/webapp/WEB-INF/struts-config.xml
36,6 → 36,8
<form-property name="password2" type="java.lang.String" />
<form-property name="boss" type="java.lang.String" />
<form-property name="superuser" type="java.lang.Boolean" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
</form-bean>
 
<form-bean
51,6 → 53,8
<form-property name="uid" type="java.lang.String" />
<form-property name="name" type="java.lang.String" />
<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-bean>
 
<form-bean
65,6 → 69,8
<form-property name="id" type="java.lang.String" />
<form-property name="name" type="java.lang.String" />
<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-bean>
 
<form-bean
85,6 → 91,8
<form-property name="viruscheck" type="java.lang.Boolean" />
<form-property name="spamcheck" type="java.lang.Boolean" />
<form-property name="systemuser" type="java.lang.String" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
</form-bean>
 
<form-bean
100,6 → 108,8
<form-property name="address" type="java.lang.String" />
<form-property name="domain" type="java.lang.String" />
<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[]"
size="1" />
</form-bean>
107,11 → 117,11
 
<global-exceptions>
<!-- FIXME: it doesn't work :( -->
<exception
<!-- exception
key="GeneralException"
type="java.lang.Exception"
path="/generalError.jsp"
/>
/ -->
 
<exception
key="UserException"
/sun/hostcaptain/trunk/webapp/WEB-INF/web.xml
116,4 → 116,9
<taglib-location>/WEB-INF/ak-backpath.tld</taglib-location>
</taglib>
 
<taglib>
<taglib-uri>/ak/hostcaptain/core</taglib-uri>
<taglib-location>/WEB-INF/hostcaptain-core.tld</taglib-location>
</taglib>
 
</web-app>
/sun/hostcaptain/trunk/webapp/domain/edit.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,17 → 21,25
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.domain.edit.name" />:
<html:text property="name" />
<bean:message key="ak.hostcaptain.page.domain.edit.name" />:
<html:text property="name" />
<br>
 
<bean:message key="ak.hostcaptain.page.domain.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.domain.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<bean:message key="ak.hostcaptain.page.domain.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.domain.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.domain.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.domain.edit.comment" />:
<html:textarea property="comment" />
<br>
 
<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>
/sun/hostcaptain/trunk/webapp/domain/list.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,6 → 21,7
<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>&nbsp;</th>
<th>&nbsp;</th>
</tr>
28,6 → 30,10
<tr>
<td><bean:write name="domain" property="name" /></td>
<td><bean:write name="domain" property="owner.login" /></td>
<td>
<logic:equal name="domain" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="domain" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/domain/edit" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostcaptain.page.domain.list.edit" /></backpath:link></td>
<td><backpath:link action="/domain/delete" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostcaptain.page.domain.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/user/system/list.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,6 → 21,8
<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>&nbsp;</th>
<th>&nbsp;</th>
</tr>
28,6 → 31,15
<tr>
<td><bean:write name="u" property="uid" /></td>
<td><bean:write name="u" property="name" /></td>
<td>
<logic:present name="u" property="owner">
<bean:write name="u" property="owner.login" />
</logic:present>
</td>
<td>
<logic:equal name="u" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="u" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/user/system/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.system.list.edit" /></backpath:link></td>
<td><backpath:link action="/user/system/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.system.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/user/system/edit.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,21 → 21,29
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.user.system.edit.uid" />:
<html:text property="uid" />
<bean:message key="ak.hostcaptain.page.user.system.edit.uid" />:
<html:text property="uid" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.system.edit.name" />:
<html:text property="name" />
<bean:message key="ak.hostcaptain.page.user.system.edit.name" />:
<html:text property="name" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.system.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.user.system.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<bean:message key="ak.hostcaptain.page.user.system.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.user.system.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.user.system.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.system.edit.comment" />:
<html:textarea property="comment" />
<br>
 
<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>
/sun/hostcaptain/trunk/webapp/user/list.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
19,6 → 20,9
<table>
<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>&nbsp;</th>
<th>&nbsp;</th>
</tr>
26,6 → 30,19
<logic:iterate name="users" id="u">
<tr>
<td><bean:write name="u" property="login" /></td>
<td>
<logic:present name="u" property="boss">
<bean:write name="u" property="boss.login" />
</logic:present>
</td>
<td>
<logic:equal name="u" property="superuser" value="true">x</logic:equal>
<logic:notEqual name="u" property="superuser" value="true">&nbsp;</logic:notEqual>
</td>
<td>
<logic:equal name="u" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="u" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/user/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.list.edit" /></backpath:link></td>
<td><backpath:link action="/user/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/user/edit.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,29 → 21,38
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.user.edit.login" />:
<html:text property="login" />
<bean:message key="ak.hostcaptain.page.user.edit.login" />:
<html:text property="login" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.edit.password" />:
<html:password property="password" redisplay="false" />
<bean:message key="ak.hostcaptain.page.user.edit.password" />:
<html:password property="password" redisplay="false" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<bean:message key="ak.hostcaptain.page.user.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.edit.boss" />:
<html:select property="boss">
<html:option value="" key="ak.hostcaptain.page.user.edit.boss.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<bean:message key="ak.hostcaptain.page.user.edit.boss" />:
<html:select property="boss">
<html:option value="" key="ak.hostcaptain.page.user.edit.boss.empty"/>
<core:options collection="users" property="id" />
</html:select>
<br>
 
<html:checkbox property="superuser" />
<bean:message key="ak.hostcaptain.page.user.edit.superuser" />
<html:checkbox property="superuser" />
<bean:message key="ak.hostcaptain.page.user.edit.superuser" />
FIXME: don't show this checkbox for editor itself
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.user.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.edit.comment" />:
<html:textarea property="comment" />
<br>
 
<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>
/sun/hostcaptain/trunk/webapp/user/password/change.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
/sun/hostcaptain/trunk/webapp/generalError.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
16,7 → 17,7
 
<p><bean:message key="ak.hostcaptain.page.generalError.message" /></p>
 
<backpath:link><bean:message key="ak.hostcaptain.page.generalError.index" /></backpath:link>
<!-- FIXME: backpath:link><bean:message key="ak.hostcaptain.page.generalError.index" /></ backpath : link-->
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.generalError.back" /></backpath:backlink>
 
/sun/hostcaptain/trunk/webapp/index.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
/sun/hostcaptain/trunk/webapp/mail/alias/edit.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
84,6 → 85,14
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.mail.alias.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.mail.alias.edit.comment" />:
<html:textarea property="comment" />
<br>
</p>
 
<table>
/sun/hostcaptain/trunk/webapp/mail/alias/list.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
19,6 → 20,7
<table>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.list.alias" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
26,6 → 28,10
<logic:iterate name="aliases" id="alias">
<tr>
<td><bean:write name="alias" property="address" /></td>
<td>
<logic:equal name="alias" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="alias" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.edit" /></backpath:link></td>
<td><backpath:link action="/mail/alias/delete" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/mail/box/edit.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,51 → 21,59
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.login" />:
<html:text property="login" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.login" />:
<html:text property="login" />
<br>
 
FIXME: checkbox to get password from owner
FIXME: checkbox to get password from owner
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.password" />:
<html:password property="password" redisplay="false" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.password" />:
<html:password property="password" redisplay="false" />
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.domain" />:
<html:select property="domain">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
<bean:message key="ak.hostcaptain.page.mail.box.edit.domain" />:
<html:select property="domain">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<bean:message key="ak.hostcaptain.page.mail.box.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.systemuser" />:
<html:select property="systemuser">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.systemuser.empty"/>
<html:options collection="systemusers" property="id" labelProperty="name" />
</html:select>
FIXME: uid+name should be shown
<bean:message key="ak.hostcaptain.page.mail.box.edit.systemuser" />:
<html:select property="systemuser">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.systemuser.empty"/>
<core:options collection="systemusers" property="id" />
</html:select>
FIXME: uid+name should be shown
<br>
 
<html:checkbox property="viruscheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.viruscheck" />
<html:checkbox property="viruscheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.viruscheck" />
<br>
 
<html:checkbox property="spamcheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.spamcheck" />
<html:checkbox property="spamcheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.spamcheck" />
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.comment" />:
<html:textarea property="comment" />
<br>
 
<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>
/sun/hostcaptain/trunk/webapp/mail/box/list.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
21,6 → 22,7
<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>&nbsp;</th>
</tr>
 
29,6 → 31,10
<td><bean:write name="mailbox" property="login" /></td>
<td><bean:write name="mailbox" property="domain.name" /></td>
<td><bean:write name="mailbox" property="owner.login" /></td>
<td>
<logic:equal name="mailbox" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="mailbox" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/mail/box/edit" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.box.list.edit" /></backpath:link></td>
<td><backpath:link action="/mail/box/delete" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.box.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/error.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
/sun/hostcaptain/trunk/webapp/system/login.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
/sun/hostcaptain/trunk/webapp/system/logout.jsp
1,8 → 1,9
<%@ 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/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/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>