Author: snoopdave
Date: Wed Apr 19 15:08:32 2006
New Revision: 395407
URL: http://svn.apache.org/viewcvs?rev=395407&view=rev
Log:
ROL-1110: Compact display for entry management page to avoid layout problems
Modified:
incubator/roller/trunk/web/theme/blue/colors.css
incubator/roller/trunk/web/theme/roller.css
incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp
Modified: incubator/roller/trunk/web/theme/blue/colors.css
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/blue/colors.css?rev=395407&r1=395406&r2=395407&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/blue/colors.css (original)
+++ incubator/roller/trunk/web/theme/blue/colors.css Wed Apr 19 15:08:32 2006
@@ -142,3 +142,22 @@
td.mm_table_actions {
background: #fff4d4;
}
+
+
+/* RTE editor */
+
+.rteBack tbody tr td, .rteBack tr td, .rteDiv, .rteBack .rteImageLowered,
.rteImage:active, .rteImageRaised, .rteImage:hover, .rteImageSm, .rteImage {
+ background: #e3e3e3;
+}
+.rteImage {
+ border: 1px solid #bcc5cd;
+}
+.rteImageSm {
+ border: 1px solid #bcc5cd;
+}
+.rteDiv {
+ border: 1px solid #bcc5cd;
+}
+
+
+
Modified: incubator/roller/trunk/web/theme/roller.css
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/roller.css?rev=395407&r1=395406&r2=395407&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/roller.css (original)
+++ incubator/roller/trunk/web/theme/roller.css Wed Apr 19 15:08:32 2006
@@ -319,10 +319,10 @@
background: #ffcccc;
border: 1px grey solid;
}
-td.pendingentry {
+td.pendingentry, tr.pendingentry {
background: #ffcccc;
}
-td.draftentry {
+td.draftentry, tr.draftentry {
background: #ffffcc;
}
.draftEntryBox {
Modified: incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp?rev=395407&r1=395406&r2=395407&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp Wed Apr 19
15:08:32 2006
@@ -79,114 +79,87 @@
<%-- Entry table--%>
<%-- ============================================================= --%>
+<p>
+<span class="draftEntryBox"> </span>
+<fmt:message key="weblogEntryQuery.draft" />
+<span class="pendingEntryBox"> </span>
+<fmt:message key="weblogEntryQuery.pending" />
+</p>
+
<table class="rollertable" width="100%">
<tr>
+ <th class="rollertable" width="5%">
+ <fmt:message key="weblogEntryQuery.pubTime" />
+ </th>
+ <th class="rollertable" width="5%">
+ <fmt:message key="weblogEntryQuery.updateTime" />
+ </th>
<th class="rollertable">
- <fmt:message key="weblogEntryQuery.weblogEntries" />
+ <fmt:message key="weblogEntryQuery.title" />
+ </th>
+ <th class="rollertable" width="5%">
+ <fmt:message key="weblogEntryQuery.category" />
+ </th>
+ <th class="rollertable" width="5%">
+ </th>
+ <th class="rollertable" width="5%">
</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}">
- <tr>
<%-- <td> with style if comment is spam or pending --%>
<c:choose>
<c:when test='${post.status == "DRAFT"}'>
- <td class="draftentry">
+ <tr class="draftentry">
</c:when>
<c:when test='${post.status == "PENDING"}'>
- <td class="pendingentry">
+ <tr class="pendingentry">
</c:when>
<c:otherwise>
- <td>
+ <tr>
</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>
-
- <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>
-
- <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" />
- </td>
- </tr>
-
- <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>
-
- <tr> <%-- category --%>
- <td style="border: none; padding:0px;">
- <fmt:message key="weblogEntryQuery.status" />
- </td>
- <td class="details" style="border: none; padding:0px;">
- <c:out value="${post.status}" />
- </td>
- </tr>
-
- </table> <%-- end entry details table in table --%>
- <br />
-
- <div style="overflow:auto">
- <roller:ShowEntryText name="post" singleEntry="false" scope="page"
/>
- </div>
+ <td>
+ <c:out value="${post.pubTime}" />
+ </td>
+
+ <td>
+ <c:out value="${post.updateTime}" />
+ </td>
+
+ <td>
+ <str:truncateNicely upper="80">
+ <c:out value="${post.displayTitle}" />
+ </str:truncateNicely>
+ </td>
- </td></tr>
+ <td>
+ <c:out value="${post.category.name}" />
+ </td>
+
+ <td>
+ <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>
+
+ <td>
+ <c:if test='${post.status == "PUBLISHED"}'>
+ <a href='<c:out value="${model.baseURL}" /><c:out
value="${post.permaLink}" />'>
+ <fmt:message key="weblogEntryQuery.view" />
+ </a>
+ </c:if>
+ </td>
+
+ </tr>
</c:forEach>
+
</table>
<c:if test="${empty model.recentWeblogEntries}" >
