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/12/06 17:17:17 UTC
svn commit: r354458 - in /incubator/roller/trunk/web:
WEB-INF/classes/ApplicationResources.properties theme/roller.css
weblog/WeblogQuery.jsp website/YourWebsites.jsp
Author: snoopdave
Date: Tue Dec 6 08:17:04 2005
New Revision: 354458
URL: http://svn.apache.org/viewcvs?rev=354458&view=rev
Log:
Formatting/style changes to make entry and comment pages consistent
Modified:
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/trunk/web/theme/roller.css
incubator/roller/trunk/web/weblog/WeblogQuery.jsp
incubator/roller/trunk/web/website/YourWebsites.jsp
Modified: incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties?rev=354458&r1=354457&r2=354458&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties Tue Dec 6 08:17:04 2005
@@ -1399,6 +1399,17 @@
weblogEntryQuery.label.publishedOnly=Published Only
weblogEntryQuery.label.pendingOnly=Pending Only
+weblogEntryQuery.weblogEntries=Weblog Entries
+weblogEntryQuery.edit=Edit
+weblogEntryQuery.link=Link
+weblogEntryQuery.title=Title
+weblogEntryQuery.category=Category
+weblogEntryQuery.pubTime=Published
+weblogEntryQuery.updateTime=Updated
+weblogEntryQuery.status=Status
+weblogEntryQuery.pending=Pending
+weblogEntryQuery.draft=Draft
+
weblogEntryQuery.section.format=Format to be used
weblogEntryQuery.label.separateEntries=Separate Entries by
@@ -1535,7 +1546,8 @@
yourWebsites.description=Description
yourWebsites.newEntry=New Entry
-yourWebsites.editEntries=Edit Entries
+yourWebsites.editEntries=Entries
+yourWebsites.manageComments=Comments
yourWebsites.manage=Settings
yourWebsites.createWeblog=Create new weblog
Modified: incubator/roller/trunk/web/theme/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/roller.css?rev=354458&r1=354457&r2=354458&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/roller.css (original)
+++ incubator/roller/trunk/web/theme/roller.css Tue Dec 6 08:17:04 2005
@@ -319,6 +319,20 @@
background: #ffcccc;
border: 1px grey solid;
}
+td.pendingentry {
+ background: #ffcccc;
+}
+td.draftentry {
+ background: #ffffcc;
+}
+.draftEntryBox {
+ background: #ffffcc;
+ border: 1px grey solid;
+}
+.pendingEntryBox {
+ background: #ffcccc;
+ border: 1px grey solid;
+}
/* ----------------------------------------------------------------------
Calendar styles
Modified: incubator/roller/trunk/web/weblog/WeblogQuery.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogQuery.jsp?rev=354458&r1=354457&r2=354458&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogQuery.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogQuery.jsp Tue Dec 6 08:17:04 2005
@@ -13,50 +13,110 @@
<fmt:message key="weblogEntryQuery.tip" />
</p>
-<div class="entryTitleBox">
- <fmt:message key="weblogEntryQuery.queryResults" />
-</div>
-
-<div class="entriesBox">
-<div class="entriesBoxInner">
+<table class="rollertable" width="100%">
+
+<tr>
+ <th class="rollertable">
+ <fmt:message key="weblogEntryQuery.weblogEntries" />
+ </th>
+</tr>
+<tr class="actionrow">
+ <td align="right" valign="center">
+ <span class="draftEntryBox"> </span>
+ <fmt:message key="weblogEntryQuery.draft" />
+ <span class="pendingEntryBox"> </span>
+ <fmt:message key="weblogEntryQuery.pending" />
+ </td>
+</tr>
<c:forEach var="post" items="${model.recentWeblogEntries}">
-
- <div class="entryBox">
-
- <roller:link page="/editor/weblog.do">
- <roller:linkparam
- id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
- name="post" property="id" />
- <roller:linkparam id="method" value="edit" />
- <img src='<c:url value="/images/Edit16.png"/>' border="0" alt="icon" title="Edit" />
- <c:out value="${post.displayTitle}" />
- </roller:link>
+ <tr>
+ <%-- <td> with style if comment is spam or pending --%>
+ <c:choose>
+ <c:when test='${post.status == "DRAFT"}'>
+ <td class="draftentry">
+ </c:when>
+ <c:when test='${post.status == "PENDING"}'>
+ <td class="pendingentry">
+ </c:when>
+ <c:otherwise>
+ <td>
+ </c:otherwise>
+ </c:choose>
+
+ <%-- entry details table in table --%>
+ <table style="border:none; padding:0px; margin:0px">
+ <tr> <%-- title --%>
+ <td style="border: none; padding:0px;">
+ <fmt:message key="weblogEntryQuery.title" />
+ </td>
+ <td class="details" style="border: none; padding:0px;">
+ <c:out value="${post.displayTitle}" />
+ [<roller:link page="/editor/weblog.do">
+ <roller:linkparam
+ id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
+ name="post" property="id" />
+ <roller:linkparam id="method" value="edit" />
+ <fmt:message key="weblogEntryQuery.edit" />
+ </roller:link>]
+ </td>
+ </tr>
+ <c:if test='${post.status == "PUBLISHED"}'>
+ <tr> <%-- link --%>
+ <td style="border: none; padding:0px;">
+ <fmt:message key="weblogEntryQuery.link" />
+ </td>
+ <td class="details" style="border: none; padding:0px;">
+ <a href='<c:out value="${model.baseURL}" /><c:out value="${post.permaLink}" />'>
+ <c:out value="${model.baseURL}" /><c:out value="${post.permaLink}" />
+ </a>
+ </td>
+ </tr>
+ </c:if>
+ <c:choose>
+ <c:when test='${post.status == "PUBLISHED"}'>
+ <tr> <%-- pubtime --%>
+ <td style="border: none; padding:0px;">
+ <fmt:message key="weblogEntryQuery.pubTime" />
+ </td>
+ <td class="details" style="border: none; padding:0px;">
+ <fmt:formatDate value="${post.pubTime}" type="both"
+ dateStyle="medium" timeStyle="medium" />
+ </td>
+ </tr>
+ </c:when>
+ <c:otherwise>
+ <tr> <%-- updatetime --%>
+ <td style="border: none; padding:0px;">
+ <fmt:message key="weblogEntryQuery.updateTime" />
+ </td>
+ <td class="details" style="border: none; padding:0px;">
+ <fmt:formatDate value="${post.updateTime}" type="both"
+ dateStyle="medium" timeStyle="medium" />
+ (<b><c:out value="${post.status}" /></b>)
+ </td>
+ </tr>
+ </c:otherwise>
+ </c:choose>
+ <tr> <%-- category --%>
+ <td style="border: none; padding:0px;">
+ <fmt:message key="weblogEntryQuery.category" />
+ </td>
+ <td class="details" style="border: none; padding:0px;">
+ <c:out value="${post.category.path}" />
+ </td>
+ </tr>
+
+ </table> <%-- end entry details table in table --%>
<br />
-
- <span class="entryDetails">
- <fmt:message key="weblogEdit.category" /> [<c:out value="${post.category.path}" />] |
- <fmt:formatDate value="${post.pubTime}" type="both" dateStyle="medium" timeStyle="medium" />
- <c:if test="${!empty post.link}">
- <a href='<c:out value="${post.link}" />' class="entryDetails">
- <fmt:message key="weblogEdit.link" />
- </a>
- </c:if>
- <a href='<c:out value="${model.baseURL}" /><c:out value="${post.permaLink}" />'
- class="entrypermalink" title="entry permalink">#</a>
- <br />
- <br />
- </span>
-
+
<div style="overflow:auto">
<roller:ApplyPlugins name="post" skipFlag="true" scope="page" />
</div>
- </div>
-
+ </td></tr>
</c:forEach>
-</div> <!-- entriesBoxInner -->
-</div> <!-- entriesBox -->
+</table>
<c:if test="${empty model.recentWeblogEntries}" >
<fmt:message key="weblogEntryQuery.noneFound" />
Modified: incubator/roller/trunk/web/website/YourWebsites.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/YourWebsites.jsp?rev=354458&r1=354457&r2=354458&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/YourWebsites.jsp (original)
+++ incubator/roller/trunk/web/website/YourWebsites.jsp Tue Dec 6 08:17:04 2005
@@ -100,6 +100,15 @@
<fmt:message key="yourWebsites.editEntries" /></a>
<br />
+ <c:url value="/editor/commentManagement.do" var="manageComments">
+ <c:param name="method" value="query" />
+ <c:param name="weblog" value="${perms.website.handle}" />
+ </c:url>
+ <img src='<c:url value="/images/Edit16.png"/>' />
+ <a href='<c:out value="${manageComments}" />'>
+ <fmt:message key="yourWebsites.manageComments" /></a>
+ <br />
+
<c:if test="${perms.permissionMask == 3}">
<c:url value="/editor/website.do" var="manageWeblog">
<c:param name="method" value="edit" />