[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community listUsers.jsp

[lisachen]

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv10242/webapp/editors/community

Modified Files:
        listUsers.jsp 
Log Message:
CMSC-990 merge add subscribers


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-990


Index: listUsers.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/listUsers.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- listUsers.jsp       28 Jul 2008 07:56:18 -0000      1.4
+++ listUsers.jsp       28 Jul 2008 14:49:13 -0000      1.5
@@ -1,12 +1,9 @@
 <[EMAIL PROTECTED] file="globals.jsp" 
-%>
-<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" 
-%>
-<%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit"
-%>
-<[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"
-%>
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" 
+%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit"
+%><[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"%>
 <fmt:setBundle basename="cmsc-community" scope="request" />
+<mm:content type="text/html" encoding="UTF-8" expires="0">
 <cmscedit:head title="reactions.title">
        <script type="text/javascript">
           function addToGroup(){
@@ -25,17 +22,26 @@
           }
        </script>
 </cmscedit:head>
+<mm:cloud jspvar="cloud" rank="basic user" loginpage="../../login.jsp">
+<mm:import externid="newsletterId"/>
+<mm:import externid="method"/>
+<c:url var="addGroup" value="/editors/community/AddUserToGroupInit.do"/>
+<c:url var="subscribeUrl" 
value="/editors/newsletter/NewsletterSubscriptionAddRelAction.do?method=${method}"/>
 
 <edit:ui-tabs>
    <edit:ui-tab key="community.search.users" active="true"/>
+   <mm:notpresent referid="newsletterId" >
    <edit:ui-tab key="community.search.groups">
       ${pageContext.request.contextPath 
}/editors/community/searchConditionalGroupAction.do
    </edit:ui-tab>
+   </mm:notpresent>
 </edit:ui-tabs>
 
 <div class="editor">
    <div style="padding-left:10px;">
+      <mm:notpresent referid="newsletterId" >
       <p><a href="userAddInitAction.do" style=" padding-left:20px; background: 
url(<cmsc:staticurl page='/editors/gfx/icons/new.png'/>) left center 
no-repeat"><fmt:message key="view.new.user"/></a><p>
+      </mm:notpresent>
       <html:form action="/editors/community/SearchConditionalUser.do" 
method="post">
        <table border="0">
          <tbody >
@@ -68,11 +74,19 @@
 <div class="editor">
    <div class="ruler_green"><div>&nbsp;<fmt:message 
key="community.search.result"/>&nbsp;</div></div>
    <div class="body">
-      <form action="${pageContext.request.contextPath 
}/editors/community/AddUserToGroupInit.do" method="post">
-         <p><input type="submit" value="add To Group" name="submitButton" 
onclick="return addToGroup()"/></p>
+
+         <mm:notpresent referid="newsletterId" >
+            <form action="${addGroup}" method="post">
+               <input type="submit" value="add To Group" name="submitButton" 
onclick="return addToGroup()"/>
+         </mm:notpresent>
+         <mm:present referid="newsletterId">
+            <form action="${subscribeUrl}" method="post">
+            <input type="submit" value="Subscribe" name="subscribe"/>
+            <input type="hidden" name="newsletterId" value="${newsletterId}"/>
+         </mm:present>
          <edit:ui-table items="${personForShow}" var="person" 
size="${totalCount}" requestURI="/editors/community/SearchConditionalUser.do">
             <edit:ui-tcolumn title="">
-               <input type="checkbox" name="chk_" 
value="${person.authId}"/>&nbsp;
+               <input type="checkbox" name="chk_${person.authId}" 
value="${person.authId}"/>&nbsp;
                <a href="${pageContext.request.contextPath 
}/editors/community/userAddInitAction.do?authid=${person.authId}"><img 
src="<cmsc:staticurl page='/editors/gfx/icons/edit.png'/>" width="16" 
height="16" title="edit"></a>
                <a href="${pageContext.request.contextPath 
}/editors/community/deleteUserAction.do?authid=${person.authId}"><img 
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16" 
height="16" title="delete"></a>
             </edit:ui-tcolumn>
@@ -92,3 +106,5 @@
       </form>
    </div>
 </div>
\ No newline at end of file
+</mm:cloud>
+</mm:content>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs