head	1.21;
access;
symbols
	TIGRIS_1_1_0RC2:1.19
	TIGRIS_1_1_0RC1:1.19
	TIGRIS_1_1:1.19.0.4
	TIGRIS_1_0_8:1.19
	TIGRIS_1_0_8RC3:1.19
	TIGRIS_1_0_8RC2:1.19
	TIGRIS_1_0_8RC1:1.19
	TIGRIS_1_0_7:1.19
	TIGRIS_1_0_7RC3:1.19
	TIGRIS_1_0_7RC2:1.19
	TIGRIS_1_0_7RC1:1.19
	TIGRIS_1_0_6:1.19
	TIGRIS_1_0_6RC5:1.19
	TIGRIS_1_0_6RC4:1.19
	TIGRIS_1_0_6RC3:1.19
	TIGRIS_1_0_6RC2:1.19
	TIGRIS_1_0_6RC1:1.19
	TIGRIS_1_0_5:1.19
	TIGRIS_1_0_5RC6:1.19
	TIGRIS_1_0_5RC5:1.19
	TIGRIS_1_0_5RC4:1.19
	TIGRIS_1_0_5RC3:1.19
	TIGRIS_1_0_5RC2:1.19
	TIGRIS_1_0_5RC1:1.19
	TIGRIS_1_0_4:1.19
	TIGRIS_1_0_3:1.19
	TIGRIS_1_0_2:1.19
	TIGRIS_1_0_1:1.19
	TIGRIS_1_0:1.19.0.6
	TIGRIS_1_0_0:1.19
	TIGRIS_1_0_0_RC1:1.19.0.2
	dlr:1.1.1
	TIGRIS_0_9_2_4:1.15
	TIGRIS_0_9_2_3:1.15
	HELM_PEER_PORT_BRANCH:1.1.1.2
	TURBINE_PEER:1.15
	TIGRIS_0_9_2_1:1.15
	TIGRIS_0_9_2:1.15.0.4
	TIGRIS_0_9_0:1.15.0.2
	TIGRIS_0_8_4:1.12.0.2
	NEWHELM:1.1.1.1
	TIGRIS_NOV_12_2000:1.1.1;
locks; strict;
comment	@# @;


1.21
date	2001.05.23.02.04.15;	author dlr;	state dead;
branches;
next	1.20;

1.20
date	2001.03.29.23.45.02;	author susank;	state Exp;
branches;
next	1.19;

1.19
date	2001.03.13.23.23.21;	author leonardr;	state Exp;
branches;
next	1.18;

1.18
date	2001.02.22.16.17.35;	author leonardr;	state Exp;
branches;
next	1.17;

1.17
date	2001.02.22.01.12.28;	author elicia;	state Exp;
branches;
next	1.16;

1.16
date	2001.02.21.01.08.31;	author dlr;	state Exp;
branches;
next	1.15;

1.15
date	2000.12.15.23.57.23;	author elicia;	state Exp;
branches
	1.15.6.1;
next	1.14;

1.14
date	2000.12.14.06.35.35;	author jrobbins;	state Exp;
branches;
next	1.13;

1.13
date	2000.12.05.00.03.37;	author susank;	state Exp;
branches;
next	1.12;

1.12
date	2000.12.02.05.53.10;	author jrobbins;	state Exp;
branches;
next	1.11;

1.11
date	2000.12.01.23.27.55;	author cameron;	state Exp;
branches;
next	1.10;

1.10
date	2000.11.28.01.23.18;	author susank;	state Exp;
branches;
next	1.9;

1.9
date	2000.11.22.06.17.41;	author edk;	state Exp;
branches;
next	1.8;

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

1.7
date	2000.11.22.02.19.46;	author edk;	state Exp;
branches;
next	1.6;

1.6
date	2000.11.17.22.14.46;	author leonardr;	state Exp;
branches;
next	1.5;

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

1.4
date	2000.11.14.23.21.06;	author leonardr;	state Exp;
branches;
next	1.3;

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

1.2
date	2000.11.14.22.57.49;	author leonardr;	state Exp;
branches;
next	1.1;

1.1
date	2000.11.12.21.18.22;	author dlr;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.11.12.21.18.22;	author dlr;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2001.02.21.00.36.59;	author dlr;	state Exp;
branches;
next	;

1.15.6.1
date	2001.02.16.02.02.17;	author leonardr;	state Exp;
branches;
next	;


desc
@@


1.21
log
@Removed WM templates in favor of Velocity templates.
@
text
@
<TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" BORDER="0" WIDTH="100%">
  <TR>
    <TD class="Header" nowrap><b>Membership Request:</b> <SPAN CLASS="ProjectNameHeader"><A HREF="$currentProject.getProjectHome()">$currentProject.getName()</a></SPAN></TD>  
  </TR>
</TABLE>

#set $approvedRoles=$loginUser.getRolesInProject($currentProject)
#set $requestedRoles=$loginUser.getRequestedRolesInProject($currentProject)
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2" BORDER="0" width="100%">
<FORM METHOD="post" NAME="ProjectMembershipRequestForm" ACTION="ProjectMembershipRequest">
#if ($ticket)
{
  <INPUT TYPE="hidden" NAME="ticket" VALUE="$ticket">
}

<TR><TD COLSPAN=2>
#if ($requestedRoles.isEmpty() && $approvedRoles.isEmpty())
{
 <p><SPAN CLASS="ProjectDownloadHeader"><b>You have no roles in the $currentProject.getName() project. Use the form below to request a role.</b></SPAN>
} #else {
 <p><SPAN CLASS="ProjectDownloadHeader"><b>Your roles in this project:</b></SPAN>
 
<ul>

 #foreach $role in $approvedRoles
 {
  <span class="PlainText"><li>$role.getName();</span>
 }

 #foreach $role in $requestedRoles
 {
  <span class="PlainText"><li>$role.getName(); <font color="red">Pending Approval</font></span>
 }
 </ul>
}

</TD></TR>
  <TR><TD COLSPAN="2"><hr size="1" noshade></TD></TR>
  <TR>
    <TD class="ProjectDownloadHeader" COLSPAN="2"><b>Specify the role you want to request in the $currentProject.getName() project.</b></TD>
  </TR>
  <TR>
    <TD class="ProjectDownloadHeader" VALIGN="top">Role:</TD>
    <TD VALIGN="top" CLASS="PlainText">

#set $first=true
#foreach $role in $loginUser.getAvailableRolesInProject($currentProject)
{
 <INPUT TYPE="radio" NAME="role" VALUE="$role.getID()"
 #if ($first)
 {
  CHECKED
  #set $first=false
 }
 ><SPAN CLASS="PlainTextBold"><b>$role.getName()</b></SPAN>: 
 $role.getDescription()<br>
}
    </TD>
  </TR>
#if (!$currentProject.isApproved())
{
  ## if you've already go a role, this comment doesn't apply to you
  #if ($approvedRoles.isEmpty())
  {
  <TR>
    <TD CLASS="PlainText" VALIGN="top"><b>Note:</b></TD>
    <TD VALING="top" CLASS="PlainText"><FONT COLOR="red">This project has not yet been approved.  You can request roles, but you will be unable to see the Project Home or other project-related pages until it has been approved.</FONT></TD>
  </TR>
  }
}
  <TR>
    <TD></TD>
    <INPUT type="hidden" name="projectID" value="$currentProject.getID()">
    <TD class="PlainText"><INPUT TYPE="submit" NAME="Button" VALUE="Submit Request"></TD>
  </TR>
</FORM>
</table>

@


1.20
log
@merges UI cleanup changes from sc10inst
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@@


1.19
log
@Select the first avaliable role as the default.
@
text
@d4 1
a4 1
    <TD class="Header" nowrap>Membership Request: <SPAN CLASS="ProjectNameHeader"><A HREF="$currentProject.getProjectHome()">$currentProject.getName()</a></SPAN></TD>  
d20 1
a20 1
 <p><SPAN CLASS="ProjectDownloadHeader">You have no roles in the $currentProject.getName() project. Use the form below to request a role.</SPAN>
d22 1
a22 1
 <p><SPAN CLASS="ProjectDownloadHeader">Your roles in this project:</SPAN>
d41 1
a41 2
    <TD class="ProjectDownloadHeader" COLSPAN="2">Specify
the role you want to request in the $currentProject.getName() project.</TD>
d56 1
a56 1
 ><SPAN CLASS="PlainTextBold">$role.getName()</SPAN>: 
@


1.18
log
@Corrected method call.
@
text
@d48 1
d51 8
a58 1
  <INPUT TYPE="radio" NAME="role" VALUE="$role.getID()"><SPAN CLASS="PlainTextBold">$role.getName()</SPAN>: $role.getDescription()<br>
@


1.17
log
@changed method name to project.getAvailableRoles
@
text
@d48 1
a48 1
#foreach $role in $currentProject.getAvailableRoles($loginUser)
@


1.16
log
@This is the highest revision from the HELM_PEER_PORT_BRANCH.  The previous import caused too many conflicts to resolve manually
@
text
@d48 1
a48 1
#foreach $role in $loginUser.getAvaliableRolesInProject($currentProject)
@


1.15
log
@changed links to support vhosting and non-vhosting modes
@
text
@d8 2
a9 2
#set $approvedRoles=$loginUser.getRolesInProject($currentProject.getID())
#set $requestedRoles=$loginUser.getRequestedRolesInProject($currentProject.getID())
d48 1
a48 1
#foreach $role in $loginUser.getAvaliableRolesInProject($currentProject.getID())
d54 1
a54 1
#if ($projectApprovalPending)
@


1.15.6.1
log
@Ported ProjectMembershipRequest servlet.
@
text
@d8 2
a9 2
#set $approvedRoles=$loginUser.getRolesInProject($currentProject)
#set $requestedRoles=$loginUser.getRequestedRolesInProject($currentProject)
d48 1
a48 1
#foreach $role in $loginUser.getAvaliableRolesInProject($currentProject)
d54 1
a54 1
#if (!$currentProject.isApproved())
@


1.14
log
@added missing style
@
text
@d4 1
a4 1
    <TD class="Header" nowrap>Membership Request: <SPAN CLASS="ProjectNameHeader"><A HREF="/servlets/ProjectHome?projectID=$currentProject.getID()">$currentProject.getName()</a></SPAN></TD>  
@


1.13
log
@changed project name in title to link to ProjectHome
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d33 1
a33 1
  <li>$role.getName(); <font color="red">Pending Approval</font>
@


1.12
log
@made style a little more consistent
@
text
@d4 1
a4 1
    <TD class="Header" nowrap>Membership Request: <SPAN CLASS="ProjectNameHeader">$currentProject.getName()</SPAN></TD>  
@


1.11
log
@fixed minor UI stuff.
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d60 1
a60 1
    <TD class="ProjectName2" VALIGN="top">Note:</TD>
@


1.10
log
@some ui and class changes
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d20 1
a20 1
 <p><li><SPAN CLASS="ProjectDownloadHeader">You have no roles in the $currentProject.getName() project.</SPAN>
d22 3
a24 2
 <p><li><SPAN CLASS="ProjectDownloadHeader">Your roles in this project:</SPAN>
 <ul>
d28 1
a28 1
  <li>$role.getName();
d37 1
a37 1
<br><br>
@


1.9
log
@correct alignment attribute name
@
text
@d20 1
a20 1
 <p><i>You have no roles in the $currentProject.getName() project.</i>
d22 1
a22 1
 <p>Your roles in this project:
d38 1
a38 1

d40 1
a40 1
    <TD class="ProjectDownloadHeader" bgcolor="#efefef" COLSPAN="2">Specify
d44 1
a44 1
    <TD class="ProjectName2" VALIGN="top">Role:</TD>
d49 1
a49 1
  <INPUT TYPE="radio" NAME="role" VALUE="$role.getID()">$role.getName(): $role.getDescription()<br>
@


1.8
log
@add a note if the project is unapproved and the visitor has not role
in the project.
@
text
@d59 1
a59 1
    <TD class="ProjectName2" VALING="top">Note:</TD>
@


1.7
log
@pass along the ticket value if it was included in this request
@
text
@d14 1
a14 1
  <input type="hidden" name="ticket" value="$ticket">
d53 11
@


1.6
log
@Show proprietary projects in which you have unapproved roles differently.
@
text
@d12 4
@


1.5
log
@corrected form tag to avoid ugly space at top of page, added space between sections
@
text
@d14 1
a14 1
#if ($approvedRoles.isEmpty())
d16 1
a16 1
 <p><i>You have no approved roles in the $currentProject.getName() project.</i>
d18 1
a18 1
 <p>Your approved roles in this project:
d20 1
a24 3
 </ul>
}
</TD></TR>
a25 7
<TR><TD COLSPAN=2>
#if ($requestedRoles.isEmpty())
{
 <p><i>You have no requested roles in the $currentProject.getName() project.</i>
} #else {
 <p>Your requested roles in this project:
 <ul>
d28 1
a28 1
  <li>$role.getName();
@


1.4
log
@Added role description.
@
text
@a0 1
<FORM METHOD="post" NAME="ProjectMembershipRequestForm" ACTION="ProjectMembershipRequest">
d11 1
d41 1
d63 1
@


1.3
log
@Changed back to radio buttons.
@
text
@d53 1
a53 1
  <INPUT TYPE="radio" NAME="role" VALUE="$role.getID()">$role.getName()<br>
d63 1
@


1.2
log
@Split up ProjectMembershipRequest to show requested/approved/other roles.
@
text
@d45 1
a45 1
the role(s) you want to request in the $currentProject.getName() project.</TD>
d53 1
a53 1
  <INPUT TYPE="checkbox" NAME="role" VALUE="$role.getID()">$role.getName()<br>
@


1.1
log
@Initial revision
@
text
@d9 2
d12 31
d45 1
a45 1
the role you want to request in the $currentProject.getName() project.</TD>
d50 2
a51 1
#foreach $role in $currentDomain.getProjectRoles()
d53 1
a53 1
        <INPUT TYPE="radio" NAME="role" VALUE="$role.getID()">$role.getName()<br>
@


1.1.1.1
log
@Merging newhelm tree into helm, as per IZ issue #557.  Previous major version of helm is tagged TIGRIS_NOV_11_2000.
@
text
@@


1.1.1.2
log
@Replacing the HEAD with the HELM_PEER_PORT_BRANCH.
@
text
@d1 1
d5 1
a5 1
    <TD class="Header" nowrap>Membership Request: <SPAN CLASS="ProjectNameHeader"><A HREF="$currentProject.getProjectHome()">$currentProject.getName()</a></SPAN></TD>  
a8 2
#set $approvedRoles=$loginUser.getRolesInProject($currentProject)
#set $requestedRoles=$loginUser.getRequestedRolesInProject($currentProject)
a9 29
<FORM METHOD="post" NAME="ProjectMembershipRequestForm" ACTION="ProjectMembershipRequest">
#if ($ticket)
{
  <INPUT TYPE="hidden" NAME="ticket" VALUE="$ticket">
}

<TR><TD COLSPAN=2>
#if ($requestedRoles.isEmpty() && $approvedRoles.isEmpty())
{
 <p><SPAN CLASS="ProjectDownloadHeader">You have no roles in the $currentProject.getName() project. Use the form below to request a role.</SPAN>
} #else {
 <p><SPAN CLASS="ProjectDownloadHeader">Your roles in this project:</SPAN>
 
<ul>

 #foreach $role in $approvedRoles
 {
  <span class="PlainText"><li>$role.getName();</span>
 }

 #foreach $role in $requestedRoles
 {
  <span class="PlainText"><li>$role.getName(); <font color="red">Pending Approval</font></span>
 }
 </ul>
}

</TD></TR>
  <TR><TD COLSPAN="2"><hr size="1" noshade></TD></TR>
d11 1
a11 1
    <TD class="ProjectDownloadHeader" COLSPAN="2">Specify
d15 1
a15 1
    <TD class="ProjectDownloadHeader" VALIGN="top">Role:</TD>
d17 1
a17 2

#foreach $role in $loginUser.getAvaliableRolesInProject($currentProject)
d19 1
a19 1
  <INPUT TYPE="radio" NAME="role" VALUE="$role.getID()"><SPAN CLASS="PlainTextBold">$role.getName()</SPAN>: $role.getDescription()<br>
a22 11
#if (!$currentProject.isApproved())
{
  ## if you've already go a role, this comment doesn't apply to you
  #if ($approvedRoles.isEmpty())
  {
  <TR>
    <TD CLASS="PlainText" VALIGN="top"><b>Note:</b></TD>
    <TD VALING="top" CLASS="PlainText"><FONT COLOR="red">This project has not yet been approved.  You can request roles, but you will be unable to see the Project Home or other project-related pages until it has been approved.</FONT></TD>
  </TR>
  }
}
a27 1
</FORM>
a28 1

@

