Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login
In directory
james.mmbase.org:/tmp/cvs-serv1248/portlets-login/src/webapp/WEB-INF/templates/view/login
Modified Files:
login.jsp
Added Files:
send_password.jsp
Log Message:
Merge van 1.4 branch
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login
Index: login.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- login.jsp 8 Feb 2008 10:36:02 -0000 1.4
+++ login.jsp 14 Mar 2008 12:52:11 -0000 1.5
@@ -4,10 +4,17 @@
<form name="<portlet:namespace />form"
action="<cmsc:actionURL><cmsc:param name="action"
value="login"/></cmsc:actionURL>"
- target="_parent"
method="post">
<table>
+<c:if test="${!empty errormessage}">
+ <tr class="inputrow" style="color: red;" >
+ <td colspan="2">
+ <fmt:message key="${errormessage}" />
+ </td>
+ </tr>
+</c:if>
+
<tr class="inputrow">
<td><fmt:message key="view.username" /></td>
<td><input type="text" name="j_username"/></td>
@@ -22,6 +29,15 @@
<input type="submit" value="<fmt:message key="view.submit" />" />
</td>
</tr>
+<%-- Community module does not have all methods yet
+ <tr>
+ <td></td>
+ <td id="Submit" align="right">
+ <cmsc:renderURL var="sendPasswordUrl"><cmsc:param name="action"
value="send_password"/></cmsc:renderURL>
+ <a href="${sendPasswordUrl}"><fmt:message key="view.send_password" /></a>
+ </td>
+ </tr>
+ --%>
</table>
</form>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
