head	1.19;
access;
symbols
	TIGRIS_1_1_0RC2:1.17
	TIGRIS_1_1_0RC1:1.17
	TIGRIS_1_1:1.17.0.4
	TIGRIS_1_0_8:1.17
	TIGRIS_1_0_8RC3:1.17
	TIGRIS_1_0_8RC2:1.17
	TIGRIS_1_0_8RC1:1.17
	TIGRIS_1_0_7:1.17
	TIGRIS_1_0_7RC3:1.17
	TIGRIS_1_0_7RC2:1.17
	TIGRIS_1_0_7RC1:1.17
	TIGRIS_1_0_6:1.17
	TIGRIS_1_0_6RC5:1.17
	TIGRIS_1_0_6RC4:1.17
	TIGRIS_1_0_6RC3:1.17
	TIGRIS_1_0_6RC2:1.17
	TIGRIS_1_0_6RC1:1.17
	TIGRIS_1_0_5:1.17
	TIGRIS_1_0_5RC6:1.17
	TIGRIS_1_0_5RC5:1.17
	TIGRIS_1_0_5RC4:1.17
	TIGRIS_1_0_5RC3:1.17
	TIGRIS_1_0_5RC2:1.17
	TIGRIS_1_0_5RC1:1.17
	TIGRIS_1_0_4:1.17
	TIGRIS_1_0_3:1.17
	TIGRIS_1_0_2:1.17
	TIGRIS_1_0_1:1.17
	TIGRIS_1_0:1.17.0.6
	TIGRIS_1_0_0:1.17
	TIGRIS_1_0_0_RC1:1.17.0.2
	dlr:1.1.1
	TIGRIS_0_9_2_4:1.12
	TIGRIS_0_9_2_3:1.12
	HELM_PEER_PORT_BRANCH:1.1.1.2
	TURBINE_PEER:1.13
	TIGRIS_0_9_2_1:1.13
	TIGRIS_0_9_2:1.12.0.4
	TIGRIS_0_9_0:1.12.0.2
	TIGRIS_0_8_4:1.9.0.2
	NEWHELM:1.1.1.1
	TIGRIS_NOV_12_2000:1.1.1;
locks; strict;
comment	@# @;


1.19
date	2001.05.23.02.04.14;	author dlr;	state dead;
branches;
next	1.18;

1.18
date	2001.03.29.23.45.02;	author susank;	state Exp;
branches;
next	1.17;

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

1.16
date	2001.03.03.03.02.08;	author elicia;	state Exp;
branches;
next	1.15;

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

1.14
date	2001.02.02.04.04.34;	author elicia;	state Exp;
branches;
next	1.13;

1.13
date	2001.01.23.23.02.01;	author elicia;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2000.12.21.02.14.23;	author susank;	state Exp;
branches
	1.12.4.1;
next	1.11;

1.11
date	2000.12.20.23.37.04;	author kmaples;	state Exp;
branches;
next	1.10;

1.10
date	2000.12.15.22.09.05;	author elicia;	state Exp;
branches;
next	1.9;

1.9
date	2000.11.30.03.16.22;	author elicia;	state Exp;
branches;
next	1.8;

1.8
date	2000.11.27.21.21.14;	author elicia;	state Exp;
branches;
next	1.7;

1.7
date	2000.11.27.18.58.18;	author susank;	state Exp;
branches;
next	1.6;

1.6
date	2000.11.27.18.54.07;	author susank;	state Exp;
branches;
next	1.5;

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

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

1.3
date	2000.11.16.19.44.19;	author elicia;	state Exp;
branches;
next	1.2;

1.2
date	2000.11.16.02.30.38;	author elicia;	state Exp;
branches;
next	1.1;

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

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

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

1.12.4.1
date	2001.02.02.20.23.14;	author elicia;	state Exp;
branches;
next	1.12.4.2;

1.12.4.2
date	2001.02.02.20.43.37;	author elicia;	state Exp;
branches;
next	;

1.13.2.1
date	2001.01.31.02.05.51;	author leonardr;	state Exp;
branches;
next	1.13.2.2;

1.13.2.2
date	2001.02.12.17.20.31;	author leonardr;	state Exp;
branches;
next	1.13.2.3;

1.13.2.3
date	2001.02.16.21.17.19;	author elicia;	state Exp;
branches;
next	;


desc
@@


1.19
log
@Removed WM templates in favor of Velocity templates.
@
text
@<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" BORDER="0" WIDTH="100%">
 <TR>
  <TD class="Header" nowrap><b>News Item:</b> <SPAN CLASS="ProjectNameHeader">
   <A HREF="$currentProject.getProjectHome()">$currentProject.getName()</a>
   </SPAN>
  </TD>  
   <TD class="PlainText" valign="top" nowrap>
    #set $proposedByUser = false
    #set $canEdit = false

    #if ($acl.hasPermission("Project News - Edit", $currentProject) )
    {
       #set $canEdit = true
    }
     
    #if ($newsItem.getProposedBy().toString().equals($acl.getUser().getID()))
    {
       #set $proposedByUser = true
    }
     #if ($proposedByUser || $canEdit)
     {
     #set $editURL = "$currentProject.getProjectPageURL("ProjectNewsEdit", "newsID=$newsItem.getID()")"
     #set $deleteURL = "$currentProject.getProjectPageURL("ProjectNewsDelete", "newsID=$newsItem.getID()")"
     &nbsp;&nbsp; <A HREF="$editURL">Edit</a> | 
     <A HREF="$deleteURL">Delete</A> 
     }
   </TD>
 </TR>
</TABLE>

<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" BORDER="0" WIDTH="75%"> 
  <TR>
      <TD colspan=2>&nbsp;</TD>
  </TR>
  <TR >
    <TD class="PlainText" valign="top">$newsItem.getEventDate(): $newsItem.getHeadline()
    <P>
    Contributed by:  <a href="mailTo:$newsItem.getProposedByUser().getEmail()">$newsItem.getProposedByUser().getRealName()</a>
    <P>
	$newsItem.getBody()
    </TD>
  </TR>
</TABLE>
@


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


1.17
log
@moved Edit/Delete links from List page to View page because List page needs more horizontal space for long headlines
@
text
@d3 1
a3 1
  <TD class="Header" nowrap>News Item: <SPAN CLASS="ProjectNameHeader">
@


1.16
log
@moved Edit/Delete links to be on the same line as page title

made table containing news body less wide so users won't have to scroll
@
text
@d7 5
a11 1
    #if ($acl.hasPermissionForProject("Project News - Edit", $currentProject))
d13 1
a13 3
    #set $editURL=$currentProject.getProjectPageURL("ProjectNewsEdit", "newsID=$newsItem.getID()")
    #set $deleteURL=$currentProject.getProjectPageURL("ProjectNewsDelete", "newsID=$newsItem.getID()")
    <TD class="PlainText" valign="top"><A HREF="$editURL">Edit</a> | <A HREF="$deleteURL">Delete</a></TD>
d15 13
@


1.15
log
@This is the highest revision from the HELM_PEER_PORT_BRANCH.  The previous import caused too many conflicts to resolve manually
@
text
@d7 6
d16 1
a16 1
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" BORDER="0" WIDTH="100%"> 
d20 1
a20 1
  <TR>
a26 6
    #if ($acl.hasPermissionForProject("Project News - Edit", $currentProject))
    {
    #set $editURL=$currentProject.getProjectPageURL("ProjectNewsEdit", "newsID=$newsItem.getID()")
    #set $deleteURL=$currentProject.getProjectPageURL("ProjectNewsDelete", "newsID=$newsItem.getID()")
    <TD class="PlainText" valign="top"><A HREF="$editURL">Edit</a> | <A HREF="$deleteURL">Delete</a></TD>
    }
@


1.14
log
@added "contributed by"
@
text
@a0 1

d2 7
a8 3
  <TR>
    <TD class="Header" nowrap>News Item: <SPAN CLASS="ProjectNameHeader">$currentProject.getName()</SPAN></TD>  

d17 1
a17 1
    Contributed by:  <a href="mailTo:$newsItem.getProposedByUser().getEmail()">$newsItem.getProposedByUser().getName()</a>
d21 1
a21 1
    #if ($acl.hasPermissionForProject("Project News - Edit", $currentProject.getID()))
@


1.13
log
@removed pagination
@
text
@d13 3
a15 1
	<P>
@


1.13.2.1
log
@Converted permission checking somewhat.
@
text
@d16 1
a16 1
    #if ($acl.hasPermissionForProject("Project News - Edit", $currentProject))
@


1.13.2.2
log
@Got rid of calls to deprecated permission checking methods.
@
text
@d16 1
a16 1
    #if ($acl.hasPermission("Project News - Edit", $currentProject))
@


1.13.2.3
log
@changed field names
@
text
@d1 1
d3 3
a5 7
 <TR>
  <TD class="Header" nowrap>News Item: <SPAN CLASS="ProjectNameHeader">
   <A HREF="$currentProject.getProjectHome()">$currentProject.getName()</a>
   </SPAN>
  </TD>  
 </TR>
</TABLE>
d13 1
a13 3
    <P>
    Contributed by:  <a href="mailTo:$newsItem.getProposedByUser().getEmail()">$newsItem.getProposedByUser().getRealName()</a>
    <P>
d16 1
a16 1
    #if ($acl.hasPermissionForProject("Project News - Edit", $currentProject))
@


1.12
log
@fixed pagination scrunching prob by making top a separate table from bottom
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@a1 2
#foreach $newsItem in $newsItems
{
a5 31
## Only show this pagination shlock if there is actually more than one page.
#if ($currentPage)
{
    <TD class="PlainText" ALIGN="right" VALIGN="top">
  #if ($prevPage)
  {
    #set $prevURL=$currentProject.getProjectPageURL("NewsItemView", "newsID=$newsItem.getID()&paginated_page=$prevPage")
      <A HREF="$prevURL">prev</A> | 
  }
  #foreach $page in $pages
  {
    #if (!$page.toString().equals("1"))
    {
      |
    }
    #if ($page.equals($currentPage))
    {
      $page
    } #else {
    #set $pageURL=$currentProject.getProjectPageURL("NewsItemView", "newsID=$newsItem.getID()&paginated_page=$page")
      <A HREF="$pageURL">$page</A>
    }
  }
  #if ($nextPage)
  {
    #set $nextURL=$currentProject.getProjectPageURL("NewsItemView", "newsID=$newsItem.getID()&paginated_page=$nextPage")
      | <A HREF="$nextURL">next</A>
  }
}
  </TD></TR>
</TABLE>
a23 1
}
@


1.12.4.1
log
@fixed bug in view introduced by leonard's pagination system
@
text
@d2 2
d8 31
d46 1
a46 3
    <P>
    Contributed by:  <a href="mailTo:$newsItem.getProposedByUser().getEmail()">$newsItem.getProposedByUser().getName()</a>
    <P>
d57 1
@


1.12.4.2
log
@removed Contributed by line, until java changes get propagated
@
text
@d14 2
@


1.11
log
@Changed key 'page' to 'paginated_page' to avoid name clash w/ a noodle key named 'page' (This is St.Ack posing as KM)
@
text
@d11 1
a11 1
    <TD class="PlainText" VALIGN="top">
d38 1
d40 1
a40 1

@


1.10
log
@changed links to work with vhosting  or non vhosting
@
text
@d14 1
a14 1
    #set $prevURL=$currentProject.getProjectPageURL("NewsItemView", "newsID=$newsItem.getID()&page=$prevPage")
d27 1
a27 1
    #set $pageURL=$currentProject.getProjectPageURL("NewsItemView", "newsID=$newsItem.getID()&page=$page")
d33 1
a33 1
    #set $nextURL=$currentProject.getProjectPageURL("NewsItemView", "newsID=$newsItem.getID()&page=$nextPage")
@


1.9
log
@re-ordering list of news items so that the current item is at the top of the stack. this will allow us to next/prev through the stack.
@
text
@d1 1
d14 2
a15 1
      <A HREF="/servlets/NewsItemView?projectID=$currentProject.getID()&page=$prevPage&newsID=$origNewsID">prev</A> | 
d27 2
a28 1
      <A HREF="/servlets/NewsItemView?projectID=$currentProject.getID()&page=$page&newsID=$origNewsID">$page</A>
d33 2
a34 1
      | <A HREF="/servlets/NewsItemView?projectID=$currentProject.getID()&page=$nextPage&newsID=$origNewsID">next</A>
d38 2
d50 3
a52 1
    <TD class="PlainText" valign="top"><A HREF="/servlets/ProjectNewsEdit?newsID=$newsItem.getID()&projectID=$newsItem.getProjectID()">Edit</a> | <A HREF="/servlets/ProjectNewsDelete?newsID=$newsItem.getID()&projectID=$newsItem.getProjectID()">Delete</a></TD>
@


1.8
log
@added next/previous links

added delete link
@
text
@d13 1
a13 1
      <A HREF="/servlets/NewsItemView?projectID=$currentProject.getID()&page=$prevPage">prev</A> | 
d25 1
a25 1
      <A HREF="/servlets/NewsItemView?projectID=$currentProject.getID()&page=$page">$page</A>
d30 1
a30 1
      | <A HREF="/servlets/NewsItemView?projectID=$currentProject.getID()&page=$nextPage">next</A>
@


1.7
log
@Project name, not Domain name
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d1 2
d6 16
a21 1
    #if ($acl.hasPermissionForProject("Project News - Edit", $currentProject.getID()))
d23 3
a25 1
    <TD class="PlainText" nowrap><A HREF="/servlets/ProjectNewsEdit?newsID=$newsItem.getID()&projectID=$newsItem.getProjectID()">Edit</A></TD>  
d27 9
a36 3
</TABLE>
<P>
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2" BORDER="0" width="85%">
d38 1
a38 1
    <TD class="PlainText" >$newsItem.getEventDate(): $newsItem.getHeadline()
d42 4
d48 1
@


1.6
log
@added project name to page header
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d3 1
a3 1
    <TD class="Header" nowrap>News Item: <SPAN CLASS="ProjectNameHeader">$currentDomain.getName()</SPAN></TD>  
@


1.5
log
@modernized files

added fields for publish_on and remove_on fields
@
text
@d3 1
a3 1
    <TD class="Header" nowrap>News Item</TD>  
@


1.4
log
@The '<' was collared--I had thought it looked suspicious.
@
text
@d6 1
a6 1
    <TD class="PlainText" nowrap><A HREF="/servlets/ProjectNewsEdit?newsID=$newsItem.getNewsID()&projectID=$newsItem.getProjectID()">Edit</A></TD>  
a10 1
#escape $newsItem.getHeadline()
@


1.3
log
@checking to see if there are any downloads for the project; if not, don't show the edit button
@
text
@a10 2
#set $test = "<"
$test
@


1.2
log
@added projectID to Edit link
PR:
Obtained from:
Submitted by:
Reviewed by:
@
text
@d11 3
@


1.1
log
@Initial revision
@
text
@d6 1
a6 1
    <TD class="PlainText" nowrap><A HREF="/servlets/ProjectNewsEdit?newsID=$newsItem.getNewsID()&$newsItem.getProjectID()">Edit</A></TD>  
@


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


1.1.1.2
log
@Replacing the HEAD with the HELM_PEER_PORT_BRANCH.
@
text
@a1 9
 <TR>
  <TD class="Header" nowrap>News Item: <SPAN CLASS="ProjectNameHeader">
   <A HREF="$currentProject.getProjectHome()">$currentProject.getName()</a>
   </SPAN>
  </TD>  
 </TR>
</TABLE>

<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" BORDER="0" WIDTH="100%"> 
d3 5
a7 1
      <TD colspan=2>&nbsp;</TD>
d9 3
d13 2
a14 4
    <TD class="PlainText" valign="top">$newsItem.getEventDate(): $newsItem.getHeadline()
    <P>
    Contributed by:  <a href="mailTo:$newsItem.getProposedByUser().getEmail()">$newsItem.getProposedByUser().getRealName()</a>
    <P>
a16 6
    #if ($acl.hasPermissionForProject("Project News - Edit", $currentProject))
    {
    #set $editURL=$currentProject.getProjectPageURL("ProjectNewsEdit", "newsID=$newsItem.getID()")
    #set $deleteURL=$currentProject.getProjectPageURL("ProjectNewsDelete", "newsID=$newsItem.getID()")
    <TD class="PlainText" valign="top"><A HREF="$editURL">Edit</a> | <A HREF="$deleteURL">Delete</a></TD>
    }
@

