Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 913 → Rev 914

/sun/hostcaptain/trunk/webapp/WEB-INF/hostcaptain-core.tld
12,7 → 12,7
<bodycontent>empty</bodycontent>
<attribute>
<name>collection</name>
<required>false</required>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
21,11 → 21,6
<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>
41,6 → 36,67
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
 
<tag>
<name>viewable</name>
<tagclass>ak.hostcaptain.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.hostcaptain.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.hostcaptain.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.hostcaptain.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.hostcaptain.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.hostcaptain.core.taglib.NotDeleteableTag</tagclass>
<bodycontent>JSP</bodycontent>
<attribute>
<name>name</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
</taglib>
 
 
/sun/hostcaptain/trunk/webapp/domain/list.jsp
17,7 → 17,7
 
<html:errors/>
 
<table>
<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>
34,13 → 34,35
<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>
<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>
</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>
</core:viewable>
<core:notViewable name="domain">
&nbsp;
</core:notViewable>
</core:notEditable>
</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>
</core:deleteable>
<core:notDeleteable name="domain">
&nbsp;
</core:notDeleteable>
</td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/domain/edit"><bean:message key="ak.hostcaptain.page.domain.list.add" /></backpath:link>
<logic:equal name="allowedToCreate" value="true">
<backpath:link action="/domain/edit"><bean:message key="ak.hostcaptain.page.domain.list.add" /></backpath:link>
</logic:equal>
 
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.domain.list.back" /></backpath:backlink>
 
/sun/hostcaptain/trunk/webapp/user/system/list.jsp
40,13 → 40,35
<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>
<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>
</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>
</core:viewable>
<core:notViewable name="u">
&nbsp;
</core:notViewable>
</core:notEditable>
</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>
</core:deleteable>
<core:notDeleteable name="u">
&nbsp;
</core:notDeleteable>
</td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/user/system/edit"><bean:message key="ak.hostcaptain.page.user.system.list.add" /></backpath:link>
<logic:equal name="allowedToCreate" value="true">
<backpath:link action="/user/system/edit"><bean:message key="ak.hostcaptain.page.user.system.list.add" /></backpath:link>
</logic:equal>
 
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.system.list.back" /></backpath:backlink>
 
/sun/hostcaptain/trunk/webapp/index.jsp
18,10 → 18,20
<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/system/list"><bean:message key="ak.hostcaptain.page.index.system_user_list" /></backpath:link></li>
<li><backpath:link action="/domain/list"><bean:message key="ak.hostcaptain.page.index.domain_list" /></backpath:link></li>
<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/alias/list"><bean:message key="ak.hostcaptain.page.index.mail_alias_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>
</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>
</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>
</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>
</logic:equal>
 
<li><backpath:link action="/system/logout"><bean:message key="ak.hostcaptain.page.index.logout" /></backpath:link></li>
</ul>
 
/sun/hostcaptain/trunk/webapp/mail/box/edit.jsp
55,7 → 55,6
<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" />
/sun/hostcaptain/trunk/webapp/mail/box/list.jsp
35,13 → 35,35
<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>
<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>
</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>
</core:viewable>
<core:notViewable name="mailbox">
&nbsp;
</core:notViewable>
</core:notEditable>
</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>
</core:deleteable>
<core:notDeleteable name="mailbox">
&nbsp;
</core:notDeleteable>
</td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/mail/box/edit"><bean:message key="ak.hostcaptain.page.mail.box.list.add" /></backpath:link>
<logic:equal name="allowedToCreate" value="true">
<backpath:link action="/mail/box/edit"><bean:message key="ak.hostcaptain.page.mail.box.list.add" /></backpath:link>
</logic:equal>
 
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.box.list.back" /></backpath:backlink>
 
/sun/hostcaptain/trunk/webapp/mail/alias/list.jsp
20,6 → 20,8
<table>
<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>&nbsp;</th>
<th>&nbsp;</th>
28,17 → 30,41
<logic:iterate name="aliases" id="alias">
<tr>
<td><bean:write name="alias" property="address" /></td>
<td><bean:write name="alias" property="domain.name" /></td>
<td><bean:write name="alias" property="owner.login" /></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>
<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>
</core:editable>
<core:notEditable name="alias">
<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.edit" /></backpath:link>
</core:viewable>
<core:notViewable name="alias">
&nbsp;
</core:notViewable>
</core:notEditable>
</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>
</core:deleteable>
<core:notDeleteable name="alias">
&nbsp;
</core:notDeleteable>
</td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/mail/alias/edit"><bean:message key="ak.hostcaptain.page.mail.alias.list.add" /></backpath:link>
<logic:equal name="allowedToCreate" value="true">
<backpath:link action="/mail/alias/edit"><bean:message key="ak.hostcaptain.page.mail.alias.list.add" /></backpath:link>
</logic:equal>
 
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.alias.list.back" /></backpath:backlink>