head	1.13;
access;
symbols
	dlr:1.1.1
	TIGRIS_0_9_2_4:1.10
	TIGRIS_0_9_2_3:1.10
	HELM_PEER_PORT_BRANCH:1.1.1.1
	TURBINE_PEER:1.10
	TIGRIS_0_9_2_1:1.10
	TIGRIS_0_9_2:1.10.0.2
	TIGRIS_0_9_0:1.7.0.2
	TIGRIS_0_8_4:1.2.0.2;
locks; strict;
comment	@# @;


1.13
date	2001.03.08.19.05.38;	author leonardr;	state dead;
branches;
next	1.12;

1.12
date	2001.02.21.23.42.39;	author leonardr;	state Exp;
branches;
next	1.11;

1.11
date	2001.02.21.01.08.29;	author dlr;	state Exp;
branches;
next	1.10;

1.10
date	2000.12.30.01.03.32;	author leonardr;	state Exp;
branches
	1.10.4.1;
next	1.9;

1.9
date	2000.12.29.17.11.54;	author leonardr;	state Exp;
branches;
next	1.8;

1.8
date	2000.12.21.06.52.08;	author edk;	state Exp;
branches;
next	1.7;

1.7
date	2000.12.21.01.08.44;	author jrobbins;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2000.12.21.00.56.35;	author jrobbins;	state Exp;
branches;
next	1.5;

1.5
date	2000.12.21.00.46.23;	author jrobbins;	state Exp;
branches;
next	1.4;

1.4
date	2000.12.14.22.51.05;	author jody;	state Exp;
branches;
next	1.3;

1.3
date	2000.12.06.18.57.53;	author leonardr;	state Exp;
branches;
next	1.2;

1.2
date	2000.12.03.06.12.55;	author jrobbins;	state Exp;
branches;
next	1.1;

1.1
date	2000.11.29.18.07.43;	author leonardr;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2001.02.21.00.36.54;	author dlr;	state Exp;
branches;
next	;

1.7.2.1
date	2000.12.21.07.16.57;	author jrobbins;	state Exp;
branches;
next	;

1.10.4.1
date	2001.01.31.02.05.50;	author leonardr;	state Exp;
branches;
next	1.10.4.2;

1.10.4.2
date	2001.02.12.17.20.30;	author leonardr;	state Exp;
branches;
next	1.10.4.3;

1.10.4.3
date	2001.02.12.18.04.08;	author leonardr;	state Exp;
branches;
next	;


desc
@@


1.13
log
@Political correctness strikes Tigris.org! The components of project and user groups no longer wish to be called "members", as that causes them to be confused with users who have roles in projects. The new, approved term is "elements".
@
text
@<TABLE BORDER="0" CELLSPACING="1" CELLPADDING="2" BORDER="0" WIDTH="100%">
  <TR>
    <TD class="Header" nowrap>Add Members: <SPAN CLASS="ProjectNameHeader">$currentUserGroup.getName()</SPAN></TD>  
  </TR>
</TABLE>

<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2" WIDTH="100%">
<FORM ACTION="UserGroupMemberAdd" METHOD="POST" ENCTYPE="application/x-www-form-urlencoded">
<INPUT TYPE="hidden" NAME="userGroupID" VALUE="$currentUserGroup.getID()">
  <TR>
    <TD WIDTH="5%" CLASS="ProjectDownloadHeader" BGCOLOR="#efefef">Add</TD>
    <TD WIDTH="11%" CLASS="ProjectDownloadHeader" BGCOLOR="#efefef"><B>&nbsp;User</B></TD>
    <TD WIDTH="84%" CLASS="ProjectDownloadHeader" BGCOLOR="#efefef"><B>Real Name</B></TD>
  </TR>

#set $users = $currentDomain.getUsersNotInGroup($currentUserGroup, $itemsPerPage, $filter);
#set $page = $users.getPage($paginated_page);
#if ($userPage.isEmpty())
{
 #if ($users.isEmpty()) 
 {
  <font color="red">All avaliable users are already in this group.</font>
 } #else {
  <font color="red">No matching users found.</font>
 }
} #else {
 #foreach $user in $page
 {
  <TR>
   <TD WIDTH="5%" BGCOLOR="white">
    <P><INPUT TYPE="CHECKBOX" NAME="Add $user.getID()">
   </TD>
   <TD WIDTH="20%" CLASS="PlainText" BGCOLOR="white">&nbsp;
    #if ($acl.hasPermission("User - Edit", $currentDomain))
    {
     <A HREF="UserEdit?userID=$user.getID()">$user.getLoginName()</A>
    } #else {
     $user.getLoginName()
    }
   </TD>
   <TD WIDTH="75%" CLASS="PlainText" VALIGN="TOP" BGCOLOR="white">
    $user.getRealName()
   </TD>
  </TR>
  <TR>
   <TD COLSPAN="6">
    <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
     <TR>
      <TD BGCOLOR="#efefef" HEIGHT="1"><SPACER TYPE="block" HEIGHT="1"></TD>
     </TR>
    </TABLE>
   </TD>
  </TR>
 }  
 <TR>
  <TD COLSPAN="3"><INPUT type="Submit" name="Button" value="Add to Group"></TD>
 </TR>
 <TR>
  <TD COLSPAN="3" ALIGN="center" CLASS="PlainText">
   $users.navigationBar("UserGroupMemberAdd?userGroupID=$currentUserGroup.getID()", $paginated_page);
  </TD>
 </TR>
}

<TR>
 <TD COLSPAN="3"><hr size="1" noshade></TD>
</TR>
<TR>
  <TD COLSPAN="3">
  <FORM METHOD="post" ACTION="UserGroupMemberAdd">
  #parse "$SERVLET_TEMPLATE_ROOT;/org/tigris/helm/tool/paginate/Filter.wm" 
  </FORM>
  </TD>
</TR>
</TABLE>@


1.12
log
@Added/fixed pagination.
@
text
@@


1.11
log
@This is the highest revision from the HELM_PEER_PORT_BRANCH.  The previous import caused too many conflicts to resolve manually
@
text
@d16 3
a18 3
#set $paginatableList = $currentDomain.getUsersNotInGroup($currentUserGroup, $itemsPerPage, $filter);
#set $userPage = $paginatableList.getPage($paginated_page);
#if (!$userPage.isEmpty())
d20 8
a27 1
 #foreach $user in $userPage
d60 1
a60 1
   $paginatableList.navigationBar("UserGroupMemberAdd?userGroupID=$currentUserGroup.getID()", $paginated_page);
a62 2
} #else {
 <font color="red">No matching users were found.</font>
@


1.10
log
@More pagination changes--allow paginated lists to filter out items already in a group.
@
text
@d16 1
a16 1
#set $paginatableList = $currentDomain.getUsersNotInGroup($currentUserGroup, $itemsPerPage, $criterion);
d24 1
a24 1
    <P><INPUT TYPE="CHECKBOX" NAME="Add $user.getUserID()">
d27 1
a27 1
    #if ($acl.hasPermissionForDomain("User - Edit", $currentDomain.getID()))
d29 1
a29 1
     <A HREF="UserEdit?userID=$user.getID()">$user.getLoginID()</A>
d31 1
a31 1
     $user.getLoginID()
d35 1
a35 1
    $user.getName()
@


1.10.4.1
log
@Converted permission checking somewhat.
@
text
@d27 1
a27 1
    #if ($acl.hasPermissionForDomain("User - Edit", $currentDomain))
@


1.10.4.2
log
@Got rid of calls to deprecated permission checking methods.
@
text
@d27 1
a27 1
    #if ($acl.hasPermission("User - Edit", $currentDomain))
@


1.10.4.3
log
@Ported UserGroupMemberAdd.java
@
text
@d16 1
a16 1
#set $paginatableList = $currentDomain.getUsersNotInGroup($currentUserGroup, $itemsPerPage, $filter);
d24 1
a24 1
    <P><INPUT TYPE="CHECKBOX" NAME="Add $user.getID()">
d29 1
a29 1
     <A HREF="UserEdit?userID=$user.getID()">$user.getLoginName()</A>
d31 1
a31 1
     $user.getLoginName()
d35 1
a35 1
    $user.getRealName()
@


1.9
log
@Many, many pagination changes.
@
text
@d16 1
a16 1
#set $paginatableList = $currentDomain.getUsers($itemsPerPage, $criterion);
@


1.8
log
@this needs to be fixed in a much more comprehensive way (at the least it
should use the new PaginatableList abstract class).  but now it's at least
somewhat functional ...
@
text
@d15 7
a21 19
  #set $users=$currentDomain.getPaginatedUsers($context)
  #foreach $user in $users
  {
   #if (!$user == null)
   {
    <TR>
    <TD WIDTH="5%" BGCOLOR="white">
      <P><INPUT TYPE="CHECKBOX" NAME="Add $user.getUserID()">
    </TD>
    <TD WIDTH="20%" CLASS="PlainText" BGCOLOR="white">&nbsp;
     #if ($acl.hasPermissionForDomain("User - Edit", $currentDomain.getID()))
     {
      <A HREF="UserEdit?userID=$user.getID()">$user.getLoginID()</A>
     } #else {
      $user.getLoginID()
     }
    </TD>
    <TD WIDTH="75%" CLASS="PlainText" VALIGN="TOP" BGCOLOR="white">$user.getName()</TD>
  </TR>
d23 14
a36 7
    <TD COLSPAN="6">
      <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
        <TR>
          <TD BGCOLOR="#efefef" HEIGHT="1"><SPACER TYPE="block" HEIGHT="1"></TD>
        </TR>
      </TABLE>
    </TD>
a37 3

   }
  }
d39 7
a45 1
    <TD COLSPAN="3"><INPUT type="hidden" name="projectID" value="$currentProject.getID()"><INPUT type="Submit" name="Button" value="Add to Group"></TD>
d47 12
d60 11
a70 13
<TR><TD COLSPAN=4 CLASS="PlainText" ALIGN="CENTER">
#set $paginationURL="/servlets/UserGroupMemberAdd?projectID=$currentProject.getID()&userGroupId=$currentUserGroup.getID()&"
#parse "$SERVLET_TEMPLATE_ROOT;/org/tigris/helm/tool/PaginationBar.wm" 
</TD></TR>

<TR><TD COLSPAN="3"><HR></TD></TR>


<TR><TD COLSPAN=4>
#parse "$SERVLET_TEMPLATE_ROOT;/org/tigris/helm/tool/UserSelection.wm" 
</TR></TD>
</FORM>
</TABLE>
@


1.7
log
@added style
@
text
@d51 1
a51 1
#set $paginationURL="/servlets/UserGroupMemberAdd?projectID=$currentProject.getID()&"
@


1.7.2.1
log
@moved edks fixes from HEAD
@
text
@d51 1
a51 1
#set $paginationURL="/servlets/UserGroupMemberAdd?projectID=$currentProject.getID()&userGroupId=$currentUserGroup.getID()&"
@


1.6
log
@correcter servlet names in pagination
@
text
@d50 1
a50 1
<TR><TD COLSPAN=4>
@


1.5
log
@corrected missing TR and TD tags
@
text
@a49 2
<TR><TD COLSPAN="3"><HR></TD></TR>

d51 1
a51 1
#set $paginationURL="/servlets/ProjectMemberAdd?projectID=$currentProject.getID()&"
d54 3
@


1.4
log
@shifted add checkboxes to left. jody.
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d52 1
d55 2
@


1.3
log
@Brought project and usergroup templates into sync.
@
text
@d1 1
a1 1
<TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" BORDER="0" WIDTH="100%">
d21 1
a21 1
    <TD WIDTH="5%" BGCOLOR="white" ALIGN="RIGHT">
@


1.2
log
@added divider lines and applied styles and corrected spacing
@
text
@d15 2
a16 2

  #foreach $user in $currentDomain.getPaginatedUsers($context)
a45 1

d49 2
@


1.1
log
@Adding files I forgot to add in previous commit.
@
text
@d34 10
@


1.1.1.1
log
@Replacing the HEAD with the HELM_PEER_PORT_BRANCH.
@
text
@d1 1
a1 1
<TABLE BORDER="0" CELLSPACING="1" CELLPADDING="2" BORDER="0" WIDTH="100%">
d16 17
a32 21
#set $paginatableList = $currentDomain.getUsersNotInGroup($currentUserGroup, $itemsPerPage, $filter);
#set $userPage = $paginatableList.getPage($paginated_page);
#if (!$userPage.isEmpty())
{
 #foreach $user in $userPage
 {
  <TR>
   <TD WIDTH="5%" BGCOLOR="white">
    <P><INPUT TYPE="CHECKBOX" NAME="Add $user.getID()">
   </TD>
   <TD WIDTH="20%" CLASS="PlainText" BGCOLOR="white">&nbsp;
    #if ($acl.hasPermission("User - Edit", $currentDomain))
    {
     <A HREF="UserEdit?userID=$user.getID()">$user.getLoginName()</A>
    } #else {
     $user.getLoginName()
    }
   </TD>
   <TD WIDTH="75%" CLASS="PlainText" VALIGN="TOP" BGCOLOR="white">
    $user.getRealName()
   </TD>
d34 3
d38 1
a38 7
   <TD COLSPAN="6">
    <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
     <TR>
      <TD BGCOLOR="#efefef" HEIGHT="1"><SPACER TYPE="block" HEIGHT="1"></TD>
     </TR>
    </TABLE>
   </TD>
a39 12
 }  
 <TR>
  <TD COLSPAN="3"><INPUT type="Submit" name="Button" value="Add to Group"></TD>
 </TR>
 <TR>
  <TD COLSPAN="3" ALIGN="center" CLASS="PlainText">
   $paginatableList.navigationBar("UserGroupMemberAdd?userGroupID=$currentUserGroup.getID()", $paginated_page);
  </TD>
 </TR>
} #else {
 <font color="red">No matching users were found.</font>
}
d41 7
a47 11
<TR>
 <TD COLSPAN="3"><hr size="1" noshade></TD>
</TR>
<TR>
  <TD COLSPAN="3">
  <FORM METHOD="post" ACTION="UserGroupMemberAdd">
  #parse "$SERVLET_TEMPLATE_ROOT;/org/tigris/helm/tool/paginate/Filter.wm" 
  </FORM>
  </TD>
</TR>
</TABLE>@


