Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory
james.mmbase.org:/tmp/cvs-serv10025/community/src/webapp/editors/community
Modified Files:
index.jsp user.jsp
Log Message:
CMSC-617 Personal Pages module
Synced branch 1.4 fixes to head
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-617
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/index.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- index.jsp 28 Feb 2008 11:02:34 -0000 1.9
+++ index.jsp 31 Mar 2008 19:49:02 -0000 1.10
@@ -86,9 +86,9 @@
<c:forEach var="auth" items="${userList}">
<pg:item>
<tr>
- <td style="padding-right: 10px"><a
href="userAddInitAction.do?userid=${auth.userId}">${auth.userId}</a></td>
+ <td style="padding-right: 10px"><a
href="userAddInitAction.do?authid=${auth.id}">${auth.userId}</a></td>
<td>
- <a href="deleteUserAction.do?userid=${auth.userId}">
+ <a href="deleteUserAction.do?authid=${auth.id}">
<img src="../gfx/icons/delete.png" border='0'
title="<fmt:message key="view.removeuser" />"
onclick="return confirm('<fmt:message
key="view.removeuserquestion" />')" />
</a>
Index: user.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/user.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- user.jsp 11 Mar 2008 11:14:41 -0000 1.3
+++ user.jsp 31 Mar 2008 19:49:02 -0000 1.4
@@ -4,10 +4,10 @@
<mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
-<cmscedit:head title="user.edit.title">
+<cmscedit:head title="view.title">
</cmscedit:head>
<body style="overflow: auto">
-<cmscedit:contentblock title="view.edit.title" titleClass="content_block_pink">
+<cmscedit:contentblock title="view.title" titleClass="content_block_pink">
<mm:cloud loginpage="../login.jsp" rank='administrator'>
<mm:cloudinfo type="user" id="cloudusername" write="false" />
<html:form action="/editors/community/userAddAction">
@@ -19,40 +19,51 @@
<td>
<logic:equal name="communityUserForm" property="action"
value="add">
- <html:text property="email" size="30" />
- <span class="notvalid"><html:errors bundle="SECURITY"
property="email" /></span>
+ <html:text property="account" size="30" />
+ <span class="notvalid"><html:errors bundle="COMMUNITY"
property="account" /></span>
</logic:equal>
<logic:notEqual name="communityUserForm" property="action"
value="add">
- <bean:write name="communityUserForm" property="email" />
+ <bean:write name="communityUserForm" property="account" />
</logic:notEqual>
</td>
</tr>
<tr>
<td class="fieldname"><fmt:message key="view.firstname" /></td>
- <td><html:text property="voornaam" size='30' /></td>
+ <td><html:text property="firstName" size='30' />
+ <span class="notvalid"><html:errors bundle="COMMUNITY"
property="firstName" /></span>
+ </td>
</tr>
<tr>
<td class="fieldname"><fmt:message key="view.prefix" /></td>
- <td><html:text property="tussenVoegsels" size="15" /></td>
+ <td><html:text property="prefix" size="15" />
+ <span class="notvalid"><html:errors bundle="COMMUNITY"
property="prefix" /></span>
+ </td>
</tr>
<tr>
<td class="fieldname"><fmt:message key="view.surname" /></td>
- <td><html:text property="achterNaam" size='30' /></td>
+ <td><html:text property="lastName" size='30' />
+ <span class="notvalid"><html:errors bundle="COMMUNITY"
property="lastName" /></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldname"><fmt:message key="view.email" /></td>
+ <td><html:text property="email" size='30' />
+ <span class="notvalid"><html:errors bundle="COMMUNITY"
property="email" /></span>
+ </td>
</tr>
-
<tr>
<td class="fieldname"><fmt:message key="view.password" /></td>
<td>
- <html:password property="password" size="15" maxlength="15" />
- <span class="notvalid"><html:errors bundle="SECURITY"
property="password" /></span>
+ <html:password property="passwordText" size="15" maxlength="15"
/>
+ <span class="notvalid"><html:errors bundle="COMMUNITY"
property="passwordText" /></span>
</td>
</tr>
<tr>
<td class="fieldname" nowrap><fmt:message
key="view.confirmpassword" /></td>
<td>
<html:password property="passwordConfirmation" size="15"
maxlength="15" />
- <span class="notvalid"><html:errors bundle="SECURITY"
property="passwordConfirmation" /></span>
+ <span class="notvalid"><html:errors bundle="COMMUNITY"
property="passwordConfirmation" /></span>
</td>
</tr>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
