Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 912 → Rev 913

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