roller/web/weblog comment-display.jspf,1.6,1.7 comments.jsp,1.11,1.12 WeblogEdit.jsp,1.8,1.9

Update of /cvsroot/roller/roller/web/weblog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27674/web/weblog

Modified Files:
        comment-display.jspf comments.jsp WeblogEdit.jsp 
Log Message:
entry.allowComments and entry.commentDays now exposed in Editor UI and enforced 
in comment JSP pages and VM templates. Also, a number of menu fixes including.

Index: comment-display.jspf
===================================================================
RCS file: /cvsroot/roller/roller/web/weblog/comment-display.jspf,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** comment-display.jspf        11 May 2004 17:11:43 -0000      1.6
--- comment-display.jspf        25 May 2004 03:27:57 -0000      1.7
***************
*** 18,26 ****
              comment.setName( "Anonymous" );
          }
!         if (StringUtils.isNotEmpty(comment.getEmail())) { %>
!             <a href='mailto:<%= RegexUtil.encode(comment.getEmail()) %>'>
!                 <%= comment.getName() %></a>
!         <% } else { %>
!             <%= comment.getName() %>
          <% } %>
           <fmt:message key="comments.at" /> <%= 
org.roller.util.DateUtil.friendlyTimestamp( comment.getPostTime() ) %>
--- 18,29 ----
              comment.setName( "Anonymous" );
          }
!         if (StringUtils.isNotEmpty(comment.getEmail()) && 
coment.getRemoteHost() != null) { %>
!             <a href='mailto:<%= RegexUtil.encode(comment.getEmail()) %>' 
!               title='<%= comment.getRemoteHost() %>'><%= comment.getName() 
%></a>
!         <% } else if (StringUtils.isNotEmpty(comment.getEmail())) { %>
!             <a href='mailto:<%= RegexUtil.encode(comment.getEmail()) %>' >
!               <%= comment.getName() %></a>
!         <% } else if (comment.getRemoteHost() != null) { %>
!             <%= comment.getName() %> (<%= comment.getRemoteHost() %>)
          <% } %>
           <fmt:message key="comments.at" /> <%= 
org.roller.util.DateUtil.friendlyTimestamp( comment.getPostTime() ) %>

Index: comments.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/weblog/comments.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** comments.jsp        11 May 2004 17:11:43 -0000      1.11
--- comments.jsp        25 May 2004 03:27:57 -0000      1.12
***************
*** 87,93 ****
  </table>
  
! <h3><fmt:message key="comments.header" /></h3>
! 
! <%@ include file="comment-form.jspf" %>
  
  </div>
--- 87,97 ----
  </table>
  
! <c:if test="${blogEntry.commentsStillAllowed}">
!    <h3><fmt:message key="comments.header" /></h3>
!    <%@ include file="comment-form.jspf" %>
! </c:if>
! <c:if test="${!blogEntry.commentsStillAllowed}">
!    <fmt:message key="comments.disabled" />
! </c:if>
  
  </div>

Index: WeblogEdit.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/weblog/WeblogEdit.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WeblogEdit.jsp      23 May 2004 13:34:21 -0000      1.8
--- WeblogEdit.jsp      25 May 2004 03:27:57 -0000      1.9
***************
*** 209,213 ****
       <fmt:message key="weblogEdit.allowComments" />
       <fmt:message key="weblogEdit.commentDays" />
!      <html:select property="categoryId" size="1" tabindex="4">
           <html:option key="weblogEdit.unlimitedCommentDays" value="0"  />
           <html:option key="weblogEdit.days1" value="1"  />
--- 209,213 ----
       <fmt:message key="weblogEdit.allowComments" />
       <fmt:message key="weblogEdit.commentDays" />
!      <html:select property="commentDays">
           <html:option key="weblogEdit.unlimitedCommentDays" value="0"  />
           <html:option key="weblogEdit.days1" value="1"  />



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click