Author: snoopdave
Date: Fri Jan 13 10:57:13 2006
New Revision: 368821
URL: http://svn.apache.org/viewcvs?rev=368821&view=rev
Log:
Fixes ROL-967 comment mod page problems with wide comments
Modified:
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/trunk/web/theme/roller.css
incubator/roller/trunk/web/weblog/CommentManagement.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=368821&r1=368820&r2=368821&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
Fri Jan 13 10:57:13 2006
@@ -227,7 +227,7 @@
commentManagement.sidebarDescription=Filter comments by search string, status,
and/or date
commentManagement.commentBy=Posted by
-commentManagement.commentByBoth={0} (<a href="mailto:{1}";>{1}</a>) from IP
address {2}
+commentManagement.commentByBoth={0} (<a href="mailto:{1}";>{2}</a>) from IP
address {3}
commentManagement.commentByName={0} from IP address {1}
commentManagement.commentByIP=User from IP address {0}
commentManagement.postTime=Posted at
Modified: incubator/roller/trunk/web/theme/roller.css
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/roller.css?rev=368821&r1=368820&r2=368821&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/roller.css (original)
+++ incubator/roller/trunk/web/theme/roller.css Fri Jan 13 10:57:13 2006
@@ -629,4 +629,15 @@
padding-right: 15px;
padding-left: 2px;
font-weight: bold;
-}
\ No newline at end of file
+}
+
+pre {
+ padding: 5px 5px 5px 7px;
+ background: #f5f5f5;
+ color: #000;
+ border: 1px dotted #ccc;
+ margin-left: 5px;
+ margin-right: 5px;
+ overflow: auto;
+ overflow-x: auto;
+}
Modified: incubator/roller/trunk/web/weblog/CommentManagement.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/CommentManagement.jsp?rev=368821&r1=368820&r2=368821&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/CommentManagement.jsp (original)
+++ incubator/roller/trunk/web/weblog/CommentManagement.jsp Fri Jan 13 10:57:13
2006
@@ -288,6 +288,7 @@
<fmt:message
key="commentManagement.commentByBoth" >
<fmt:param value="${comment.name}" />
<fmt:param value="${comment.email}" />
+ <fmt:param value="mailto" />
<fmt:param
value="${comment.remoteHost}" />
</fmt:message>
</c:when>
@@ -311,7 +312,7 @@
</c:choose>
<c:if test="${!empty comment.url}">
<br /><a href='<c:out value="${comment.url}"
/>'>
- <c:out value="${comment.url}" /></a>
+ <str:truncateNicely upper="60"
appendToEnd="..."><c:out value="${comment.url}" /></str:truncateNicely></a>
</c:if>
</td>
</tr>
@@ -326,7 +327,7 @@
<%-- comment content --%>
<br />
<span class="details">
- <c:out value="${comment.content}" escapeXml="false" />
+ <pre><str:wordWrap><c:out value="${comment.content}"
escapeXml="true" /></str:wordWrap></pre>
</span>
</td>
