/sun/hostadmiral/trunk/webapp/index.jsp |
---|
35,7 → 35,17 |
<li><backpath:link action="/system/logout"><bean:message key="ak.hostadmiral.page.index.logout" /></backpath:link></li> |
</ul> |
<p><bean:message key="ak.hostadmiral.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> |
<p> |
<bean:message key="ak.hostadmiral.page.index.locale" />: |
<core:language /> |
<logic:notEmpty name="user" property="locale.displayCountry"> |
/ <core:country /> |
</logic:notEmpty> |
</p> |
</body> |
/sun/hostadmiral/trunk/webapp/WEB-INF/hostadmiral-core.tld |
---|
183,4 → 183,20 |
<rtexprvalue>true</rtexprvalue> |
</attribute> |
</tag> |
<tag> |
<name>language</name> |
<tagclass>ak.hostadmiral.core.taglib.LanguageTag</tagclass> |
<bodycontent>empty</bodycontent> |
</tag> |
<tag> |
<name>country</name> |
<tagclass>ak.hostadmiral.core.taglib.CountryTag</tagclass> |
<bodycontent>empty</bodycontent> |
</tag> |
<tag> |
<name>localeOptions</name> |
<tagclass>ak.hostadmiral.core.taglib.LocaleOptionsTag</tagclass> |
<bodycontent>empty</bodycontent> |
</tag> |
</taglib> |
/sun/hostadmiral/trunk/webapp/WEB-INF/struts-config.xml |
---|
42,11 → 42,19 |
<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="locale" type="java.lang.String" /> |
<form-property name="enabled" type="java.lang.Boolean" /> |
<form-property name="comment" type="java.lang.String" /> |
</form-bean> |
<form-bean |
name="ak.hostadmiral.core.form.UserPartEditForm" |
type="org.apache.struts.validator.DynaValidatorForm"> |
<form-property name="id" type="java.lang.String" /> |
<form-property name="locale" type="java.lang.String" /> |
</form-bean> |
<form-bean |
name="ak.hostadmiral.core.form.SystemUserForm" |
type="org.apache.struts.validator.DynaValidatorForm"> |
<form-property name="id" type="java.lang.String" /> |
265,6 → 273,28 |
> |
</action> |
<action |
path="/user/partedit" |
type="ak.hostadmiral.core.action.UserAction" |
parameter="partedit" |
name="ak.hostadmiral.core.form.UserForm" |
validate="true" |
scope="request" |
> |
<forward name="default" path="/user/partedit.jsp" /> |
</action> |
<action |
path="/user/partsubmit" |
type="ak.hostadmiral.core.action.UserAction" |
parameter="partsubmit" |
name="ak.hostadmiral.core.form.UserPartEditForm" |
validate="true" |
scope="request" |
input="/user/partedit.jsp" |
> |
</action> |
<!-- == system user ======================================================================= --> |
<action |
/sun/hostadmiral/trunk/webapp/WEB-INF/validation.xml |
---|
53,8 → 53,21 |
<field property="boss" depends="long"> |
<msg name="long" key="ak.hostadmiral.core.user.boss.id.wrong" /> |
</field> |
<field property="locale" depends="required"> |
<msg name="long" key="ak.hostadmiral.core.user.locale.wrong" /> |
</field> |
</form> |
<form name="ak.hostadmiral.core.form.UserPartEditForm"> |
<field property="id" depends="long,required"> |
<msg name="required" key="ak.hostadmiral.core.user.id.wrong" /> |
<msg name="long" key="ak.hostadmiral.core.user.id.wrong" /> |
</field> |
<field property="locale" depends="required"> |
<msg name="long" key="ak.hostadmiral.core.user.locale.wrong" /> |
</field> |
</form> |
<form name="ak.hostadmiral.core.form.SystemUserForm"> |
<field property="id" depends="long"> |
<msg name="long" key="ak.hostadmiral.core.user.system.edit.id.wrong" /> |
91,8 → 104,8 |
<msg name="required" key="ak.hostadmiral.core.domain.edit.name.empty" /> |
</field> |
<field property="owner" depends="required,long"> |
<msg name="required" key="ak.hostadmiral.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> |
110,12 → 123,12 |
<msg name="required" key="ak.hostadmiral.core.mailbox.edit.login.empty" /> |
</field> |
<field property="domain" depends="required,long"> |
<msg name="required" key="ak.hostadmiral.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="required" key="ak.hostadmiral.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.hostadmiral.core.mailbox.edit.systemuser.wrong" /> |
/sun/hostadmiral/trunk/webapp/user/edit.jsp |
---|
60,6 → 60,14 |
</td> |
</tr> |
<tr> |
<th><bean:message key="ak.hostadmiral.page.user.edit.locale" /></th> |
<td> |
<html:select property="locale"> |
<core:localeOptions /> |
</html:select> |
</td> |
</tr> |
<tr> |
<th><bean:message key="ak.hostadmiral.page.user.edit.enabled" /></th> |
<td><html:checkbox property="enabled" /></td> |
</tr> |
/sun/hostadmiral/trunk/webapp/user/list.jsp |
---|
51,6 → 51,10 |
<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:rights name="u" method="partEditableBy"> |
<backpath:link action="/user/partedit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.list.partedit" /></backpath:link> |
</core:rights> |
<core:noRights name="u" method="partEditableBy"> |
<core:viewable name="u"> |
<backpath:link action="/user/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.list.view" /></backpath:link> |
</core:viewable> |
57,6 → 61,7 |
<core:notViewable name="u"> |
|
</core:notViewable> |
</core:noRights> |
</core:notEditable> |
</td> |
<td> |
/sun/hostadmiral/trunk/webapp/user/partedit.jsp |
---|
0,0 → 1,90 |
<%@ 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/hostadmiral-core.tld" prefix="core" %> |
<html> |
<head> |
<meta http-equiv="expires" content="0"> |
<title><bean:message key="ak.hostadmiral.page.user.partedit.title" /></title> |
</head> |
<body> |
<h1><bean:message key="ak.hostadmiral.page.user.partedit.title" /></h1> |
<html:errors/> |
<html:form action="/user/partsubmit"> |
<backpath:current /> |
<html:hidden property="id" /> |
<table border=1> |
<tr> |
<th><bean:message key="ak.hostadmiral.page.user.partedit.login" /></th> |
<td><bean:write name="u" property="login" /></td> |
</tr> |
<tr> |
<th><bean:message key="ak.hostadmiral.page.user.partedit.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.hostadmiral.page.user.partedit.boss.empty" /> |
</logic:notPresent> |
</td> |
</tr> |
<tr> |
<th><bean:message key="ak.hostadmiral.page.user.partedit.superuser" /></th> |
<td> |
<logic:equal name="u" property="superuser" value="true"> |
<bean:message key="ak.hostadmiral.page.user.partedit.superuser.true" /> |
</logic:equal> |
<logic:notEqual name="u" property="superuser" value="true"> |
<bean:message key="ak.hostadmiral.page.user.partedit.superuser.false" /> |
</logic:notEqual> |
</td> |
</tr> |
<tr> |
<th><bean:message key="ak.hostadmiral.page.user.partedit.locale" /></th> |
<td> |
<html:select property="locale"> |
<core:localeOptions /> |
</html:select> |
</td> |
</tr> |
<tr> |
<th><bean:message key="ak.hostadmiral.page.user.partedit.enabled" /></th> |
<td> |
<logic:equal name="u" property="enabled" value="true"> |
<bean:message key="ak.hostadmiral.page.user.partedit.enabled.true" /> |
</logic:equal> |
<logic:notEqual name="u" property="enabled" value="true"> |
<bean:message key="ak.hostadmiral.page.user.partedit.enabled.false" /> |
</logic:notEqual> |
</td> |
</tr> |
<tr> |
<th><bean:message key="ak.hostadmiral.page.user.partedit.comment" /></th> |
<td><bean:write name="u" property="comment" /> </td> |
</tr> |
<tr> |
<td colspan=2> |
<html:submit><bean:message key="ak.hostadmiral.page.user.partedit.submit" /></html:submit> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.partedit.back" /></backpath:backlink> |
</td> |
</tr> |
</table> |
</html:form> |
<p> |
<backpath:link action="/user/logins" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.partedit.logins" /></backpath:link> |
</p> |
</body> |
</html> |