Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 912 → Rev 913

/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>