You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/11/29 03:45:58 UTC
svn commit: r349596 [2/2] - in /incubator/roller/trunk: metadata/database/
metadata/xdoclet/ src/org/roller/business/
src/org/roller/business/hibernate/ src/org/roller/model/
src/org/roller/pojos/ src/org/roller/presentation/servlets/
src/org/roller/pr...
Added: incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp?rev=349596&view=auto
==============================================================================
--- incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp (added)
+++ incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp Mon Nov 28 18:45:40 2005
@@ -0,0 +1,111 @@
+<%@ include file="/taglibs.jsp" %>
+<%@ page import="org.roller.presentation.weblog.actions.CommentManagementAction" %>
+<%
+CommentManagementAction.CommentManagementPageModel model =
+ (CommentManagementAction.CommentManagementPageModel)request.getAttribute("model");
+%>
+
+<div class="sidebarFade">
+ <div class="menu-tr">
+ <div class="menu-tl">
+
+<div class="sidebarInner">
+
+<h3><fmt:message key="commentManagement.sidebarTitle" /></h3>
+<hr size="1" noshade="noshade" />
+
+<p><fmt:message key="commentManagement.sidebarDescription" /></p>
+
+<html:form action="/editor/commentQuery" method="post">
+ <html:hidden property="weblog" />
+ <html:hidden property="entryid" />
+ <html:hidden property="ids" />
+ <html:hidden property="offset" />
+ <html:hidden property="count" />
+
+ <div class="sideformrow">
+ <label for="searchString" class="sideformrow">
+ <fmt:message key="commentManagement.searchString" /></label>
+ <html:text property="searchString" /></input>
+ </div>
+ <br />
+
+ <%-- ========================================================= --%>
+ <%-- filter by date --%>
+
+ <div class="sideformrow">
+ <label for="pendingString" class="sideformrow">
+ <fmt:message key="commentManagement.pendingStatus" />
+ <br />
+ <br />
+ <br />
+ <br />
+ <br />
+ </label>
+ <div>
+ <div>
+ <html:radio property="pendingString" value="ALL">
+ <fmt:message key="commentManagement.all" /></html:radio><br />
+ <html:radio property="pendingString" value="ONLY_PENDING">
+ <fmt:message key="commentManagement.onlyPending" /></html:radio><br />
+ <html:radio property="pendingString" value="ONLY_APPROVED">
+ <fmt:message key="commentManagement.onlyApproved" /></html:radio><br />
+ <html:radio property="pendingString" value="ONLY_DISAPPROVED" >
+ <fmt:message key="commentManagement.onlyDisapproved" /></html:radio><br />
+ </div>
+ </div>
+ <br />
+
+ <div class="sideformrow">
+ <label for="spamString" class="sideformrow">
+ <fmt:message key="commentManagement.spamStatus" />
+ <br />
+ <br />
+ <br />
+ <br />
+ </label>
+ <div>
+ <html:radio property="spamString" value="ALL">
+ <fmt:message key="commentManagement.all" /></html:radio><br />
+ <html:radio property="spamString" value="NO_SPAM">
+ <fmt:message key="commentManagement.noSpam" /></html:radio><br />
+ <html:radio property="spamString" value="ONLY_SPAM" >
+ <fmt:message key="commentManagement.onlySpam" /></html:radio><br />
+ </div>
+ </div>
+ <br />
+
+ <br />
+ <div class="sideformrow">
+ <label for="startDateString" class="sideformrow">
+ <fmt:message key="commentManagement.startDate" />:
+ </label>
+ <roller:Date property="startDateString"
+ dateFormat='<%= model.getShortDateFormat() %>' />
+ </div>
+
+ <div class="sideformrow">
+ <label for="endDateString" class="sideformrow">
+ <fmt:message key="commentManagement.endDate" />:
+ </label>
+ <roller:Date property="endDateString"
+ dateFormat='<%= model.getShortDateFormat() %>' />
+ </div>
+ <br />
+
+ <input type="submit" name="post"
+ value='<fmt:message key="commentManagement.query" />' />
+ </input>
+ <input type="hidden" name="method" value="query"/>
+
+</html:form>
+
+<br />
+<br />
+</div> <!-- sidebarInner -->
+
+ </div>
+ </div>
+</div>
+
+
Modified: incubator/roller/trunk/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEdit.jsp?rev=349596&r1=349595&r2=349596&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEdit.jsp Mon Nov 28 18:45:40 2005
@@ -32,10 +32,6 @@
document.weblogEntryFormEx.method.value = "removeOk";
postWeblogEntry();
}
-function updateComments() {
- document.weblogEntryFormEx.method.value = "updateComments";
- postWeblogEntry();
-}
function sendTrackback() {
document.weblogEntryFormEx.method.value = "sendTrackback";
postWeblogEntry();
@@ -108,13 +104,11 @@
</html:select>
</td></tr>
- <tr><td class="entryEditFormLabel">
- <label for="link"><fmt:message key="weblogEdit.pubTime" /></label>
-
- <c:if test="${model.editMode && !empty model.comments}" >
- <a href="#comments" style="float:right"><fmt:message key="weblogEdit.comments" /></a>
- </c:if>
- </td><td>
+ <tr>
+ <td class="entryEditFormLabel">
+ <label for="link"><fmt:message key="weblogEdit.pubTime" /></label>
+ </td>
+ <td>
<div>
<html:select property="hours">
<html:options name="model" property="hoursList" />
@@ -262,7 +256,7 @@
<fmt:message key="weblogEdit.pluginsToApply" /></a>
</div>
<div id="pluginControl" class="miscControl" style="display:none">
- <logic:iterate id="plugin" type="org.roller.presentation.velocity.PagePlugin"
+ <logic:iterate id="plugin" type="org.roller.model.PagePlugin"
collection="<%= model.getPagePlugins() %>">
<html:multibox property="pluginsArray"
title="<%= plugin.getName() %>" value="<%= plugin.getName() %>"
@@ -425,61 +419,6 @@
</c:if>
- <%-- ================================================================== --%>
- <%-- Comments of this weblog entry --%>
-
- <c:if test="${model.editMode && !empty model.comments && model.userAuthorizedToAuthor}" >
- <br />
- <br />
- <a name="comments"></a>
- <h1><fmt:message key="weblogEdit.comments" /></h1>
- <br />
- <table class="rollertable">
- <tr>
- <th class="rollertable"><fmt:message key="weblogEdit.commentDelete" /></th>
- <th class="rollertable"><fmt:message key="weblogEdit.commentSpam" /></th>
- <th class="rollertable"><fmt:message key="weblogEdit.comment" /></th>
- <tr>
- <c:forEach var="comment" items="${model.comments}">
- <tr>
-
- <td class="rollertable_entry" >
- <html:multibox property="deleteComments">
- <c:out value="${comment.id}" />
- </html:multibox>
- </td>
-
- <td class="rollertable_entry" >
- <html:multibox property="spamComments">
- <c:out value="${comment.id}" />
- </html:multibox>
- </td>
-
- <td class="rollertable_entry" valign="top" >
- <span class="entryDetails">
- <fmt:message key="weblogEdit.commenterName" />
- [<c:out value="${comment.name}" />] |
- <fmt:formatDate value="${comment.postTime}" type="both"
- dateStyle="medium" timeStyle="medium" /><br />
- <fmt:message key="weblogEdit.commenterEmail" />:
- <c:out value="${comment.email}" /><br />
- <fmt:message key="weblogEdit.commenterUrl" />:
- <c:out value="${comment.url}" /><br />
- </span>
- <br />
- <c:out value="${comment.content}" />
- </td>
-
- </tr>
- </c:forEach>
- </table>
-
- <br />
- <input type="button" name="post"
- value='<fmt:message key="weblogEdit.updateComments" />'
- onclick="updateComments(true)" />
- </c:if>
-
</html:form>
<%--
@@ -487,7 +426,6 @@
<iframe id="keepalive" width="100%" height="25" style="border: none;"
src="<%= request.getContextPath() %>/keepalive.jsp" ></iframe>
--%>
-
<script type="text/javascript">
<!--
Modified: incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp?rev=349596&r1=349595&r2=349596&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp Mon Nov 28 18:45:40 2005
@@ -11,6 +11,19 @@
<div class="sidebarInner">
+<c:if test="${model.commentCount > 0}">
+ <h3><fmt:message key="weblogEdit.comments" /></h3>
+ <c:url value="/editor/commentManagement.do" var="commentManagement">
+ <c:param name="method" value="query" />
+ <c:param name="weblog" value="${model.website.handle}" />
+ <c:param name="entryid" value="${model.weblogEntry.id}" />
+ </c:url>
+ <img src='<c:url value="/images/Edit16.png"/>' />
+ <a href='<c:out value="${commentManagement}" />'>
+ <fmt:message key="weblogEdit.comments" /></a>
+ <br />
+</c:if>
+
<h3><fmt:message key="weblogEdit.pendingEntries" /></h3>
<c:if test="${empty model.recentPendingEntries}">
Modified: incubator/roller/trunk/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/edit-website.jsp?rev=349596&r1=349595&r2=349596&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/edit-website.jsp (original)
+++ incubator/roller/trunk/web/website/edit-website.jsp Mon Nov 28 18:45:40 2005
@@ -93,6 +93,12 @@
<td class="field"><html:checkbox property="allowComments" /></input></td>
<td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
</tr>
+
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.moderateComments" /></td>
+ <td class="field"><html:checkbox property="moderateComments" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
<%
boolean emailComments = RollerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
if (emailComments) { %>
@@ -109,6 +115,17 @@
</tr>
<% } %>
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.defaultAllowComments" /></td>
+ <td class="field"><html:checkbox property="defaultAllowComments" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+ <tr>
+ <td class="label"><fmt:message key="websiteSettings.defaultCommentDays" /></td>
+ <td class="field"><html:checkbox property="defaultCommentDays" /></input></td>
+ <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+ </tr>
+
<%-- ***** Blogger API setting settings ***** --%>
<tr>
@@ -143,7 +160,7 @@
<tr>
<td class="label">Default Entry Formatters <br />(applied in the listed order)</td>
<td class="field">
- <logic:iterate id="plugin" type="org.roller.presentation.velocity.PagePlugin"
+ <logic:iterate id="plugin" type="org.roller.model.PagePlugin"
collection="<%= model.getPagePlugins() %>">
<html:multibox property="defaultPluginsArray"
title="<%= plugin.getName() %>" value="<%= plugin.getName() %>" /></input>