head	1.18;
access;
symbols;
locks; strict;
comment	@# @;


1.18
date	2001.08.30.01.10.57;	author tfahrner;	state Exp;
branches;
next	1.17;

1.17
date	2001.08.29.22.47.36;	author tfahrner;	state Exp;
branches;
next	1.16;

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

1.15
date	2001.08.22.00.29.25;	author tfahrner;	state Exp;
branches;
next	1.14;

1.14
date	2001.08.20.22.29.20;	author tfahrner;	state Exp;
branches;
next	1.13;

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

1.12
date	2001.08.04.02.01.31;	author tfahrner;	state Exp;
branches;
next	1.11;

1.11
date	2001.08.01.18.09.05;	author susank;	state Exp;
branches;
next	1.10;

1.10
date	2001.07.30.18.40.40;	author leonardr;	state Exp;
branches;
next	1.9;

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

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

1.7
date	2001.06.08.17.01.55;	author beril;	state Exp;
branches;
next	1.6;

1.6
date	2001.06.08.00.20.06;	author jefflove;	state Exp;
branches;
next	1.5;

1.5
date	2001.05.25.21.33.32;	author dlr;	state Exp;
branches;
next	1.4;

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

1.3
date	2001.05.24.20.31.04;	author dlr;	state Exp;
branches;
next	1.2;

1.2
date	2001.05.24.19.51.16;	author dlr;	state Exp;
branches;
next	1.1;

1.1
date	2001.05.23.01.58.15;	author dlr;	state Exp;
branches;
next	;


desc
@@


1.18
log
@removed redundant links in Admin functions
@
text
@<div id="navcolumn">

<div><strong><a href="$res.encodeUrl("/servlets/StartPage")">Start page</a></strong></div>

<div><strong><a href="/servlets/ProjectList">Projects</a>/<a href="/servlets/CategoryList">Categories</a></strong></div> 

#if( $currentProject && $myProperties.get("showProjectNav") && $currentProject.getName() != "www" )
<div id="tools"><strong>Project tools</strong>
#if ($acl.hasPermission("Project News - View", $currentProject))
<div><small><a href="$res.encodeUrl($currentProject.getProjectPageURL("ProjectNewsList"))">News</a></small></div>  
#end
#if ($acl.hasPermission("Project Member - List", $currentProject))
<div><small><a href="$res.encodeUrl($currentProject.getProjectPageURL("ProjectMemberList"))">Members</a></small></div>
#end
#if ($acl.hasPermission("Mailing List - List", $currentProject))
<div><small><a href="$res.encodeUrl($currentProject.getProjectPageURL("ProjectMailingListList"))"> Mailing Lists</a></small></div> 
#end
<div><small><a href="$res.encodeUrl($currentProject.getProjectPageURL("ProjectDocumentList"))">Documents</a></small></div>
<div><small><a href="$res.encodeUrl($currentProject.getProjectPageURL("ProjectSource"))">Source Code</a></small></div>
<div><small><a href="$res.encodeUrl($currentProject.getProjectPageURL("ProjectIssues"))">Issue Tracking</a></small></div>
</div>
#end 



#set ($adminLevel = $myProperties.get("adminLevel"))
#if( $adminLevel == "host" || $adminLevel == "domain" )
#if( $acl.hasPermission("Domain - Administer", $currentDomain) )
<div id="admfun"><strong>Admin functions</strong>
<div><small><a href="$res.encodeUrl("/servlets/ProjectGroupList")">Project groups</a></small></div>
#if( $acl.hasPermission("User - List", $currentDomain) )
<div><small><a href="$res.encodeUrl("/servlets/UserList")">Users</a></small></div>  
#end
#if( $acl.hasPermission("Mailing List - List", $currentProject) )
<div><small><a href="$res.encodeUrl("/servlets/UserGroupList")">User groups</a></small> </div>
#end
## #if ($acl.hasPermission("Role - List", $currentDomain)) 
## {
<div><small><a href="$res.encodeUrl("/servlets/RoleList")">Roles</a></small></div>  
## }
#if( $acl.hasPermission("Mailing List - List", $currentProject) )
<div><small><a href="$res.encodeUrl("/servlets/ResourceList")">Resources</a></small></div> 
#end
#if( $acl.hasPermission("Licenses - Administer", $currentDomain) )
<div><small><a href="$res.encodeUrl("/servlets/LicenseList")">Licenses</a></small></div>  
#end
#if( $acl.hasPermission("Session - List", $currentDomain) )
<div><small><a href="$res.encodeUrl("/servlets/SessionList")">Sessions</a></small> </div> 
#end
## #if ($acl.hasPermission("AuditLog - List")) 
## {
<div><small><a href="$res.encodeUrl("/servlets/AuditLogList")">Audit log</a></small> </div>
## }
#if( $acl.hasPermission("Helm - Administer") )
<div><small><a href="$res.encodeUrl("/servlets/AdminUtils")">Other utils</a></small> </div>
#end
</div>
#end 
#elseif( $acl.hasPermission("Domain - Administer", $currentDomain) )
<div><strong><a href="$res.encodeUrl("/servlets/ProjectList")">Admin functions</a></strong></div>
#end 
</div>
#if( $servletHelp.available($servletName) )
  #parse( $servletHelp.getPath($servletName) )
#else
  #parse( $servletHelp.getPath("Default") )
#end

@


1.17
log
@added tab styling, projects/categories link from nav_column
@
text
@a29 1
<div><small><a href="$res.encodeUrl("/servlets/ProjectList")">Projects</a></small></div>
a30 1
<div><small><a href="$res.encodeUrl("/servlets/CategoryList")">Project categories</a></small></div> 
@


1.16
log
@Removed some unnecessary whitespace.
@
text
@d5 1
a5 1
<div><strong><a href="/servlets/DomainProjects">Hosted Projects</a></strong></div> 
@


1.15
log
@ui revision, neaten/tidy
@
text
@d9 1
a9 1
#if ($acl.hasPermission("Project News - View", $currentProject)) 
d12 1
a12 1
#if ($acl.hasPermission("Project Member - List", $currentProject)) 
d15 1
a15 1
#if ($acl.hasPermission("Mailing List - List", $currentProject)) 
d18 3
a20 3
<div><small><a href="$res.encodeUrl($currentProject.getProjectPageURL("ProjectDocumentList"))">Documents</a></small></div>  
<div><small><a href="$res.encodeUrl($currentProject.getProjectPageURL("ProjectSource"))">Source Code</a></small></div>  
<div><small><a href="$res.encodeUrl($currentProject.getProjectPageURL("ProjectIssues"))">Issue Tracking</a></small></div>  
@


1.14
log
@first wave of ui revisions. expect minor breakage. working on it.
@
text
@d3 1
a3 7
<p class="firstchild"><strong>
<a href="$res.encodeUrl("/servlets/StartPage")">Start page</a></strong>
</p>


<p><strong><a href="$res.encodeUrl("http://collabnet.cleverchimp.com/scratch/projects.html")">Projects by Category</a></strong></p> 

d5 1
d8 14
a21 1
#parse("Tools.vm")
a26 1

a27 1

d29 4
a32 14

<div><strong>Admin functions</strong>


<div>
<a href="$res.encodeUrl("/servlets/ProjectList")">Projects</a>
</div>
<div>
<a href="$res.encodeUrl("/servlets/ProjectGroupList")">Project groups</a> 
</div>
<div>
<a href="$res.encodeUrl("/servlets/CategoryList")">Project categories</a>
</div> 

d34 1
a34 3
      <div>
<a href="$res.encodeUrl("/servlets/UserList")">Users</a>
</div>  
d37 1
a37 3
      <div>
<a href="$res.encodeUrl("/servlets/UserGroupList")">Project groups</a> 
</div>
a38 2


d41 1
a41 3
     <div>
<a href="$res.encodeUrl("/servlets/RoleList")">Roles</a>
</div>  
d44 1
a44 3
      <div>
<a href="$res.encodeUrl("/servlets/ResourceList")">Resources</a>
</div> 
a45 1

d47 1
a47 3
      <div>
<a href="$res.encodeUrl("/servlets/LicenseList")">Licenses</a>
</div>  
a48 1

d50 1
a50 3
      <div>
<a href="$res.encodeUrl("/servlets/SessionList")">Sessions</a> 
</div> 
d54 1
a54 3
      <div>
<a href="$res.encodeUrl("/servlets/AuditLogList")">Audit log</a> 
</div>
a55 1

d57 1
a57 3
      <div>
<a href="$res.encodeUrl("/servlets/AdminUtils")">Other utils</a> 
</div>
a59 1

a61 1

a63 1

a64 2


@


1.13
log
@help stickies are now vm, should be #parsed (instead of #included)
default help sticky now in place
Issue number:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d3 79
a81 21
 <table border="0" cellspacing="0" cellpadding="0" width="100%" id="domainnav">
  <tr>
   <th nowrap="nowrap">$currentDomain.getName()</th>
  </tr>

  <tr>
   <td>
#if( $loginUser && !$loginUser.isAnonymous() )
    <div>
     <a href="$res.encodeUrl("/servlets/StartPage")">My Start Page</a>
    </div>
 #end
    <div>
    <a href="$res.encodeUrl("/servlets/DomainHome")">Domain Home</a></div>

    <div>
    <a href="$res.encodeUrl("/servlets/DomainProjects")">Hosted Projects</a></div>

   </td>
  </tr>
 </table>
d83 12
@


1.12
log
@various ui/layout revisions
@
text
@d27 2
@


1.11
log
@made help stickies file parsed, rather than included, so that vm gets processed
Issue number:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d2 2
a3 1
 <table border="0" cellspacing="0" cellpadding="0" width="100%" id="profile">
d5 1
a5 7
   <th nowrap="nowrap">
#if( $loginUser && !$loginUser.isAnonymous() )
My Profile
#else
Login/Register
#end
</th>
d9 1
a9 4
   <td>#if( $loginUser && !$loginUser.isAnonymous() )
    <div id="loginstatus">
     Logged in as: <b class="username">$loginUser.getRealName()</b>
    </div>
a15 31
     <a href="$res.encodeUrl("/servlets/UserEdit")">Edit Profile</a>
    </div>

    <div>
     <a href="$res.encodeUrl("/servlets/Logout")">Logout</a>
    </div>
   
#else
   
    <div>
     <a class="nav" href="$res.encodeUrl("/servlets/TLogin")">Login</a>
    </div>

    <div>
     <a class="nav" href="$res.encodeUrl("/servlets/Join")">Register</a>
    </div>
#end
   </td>
  </tr>
 </table>

## <!-- vmtechnote: i don't think following table should display if value of $currentDomain is null! (add condition) - tfahrner -->

 <table border="0" cellspacing="0" cellpadding="0" width="100%" id="domainnav">
  <tr>
   <th nowrap="nowrap">$currentDomain.getName()</th>
  </tr>

  <tr>
   <td>
    <div>
a20 12
    <div>
    <a href="$res.encodeUrl("/servlets/HelpTOC")">Help</a></div>

    <div>
    <a href="/project/www/docs/hostedtools.html">Hosted Tools</a></div>

    <div>
    <a href="/project/www/docs/DomainFAQ.html">Site FAQ</a></div>

    <div>
    <a href="/project/www/docs/DomainFeedback.html">Feedback</a></div>

a23 67

#if( $acl.hasPermission("User - List", $currentDomain) || ($isProjectOwner) )
 <table border="0" cellspacing="0" cellpadding="0" width="100%" id="adminopts">
  <tr>
   <th nowrap="nowrap">Admin Options</th>
  </tr>

  <tr>
   <td>
    <div>
     <a href="/servlets/ProjectList">Projects</a>
    </div>
    <div>
     <a href="/servlets/ProjectGroupList">Project Groups</a>
    </div>
    <div>
     <a href="/servlets/CategoryList">Categories</a>
    </div>
    #if( $acl.hasPermission("User - List", $currentDomain) )
     <div>
      <a href="/servlets/UserList">Users</a>
     </div>
    #end
    #if( $acl.hasPermission("UserGroup - List", $currentDomain) )
     <div>
      <a href="/servlets/UserList">User Groups</a>
     </div>
    #end
    #if( $acl.hasPermission("Role - Add", $currentProject) )
     <div>
      <a href="/servlets/RoleList">Roles</a>
     </div>
    #end
    #if( $acl.hasPermission("Resource - Add", $currentProject) )
     <div>
      <a href="/servlets/ResourceList">Resources</a>
     </div>
    #end
    #if( $acl.hasPermission("Licenses - Administer", $currentDomain) )
     <div>
      <a href="/servlets/LicenseList">Licenses</a>
     </div>
    #end
   </td>
  </tr>
 </table>

 <table border="0" cellspacing="0" cellpadding="0" width="100%" id="admintools">
  <tr>
   <th nowrap="nowrap">Admin Tools</th>
  </tr>

  <tr>
   <td>
  #if( $acl.hasPermission("Session - List", $currentDomain) )
    <div>
     <a href="$res.encodeUrl("/servlets/SessionList")">Active User Sessions</a>
    </div>
  #end
    <div>
     <a href="$res.encodeUrl("/servlets/AuditLogList")">Show Audit Log</a>
    </div>
   </td>
  </tr>
 </table>
#end

a24 16
#if( !$loginUser || $loginUser.isAnonymous() )
 #if( !$servletName.equals("TLogin") )
<div class="login">
  <form action="$res.encodeUrl("TLogin")" method="post">
  <p><b>Login</b><br />
  <input type="text" name="loginID" value="" size="15" maxlength="32" /></p>

  <p><b>Password</b><br />
  <input type="password" name="password" value="" size="15" maxlength="32" /></p>

  <p><input type="submit" name="Button" value="Login" /></p>
  </form>
</div>
 #end
#end
#parse( "Nav_Search.vm" )
d28 1
@


1.10
log
@Action cleanup. Some role actions, and Audit Log - View, had three actions apiece when one would do. We're now down to 76 actions.
@
text
@d160 1
a160 1
  #include( $servletHelp.getPath($servletName) )
@


1.9
log
@Made admin options the same as the other admin options (is this what we want?)
@
text
@d103 1
a103 1
    #if( $acl.hasPermission("Project Role - Add", $currentProject) )
@


1.8
log
@Implemented basic project group and category nesting.
@
text
@a83 4
   <div>
     <a href="/servlets/ProjectList">Add/Edit Projects</a>
    </div>
  #if( $acl.hasPermission("User - List", $currentDomain) )
d85 1
a85 1
     <a href="/servlets/UserList">Add/Edit Users</a>
a86 2
  #end
  #if( $acl.hasPermission("Project Role - Add", $currentDomain) )
d88 1
a88 1
     <a href="/servlets/RoleList">Administer Roles</a>
a89 1
  #end
d91 1
a91 1
     <a href="/servlets/ProjectGroupList">Project Groups</a>
d93 25
@


1.7
log
@uppercase to lowercase
@
text
@d76 1
a76 1
#if( $acl.hasPermission("Project - List", $currentDomain) || $acl.hasPermission("User - List", $currentDomain) || ($isProjectOwner) )
a83 1
  #if( $acl.hasPermission("Project - List", $currentDomain) )
a86 1
 #end
a96 1
  #if( $acl.hasPermission("ProjectGroup - List", $currentDomain) )
a99 1
#end
@


1.6
log
@xmlizing nowrap attrs
@
text
@d139 1
a139 1
  <p><input type="Submit" name="Button" value="Login" /></p>
@


1.5
log
@Leveraged my new ServletHelp interface.
@
text
@d4 1
a4 1
   <th nowrap>
d49 1
a49 1
   <th nowrap>$currentDomain.getName()</th>
d79 1
a79 1
   <th nowrap>Admin Options</th>
d110 1
a110 1
   <th nowrap>Admin Tools</th>
@


1.4
log
@Used new ServletHelp API.
@
text
@d145 2
a146 3
#set( $helpFile = $servletHelp.getHelpFileName($servletName) )
#if( $servletHelp.helpExists($helpFile) )
  #include( "$helpFile" )
@


1.3
log
@Simplified logic in light of block which has moved up in the world
(higher in the nav column).
@
text
@d145 1
a145 1
#set( $helpFile = $documentRoot.concat("/www/www/docs/").concat($servletName).concat("Help.html") )
@


1.2
log
@Removed BRAND_TEMPLATE_ROOT, SERVLET_TEMPLATE_ROOT, and SANDBOX from use in #include and #parse directives (deprecated by multiple template paths).
@
text
@d129 1
a129 2
#if( $loginUser && !$loginUser.isAnonymous() )
#else
d142 1
a142 1
#end
@


1.1
log
@Added shiny new Velocity templates.
@
text
@d145 1
a145 1
#parse( "$BRAND_TEMPLATE_ROOT/Nav_Search.vm" )
@

