head	1.51;
access;
symbols
	TIGRIS_1_1_0RC2:1.46.6.2
	TIGRIS_1_1_0RC1:1.46.6.2
	TIGRIS_1_1:1.46.6.2.0.2
	TIGRIS_1_0_8:1.46.6.2
	TIGRIS_1_0_8RC3:1.46.6.2
	TIGRIS_1_0_8RC2:1.46.6.2
	TIGRIS_1_0_8RC1:1.46.6.2
	TIGRIS_1_0_7:1.46.6.2
	TIGRIS_1_0_7RC3:1.46.6.2
	TIGRIS_1_0_7RC2:1.46.6.2
	TIGRIS_1_0_7RC1:1.46.6.2
	TIGRIS_1_0_6:1.46.6.2
	TIGRIS_1_0_6RC5:1.46.6.2
	TIGRIS_1_0_6RC4:1.46.6.2
	TIGRIS_1_0_6RC3:1.46.6.2
	TIGRIS_1_0_6RC2:1.46.6.2
	TIGRIS_1_0_6RC1:1.46.6.2
	TIGRIS_1_0_5:1.46.6.2
	TIGRIS_1_0_5RC6:1.46.6.2
	TIGRIS_1_0_5RC5:1.46.6.1
	TIGRIS_1_0_5RC4:1.46.6.1
	TIGRIS_1_0_5RC3:1.46.6.1
	TIGRIS_1_0_5RC2:1.46.6.1
	TIGRIS_1_0_5RC1:1.46.6.1
	TIGRIS_1_0_4:1.46.6.1
	TIGRIS_1_0_3:1.46.6.1
	TIGRIS_1_0_2:1.46
	TIGRIS_1_0_1:1.46
	TIGRIS_1_0:1.46.0.6
	TIGRIS_1_0_0:1.46
	TIGRIS_1_0_0_RC1:1.46.0.2
	dlr:1.1.1
	TIGRIS_0_9_2_4:1.25
	TIGRIS_0_9_2_3:1.25
	HELM_PEER_PORT_BRANCH:1.1.1.1
	TURBINE_PEER:1.25
	TIGRIS_0_9_2_1:1.25
	TIGRIS_0_9_2:1.25.0.2
	TIGRIS_0_9_0:1.17.0.2
	TIGRIS_0_8_4:1.13.0.2;
locks; strict;
comment	@# @;


1.51
date	2001.05.23.02.04.14;	author dlr;	state dead;
branches;
next	1.50;

1.50
date	2001.05.23.01.11.20;	author jefflove;	state Exp;
branches;
next	1.49;

1.49
date	2001.05.21.11.29.25;	author edk;	state Exp;
branches;
next	1.48;

1.48
date	2001.04.12.21.12.26;	author beril;	state Exp;
branches;
next	1.47;

1.47
date	2001.03.29.02.04.07;	author susank;	state Exp;
branches;
next	1.46;

1.46
date	2001.03.26.17.52.14;	author jrobbins;	state Exp;
branches
	1.46.6.1;
next	1.45;

1.45
date	2001.03.22.16.50.37;	author caitlyn;	state Exp;
branches;
next	1.44;

1.44
date	2001.03.16.02.42.58;	author elicia;	state Exp;
branches;
next	1.43;

1.43
date	2001.03.09.18.34.36;	author elicia;	state Exp;
branches;
next	1.42;

1.42
date	2001.03.09.05.39.30;	author elicia;	state Exp;
branches;
next	1.41;

1.41
date	2001.03.08.21.53.42;	author leonardr;	state Exp;
branches;
next	1.40;

1.40
date	2001.03.08.21.31.00;	author leonardr;	state Exp;
branches;
next	1.39;

1.39
date	2001.03.06.03.16.16;	author elicia;	state Exp;
branches;
next	1.38;

1.38
date	2001.03.05.23.38.07;	author elicia;	state Exp;
branches;
next	1.37;

1.37
date	2001.03.05.22.40.35;	author dlr;	state Exp;
branches;
next	1.36;

1.36
date	2001.03.05.22.04.24;	author elicia;	state Exp;
branches;
next	1.35;

1.35
date	2001.03.03.02.53.22;	author elicia;	state Exp;
branches;
next	1.34;

1.34
date	2001.03.03.00.42.52;	author leonardr;	state Exp;
branches;
next	1.33;

1.33
date	2001.03.01.19.47.24;	author leonardr;	state Exp;
branches;
next	1.32;

1.32
date	2001.02.22.18.29.49;	author leonardr;	state Exp;
branches;
next	1.31;

1.31
date	2001.02.22.02.27.13;	author elicia;	state Exp;
branches;
next	1.30;

1.30
date	2001.02.21.07.22.19;	author dlr;	state Exp;
branches;
next	1.29;

1.29
date	2001.02.21.07.01.48;	author edk;	state Exp;
branches;
next	1.28;

1.28
date	2001.02.21.01.08.30;	author dlr;	state Exp;
branches;
next	1.27;

1.27
date	2001.02.09.18.50.09;	author elicia;	state Exp;
branches;
next	1.26;

1.26
date	2001.02.06.21.34.14;	author elicia;	state Exp;
branches;
next	1.25;

1.25
date	2001.01.16.21.26.01;	author elicia;	state Exp;
branches
	1.25.4.1;
next	1.24;

1.24
date	2001.01.11.00.30.26;	author elicia;	state Exp;
branches;
next	1.23;

1.23
date	2001.01.06.18.59.25;	author jrobbins;	state Exp;
branches;
next	1.22;

1.22
date	2000.12.29.17.11.55;	author leonardr;	state Exp;
branches;
next	1.21;

1.21
date	2000.12.22.08.09.57;	author jrobbins;	state Exp;
branches;
next	1.20;

1.20
date	2000.12.21.19.14.33;	author jrobbins;	state Exp;
branches;
next	1.19;

1.19
date	2000.12.21.18.39.05;	author jrobbins;	state Exp;
branches;
next	1.18;

1.18
date	2000.12.21.17.42.51;	author jrobbins;	state Exp;
branches;
next	1.17;

1.17
date	2000.12.19.21.42.33;	author elicia;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2000.12.15.01.33.57;	author jrobbins;	state Exp;
branches;
next	1.15;

1.15
date	2000.12.15.01.33.18;	author jrobbins;	state Exp;
branches;
next	1.14;

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

1.13
date	2000.12.04.05.16.27;	author edk;	state Exp;
branches;
next	1.12;

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

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

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

1.9
date	2000.12.03.02.53.32;	author jrobbins;	state Exp;
branches;
next	1.8;

1.8
date	2000.12.03.00.28.03;	author leonardr;	state Exp;
branches;
next	1.7;

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

1.6
date	2000.12.02.00.35.48;	author elicia;	state Exp;
branches;
next	1.5;

1.5
date	2000.12.01.22.59.33;	author elicia;	state Exp;
branches;
next	1.4;

1.4
date	2000.11.29.01.20.07;	author elicia;	state Exp;
branches;
next	1.3;

1.3
date	2000.11.22.06.02.28;	author susank;	state Exp;
branches;
next	1.2;

1.2
date	2000.11.22.05.58.14;	author susank;	state Exp;
branches;
next	1.1;

1.1
date	2000.11.13.23.51.56;	author elicia;	state Exp;
branches
	1.1.1.1;
next	;

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

1.17.2.1
date	2000.12.21.22.36.01;	author jrobbins;	state Exp;
branches;
next	1.17.2.2;

1.17.2.2
date	2000.12.22.08.14.42;	author jrobbins;	state Exp;
branches;
next	;

1.25.4.1
date	2001.01.31.02.05.51;	author leonardr;	state Exp;
branches;
next	1.25.4.2;

1.25.4.2
date	2001.02.08.18.19.26;	author leonardr;	state Exp;
branches;
next	1.25.4.3;

1.25.4.3
date	2001.02.12.17.20.31;	author leonardr;	state Exp;
branches;
next	1.25.4.4;

1.25.4.4
date	2001.02.17.19.23.42;	author leonardr;	state Exp;
branches;
next	;

1.46.6.1
date	2001.04.25.20.04.54;	author jrobbins;	state Exp;
branches;
next	1.46.6.2;

1.46.6.2
date	2001.05.21.11.29.46;	author edk;	state Exp;
branches;
next	;


desc
@@


1.51
log
@Removed WM templates in favor of Velocity templates.
@
text
@#if ($acl.hasPermission("Project - List", $currentDomain))
{
 #set $anyAdmin = 1
 #set $hasProjectList = 1
}
#if ($acl.hasPermission("User - List", $currentDomain))
{
 #set $anyAdmin = 1
 #set $hasUserList = 1
}
#if ($acl.hasPermission("UserGroup - List", $currentDomain))
{
 #set $anyAdmin = 1
 #set $hasUserGroupList = 1
}
#if ($acl.hasPermission("ProjectGroup - List", $currentDomain))
{
 #set $anyAdmin = 1
 #set $hasProjectGroupList = 1
}

#if ($acl.hasPermission("Project Role - Add", $currentDomain))
{
 ##set $anyAdmin = 1
 #set $hasRoleList = 1
}

#set $requestedProjects = $currentDomain.getUnapprovedProjects($acl)
#if ($acl.hasPermission("Project - Approve", $currentDomain) && (!$requestedProjects.isEmpty()))
{
  #set $anyPending = 1
}
#foreach $project in $loginUser.getProjectsForUser()
{
  #set $requestedProjects = $project.getNumberOfRequestedRoles()
  #set $requestedRoles = $project.getNumberOfRequestedRoles()
  #set $requestedNews = $project.getUnapprovedNews($acl)
  #set $requestedDocuments = $project.getUnapprovedDocuments()
  #set $requestedSections = $project.getUnapprovedSections()
  #set $requestedDownloads = $project.getUnapprovedDownloads()

  #if ($acl.hasPermission("Project Role - Grant", $project) && (!$requestedRoles==0))
  {  
    #set $anyPending = 1
  }
  #if ($acl.hasPermission("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
  {  
    #set $anyPending = 1
  }
  #if ($acl.hasPermission("Project Document - Approve", $project) && (!$requestedDocuments.isEmpty()))
  {  
   #set $anyPending = 1
  }
  #if ($acl.hasPermission("Project Document - Approve", $project) && (!$requestedSections.isEmpty()))
  {  
   #set $anyPending = 1
  }
  #if ($acl.hasPermission("Project Download - Approve", $project) && (!$requestedDownloads.isEmpty()))
  {  
   #set $anyPending = 1
  }
  #if ($loginUser.isProjectOwner($project) && $project.isLocked())
  {  
   #set $anyPending = 1
  }
}

#if ($anyAdmin) 
{
<div id="adminoptions">
<h4>Admin Options</h4>
<ul>
#if ($hasProjectList) { 
 <li><a href="/servlets/ProjectList">Administer Projects</a></li>
 }
#if ($hasProjectGroupList) {
 <li><a href="/servlets/ProjectGroupList">Administer Project Groups</a></li>
 }
#if ($hasUserList) {
 <li><a href="/servlets/UserList">Administer Users</a></li>
 }
#if ($hasUserGroupList) { 
 <li><a href="/servlets/UserGroupList">Administer User Groups</a></li>
 }
 <li><a href="/servlets/RoleList">Administer Roles</a></li>
 <li><a href="/servlets/AuditLogList">Administrative Audit Log</a></li>
 
#if ($acl.hasPermission("Session - List", $currentDomain)) {
 <li><a href="/servlets/SessionList">Active User Sessions</a></li>
 }
#if ($acl.hasPermission("Helm - Administer")) {
 <li><a href="/servlets/AdminUtils">Administrative Utilities</a> </li>
 }
</ul>
</div>
} ## anyAdmin

#if ($anyPending) 
{
<div id="pendingactions">
 <h4>Pending Actions</h4>
<ul>
##LOCKED PROJECTS
#foreach $project in $loginUser.getProjectsForUser()
{
 #if ($loginUser.isProjectOwner($project) && ($project.isLocked()))
 {
 <li><a href="$project.getProjectHome()">Project $project.getName() is Locked</a></li>
 }
}
## PROJECT APPROVAL
#set $unapprovedProjects = $currentDomain.getUnapprovedProjects($acl)
#if ($acl.hasPermission("Project - Approve", $currentDomain) && !$unapprovedProjects.isEmpty())
{
     #set $projectWord = "Projects"
     #if ($unapprovedProjects.size() == 1)
     {
     #set $projectWord = "Project"
     }

<li><a href="/servlets/ProjectApproval">Proposed $projectWord</a> ($unapprovedProjects.size();)</li>
}
## PROPOSED USERS
#foreach $project in $loginUser.getProjectsForUser()
{
  #set $requestedRoles = $project.getNumberOfRequestedRoles()

  #if ($acl.hasPermission("Project Role - Grant", $project) && (!$requestedRoles==0))
  {  
     #set $roleWord = "Roles"
     #if ($requestedRoles == 1)
     {
     #set $roleWord = "Role"
     }
<li><a href="$project.getProjectPageURL(ProjectMemberList)">Proposed $roleWord in Project $project.getWordMark()</a> ($requestedRoles)</li>
  }
}
## PROPOSED NEWS
#foreach $project in $loginUser.getProjectsForUser()
{
#set $allRequestedNews = $project.getUnapprovedNews($acl)

#set $requestedNews = $allRequestedNews.getPage($paginated_page);

  #if ($acl.hasPermission("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
  {  
     #set $newsWord = "news items"
     #if ($requestedNews.size() == 1)
     {
     #set $newsWord = "news item"
     }
 <li><a href="$project.getProjectPageURL(ProjectNewsApproval)">Proposed $newsWord in Project $project.getWordMark()</a> ($requestedNews.size();)</li>
  }
}
## PROPOSED DOCUMENT SECTIONS
#foreach $project in $loginUser.getProjectsForUser()
{
 #set $requestedSections = $project.getUnapprovedSections()
  #if ($acl.hasPermission("Project Document - Approve", $project) && (!$requestedSections.isEmpty()))
  {  
     #set $secWord = "document sections"
     #if ($requestedSections.size() == 1)
     {
     #set $secWord = "document section"
     }

 <li><a href="$project.getProjectPageURL(ProjectSectionApproval)">Proposed $secWord in Project $project.getWordMark()</a> ($requestedSections.size();)</li>
  }
}
## PROPOSED DOCUMENTS
#foreach $project in $loginUser.getProjectsForUser()
{
 #set $requestedDocuments = $project.getUnapprovedDocuments()
  #if ($acl.hasPermission("Project Document - Approve", $project) && (!$requestedDocuments.isEmpty()))
  {  
     #set $docWord = "documents"
     #if ($requestedDocuments.size() == 1)
     {
     #set $docWord = "document"
     }
 <li><a href="$project.getProjectPageURL(ProjectDocumentApproval")">Proposed $docWord in Project $project.getWordMark()</a> ($requestedDocuments.size();)</li>
  }
}
## PROPOSED DOWNLOADS
#foreach $project in $loginUser.getProjectsForUser()
{
 #set $requestedDownloads = $project.getUnapprovedDownloads()
  #if ($acl.hasPermission("Project Download - Approve", $project) && (!$requestedDownloads.isEmpty()))
  {  
     #set $dlWord = "downloads"
     #if ($requestedDownloads.size() == 1)
     {
     #set $dlWord = "downloads"
     }
 <li><a href="$project.getProjectPageURL(ProjectDownloadApproval)">Proposed $dlWord in Project $project.getWordMark()</a> ($requestedDownloads.size();)</li>
    }
}
</ul>
</div>
} ## anyPending
@


1.50
log
@Recoded HTML to validate against house DTD. -tfahrner@@collab.net
@
text
@@


1.49
log
@we want to check "Project - Approve" against the current domain, not
against a variable which is null.
@
text
@d3 2
a4 2
   #set $anyAdmin = 1
   #set $hasProjectList = 1
d8 2
a9 2
   #set $anyAdmin = 1
   #set $hasUserList = 1
d13 2
a14 2
   #set $anyAdmin = 1
   #set $hasUserGroupList = 1
d18 2
a19 2
   #set $anyAdmin = 1
   #set $hasProjectGroupList = 1
d24 2
a25 2
   ##set $anyAdmin = 1
   #set $hasRoleList = 1
d31 1
a31 1
    #set $anyPending = 1
d35 6
a40 6
    #set $requestedProjects = $project.getNumberOfRequestedRoles()
    #set $requestedRoles = $project.getNumberOfRequestedRoles()
    #set $requestedNews = $project.getUnapprovedNews($acl)
    #set $requestedDocuments = $project.getUnapprovedDocuments()
    #set $requestedSections = $project.getUnapprovedSections()
    #set $requestedDownloads = $project.getUnapprovedDownloads()
d42 24
a65 24
    #if ($acl.hasPermission("Project Role - Grant", $project) && (!$requestedRoles==0))
    {  
        #set $anyPending = 1
    }
    #if ($acl.hasPermission("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
    {  
        #set $anyPending = 1
    }
    #if ($acl.hasPermission("Project Document - Approve", $project) && (!$requestedDocuments.isEmpty()))
    {  
       #set $anyPending = 1
    }
    #if ($acl.hasPermission("Project Document - Approve", $project) && (!$requestedSections.isEmpty()))
    {  
       #set $anyPending = 1
    }
    #if ($acl.hasPermission("Project Download - Approve", $project) && (!$requestedDownloads.isEmpty()))
    {  
       #set $anyPending = 1
    }
    #if ($loginUser.isProjectOwner($project) && $project.isLocked())
    {  
       #set $anyPending = 1
    }
a67 1

d70 26
a95 108
<!--
<table border="0" cellspacing="0" cellpadding="0" width="100%"> 
  <tr> 
        <td bgcolor="#000000" width="100%" height="1" colspan="2"><spacer type="block" height="1"></td> 
  </tr> 
  <tr> 
        <td width="100%" valign="top" height="2" colspan="2"><spacer type="block" height="1"></td> 
  </tr> 
  <tr> 
        <td colspan="2" class="InputHeader">ADMIN OPTIONS</td> 
  </tr> 
 <tr> 
        <td width="100%" valign="top" height="2" colspan="2"><spacer type="block" height="1"></td> 
  </tr> 
 <tr> 
        <td width="100%" valign="top" height="2" colspan="2"><spacer type="block" height="1"></td> 
  </tr> 
  <tr> 
        <td bgcolor="#000000" width="100%" valign="top" height="1" colspan="2"><spacer type="block" height="1"></td> 
  </tr> 
</table> 
-->


<!--
##PROJECT AND PROJECTGROUP ADMINISTRATION ROW
#if ($hasProjectList || $hasProjectGroupList) {
<table border="0" cellspacing="0" cellpadding="0" width="100%"> 
<tr>
                    #if ($hasProjectList) { 
		      <td class="PlainText" valign="top">
                        &nbsp;&#149; <a href="/servlets/ProjectList">Administer Projects</a>
                      </td>
                    }
                    #else {
                      <td>&nbsp;</td>
                    }
                <td></td>
                    #if ($hasProjectGroupList) { 
		      <td class="PlainText" valign="top">
                        &nbsp;&#149; <a href="/servlets/ProjectGroupList">Administer Project Groups</a>
                      </td>
                    }
                    #else {
                      <td>&nbsp;</td>
                    }
    </tr>

##PROJECT AND PROJECTGROUP ADMINISTRATION ROW
#if ($hasUserList || $hasUserGroupList) {
    <tr>
                    #if ($hasUserList) { 
		      <td class="PlainText" valign="top">
                        &nbsp;&#149; <a href="/servlets/UserList">Administer Users</a>
                      </td>
                    }
                    #else {
                      <td>&nbsp;</td>
                    }
	<td></td>
                    #if ($hasUserGroupList) { 
		      <td class="PlainText" valign="top">
                        &nbsp;&#149; <a href="/servlets/UserGroupList">Administer User Groups</a>
                      </td>
                    }
                    #else {
                      <td>&nbsp;</td>
                    }
    </tr>
}



    <tr>
		    <td class="PlainText" valign="top">
                        &nbsp;&#149; <a href="/servlets/RoleList">Administer Roles</a>
                    </td>
	<td></td>
		    <TD CLASS="PlainText" VALIGN="top">
                      &nbsp;&#149; <a href="/servlets/AuditLogList">Administrative Audit Log</a>
                    </TD>
    </TR>


    <TR>
                    #if ($acl.hasPermission("Session - List", $currentDomain))
                    { 
		      <TD CLASS="PlainText" VALIGN="top">
                      &nbsp;&#149; 
                      <a href="/servlets/SessionList">Active User Sessions</a>
                      </TD>
                    }
	<td></TD>
                    #if ($acl.hasPermission("Helm - Administer")) { 
		      <TD CLASS="PlainText" VALIGN="top">
                      &nbsp;&#149; <a href="/servlets/AdminUtils">Administrative Utilities</a>
                      </TD>
                    }
                    #else {
                      <TD>&nbsp;</TD>
                    }
    </TR>

    <TR>
	<TD COLSPAN="3"><HR SIZE="1" NOSHADE></TD>
    </TR>
</table>

a96 2
-->

d100 3
a102 23
<table border="0" cellspacing="0" cellpadding="0" width="100%"> 
  <tr> 
        <td bgcolor="#000000" width="100%" height="1" colspan="2"><spacer type="block" height="1"></td> 
  </tr> 
  <tr> 
        <td width="100%" valign="top" height="2" colspan="2"><spacer type="block" height="1"></td> 
  </tr> 
  <tr> 
        <td colspan="2" class="InputHeader">PENDING ACTIONS</td> 
  </tr> 
 <tr> 
        <td width="100%" valign="top" height="2" colspan="2"><spacer type="block" height="2"></td> 
  </tr> 
  <tr> 
        <td bgcolor="#000000" width="100%" valign="top" height="1" colspan="2"><spacer type="block" height="1"></td> 
  </tr> 
 <tr>
        <td width="100%" valign="top" height="2" colspan="2"><spacer type="block" height="2"></td>
  </tr>
</table> 
}

<table border="0" cellspacing="0" cellpadding="0" width="100%"> 
d106 4
a109 6
   #if ($loginUser.isProjectOwner($project) && ($project.isLocked()))
   {
      <TR>
         <TD CLASS="PlainText" COLSPAN="3" VALIGN="top">&nbsp;&#149;<a href="$project.getProjectHome()">Project $project.getName() is Locked</a></TD>
      </TR>
   }
d111 1
a111 2

## PROJECT APPROVAL ROW
d115 22
a136 8
    <TR>
           #set $projectWord = "Projects"
           #if ($unapprovedProjects.size() == 1)
           {
             #set $projectWord = "Project"
           }
    <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="/servlets/ProjectApproval">Proposed $projectWord</a> ($unapprovedProjects.size();)</TD>
    </TR>
d138 1
a138 22

## PROPOSED USERS ROW

#foreach $project in $loginUser.getProjectsForUser()
{
    #set $requestedRoles = $project.getNumberOfRequestedRoles()

    #if ($acl.hasPermission("Project Role - Grant", $project) && (!$requestedRoles==0))
    {  
    <TR>
           #set $roleWord = "Roles"
           #if ($requestedRoles == 1)
           {
             #set $roleWord = "Role"
           }
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="$project.getProjectPageURL(ProjectMemberList)">Proposed $roleWord in Project $project.getWordMark()</a> ($requestedRoles)</TD>
    </TR>
    }
}

## PROPOSED NEWS ROW

d145 51
a195 29
    #if ($acl.hasPermission("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
    {  
    <TR>
           #set $newsWord = "news items"
           #if ($requestedNews.size() == 1)
           {
             #set $newsWord = "news item"
           }
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="$project.getProjectPageURL(ProjectNewsApproval)">Proposed $newsWord in Project $project.getWordMark()</a> ($requestedNews.size();)</TD>
    </TR>
    }
}


## PROPOSED DOCUMENT SECTIONS ROW

#foreach $project in $loginUser.getProjectsForUser()
{
   #set $requestedSections = $project.getUnapprovedSections()
    #if ($acl.hasPermission("Project Document - Approve", $project) && (!$requestedSections.isEmpty()))
    {  
    <TR>
           #set $secWord = "document sections"
           #if ($requestedSections.size() == 1)
           {
             #set $secWord = "document section"
           }
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="$project.getProjectPageURL(ProjectSectionApproval)">Proposed $secWord in Project $project.getWordMark()</a> ($requestedSections.size();)</TD>
    </TR>
d198 2
a199 40
## PROPOSED DOCUMENTS ROW

#foreach $project in $loginUser.getProjectsForUser()
{
   #set $requestedDocuments = $project.getUnapprovedDocuments()
    #if ($acl.hasPermission("Project Document - Approve", $project) && (!$requestedDocuments.isEmpty()))
    {  
    <TR>
           #set $docWord = "documents"
           #if ($requestedDocuments.size() == 1)
           {
             #set $docWord = "document"
           }
      <TD CLASS="PlainText" VALIGN="top"> &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDocumentApproval")">Proposed $docWord in Project $project.getWordMark()</a> ($requestedDocuments.size();)</TD>
    </TR>
    }
}
## PROPOSED DOWNLOADS ROW

#foreach $project in $loginUser.getProjectsForUser()
{
   #set $requestedDownloads = $project.getUnapprovedDownloads()
    #if ($acl.hasPermission("Project Download - Approve", $project) && (!$requestedDownloads.isEmpty()))
    {  
    <TR>
           #set $dlWord = "downloads"
           #if ($requestedDownloads.size() == 1)
           {
             #set $dlWord = "downloads"
           }
      <TD CLASS="PlainText" VALIGN="top"> &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDownloadApproval)">Proposed $dlWord in Project $project.getWordMark()</a> ($requestedDownloads.size();)</TD>
    </TR>

</TABLE>

    }
}

<br>

@


1.48
log
@fixed bad table
@
text
@d29 1
a29 1
#if ($acl.hasPermission("Project - Approve", $project) && (!$requestedProjects.isEmpty()))
@


1.47
log
@hand-merged UI changes made to sc10inst for UI cleanup
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d323 3
d328 1
a328 1
</TABLE>
@


1.46
log
@updated role list link guard
@
text
@d71 22
a92 4
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0"  WIDTH="100%">
    <TR>
	<TD bgcolor="#cccccc" COLSPAN="3" CLASS="InputHeader" WIDTH="100%">Admin Options</TD>
    </TR>
d95 1
d98 2
a99 1
    <TR>
d101 1
a101 1
		      <TD CLASS="PlainText" VALIGN="top">
d103 1
a103 1
                      </TD>
d106 1
a106 1
                      <TD>&nbsp;</TD>
d110 1
a110 1
		      <TD CLASS="PlainText" VALIGN="top">
d112 1
a112 1
                      </TD>
d115 1
a115 1
                      <TD>&nbsp;</TD>
d117 1
a117 1
    </TR>
d121 1
a121 1
    <TR>
d123 1
a123 1
		      <TD CLASS="PlainText" VALIGN="top">
d125 1
a125 1
                      </TD>
d128 1
a128 1
                      <TD>&nbsp;</TD>
d132 1
a132 1
		      <TD CLASS="PlainText" VALIGN="top">
d134 1
a134 1
                      </TD>
d137 1
a137 1
                      <TD>&nbsp;</TD>
d139 1
a139 1
    </TR>
d144 2
a145 2
    <TR>
		    <TD CLASS="PlainText" VALIGN="top">
d147 2
a148 2
                    </TD>
	<td></TD>
d177 1
a177 1
</TABLE>
d180 3
d185 20
a204 7

<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2" WIDTH="100%">
    <TR>
	<TD bgcolor="#cccccc" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
    <TD WIDTH="10" BGCOLOR="#cccccc"><SPACER TYPE="block" WIDTH="10"></TD>
	<TD bgcolor="#cccccc" CLASS="InputHeader" WIDTH="50%">Count</TD>
    </TR>
d207 1
d229 1
a229 3
    <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="/servlets/ProjectApproval">Proposed $projectWord</a></TD>
	<TD></TD>
	<TD VALIGN="top" CLASS="PlainText">$unapprovedProjects.size()</TD>
d247 1
a247 3
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="$project.getProjectPageURL(ProjectMemberList)">Proposed $roleWord in Project $project.getWordMark()</a></TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedRoles</TD>
d268 1
a268 3
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="$project.getProjectPageURL(ProjectNewsApproval)">Proposed $newsWord in Project $project.getWordMark()</a></TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedNews.size()</TD>
d287 1
a287 3
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="$project.getProjectPageURL(ProjectSectionApproval)">Proposed $secWord in Project $project.getWordMark()</a></TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedSections.size()</TD>
d304 1
a304 3
      <TD CLASS="PlainText" VALIGN="top"> &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDocumentApproval")">Proposed $docWord in Project $project.getWordMark()</a></TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedDocuments.size()</TD>
d321 1
a321 3
      <TD CLASS="PlainText" VALIGN="top"> &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDownloadApproval)">Proposed $dlWord in Project $project.getWordMark()</a></TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedDownloads.size()</TD>
a324 3
    <TR>
	<TD COLSPAN="3"><HR SIZE="1" NOSHADE></TD>
    </TR>
d326 1
a326 1

@


1.46.6.1
log
@corrected some mismatched braces and added comments to try to make this easier to find in the future
@
text
@a0 7
<!-- AdminOptions.wm -->
<!-- AdminOptions.wm -->
<!-- AdminOptions.wm -->
<!-- AdminOptions.wm -->
<!-- AdminOptions.wm -->
<!-- AdminOptions.wm -->

d24 1
a24 1
   ## #set $anyAdmin = 1
a44 1
           <!-- approve grant -->
a48 1
           <!-- approve news -->
a52 1
           <!-- approve documents -->
a56 1
           <!-- approve section -->
a60 1
           <!-- approve downloads -->
a68 3
<!--  anyAdmin -->


d77 2
a78 2
    ##PROJECT AND PROJECTGROUP ADMINISTRATION ROW
    #if ($hasProjectList || $hasProjectGroupList) {
a97 1
    }
d99 2
a100 2
    ##PROJECT AND PROJECTGROUP ADMINISTRATION ROW
    #if ($hasUserList || $hasUserGroupList) {
d120 1
a120 1
    }  
d155 1
a155 1
	<TD COLSPAN="3"><HR SIZE="1" NOSHADE></TD>  <!-- anyAdmin finly HR -->
d159 1
a159 5
} 
<!-- /anyAdmin -->


<!-- anyPending -->
d169 1
a169 1

a299 1

d306 1
a306 1
} <!-- /anyPending -->
@


1.46.6.2
log
@we want to check "Project - Approve" against the current domain, not
against a variable which is null.
@
text
@d36 1
a36 1
#if ($acl.hasPermission("Project - Approve", $currentDomain) && (!$requestedProjects.isEmpty()))
@


1.45
log
@changed the table width from 50% to 100%, changed some colspan's from 4 to 3.



PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d22 1
a22 1
#if ($acl.hasPermission("Role - Add", $currentDomain))
@


1.44
log
@in Pending Actions there is a message to Project Owners when their projects are locked
@
text
@d73 1
a73 1
	<TD bgcolor="#cccccc" COLSPAN="3" CLASS="InputHeader" WIDTH="50%">Admin Options</TD>
d155 1
a155 1
	<TD COLSPAN="4"><HR SIZE="1" NOSHADE></TD>
d165 1
a165 1
	<TD  width="80%" bgcolor="#cccccc" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
d167 1
a167 1
	<TD bgcolor="#cccccc"  CLASS="InputHeader" WIDTH="50%">Count</TD>
d212 1
a212 2
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="$project.getProjectPageURL(ProjectMemberList)">Proposed $roleWord in Project $project.getWordMark()</a>
      </TD>
d235 1
a235 2
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="$project.getProjectPageURL(ProjectNewsApproval)">Proposed $newsWord in Project $project.getWordMark()</a>
      </TD>
d256 1
a256 2
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149; <a href="$project.getProjectPageURL(ProjectSectionApproval)">Proposed $secWord in Project $project.getWordMark()</a>
      </TD>
d275 1
a275 2
      <TD CLASS="PlainText" VALIGN="top"> &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDocumentApproval")">Proposed $docWord in Project $project.getWordMark()</a>
      </TD>
d294 1
a294 2
      <TD CLASS="PlainText" VALIGN="top"> &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDownloadApproval)">Proposed $dlWord in Project $project.getWordMark()</a>
      </TD>
d301 1
a301 1
	<TD COLSPAN="4"><HR SIZE="1" NOSHADE></TD>
@


1.43
log
@the AdminOptions box was misaligned--removed leonard's extra <td>
@
text
@d62 4
a159 1

d169 11
@


1.42
log
@no longer printing empty Admin Options and Pending Actions boxes
@
text
@a147 1
 	<td></TD>
@


1.41
log
@Restored SessionList to its former glory.
@
text
@d24 1
a24 1
   #set $anyAdmin = 1
d29 1
a29 1
#if ($acl.hasPermission("Project - Approve", $project) && (!$requestedProjects==0))
@


1.40
log
@Changed StaticUtils to AdminUtils, and added links from it to other servlets.
@
text
@d132 8
@


1.39
log
@gave the actions column more space in Pending Actions to prevent wrapping
@
text
@d132 1
a132 1
                    #if ($hasRoleList) { 
d134 1
a134 1
                      &nbsp;&#149; <a href="/servlets/SessionList">Active User Sessions</a>
@


1.38
log
@fixed it so that it would display the Pending Actions table when there were unapproved projects
@
text
@d67 1
a67 1
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2"  WIDTH="100%">
d155 2
a156 2
	<TD colspan=2 bgcolor="#cccccc" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
        <TD WIDTH="10" BGCOLOR="#cccccc"><SPACER TYPE="block" WIDTH="10"></TD>
d171 1
a171 2
	<TD CLASS="PlainText" VALIGN="top">&nbsp;&#149;</TD>
    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectApproval">Proposed $projectWord</a></TD>
d191 1
a191 2
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149;</TD>
      <TD CLASS="PlainText" VALIGN="top"><a href="$project.getProjectPageURL(ProjectMemberList)">Proposed $roleWord in Project $project.getWordMark()</a>
d215 1
a215 2
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149;</TD>
      <TD CLASS="PlainText" VALIGN="top"> <a href="$project.getProjectPageURL(ProjectNewsApproval)">Proposed $newsWord in Project $project.getWordMark()</a>
d237 1
a237 2
      <TD CLASS="PlainText" VALIGN="top">&nbsp;&#149;</TD>
      <TD CLASS="PlainText" VALIGN="top"><a href="$project.getProjectPageURL(ProjectSectionApproval)">Proposed $secWord in Project $project.getWordMark()</a>
d257 1
a257 2
      <TD CLASS="PlainText" VALIGN="top"> &nbsp;&#149;</TD>
      <TD CLASS="PlainText" VALIGN="top"> <a href="$project.getProjectPageURL(ProjectDocumentApproval")">Proposed $docWord in Project $project.getWordMark()</a>
d277 1
a277 2
      <TD CLASS="PlainText" VALIGN="top"> &nbsp;&#149;</TD>
      <TD CLASS="PlainText" VALIGN="top"><a href="$project.getProjectPageURL(ProjectDownloadApproval)">Proposed $dlWord in Project $project.getWordMark()</a>
@


1.37
log
@Prefer Project's getWordMark() method over getName() to preserve initial
capitalization style.
@
text
@d28 5
d35 1
@


1.36
log
@now wrapping better in Pending Actions section
@
text
@d187 1
a187 1
      <TD CLASS="PlainText" VALIGN="top"><a href="$project.getProjectPageURL(ProjectMemberList)">Proposed $roleWord in Project $project.getName()</a>
d212 1
a212 1
      <TD CLASS="PlainText" VALIGN="top"> <a href="$project.getProjectPageURL(ProjectNewsApproval)">Proposed $newsWord in Project $project.getName()</a>
d235 1
a235 1
      <TD CLASS="PlainText" VALIGN="top"><a href="$project.getProjectPageURL(ProjectSectionApproval)">Proposed $secWord in Project $project.getName()</a>
d256 1
a256 1
      <TD CLASS="PlainText" VALIGN="top"> <a href="$project.getProjectPageURL(ProjectDocumentApproval")">Proposed $docWord in Project $project.getName()</a>
d277 1
a277 1
      <TD CLASS="PlainText" VALIGN="top"><a href="$project.getProjectPageURL(ProjectDownloadApproval)">Proposed $dlWord in Project $project.getName()</a>
@


1.35
log
@added document sections to admin Pending Actions
@
text
@d149 1
a149 1
	<TD bgcolor="#cccccc" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
d165 2
a166 3
	<TD CLASS="PlainText" VALIGN="top">
          &nbsp;&#149; <a href="/servlets/ProjectApproval">Proposed $projectWord</a>
        </TD>
d186 2
a187 2
      <TD CLASS="PlainText" VALIGN="top">
        &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectMemberList)">Proposed $roleWord in Project $project.getName()</a>
d211 2
a212 2
      <TD CLASS="PlainText" VALIGN="top">
         &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectNewsApproval)">Proposed $newsWord in Project $project.getName()</a>
d221 1
a221 1
## PROPOSED DOCUMENTS ROW
d234 2
a235 2
      <TD CLASS="PlainText" VALIGN="top">
         &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectSectionApproval)">Proposed $secWord in Project $project.getName()</a>
d242 21
d276 2
a277 2
      <TD CLASS="PlainText" VALIGN="top">
         &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDownloadApproval)">Proposed $dlWord in Project $project.getName()</a>
@


1.34
log
@Changed action to one that actually exists.
@
text
@d33 1
d48 4
d226 2
a227 2
   #set $requestedDocuments = $project.getUnapprovedDocuments()
    #if ($acl.hasPermission("Project Document - Approve", $project) && (!$requestedDocuments.isEmpty()))
d230 2
a231 2
           #set $docWord = "documents"
           #if ($requestedDocuments.size() == 1)
d233 1
a233 1
             #set $docWord = "document"
d236 1
a236 1
         &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDocumentApproval)">Proposed $docWord in Project $project.getName()</a>
d239 1
a239 1
      <TD CLASS="PlainText" VALIGN="top">$requestedDocuments.size()</TD>
@


1.33
log
@Added link to role admin page.
@
text
@d22 1
a22 1
#if ($acl.hasPermission("Role - List", $currentDomain))
@


1.32
log
@Changed "List All" to "Administer" to reflect the status of the list servlets as entries into the administrative sections.
@
text
@d22 6
d111 1
a111 1
                      &nbsp;&#149; <a href="/servlets/SessionList">Active User Sessions</a>
d119 12
@


1.31
log
@fixed so that Proposed Projects no longer shows up if there are 0 proposed projects

added requested downloads
@
text
@d56 1
a56 1
##LIST ALL PROJECTS AND PROJECT GROUPS ROW
d61 1
a61 1
                        &nbsp;&#149; <a href="/servlets/ProjectList">List All Projects</a>
d70 1
a70 1
                        &nbsp;&#149; <a href="/servlets/ProjectGroupList">List All Project Groups</a>
d78 1
a78 1
##LIST ALL USERS AND USERSGROUP ROW
d83 1
a83 1
                        &nbsp;&#149; <a href="/servlets/UserList">List All Users</a>
d92 1
a92 1
                        &nbsp;&#149; <a href="/servlets/UserGroupList">List All User Groups</a>
@


1.30
log
@Changed calls to the deprecated hasPermissionForProject() method to
hasPermission(), the suggested alternative.
@
text
@a20 4
#if ($acl.hasPermission("Project - Approve", $currentDomain))
{
   #set $anyPending = 1
}
d134 1
a134 1
#if ($acl.hasPermission("Project - Approve", $currentDomain))
d165 1
a165 1
        &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectMembers)">Proposed $roleWord in Project $project.getName()</a>
@


1.29
log
@hasPermissionForProject now takes a Project rather than a String
@
text
@d41 1
a41 1
    #if ($acl.hasPermissionForProject("Project Document - Approve", $project) && (!$requestedDocuments.isEmpty()))
d45 1
a45 1
    #if ($acl.hasPermissionForProject("Project Download - Approve", $project) && (!$requestedDownloads.isEmpty()))
d208 1
a208 1
    #if ($acl.hasPermissionForProject("Project Document - Approve", $project) && (!$requestedDocuments.isEmpty()))
d229 1
a229 1
    #if ($acl.hasPermissionForProject("Project Download - Approve", $project) && (!$requestedDownloads.isEmpty()))
@


1.28
log
@This is the highest revision from the HELM_PEER_PORT_BRANCH.  The previous import caused too many conflicts to resolve manually
@
text
@d41 1
a41 1
    #if ($acl.hasPermissionForProject("Project Document - Approve", $project.getID()) && (!$requestedDocuments.isEmpty()))
d45 1
a45 1
    #if ($acl.hasPermissionForProject("Project Download - Approve", $project.getID()) && (!$requestedDownloads.isEmpty()))
d208 1
a208 1
    #if ($acl.hasPermissionForProject("Project Document - Approve", $project.getID()) && (!$requestedDocuments.isEmpty()))
d229 1
a229 1
    #if ($acl.hasPermissionForProject("Project Download - Approve", $project.getID()) && (!$requestedDownloads.isEmpty()))
@


1.27
log
@added requested downloads to admin options
@
text
@d1 1
a1 1
#if ($acl.hasPermissionForDomain("Project - List", $currentDomain.getID()))
d6 1
a6 1
#if ($acl.hasPermissionForDomain("User - List", $currentDomain.getID()))
d11 1
a11 1
#if ($acl.hasPermissionForDomain("UserGroup - List", $currentDomain.getID()))
d16 1
a16 1
#if ($acl.hasPermissionForDomain("ProjectGroup - List", $currentDomain.getID()))
d21 1
a21 1
#if ($acl.hasPermissionForDomain("Project - Approve", $currentDomain.getID()))
d25 1
d28 1
a28 1
    #set $requestedRoles = $project.getRequestedRoles()
d32 2
a33 1
    #if ($acl.hasPermissionForProject("Project Role - Grant", $project.getID()) && (!$requestedRoles.isEmpty()))
d35 1
a35 1
       #set $anyPending = 1
d37 1
a37 1
    #if ($acl.hasPermissionForProject("Project News - Approve", $project.getID()) && (!$requestedNews.isEmpty()))
d39 1
a39 1
       #set $anyPending = 1
a80 1
}
d125 2
a126 1
#if ($anyPending) {
d134 1
d138 1
a138 1
#if ($acl.hasPermissionForDomain("Project - Approve", $currentDomain.getID()))
d158 1
a158 1
    #set $requestedRoles = $project.getRequestedRoles()
d160 1
a160 1
    #if ($acl.hasPermissionForProject("Project Role - Grant", $project.getID()) && (!$requestedRoles.isEmpty()))
d164 1
a164 1
           #if ($requestedRoles.size() == 1)
d172 1
a172 1
      <TD CLASS="PlainText" VALIGN="top">$requestedRoles.size()</TD>
d185 1
a185 1
    #if ($acl.hasPermissionForProject("Project News - Approve", $project.getID()) && (!$requestedNews.isEmpty()))
@


1.26
log
@added unapproved documents to admin workflow
@
text
@a20 3



d30 1
d43 4
d218 21
@


1.25
log
@changed link to news approval page (it was renamed)
@
text
@d32 1
d41 4
d193 23
@


1.25.4.1
log
@Converted permission checking somewhat.
@
text
@d1 1
a1 1
#if ($acl.hasPermissionForDomain("Project - List", $currentDomain))
d6 1
a6 1
#if ($acl.hasPermissionForDomain("User - List", $currentDomain))
d11 1
a11 1
#if ($acl.hasPermissionForDomain("UserGroup - List", $currentDomain))
d16 1
a16 1
#if ($acl.hasPermissionForDomain("ProjectGroup - List", $currentDomain))
d24 1
a24 1
#if ($acl.hasPermissionForDomain("Project - Approve", $currentDomain))
d32 1
a32 1
    #if ($acl.hasPermissionForProject("Project Role - Grant", $project) && (!$requestedRoles.isEmpty()))
d36 1
a36 1
    #if ($acl.hasPermissionForProject("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
d128 1
a128 1
#if ($acl.hasPermissionForDomain("Project - Approve", $currentDomain))
d150 1
a150 1
    #if ($acl.hasPermissionForProject("Project Role - Grant", $project) && (!$requestedRoles.isEmpty()))
d175 1
a175 1
    #if ($acl.hasPermissionForProject("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
@


1.25.4.2
log
@Changes to method calls.
@
text
@d23 1
a27 1

d30 1
a30 1
    #set $requestedRoles = $project.getNumberOfRequestedRoles()
d32 1
a32 1
    #if ($acl.hasPermissionForProject("Project Role - Grant", $project) && (!$requestedRoles==0))
d34 1
a34 1
        #set $anyPending = 1
d38 1
a38 1
        #set $anyPending = 1
d72 1
d117 1
a117 2
#if ($anyPending) 
{
a124 1
}
d148 1
a148 1
    #set $requestedRoles = $project.getNumberOfRequestedRoles()
d150 1
a150 1
    #if ($acl.hasPermissionForProject("Project Role - Grant", $project) && (!$requestedRoles==0))
d154 1
a154 1
           #if ($requestedRoles == 1)
d162 1
a162 1
      <TD CLASS="PlainText" VALIGN="top">$requestedRoles</TD>
@


1.25.4.3
log
@Got rid of calls to deprecated permission checking methods.
@
text
@d1 1
a1 1
#if ($acl.hasPermission("Project - List", $currentDomain))
d6 1
a6 1
#if ($acl.hasPermission("User - List", $currentDomain))
d11 1
a11 1
#if ($acl.hasPermission("UserGroup - List", $currentDomain))
d16 1
a16 1
#if ($acl.hasPermission("ProjectGroup - List", $currentDomain))
d23 1
a23 1
#if ($acl.hasPermission("Project - Approve", $currentDomain))
d32 1
a32 1
    #if ($acl.hasPermission("Project Role - Grant", $project) && (!$requestedRoles==0))
d36 1
a36 1
    #if ($acl.hasPermission("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
d129 1
a129 1
#if ($acl.hasPermission("Project - Approve", $currentDomain))
d151 1
a151 1
    #if ($acl.hasPermission("Project Role - Grant", $project) && (!$requestedRoles==0))
d176 1
a176 1
    #if ($acl.hasPermission("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
@


1.25.4.4
log
@Ported changes from head.
@
text
@d21 2
a31 3
    #set $requestedDocuments = $project.getUnapprovedDocuments()
    #set $requestedDownloads = $project.getUnapprovedDownloads()

a39 8
    #if ($acl.hasPermissionForProject("Project Document - Approve", $project.getID()) && (!$requestedDocuments.isEmpty()))
    {  
       #set $anyPending = 1
    }
    #if ($acl.hasPermissionForProject("Project Download - Approve", $project.getID()) && (!$requestedDownloads.isEmpty()))
    {  
       #set $anyPending = 1
    }
a188 44
    </TR>
    }
}


## PROPOSED DOCUMENTS ROW

#foreach $project in $loginUser.getProjectsForUser()
{
   #set $requestedDocuments = $project.getUnapprovedDocuments()
    #if ($acl.hasPermissionForProject("Project Document - Approve", $project.getID()) && (!$requestedDocuments.isEmpty()))
    {  
    <TR>
           #set $docWord = "documents"
           #if ($requestedDocuments.size() == 1)
           {
             #set $docWord = "document"
           }
      <TD CLASS="PlainText" VALIGN="top">
         &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDocumentApproval)">Proposed $docWord in Project $project.getName()</a>
      </TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedDocuments.size()</TD>
    </TR>
    }
}
## PROPOSED DOWNLOADS ROW

#foreach $project in $loginUser.getProjectsForUser()
{
   #set $requestedDownloads = $project.getUnapprovedDownloads()
    #if ($acl.hasPermissionForProject("Project Download - Approve", $project.getID()) && (!$requestedDownloads.isEmpty()))
    {  
    <TR>
           #set $dlWord = "downloads"
           #if ($requestedDownloads.size() == 1)
           {
             #set $dlWord = "downloads"
           }
      <TD CLASS="PlainText" VALIGN="top">
         &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDownloadApproval)">Proposed $dlWord in Project $project.getName()</a>
      </TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedDownloads.size()</TD>
@


1.24
log
@fixed pagination error in Proposed news items
@
text
@d184 1
a184 1
         &nbsp;&#149; <a href="$project.getProjectPageURL(NewsItemApprove)">Proposed $newsWord in Project $project.getName()</a>
@


1.23
log
@corrected background color
corrected spacing
@
text
@d171 3
a173 1
    #set $requestedNews = $project.getUnapprovedNews($acl)
d197 1
a197 1
} ## anyPending@


1.22
log
@Many, many pagination changes.
@
text
@d140 1
a140 1
	<TD BGCOLOR="#ffffff" VALIGN="top" CLASS="PlainText">$unapprovedProjects.size()</TD>
d159 1
a159 1
        &#149; <a href="$project.getProjectPageURL(ProjectMembers)">Proposed $roleWord in Project $project.getName()</a></TD>
d182 1
a182 1
         &#149; <a href="$project.getProjectPageURL(NewsItemApprove)">Proposed $newsWord in Project $project.getName()</a>
@


1.21
log
@simplified nested tables considerably
@
text
@d31 1
a31 1
    #set $requestedNews = $project.getUnapprovedNews()
d171 1
a171 1
    #set $requestedNews = $project.getUnapprovedNews()
@


1.20
log
@cleaned up nested tables in admin info and pending actions
@
text
@d45 1
a45 1
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2" BORDER="0" width="100%">
d47 1
a47 1
	<TD bgcolor="#cccccc" COLSPAN="5" CLASS="InputHeader" WIDTH="50%">Admin Options</TD>
a53 3
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
d55 3
a57 2
		      <TD CLASS="PlainText">&#149;</TD>
		      <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectList">List All Projects</a></TD>
a60 1
                      <TD>&nbsp;</TD>
d62 1
a62 7
		</TR>

	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
d64 3
a66 2
		      <TD CLASS="PlainText">&#149;</TD>
		      <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectGroupList">List All Project Groups</a></TD>
a69 1
                      <TD>&nbsp;</TD>
a70 3
		</TR>
	    </TABLE>
	</TD>
a76 3
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
d78 3
a80 2
		      <TD CLASS="PlainText">&#149;</TD>
		      <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/UserList">List All Users</a></TD>
a83 1
                      <TD>&nbsp;</TD>
d85 1
a85 6
		</TR>
	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
d87 3
a89 2
		      <TD CLASS="PlainText">&#149;</TD>
		      <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/UserGroupList">List All User Groups</a></TD>
a92 1
                      <TD>&nbsp;</TD>
a93 3
		</TR>
	    </TABLE>
	</TD>
d100 7
a106 16
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText">&#149;</TD>
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/SessionList">Active User Sessions</a></TD>
		</TR>
	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText">&#149;</TD>
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/AuditLogList">Administrative Audit Log</a></TD>
		</TR>
	    </TABLE>
	</TD>
d119 1
a119 1
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2" BORDER="0" width="100%">
d121 1
a121 1
	<TD bgcolor="#cccccc" COLSPAN="2" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
a130 1
	<TD CLASS="PlainText">&#149;</TD>
d136 3
a138 1
	<TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectApproval">Proposed $projectWord </a></TD>
a152 1
      <TD CLASS="PlainText">&#149;</TD>
d159 1
a159 1
        <a href="$project.getProjectPageURL(ProjectMembers)">Proposed $roleWord in Project $project.getName()</a></TD>
a175 1
      <TD CLASS="PlainText">&#149;</TD>
d182 1
a182 1
          <a href="$project.getProjectPageURL(NewsItemApprove)">Proposed $newsWord in Project $project.getName()</a>
@


1.19
log
@changed layout of admin options, separated pending actions
@
text
@d47 1
a47 2
	<TD bgcolor="#cccccc" COLSPAN="4" CLASS="InputHeader" WIDTH="50%">Admin Options</TD>
	<TD bgcolor="#cccccc" COLSPAN="4" CLASS="InputHeader" WIDTH="50%">&nbsp;</TD>
a48 1
</TABLE>
a49 1
<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">
d153 3
a155 2
	<TD bgcolor="#cccccc" COLSPAN="4" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
	<TD bgcolor="#cccccc" COLSPAN="4" CLASS="InputHeader" WIDTH="50%">Count</TD>
a156 4
</TABLE>

<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">

d163 1
a163 4
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText">&#149;</TD>
d169 3
a171 11
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectApproval">Proposed $projectWord </a></TD>
		</TR>
	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText" VALIGN="top">$unapprovedProjects.size()</TD>
		</TR>
	    </TABLE>
	</TD>
d184 1
a184 4
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText">&#149;</TD>
d190 5
a194 12

		    <TD CLASS="PlainText" VALIGN="top"><a href="$project.getProjectPageURL(ProjectMembers)">Proposed $roleWord in Project $project.getName()</a></TD>
		</TR>
	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText" VALIGN="top">$requestedRoles.size()</TD>
		</TR>
	    </TABLE>
	</TD>
d208 1
a208 4
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText">&#149;</TD>
d214 5
a218 12

		    <TD CLASS="PlainText" VALIGN="top"><a href="$project.getProjectPageURL(NewsItemApprove)">Proposed $newsWord in Project $project.getName()</a></TD>
		</TR>
	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText" VALIGN="top">$requestedNews.size()</TD>
		</TR>
	    </TABLE>
	</TD>
@


1.18
log
@added links to new admin servlets
@
text
@d4 1
d9 1
d14 1
d19 1
d21 3
d26 1
a26 1
   #set $anyAdmin = 1
d34 1
a34 1
       #set $anyAdmin = 1
d38 1
a38 1
       #set $anyAdmin = 1
d48 1
a48 1
	<TD bgcolor="#cccccc" COLSPAN="4" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
d54 2
a55 3
##LIST ALL PROJECTS ROW
#if ($acl.hasPermissionForDomain("Project - List", $currentDomain.getID()))
{
d60 8
a67 2
		    <TD CLASS="PlainText">&#149;</TD>
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectList">List All Projects</a></TD>
d75 8
a82 1
		    <TD CLASS="PlainText" VALIGN="top">No pending actions.</TD>
d88 3
a90 3
##LIST ALL USERS ROW
#if ($acl.hasPermissionForDomain("User - List", $currentDomain.getID()))
{
d95 8
a102 2
		    <TD CLASS="PlainText">&#149;</TD>
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/UserList">List All Users</a></TD>
d109 8
a116 1
		    <TD CLASS="PlainText" VALIGN="top">No pending actions.</TD>
d123 2
a124 3
##LIST ALL USER GROUPS ROW
#if ($acl.hasPermissionForDomain("UserGroup - List", $currentDomain.getID()))
{
d130 1
a130 1
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/UserGroupList">List All User Groups</a></TD>
d137 2
a138 1
		    <TD CLASS="PlainText" VALIGN="top">No pending actions.</TD>
a142 1
}
d144 1
a144 3
##LIST ALL PROJECT GROUPS ROW
#if ($acl.hasPermissionForDomain("ProjectGroup - List", $currentDomain.getID()))
{
d146 1
a146 15
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText">&#149;</TD>
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectGroupList">List All Project Groups</a></TD>
		</TR>
	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText" VALIGN="top">No pending actions.</TD>
		</TR>
	    </TABLE>
	</TD>
d148 5
a152 1
}
d154 1
d156 2
a157 15
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText">&#149;</TD>
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/SessionList">Active User Sessions</a></TD>
		</TR>
	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText" VALIGN="top">No pending actions.</TD>
		</TR>
	    </TABLE>
	</TD>
d159 1
d161 1
a161 17
    <TR>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText">&#149;</TD>
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/AuditLogList">Administrative Audit Log</a></TD>
		</TR>
	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText" VALIGN="top">No pending actions.</TD>
		</TR>
	    </TABLE>
	</TD>
    </TR>
d264 2
a265 1
}
@


1.17
log
@added unapproved news to Admin Options box
@
text
@d135 37
@


1.17.2.1
log
@moved changes from HEAD
@
text
@a3 1
   #set $hasProjectList = 1
a7 1
   #set $hasUserList = 1
a11 1
   #set $hasUserGroupList = 1
a15 1
   #set $hasProjectGroupList = 1
a16 3



d19 1
a19 1
   #set $anyPending = 1
d27 1
a27 1
       #set $anyPending = 1
d31 1
a31 1
       #set $anyPending = 1
d40 2
a41 1
	<TD bgcolor="#cccccc" COLSPAN="5" CLASS="InputHeader" WIDTH="50%">Admin Options</TD>
d43 1
d45 1
d47 3
a49 2
##LIST ALL PROJECTS AND PROJECT GROUPS ROW
#if ($hasProjectList || $hasProjectGroupList) {
d54 2
a55 8
                    #if ($hasProjectList) { 
		      <TD CLASS="PlainText">&#149;</TD>
		      <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectList">List All Projects</a></TD>
                    }
                    #else {
                      <TD>&nbsp;</TD>
                      <TD>&nbsp;</TD>
                    }
d63 1
a63 8
                    #if ($hasProjectGroupList) { 
		      <TD CLASS="PlainText">&#149;</TD>
		      <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectGroupList">List All Project Groups</a></TD>
                    }
                    #else {
                      <TD>&nbsp;</TD>
                      <TD>&nbsp;</TD>
                    }
d69 3
a71 3

##LIST ALL USERS AND USERSGROUP ROW
#if ($hasUserList || $hasUserGroupList) {
d76 2
a77 8
                    #if ($hasUserList) { 
		      <TD CLASS="PlainText">&#149;</TD>
		      <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/UserList">List All Users</a></TD>
                    }
                    #else {
                      <TD>&nbsp;</TD>
                      <TD>&nbsp;</TD>
                    }
d84 1
a84 8
                    #if ($hasUserGroupList) { 
		      <TD CLASS="PlainText">&#149;</TD>
		      <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/UserGroupList">List All User Groups</a></TD>
                    }
                    #else {
                      <TD>&nbsp;</TD>
                      <TD>&nbsp;</TD>
                    }
d91 3
a93 2


d99 1
a99 1
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/SessionList">Active User Sessions</a></TD>
d106 1
a106 2
		    <TD CLASS="PlainText">&#149;</TD>
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/AuditLogList">Administrative Audit Log</a></TD>
d111 1
d113 3
a115 1

d117 15
a131 13
	<TD COLSPAN="4"><HR SIZE="1" NOSHADE></TD>
    </TR>
</TABLE>

} ## anyAdmin

#if ($anyPending) {

<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2" BORDER="0" width="100%">
    <TR>
	<TD bgcolor="#cccccc" COLSPAN="2" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
        <TD WIDTH="10" BGCOLOR="#cccccc"><SPACER TYPE="block" WIDTH="10"></TD>
	<TD bgcolor="#cccccc"  CLASS="InputHeader" WIDTH="50%">Count</TD>
d133 1
d140 4
a143 1
	<TD CLASS="PlainText">&#149;</TD>
d149 11
a159 3
	<TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectApproval">Proposed $projectWord </a></TD>
	<TD></TD>
	<TD BGCOLOR="#ffffff" VALIGN="top" CLASS="PlainText">$unapprovedProjects.size()</TD>
d172 4
a175 1
      <TD CLASS="PlainText">&#149;</TD>
d181 12
a192 5
      <TD CLASS="PlainText" VALIGN="top">
        <a href="$project.getProjectPageURL(ProjectMembers)">Proposed $roleWord in Project $project.getName()</a></TD>
      </TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedRoles.size()</TD>
d206 4
a209 1
      <TD CLASS="PlainText">&#149;</TD>
d215 12
a226 5
      <TD CLASS="PlainText" VALIGN="top">
          <a href="$project.getProjectPageURL(NewsItemApprove)">Proposed $newsWord in Project $project.getName()</a>
      </TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedNews.size()</TD>
d235 1
a235 2

} ## anyPending@


1.17.2.2
log
@merged in changes from HEAD
@
text
@d45 1
a45 1
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2"  WIDTH="100%">
d47 1
a47 1
	<TD bgcolor="#cccccc" COLSPAN="3" CLASS="InputHeader" WIDTH="50%">Admin Options</TD>
d54 3
d58 2
a59 3
		      <TD CLASS="PlainText" VALIGN="top">
                        &nbsp;&#149; <a href="/servlets/ProjectList">List All Projects</a>
                      </TD>
d63 1
d65 7
a71 1
                <td></td>
d73 2
a74 3
		      <TD CLASS="PlainText" VALIGN="top">
                        &nbsp;&#149; <a href="/servlets/ProjectGroupList">List All Project Groups</a>
                      </TD>
d78 1
d80 3
d89 3
d93 2
a94 3
		      <TD CLASS="PlainText" VALIGN="top">
                        &nbsp;&#149; <a href="/servlets/UserList">List All Users</a>
                      </TD>
d98 1
d100 6
a105 1
	<td></td>
d107 2
a108 3
		      <TD CLASS="PlainText" VALIGN="top">
                        &nbsp;&#149; <a href="/servlets/UserGroupList">List All User Groups</a>
                      </TD>
d112 1
d114 3
d123 16
a138 7
		    <TD CLASS="PlainText" VALIGN="top">
                      &nbsp;&#149; <a href="/servlets/SessionList">Active User Sessions</a>
                    </TD>
	<td></TD>
		    <TD CLASS="PlainText" VALIGN="top">
                      &nbsp;&#149; <a href="/servlets/AuditLogList">Administrative Audit Log</a>
                    </TD>
d151 1
a151 1
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2" WIDTH="100%">
d153 1
a153 1
	<TD bgcolor="#cccccc" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
d163 1
d169 1
a169 3
	<TD CLASS="PlainText" VALIGN="top">
          &nbsp;&#149; <a href="/servlets/ProjectApproval">Proposed $projectWord</a>
        </TD>
d184 1
d191 1
a191 1
        &#149; <a href="$project.getProjectPageURL(ProjectMembers)">Proposed $roleWord in Project $project.getName()</a></TD>
d208 1
d215 1
a215 1
         &#149; <a href="$project.getProjectPageURL(NewsItemApprove)">Proposed $newsWord in Project $project.getName()</a>
@


1.16
log
@commented out debugging info accidentily added
@
text
@d24 1
d29 4
a168 2
## debug $requestedRoles

d190 34
@


1.15
log
@change the way project news item URLs are computed
@
text
@d164 1
a164 1
$requestedRoles
@


1.14
log
@enabled links to user groups and project groups
@
text
@d164 2
@


1.13
log
@use Project.getProjectPageURL for all links
@
text
@d13 4
d86 21
a106 21
## ##LIST ALL USER GROUPS ROW
## #if ($acl.hasPermissionForDomain("UserGroup - List", $currentDomain.getID()))
## {
##     <TR>
## 	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
## 	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
## 		<TR>
## 		    <TD CLASS="PlainText">&#149;</TD>
## 		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/UserGroupList">List All User Groups</a></TD>
## 		</TR>
## 	    </TABLE>
## 	</TD>
## 	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
## 	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
## 		<TR>
## 		    <TD CLASS="PlainText" VALIGN="top">No pending actions.</TD>
## 		</TR>
## 	    </TABLE>
## 	</TD>
##     </TR>
## }
d108 21
d138 1
a138 1
		    <TD CLASS="PlainText">&nbsp;</TD>
d170 1
a170 1
		    <TD CLASS="PlainText">&nbsp;</TD>
@


1.12
log
@commetned out link to user groups since that was not 100% done yet
@
text
@d152 1
a152 1
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectMembers?projectID=$project.getID()">Proposed $roleWord in Project $project.getName()</a></TD>
d171 1
a171 1
}@


1.11
log
@added link to user groups
@
text
@d82 21
a102 21
##LIST ALL USER GROUPS ROW
#if ($acl.hasPermissionForDomain("UserGroup - List", $currentDomain.getID()))
{
    <TR>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText">&#149;</TD>
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/UserGroupList">List All User Groups</a></TD>
		</TR>
	    </TABLE>
	</TD>
	<TD BGCOLOR="#ffffff" WIDTH="50%" VALIGN="top">
	    <TABLE BORDER="0" CELLSPACING="3" CELLPADDING="0" BGCOLOR="#ffffff">
		<TR>
		    <TD CLASS="PlainText" VALIGN="top">No pending actions.</TD>
		</TR>
	    </TABLE>
	</TD>
    </TR>
}
@


1.10
log
@corrected typo
@
text
@d9 4
d81 24
@


1.9
log
@made box only appear when it has something
@
text
@d23 1
a23 1
#if (anyAdmin) 
@


1.8
log
@More of the same.
@
text
@d1 24
d143 1
@


1.7
log
@Only show pending actions if there are any.
@
text
@d54 1
d63 1
a63 1
           #if ($currentDomain.getUnapprovedProjects($acl).size() == "1")
d74 1
a74 1
		    <TD CLASS="PlainText" VALIGN="top">$currentDomain.getUnapprovedProjects($acl).size()</TD>
d95 1
a95 1
           #if ($requestedRoles().size() == "1")
@


1.6
log
@fixed requested roles typo
@
text
@d86 1
a86 1
    #if ($acl.hasPermissionForProject("Project Role - Grant", $project.getID()) && (!$requestedRoles().size() == 0))
@


1.5
log
@eliminated multiple calls to getRequestedRoles by putting results in a variable
@
text
@a6 1
			
a80 1
#set $requestedRoles = getRequestedRoles()
d84 2
d106 1
a106 1
		    <TD CLASS="PlainText" VALIGN="top">$requestedRoles().size()</TD>
@


1.4
log
@added Admin Options section for ProjectOwners so that they can see the number of user roles awaiting approval. Changed unapproved users to unapproved roles.
@
text
@d82 1
d86 1
a86 1
    #if ($acl.hasPermissionForProject("Project Role - Grant", $project.getID()) && (!$project.getRequestedUsers().size() == 0))
d94 1
a94 1
           #if ($project.getRequestedRoles().size() == "1")
d106 1
a106 1
		    <TD CLASS="PlainText" VALIGN="top">$project.getRequestedRoles().size()</TD>
@


1.3
log
@changed header class
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d92 2
a93 2
           #set $memberWord = "Members"
           #if ($project.getNumberOfRequestedUsers() == "1")
d95 1
a95 1
             #set $memberWord = "Member"
d98 1
a98 1
		    <TD CLASS="PlainText" VALIGN="top"><a href="/servlets/ProjectMembers?projectID=$project.getID()">Proposed $memberWord of Project $project.getName()</a></TD>
d105 1
a105 1
		    <TD CLASS="PlainText" VALIGN="top">$project.getRequestedUsers().size()</TD>
@


1.2
log
@changed TD bgcolors to #cccccc
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d3 2
a4 2
	<TD bgcolor="#cccccc" COLSPAN="4" CLASS="StatHeader" WIDTH="50%">Admin Options</TD>
	<TD bgcolor="#cccccc" COLSPAN="4" CLASS="StatHeader" WIDTH="50%">Pending Actions</TD>
@


1.1
log
@this is an include used by StartPage
@
text
@d3 2
a4 2
	<TD bgcolor="#333366" COLSPAN="4" CLASS="StatHeader" WIDTH="50%">Admin Options</TD>
	<TD bgcolor="#333366" COLSPAN="4" CLASS="StatHeader" WIDTH="50%">Pending Actions</TD>
@


1.1.1.1
log
@Replacing the HEAD with the HELM_PEER_PORT_BRANCH.
@
text
@d1 1
a1 61
#if ($acl.hasPermission("Project - List", $currentDomain))
{
   #set $anyAdmin = 1
   #set $hasProjectList = 1
}
#if ($acl.hasPermission("User - List", $currentDomain))
{
   #set $anyAdmin = 1
   #set $hasUserList = 1
}
#if ($acl.hasPermission("UserGroup - List", $currentDomain))
{
   #set $anyAdmin = 1
   #set $hasUserGroupList = 1
}
#if ($acl.hasPermission("ProjectGroup - List", $currentDomain))
{
   #set $anyAdmin = 1
   #set $hasProjectGroupList = 1
}
#if ($acl.hasPermission("Project - Approve", $currentDomain))
{
   #set $anyPending = 1
}

#foreach $project in $loginUser.getProjectsForUser()
{
    #set $requestedRoles = $project.getNumberOfRequestedRoles()
    #set $requestedNews = $project.getUnapprovedNews($acl)
    #set $requestedDocuments = $project.getUnapprovedDocuments()
    #set $requestedDownloads = $project.getUnapprovedDownloads()

    #if ($acl.hasPermission("Project Role - Grant", $project) && (!$requestedRoles==0))
    {  
        #set $anyPending = 1
    }
    #if ($acl.hasPermission("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
    {  
        #set $anyPending = 1
    }
    #if ($acl.hasPermissionForProject("Project Document - Approve", $project.getID()) && (!$requestedDocuments.isEmpty()))
    {  
       #set $anyPending = 1
    }
    #if ($acl.hasPermissionForProject("Project Download - Approve", $project.getID()) && (!$requestedDownloads.isEmpty()))
    {  
       #set $anyPending = 1
    }
}


#if ($anyAdmin) 
{
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2"  WIDTH="100%">
    <TR>
	<TD bgcolor="#cccccc" COLSPAN="3" CLASS="InputHeader" WIDTH="50%">Admin Options</TD>
    </TR>


##LIST ALL PROJECTS AND PROJECT GROUPS ROW
#if ($hasProjectList || $hasProjectGroupList) {
d3 2
a4 57
                    #if ($hasProjectList) { 
		      <TD CLASS="PlainText" VALIGN="top">
                        &nbsp;&#149; <a href="/servlets/ProjectList">List All Projects</a>
                      </TD>
                    }
                    #else {
                      <TD>&nbsp;</TD>
                    }
                <td></td>
                    #if ($hasProjectGroupList) { 
		      <TD CLASS="PlainText" VALIGN="top">
                        &nbsp;&#149; <a href="/servlets/ProjectGroupList">List All Project Groups</a>
                      </TD>
                    }
                    #else {
                      <TD>&nbsp;</TD>
                    }
    </TR>

##LIST ALL USERS AND USERSGROUP ROW
#if ($hasUserList || $hasUserGroupList) {
    <TR>
                    #if ($hasUserList) { 
		      <TD CLASS="PlainText" VALIGN="top">
                        &nbsp;&#149; <a href="/servlets/UserList">List All Users</a>
                      </TD>
                    }
                    #else {
                      <TD>&nbsp;</TD>
                    }
	<td></td>
                    #if ($hasUserGroupList) { 
		      <TD CLASS="PlainText" VALIGN="top">
                        &nbsp;&#149; <a href="/servlets/UserGroupList">List All User Groups</a>
                      </TD>
                    }
                    #else {
                      <TD>&nbsp;</TD>
                    }
    </TR>
}



    <TR>
		    <TD CLASS="PlainText" VALIGN="top">
                      &nbsp;&#149; <a href="/servlets/SessionList">Active User Sessions</a>
                    </TD>
	<td></TD>
		    <TD CLASS="PlainText" VALIGN="top">
                      &nbsp;&#149; <a href="/servlets/AuditLogList">Administrative Audit Log</a>
                    </TD>
    </TR>


    <TR>
	<TD COLSPAN="4"><HR SIZE="1" NOSHADE></TD>
d7 1
d9 1
a9 1
} ## anyAdmin
d11 2
a12 1
#if ($anyPending) 
a13 2

<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2" WIDTH="100%">
d15 37
a51 3
	<TD bgcolor="#cccccc" CLASS="InputHeader" WIDTH="50%">Pending Actions</TD>
        <TD WIDTH="10" BGCOLOR="#cccccc"><SPACER TYPE="block" WIDTH="10"></TD>
	<TD bgcolor="#cccccc"  CLASS="InputHeader" WIDTH="50%">Count</TD>
a53 1

d55 1
a55 2
#set $unapprovedProjects = $currentDomain.getUnapprovedProjects($acl)
#if ($acl.hasPermission("Project - Approve", $currentDomain))
d58 4
d63 1
a63 1
           #if ($unapprovedProjects.size() == 1)
d67 11
a77 5
	<TD CLASS="PlainText" VALIGN="top">
          &nbsp;&#149; <a href="/servlets/ProjectApproval">Proposed $projectWord</a>
        </TD>
	<TD></TD>
	<TD VALIGN="top" CLASS="PlainText">$unapprovedProjects.size()</TD>
d85 1
a85 3
    #set $requestedRoles = $project.getNumberOfRequestedRoles()

    #if ($acl.hasPermission("Project Role - Grant", $project) && (!$requestedRoles==0))
d88 6
a93 2
           #set $roleWord = "Roles"
           #if ($requestedRoles == 1)
d95 1
a95 1
             #set $roleWord = "Role"
a96 16
      <TD CLASS="PlainText" VALIGN="top">
        &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectMembers)">Proposed $roleWord in Project $project.getName()</a>
      </TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedRoles</TD>
    </TR>
    }
}

## PROPOSED NEWS ROW

#foreach $project in $loginUser.getProjectsForUser()
{
#set $allRequestedNews = $project.getUnapprovedNews($acl)

#set $requestedNews = $allRequestedNews.getPage($paginated_page);
d98 11
a108 57
    #if ($acl.hasPermission("Project News - Approve", $project) && (!$requestedNews.isEmpty()))
    {  
    <TR>
           #set $newsWord = "news items"
           #if ($requestedNews.size() == 1)
           {
             #set $newsWord = "news item"
           }
      <TD CLASS="PlainText" VALIGN="top">
         &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectNewsApproval)">Proposed $newsWord in Project $project.getName()</a>
      </TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedNews.size()</TD>
    </TR>
    }
}


## PROPOSED DOCUMENTS ROW

#foreach $project in $loginUser.getProjectsForUser()
{
   #set $requestedDocuments = $project.getUnapprovedDocuments()
    #if ($acl.hasPermissionForProject("Project Document - Approve", $project.getID()) && (!$requestedDocuments.isEmpty()))
    {  
    <TR>
           #set $docWord = "documents"
           #if ($requestedDocuments.size() == 1)
           {
             #set $docWord = "document"
           }
      <TD CLASS="PlainText" VALIGN="top">
         &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDocumentApproval)">Proposed $docWord in Project $project.getName()</a>
      </TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedDocuments.size()</TD>
    </TR>
    }
}
## PROPOSED DOWNLOADS ROW

#foreach $project in $loginUser.getProjectsForUser()
{
   #set $requestedDownloads = $project.getUnapprovedDownloads()
    #if ($acl.hasPermissionForProject("Project Download - Approve", $project.getID()) && (!$requestedDownloads.isEmpty()))
    {  
    <TR>
           #set $dlWord = "downloads"
           #if ($requestedDownloads.size() == 1)
           {
             #set $dlWord = "downloads"
           }
      <TD CLASS="PlainText" VALIGN="top">
         &nbsp;&#149; <a href="$project.getProjectPageURL(ProjectDownloadApproval)">Proposed $dlWord in Project $project.getName()</a>
      </TD>
      <TD></TD>
      <TD CLASS="PlainText" VALIGN="top">$requestedDownloads.size()</TD>
a116 2

} ## anyPending
@


