head	1.14;
access;
symbols
	TIGRIS_1_1_0RC2:1.12.6.1
	TIGRIS_1_1_0RC1:1.12.6.1
	TIGRIS_1_1:1.12.6.1.0.2
	TIGRIS_1_0_8:1.12.6.1
	TIGRIS_1_0_8RC3:1.12.6.1
	TIGRIS_1_0_8RC2:1.12.6.1
	TIGRIS_1_0_8RC1:1.12.6.1
	TIGRIS_1_0_7:1.12.6.1
	TIGRIS_1_0_7RC3:1.12.6.1
	TIGRIS_1_0_7RC2:1.12.6.1
	TIGRIS_1_0_7RC1:1.12.6.1
	TIGRIS_1_0_6:1.12.6.1
	TIGRIS_1_0_6RC5:1.12.6.1
	TIGRIS_1_0_6RC4:1.12.6.1
	TIGRIS_1_0_6RC3:1.12.6.1
	TIGRIS_1_0_6RC2:1.12.6.1
	TIGRIS_1_0_6RC1:1.12.6.1
	TIGRIS_1_0_5:1.12
	TIGRIS_1_0_5RC6:1.12
	TIGRIS_1_0_5RC5:1.12
	TIGRIS_1_0_5RC4:1.12
	TIGRIS_1_0_5RC3:1.12
	TIGRIS_1_0_5RC2:1.12
	TIGRIS_1_0_5RC1:1.12
	TIGRIS_1_0_4:1.12
	TIGRIS_1_0_3:1.12
	TIGRIS_1_0_2:1.12
	TIGRIS_1_0_1:1.12
	TIGRIS_1_0:1.12.0.6
	TIGRIS_1_0_0:1.12
	TIGRIS_1_0_0_RC1:1.12.0.2
	dlr:1.1.1
	TIGRIS_0_9_2_4:1.2
	TIGRIS_0_9_2_3:1.2
	HELM_PEER_PORT_BRANCH:1.1.1.1
	TURBINE_PEER:1.2
	TIGRIS_0_9_2_1:1.2
	TIGRIS_0_9_2:1.2.0.2
	TIGRIS_0_9_0:1.1.0.2;
locks; strict;
comment	@# @;


1.14
date	2001.05.23.02.04.15;	author dlr;	state dead;
branches;
next	1.13;

1.13
date	2001.04.23.19.32.47;	author leonardr;	state Exp;
branches;
next	1.12;

1.12
date	2001.03.24.09.44.52;	author jrobbins;	state Exp;
branches
	1.12.6.1;
next	1.11;

1.11
date	2001.03.24.09.06.04;	author jrobbins;	state Exp;
branches;
next	1.10;

1.10
date	2001.03.24.08.39.49;	author jrobbins;	state Exp;
branches;
next	1.9;

1.9
date	2001.03.22.19.59.08;	author caitlyn;	state Exp;
branches;
next	1.8;

1.8
date	2001.03.06.01.51.57;	author jrobbins;	state Exp;
branches;
next	1.7;

1.7
date	2001.03.05.21.41.13;	author leonardr;	state Exp;
branches;
next	1.6;

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

1.5
date	2001.03.01.19.58.04;	author leonardr;	state Exp;
branches;
next	1.4;

1.4
date	2001.02.21.01.08.32;	author dlr;	state Exp;
branches;
next	1.3;

1.3
date	2001.02.07.00.06.02;	author jrobbins;	state Exp;
branches;
next	1.2;

1.2
date	2001.01.04.22.55.15;	author jody;	state Exp;
branches
	1.2.4.1;
next	1.1;

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

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

1.2.4.1
date	2001.01.31.02.05.52;	author leonardr;	state Exp;
branches;
next	1.2.4.2;

1.2.4.2
date	2001.02.01.21.18.38;	author leonardr;	state Exp;
branches;
next	1.2.4.3;

1.2.4.3
date	2001.02.12.17.20.32;	author leonardr;	state Exp;
branches;
next	1.2.4.4;

1.2.4.4
date	2001.02.20.07.20.01;	author dlr;	state Exp;
branches;
next	1.2.4.5;

1.2.4.5
date	2001.02.20.07.21.56;	author dlr;	state Exp;
branches;
next	;

1.12.6.1
date	2001.06.01.21.01.41;	author leonardr;	state Exp;
branches;
next	;


desc
@@


1.14
log
@Removed WM templates in favor of Velocity templates.
@
text
@#parse "$BRAND_TEMPLATE_ROOT/Admin_Nav.wm"

<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="3" BORDER="0" WIDTH="100%">
 <TR>
  <TD colspan="2" class="Header">Role List</TD>
 </TR>


<TR><TD valign="TOP" COLSPAN="5">&nbsp;</TD></TR>


##Host roles
<TR><TD colspan="2" class="SmallHeader">Host Roles:</TD>
#if ($acl.hasPermission("Host Role - Add"))
{
      <TD ALIGN="RIGHT" colspan="3" CLASS="PlainText"><A HREF="RoleAdd?type=Host">Add New Role</a></TD>
}
</TR>

  <TR>
  <TD class="ProjectDownloadHeader" bgcolor="#efefef">Name</TD>
  <TD WIDTH="10" bgcolor="#efefef"><SPACER TYPE="block" WIDTH="10"></TD>
  <TD class="ProjectDownloadHeader" bgcolor="#efefef">Description</TD>
  <TD WIDTH="10" bgcolor="#efefef"><SPACER TYPE="block" WIDTH="10"></TD>
  <TD class="ProjectDownloadHeader" bgcolor="#efefef">Requestable</TD>
  </TR>

#foreach $role in $host.getHostRoles()
{
 <TR> 
  <TD class="PlainText" VALIGN="top">
  #if ($acl.hasPermission("Host Role - Edit", $currentDomain))
  {
   <A HREF="RoleEdit?roleID=$role.getID()">$role.getName()</A>
  } #else {
   <A HREF="RoleView?roleID=$role.getID()">$role.getName()</A>
  }
  </TD> 
  <td></td>
  <TD class="PlainText">$role.getDescription()</TD> 
  <td></td>
  <TD class="PlainText"> 
  #if ($role.isRequestable())
  {
   X
  }
  </TD>
 </TR> 
  <TR>
   <TD COLSPAN="5">
    <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 valign="TOP" COLSPAN="5"><HR size="1" noshade></TD></TR>
<TR><TD valign="TOP" COLSPAN="5">&nbsp;</TD></TR>

##Domain roles
<TR>
<TD colspan="2" class="SmallHeader">Domain Roles:</TD>
#if ($acl.hasPermission("Domain Role - Add", $currentDomain))
{
      <TD ALIGN="RIGHT" colspan="3" CLASS="PlainText"><A HREF="RoleAdd?type=Domain">Add New Role</A></TD>
}
</TR>

  <TR>
  <TD class="ProjectDownloadHeader" bgcolor="#efefef">Name</TD>
  <TD WIDTH="10" bgcolor="#efefef"><SPACER TYPE="block" WIDTH="10"></TD>
  <TD class="ProjectDownloadHeader" bgcolor="#efefef">Description</TD>
  <TD WIDTH="10" bgcolor="#efefef"><SPACER TYPE="block" WIDTH="10"></TD>
  <TD class="ProjectDownloadHeader" bgcolor="#efefef">Requestable</TD>
  </TR>

#foreach $role in $host.getDomainRoles()
{
 <TR> 
  <TD class="PlainText" VALIGN="top">
  #if ($acl.hasPermission("Domain Role - Edit", $currentDomain))
  {
   <A HREF="RoleEdit?roleID=$role.getID()">$role.getName()</A>
  } #else {
   <A HREF="RoleView?roleID=$role.getID()">$role.getName()</A>
  }
  </TD> 
  <td></td>
  <TD class="PlainText">$role.getDescription()</TD> 
  <td></td>
  <TD class="PlainText"> 
  #if ($role.isRequestable())
  {
   X
  }
  </TD>
 </TR> 
  <TR>
   <TD COLSPAN="5">
    <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 valign="TOP" COLSPAN="5"><HR size="1" noshade></TD></TR>
<TR><TD valign="TOP" COLSPAN="5">&nbsp;</TD></TR>

##Project roles
<TR>
<TD colspan="2" class="SmallHeader">Project Roles:</TD>
#if ($acl.hasPermission("Project Role - Add", $currentDomain))
{
      <TD ALIGN="RIGHT" colspan="3" CLASS="PlainText"><A HREF="RoleAdd?type=Project">Add New Role</A></TD>
}
</TR>

  <TR>
  <TD class="ProjectDownloadHeader" bgcolor="#efefef">Name</TD>
  <TD WIDTH="10" bgcolor="#efefef"><SPACER TYPE="block" WIDTH="10"></TD>
  <TD class="ProjectDownloadHeader" bgcolor="#efefef">Description</TD>
  <TD WIDTH="10" bgcolor="#efefef"><SPACER TYPE="block" WIDTH="10"></TD>
  <TD class="ProjectDownloadHeader" bgcolor="#efefef">Requestable</TD>
  </TR>

#foreach $role in $host.getProjectRoles()
{
 <TR> 
  <TD class="PlainText" VALIGN="top">
  #if ($acl.hasPermission("Project Role - Edit", $currentDomain))
  {
   <A HREF="RoleEdit?roleID=$role.getID()">$role.getName()</A>
  } #else {
   <A HREF="RoleView?roleID=$role.getID()">$role.getName()</A>
  }
  </TD> 
  <td></td>
  <TD class="PlainText">$role.getDescription()</TD> 
  <td></td>
  <TD class="PlainText"> 
  #if ($role.isRequestable())
  {
   X
  }
  </TD>
 </TR> 
  <TR>
   <TD COLSPAN="5">
    <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>
}

</TABLE>

</FORM>









@


1.13
log
@Where appropriate, check role add permission in the domain rather than in the host.
@
text
@@


1.12
log
@removed links that are now reduntant with Admin_Nav.wm
@
text
@d66 1
a66 1
#if ($acl.hasPermission("Domain Role - Add"))
d118 1
a118 1
#if ($acl.hasPermission("Project Role - Add"))
@


1.12.6.1
log
@Corrected permission checks.
@
text
@d32 1
a32 1
  #if ($acl.hasPermission("Host Role - Edit"))
d66 1
a66 1
#if ($acl.hasPermission("Domain Role - Add", $currentDomain))
d118 1
a118 1
#if ($acl.hasPermission("Project Role - Add", $currentDomain))
@


1.11
log
@added much needed admin nav element
@
text
@a5 1
  <TD colspan="3"><a href="ResourceList" class="PlainText">Resource List</a></TD>
@


1.10
log
@added style, spacing, divider lines, moved a few links around on the pages
@
text
@d1 2
@


1.9
log
@fixed alignment of "Add New Role"



PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d1 1
a1 1
<TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" BORDER="0" WIDTH="100%">
d3 2
a4 2
  <TD CLASS="Welcome">Role List</TD>
  <TD colspan="2"><a href="ResourceList" class="PlainText">Resource List</a></TD>
d7 4
d12 1
a12 1
<TR><TD class="ProjectDownloadHeader">Host Roles</TD>
d15 1
a15 1
      <TD ALIGN="RIGHT" colspan="2" CLASS="PlainText"><A HREF="RoleAdd?type=Host">Add New Role</a></TD>
d21 1
d23 1
d38 1
d40 1
d48 9
d59 2
a60 1
<TR><TD COLSPAN="3"><HR></TD></TR>
d63 2
a64 1
<TR><TD class="ProjectDownloadHeader">Domain Roles</TD>
d67 1
a67 1
      <TD ALIGN="RIGHT" colspan="2" CLASS="PlainText"><A HREF="RoleAdd?type=Domain">Add New Role</A></TD>
d73 1
d75 1
d90 1
d92 1
d100 9
d111 2
a112 1
<TR><TD COLSPAN="3"><HR></TD></TR>
d115 2
a116 1
<TR><TD class="ProjectDownloadHeader">Project Roles</TD>
d119 1
a119 1
      <TD ALIGN="RIGHT" colspan="2" CLASS="PlainText"><A HREF="RoleAdd?type=Project">Add New Role</A></TD>
d125 1
d127 1
d142 1
d144 1
d152 9
@


1.8
log
@added style
@
text
@d4 1
a4 1
  <TD><a href="ResourceList" class="PlainText">Resource List</a></TD>
d11 1
a11 3
      <TD ALIGN="RIGHT" CLASS="PlainText">
        <A HREF="RoleAdd?type=Host">Add New Role</a>
      </TD>
d48 1
a48 3
      <TD ALIGN="RIGHT" CLASS="PlainText">
        <A HREF="RoleAdd?type=Domain">Add New Role</A>
      </TD>
d85 1
a85 3
      <TD ALIGN="RIGHT" CLASS="PlainText">
        <A HREF="RoleAdd?type=Project">Add New Role</A>
      </TD>
@


1.7
log
@Added links in and out of resource manipulation functionality.
@
text
@d4 1
a4 1
  <TD><a href="ResourceList">Resource List</a></TD>
@


1.6
log
@removed incorrect color specifications
@
text
@d1 1
a1 1
<TABLE BORDER="0" CELLSPACING="1" CELLPADDING="2" BORDER="0" WIDTH="100%">
d4 1
a5 3
</TABLE>

<TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" BORDER="0" width="100%">
@


1.5
log
@Corrected links to RoleAdd.
@
text
@d10 1
a10 1
<TR><TD class="ProjectDownloadHeader" bgcolor="#ffffff">Host Roles</TD>
d49 1
a49 1
<TR><TD class="ProjectDownloadHeader" bgcolor="#ffffff">Domain Roles</TD>
d88 1
a88 1
<TR><TD class="ProjectDownloadHeader" bgcolor="#ffffff">Project Roles</TD>
@


1.4
log
@This is the highest revision from the HELM_PEER_PORT_BRANCH.  The previous import caused too many conflicts to resolve manually
@
text
@d53 1
a53 1
        <A HREF="RoleAdd?type=Host">Add New Role</A>
d92 1
a92 1
        <A HREF="RoleAdd?type=Domain">Add New Role</A>
@


1.3
log
@added style
@
text
@d11 1
a11 1
#if ($acl.hasPermissionForHost("Host Role - Add"))
d13 3
a15 1
      <TD align="RIGHT" class="PlainText"><A HREF="RoleAdd?type=Host">Add New Role</a></TD>
d17 1
a17 1
</TD></TR>
d25 1
a25 1
#foreach $role in $currentDomain.getHostRoles()
d29 1
a29 1
  #if ($acl.hasPermissionForDomain("Host Role - Edit", $currentDomain.getID()))
d50 1
a50 1
#if ($acl.hasPermissionForHost("Domain Role - Add"))
d52 3
a54 1
      <TD align="RIGHT" class="PlainText"><A HREF="RoleAdd?type=Domain">Add New Role</a></TD>
d64 1
a64 1
#foreach $role in $currentDomain.getDomainRoles()
d68 1
a68 1
  #if ($acl.hasPermissionForDomain("Domain Role - Edit", $currentDomain.getID()))
d89 1
a89 1
#if ($acl.hasPermissionForHost("Project Role - Add"))
d91 3
a93 1
      <TD align="RIGHT" class="PlainText"><A HREF="RoleAdd?type=Project">Add New Role</a></TD>
d103 1
a103 1
#foreach $role in $currentDomain.getProjectRoles()
d107 1
a107 1
  #if ($acl.hasPermissionForProject("Project Role - Edit", $currentDomain.getID()))
@


1.2
log
@ tweeked table tag
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d13 1
a13 1
      <TD><A HREF="RoleAdd?type=Host">Add New</a></TD>
d50 1
a50 1
      <TD><A HREF="RoleAdd?type=Domain">Add New</a></TD>
d87 1
a87 1
      <TD><A HREF="RoleAdd?type=Project">Add New</a></TD>
@


1.2.4.1
log
@Converted permission checking somewhat.
@
text
@d27 1
a27 1
  #if ($acl.hasPermissionForDomain("Host Role - Edit", $currentDomain))
d64 1
a64 1
  #if ($acl.hasPermissionForDomain("Domain Role - Edit", $currentDomain))
d101 1
a101 1
  #if ($acl.hasPermissionForDomain("Project Role - Edit", $currentDomain))
@


1.2.4.2
log
@Ported RoleList servlet.
@
text
@d23 1
a23 1
#foreach $role in $host.getHostRoles()
d60 1
a60 1
#foreach $role in $host.getDomainRoles()
d97 1
a97 1
#foreach $role in $host.getProjectRoles()
@


1.2.4.3
log
@Got rid of calls to deprecated permission checking methods.
@
text
@d11 1
a11 1
#if ($acl.hasPermission("Host Role - Add"))
d27 1
a27 1
  #if ($acl.hasPermission("Host Role - Edit", $currentDomain))
d48 1
a48 1
#if ($acl.hasPermission("Domain Role - Add"))
d64 1
a64 1
  #if ($acl.hasPermission("Domain Role - Edit", $currentDomain))
d85 1
a85 1
#if ($acl.hasPermission("Project Role - Add"))
d101 1
a101 1
  #if ($acl.hasPermission("Project Role - Edit", $currentDomain))
@


1.2.4.4
log
@Merged in changes from the HEAD and removed extra closing table data
tag after check for "Host Role - Add" permission.
@
text
@d13 1
a13 3
      <TD ALIGN="RIGHT" CLASS="PlainText">
        <A HREF="RoleAdd?type=Host">Add New Role</a>
      </TD>
d15 1
a15 1
</TR>
@


1.2.4.5
log
@Merged in more changes from HEAD.
@
text
@d52 1
a52 3
      <TD ALIGN="RIGHT" CLASS="PlainText">
        <A HREF="RoleAdd?type=Host">Add New Role</A>
      </TD>
d89 1
a89 3
      <TD ALIGN="RIGHT" CLASS="PlainText">
        <A HREF="RoleAdd?type=Domain">Add New Role</A>
      </TD>
@


1.1
log
@New servlet: RoleList
@
text
@d7 1
a7 1
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="3" BORDER="0" width="100%">
@


1.1.1.1
log
@Replacing the HEAD with the HELM_PEER_PORT_BRANCH.
@
text
@d7 1
a7 1
<TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" BORDER="0" width="100%">
d11 1
a11 1
#if ($acl.hasPermission("Host Role - Add"))
d13 1
a13 3
      <TD ALIGN="RIGHT" CLASS="PlainText">
        <A HREF="RoleAdd?type=Host">Add New Role</a>
      </TD>
d15 1
a15 1
</TR>
d23 1
a23 1
#foreach $role in $host.getHostRoles()
d27 1
a27 1
  #if ($acl.hasPermission("Host Role - Edit", $currentDomain))
d48 1
a48 1
#if ($acl.hasPermission("Domain Role - Add"))
d50 1
a50 3
      <TD ALIGN="RIGHT" CLASS="PlainText">
        <A HREF="RoleAdd?type=Host">Add New Role</A>
      </TD>
d60 1
a60 1
#foreach $role in $host.getDomainRoles()
d64 1
a64 1
  #if ($acl.hasPermission("Domain Role - Edit", $currentDomain))
d85 1
a85 1
#if ($acl.hasPermission("Project Role - Add"))
d87 1
a87 3
      <TD ALIGN="RIGHT" CLASS="PlainText">
        <A HREF="RoleAdd?type=Domain">Add New Role</A>
      </TD>
d97 1
a97 1
#foreach $role in $host.getProjectRoles()
d101 1
a101 1
  #if ($acl.hasPermission("Project Role - Edit", $currentDomain))
@


