Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login
In directory
james.mmbase.org:/tmp/cvs-serv26722/src/webapp/WEB-INF/templates/view/login
Modified Files:
confirmation.txt register_success.jsp
Log Message:
CMSC-948 Registration portlet for CMS container
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login
See also: http://www.mmbase.org/jira/browse/CMSC-948
Index: confirmation.txt
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/confirmation.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- confirmation.txt 6 Nov 2008 07:21:44 -0000 1.1
+++ confirmation.txt 7 Nov 2008 06:56:27 -0000 1.2
@@ -12,17 +12,11 @@
Your account is currently inactive. You cannot use it until you visit
the following link:
-https://www.jboss.com/index.html?module=user&op=activate&i=baad8951cb929c4f40989c674f0ad0eb&u=331200
%s
+
If you did not register for membership on our site, no further action
is required.
Regards,
-The JBoss.com Staff
-
-
-
-Account successfully activated!
-Login to access your account.
\ No newline at end of file
Index: register_success.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/register_success.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- register_success.jsp 6 Nov 2008 07:21:44 -0000 1.1
+++ register_success.jsp 7 Nov 2008 06:56:27 -0000 1.2
@@ -1,16 +1,32 @@
<[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp"%>
-
+<c:if test="${empty active}">
<h3><fmt:message key="register.success" /></h3>
-
<form name="<portlet:namespace />form"
action="<cmsc:actionURL/>"
method="post">
-
<table>
<tr class="inputrow">
<td><fmt:message key="register.success.information" />
</td>
</tr>
</table>
-
</form>
+</c:if>
+<c:if test="${!empty active}">
+<br/>
+ <table>
+ <tr class="inputrow">
+ <td>
+ <c:if test="${active == 'success'}">
+ <fmt:message key="register.active.success" />
+ </c:if>
+ <c:if test="${active == 'failure'}">
+ <fmt:message key="register.active.failure" />
+ </c:if>
+ <c:if test="${active == 'actived'}">
+ <fmt:message key="register.active.actived" />
+ </c:if>
+ </td>
+ </tr>
+ </table>
+</c:if>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
