Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 914 → Rev 915

/sun/hostcaptain/trunk/webapp/system/login.jsp
19,7 → 19,7
 
<html:form action="/system/login/submit" focus="username">
<backpath:current />
<table border="0">
<table border=1>
<tr>
<th class="right">
<bean:message key="ak.hostcaptain.page.system.login.login" />
/sun/hostcaptain/trunk/webapp/WEB-INF/hostcaptain-core.tld
97,7 → 97,60
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
 
<tag>
<name>write</name>
<tagclass>ak.hostcaptain.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/validation.xml
125,16 → 125,11
<field property="id" depends="long">
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.id.wrong" />
</field>
<field property="address" depends="required">
<msg name="required" key="ak.hostcaptain.core.mail.alias.edit.address.empty" />
</field>
<field property="domain" depends="required,long">
<field property="domain" depends="long">
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.domain.wrong" />
<msg name="required" key="ak.hostcaptain.core.mail.alias.edit.domain.wrong" />
</field>
<field property="owner" depends="required,long">
<field property="owner" depends="long">
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.owner.wrong" />
<msg name="required" key="ak.hostcaptain.core.mail.alias.edit.owner.wrong" />
</field>
</form>
</formset>
/sun/hostcaptain/trunk/webapp/domain/edit.jsp
21,28 → 21,36
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.domain.edit.name" />:
<html:text property="name" />
<br>
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.edit.name" /></th>
<td><html:text property="name" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.edit.owner" /></th>
<td>
<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>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.edit.enabled" /></th>
<td><html:checkbox property="enabled" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.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>
</td>
</tr>
</table>
 
<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>
</html:form>
 
</body>
/sun/hostcaptain/trunk/webapp/user/password/change.jsp
20,40 → 20,38
<html:form action="/user/password/submit" focus="oldpassword">
<backpath:current/>
 
<table border="0">
<table border=1>
<tr>
<th class="right">
<th>
<bean:message key="ak.hostcaptain.page.user.password.change.old_password" />
</th>
<td class="left">
<td>
<html:password property="oldpassword" size="16" redisplay="false" />
</td>
</tr>
<tr>
<th class="right">
<th>
<bean:message key="ak.hostcaptain.page.user.password.change.new_password" />
</th>
<td class="left">
<td>
<html:password property="password" size="16" redisplay="false" />
</td>
</tr>
<tr>
<th class="right">
<th>
<bean:message key="ak.hostcaptain.page.user.password.change.new_password_again" />
</th>
<td class="left">
<td>
<html:password property="password2" size="16" redisplay="false" />
</td>
</tr>
<tr>
<td class="right">
<td colspan=2>
<html:submit>
<bean:message key="ak.hostcaptain.page.user.password.change.submit" />
</html:submit>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.password.change.back" /></backpath:backlink>
</td>
<td class="right">
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.password.change.cancel" /></backpath:backlink>
</td>
</tr>
</table>
</html:form>
/sun/hostcaptain/trunk/webapp/user/system/list.jsp
17,7 → 17,7
 
<html:errors/>
 
<table>
<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>
35,6 → 35,9
<logic:present name="u" property="owner">
<bean:write name="u" property="owner.login" />
</logic:present>
<logic:notPresent name="u" property="owner">
&nbsp;
</logic:notPresent>
</td>
<td>
<logic:equal name="u" property="enabled" value="true">x</logic:equal>
/sun/hostcaptain/trunk/webapp/user/system/edit.jsp
21,32 → 21,40
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.user.system.edit.uid" />:
<html:text property="uid" />
<br>
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.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>
<td><html:text property="name" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.edit.owner" /></th>
<td>
<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>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.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>
<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>
</td>
</tr>
</table>
 
<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>
<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>
</html:form>
 
</body>
/sun/hostcaptain/trunk/webapp/user/list.jsp
17,7 → 17,7
 
<html:errors/>
 
<table>
<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>
34,6 → 34,9
<logic:present name="u" property="boss">
<bean:write name="u" property="boss.login" />
</logic:present>
<logic:notPresent name="u" property="boss">
&nbsp;
</logic:notPresent>
</td>
<td>
<logic:equal name="u" property="superuser" value="true">x</logic:equal>
/sun/hostcaptain/trunk/webapp/user/edit.jsp
21,41 → 21,49
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.user.edit.login" />:
<html:text property="login" />
<br>
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.login" /></th>
<td><html:text property="login" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.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>
<td><html:password property="password2" redisplay="false" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.boss" /></th>
<td>
<html:select property="boss">
<html:option value="" key="ak.hostcaptain.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>
<td><html:checkbox property="superuser" />
FIXME: don't show this checkbox for editor itself</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.edit.enabled" /></th>
<td><html:checkbox property="enabled" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.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>
</td>
</tr>
</table>
 
<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" />
<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"/>
<core:options collection="users" property="id" />
</html:select>
<br>
 
<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>
</html:form>
 
</body>
/sun/hostcaptain/trunk/webapp/mail/box/edit.jsp
21,61 → 21,73
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.login" />:
<html:text property="login" />
<br>
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.login" /></th>
<td><html:text property="login" /></td>
</tr>
<tr>
<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>
<td><html:password property="password" redisplay="false" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.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>
<td>
<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>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.owner" /></th>
<td>
<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>
</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.box.edit.systemuser" /></th>
<td>
<html:select property="systemuser">
<html:option value="" key="ak.hostcaptain.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>
<td><html:checkbox property="viruscheck" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.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>
<td><html:checkbox property="enabled" /></td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.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>
</td>
</tr>
</table>
 
FIXME: checkbox to get password from owner
<br>
 
<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" />
<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>
<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>
<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"/>
<core:options collection="systemusers" property="id" />
</html:select>
<br>
 
<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" />
<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>
</html:form>
 
</body>
/sun/hostcaptain/trunk/webapp/mail/box/list.jsp
17,7 → 17,7
 
<html:errors/>
 
<table>
<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>
24,6 → 24,7
<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>
<th>&nbsp;</th>
</tr>
 
<logic:iterate name="mailboxes" id="mailbox">
/sun/hostcaptain/trunk/webapp/mail/alias/list.jsp
17,7 → 17,7
 
<html:errors/>
 
<table>
<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>
/sun/hostcaptain/trunk/webapp/mail/alias/edit.jsp
67,38 → 67,58
<backpath:current/>
<html:hidden property="id" />
 
<p>
<bean:message key="ak.hostcaptain.page.mail.alias.edit.address" />:
<html:text property="address" />
<br>
<table border=1>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.address" /></th>
<td><html:text property="address" /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.domain" /></th>
<td>
<html:select property="domain">
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.owner" /></th>
<td>
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.enabled" /></th>
<td><html:checkbox property="enabled" /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.comment" /></th>
<td><html:textarea property="comment" /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
 
<bean:message key="ak.hostcaptain.page.mail.alias.edit.domain" />:
<html:select property="domain">
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
<br>
 
<bean:message key="ak.hostcaptain.page.mail.alias.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.owner.empty"/>
<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>
<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>&nbsp;</th>
</tr>
 
112,17 → 132,19
</html:select>
</td>
<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>
</tr>
</logic:iterate>
 
<tr>
<td colspan=3><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.hostcaptain.page.mail.alias.edit.add" /></html:submit></td>
<tr>
</tr>
<td colspan=3>
<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.cancel" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.alias.edit.back" /></backpath:backlink>
</td>
</tr>
</table>