pvollenweider 2005/04/22 16:29:00 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp blog_listing.jsp
src/view/jsp/include blog_entries.inc blog_entry.inc
Revision Changes Path
1.1.2.21 +7 -4 corporate_portal_templates/src/view/jsp/blog_listing.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog_listing.jsp.diff?r1=1.1.2.20&r2=1.1.2.21&f=h
1.1.2.12 +6 -4
corporate_portal_templates/src/view/jsp/include/blog_entries.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_entries.inc.diff?r1=1.1.2.11&r2=1.1.2.12&f=h
1.1.2.19 +116 -83
corporate_portal_templates/src/view/jsp/include/blog_entry.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_entry.inc.diff?r1=1.1.2.18&r2=1.1.2.19&f=h
Index: blog_listing.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/Attic/blog_listing.jsp,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- blog_listing.jsp 15 Apr 2005 14:30:09 -0000 1.1.2.20
+++ blog_listing.jsp 22 Apr 2005 14:29:00 -0000 1.1.2.21
@@ -147,12 +147,15 @@
String title = entry.getFieldValue("title","");
String body = entry.getFieldValue("body","");
String author = entry.getFieldValue("author","");
- String excerpt = "";
- excerpt = removeTags(body);
- if ( (excerpt.length()) > 255 ) {
- excerpt = excerpt.substring( 0, 255 - 3 ) + "...";
+ String excerpt = entry.getFieldValue("excerpt","");;
+ if ("".equals(excerpt)){
+ excerpt = removeTags(body);
+ if ( (excerpt.length()) > 255 ) {
+ excerpt = excerpt.substring( 0, 255 - 3 ) +
"...";
+ }
}
+
//String date = entry.getFieldValue("date","");
long dateLong = -1;
try {
Index: blog_entries.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/blog_entries.inc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- blog_entries.inc 15 Apr 2005 14:21:39 -0000 1.1.2.11
+++ blog_entries.inc 22 Apr 2005 14:29:00 -0000 1.1.2.12
@@ -50,10 +50,12 @@
String title = entry.getFieldValue("title","");
String body = entry.getFieldValue("body","");
String author = entry.getFieldValue("author","");
- String excerpt = "";
- excerpt = removeTags(body);
- if ( (excerpt.length()) > 255 ) {
- excerpt = excerpt.substring( 0, 255 - 3 ) + "...";
+ String excerpt = entry.getFieldValue("excerpt","");;
+ if ("".equals(excerpt)){
+ excerpt = removeTags(body);
+ if ( (excerpt.length()) > 255 ) {
+ excerpt = excerpt.substring( 0, 255 - 3 ) + "...";
+ }
}
//String date = entry.getFieldValue("date","");
Index: blog_entry.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/blog_entry.inc,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- blog_entry.inc 22 Apr 2005 13:47:53 -0000 1.1.2.18
+++ blog_entry.inc 22 Apr 2005 14:29:00 -0000 1.1.2.19
@@ -60,6 +60,20 @@
<a href="#comments" class="commentlink"><%=commentsCount%>
<jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="blog.comments"/></a>
+ <%
+ JahiaContainerList trackbacks = entry.getContainerList(
"trackbacks" );
+ int trackbacksCount = 0;
+ if (trackbacks != null) {
+ trackbacksCount = trackbacks.getFullSize();
+ }
+ if (trackbacksCount>0) {
+ %>
+ <a href="#trackbacks"
class="commentlink"><%=trackbacksCount%>
+ <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="blog.trackbacks"/></a>
+ <%
+ }
+ %>
</p>
<%
@@ -132,110 +146,129 @@
class="commentlink"><%=commentsCount%>
<jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="blog.comments"/></a>
+ <%
+ if (trackbacksCount>0) {
+ %>
+ <a href="#trackbacks"
class="commentlink"><%=trackbacksCount%>
+ <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="blog.trackbacks"/></a>
+ <%
+ }
+ %>
<br/><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="blog.trackback"/> url: <%=trackBackURL%>
<div id="comments">
- <h4>
- <%=commentsCount%>
- <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="blog.comments"/> <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="blog.forFar"/> <span>
- (<a href="#postcomment"><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="blog.postYourOwn"/></a>)</span>
- </h4>
- <dl>
- <%
- if (comments != null) {
- Enumeration commentsEnum = comments.getContainers();
- int counter = 0;
- while (commentsEnum.hasMoreElements()) {
- JahiaContainer comment = (JahiaContainer)
commentsEnum.nextElement();
- counter++;
- String alt = counter % 2 == 1 ? "alt" : "alt2";
- String commentAuthor =
comment.getFieldValue("author","");
- String commentTitle =
comment.getFieldValue("title","");
- String commentBody =
comment.getFieldValue("body","");
- String commentDate =
comment.getFieldValue("date","");
- long commentDateLong = -1;
- try {
- commentDateLong =
Long.parseLong((String)comment.getFieldObject("date"));
- } catch (NumberFormatException nfe) {
- }
- %>
- <dt id="comment<%=counter%>" class="<%=alt%>">
- <a href="#comment<%=counter%>" class="postno"
title="Link to comment <%=counter%>"><%=counter%>.</a>
- At
- <% sdf.applyPattern("kk:mm z"); %><%=sdf.format(
new Date(commentDateLong) )%>
- on <%sdf.applyPattern("d MMM
yyyy");%><%=sdf.format( new Date(commentDateLong) )%>, <%=commentAuthor%> wrote:
- </dt>
- <dd class="<%=alt%>">
- <%
- if (! "".equals(commentTitle)) {
- %><h3><%=commentTitle%></h3><br/><%
- }
- %>
- <%=commentBody%>
- </dd>
- <%
- }
- }
- %>
- </dl>
<%
- JahiaContainerList trackbacks = entry.getContainerList(
"trackbacks" );
-
- int trackbacksCount = 0;
- if (trackbacks != null) {
- trackbacksCount = trackbacks.getFullSize();
- }
- ContainerListBean trackbacksBean = new
ContainerListBean(trackbacks,jParams);
- jData.gui().html().drawBeginActionMenu(trackbacksBean ,
- null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
- if (trackbacksCount>0 || jData.gui().isEditMode()) {
- %><h4><%=trackbacksCount%> <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="blog.trackbacks"/></h4>
- <dl>
- <%
- Enumeration trackbacksEnum = trackbacks.getContainers();
+ if (comments != null) {
+ jData.gui().html().drawBeginActionMenu(commentsBean ,
+ null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ if (commentsCount>0 || jData.gui().isEditMode()) {
+ %>
+ <h4>
+ <%=commentsCount%>
+ <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="blog.comments"/>
<jahia:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="blog.forFar"/> <span>
+ (<a href="#postcomment"><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="blog.postYourOwn"/></a>)</span>
+ </h4>
+ <dl>
+ <%
+ }
+ Enumeration commentsEnum = comments.getContainers();
int counter = 0;
- while (trackbacksEnum.hasMoreElements()) {
- JahiaContainer trackback = (JahiaContainer)
trackbacksEnum.nextElement();
- ContainerBean trackbackBean = new
ContainerBean(trackback,jParams);
+ while (commentsEnum.hasMoreElements()) {
+ JahiaContainer comment = (JahiaContainer)
commentsEnum.nextElement();
+ ContainerBean commentBean = new
ContainerBean(comment,jParams);
counter++;
String alt = counter % 2 == 1 ? "alt" : "alt2";
- String trackBackTitle =
trackback.getFieldValue("trackBackTitle","");
- String trackBackExcerpt =
trackback.getFieldValue("trackBackExcerpt","");
- String trackBackUrl =
trackback.getFieldValue("trackBackUrl","#");
- String trackBackBlog_name =
trackback.getFieldValue("trackBackBlog_name","#");
+ String commentAuthor =
comment.getFieldValue("author","");
+ String commentTitle = comment.getFieldValue("title","");
+ String commentBody = comment.getFieldValue("body","");
+ String commentDate = comment.getFieldValue("date","");
+ long commentDateLong = -1;
+ try {
+ commentDateLong =
Long.parseLong((String)comment.getFieldObject("date"));
+ } catch (NumberFormatException nfe) {
+ }
%>
- <dt id="trackback<%=counter%>" class="<%=alt%>">
- <a href="#trackback<%=counter%>" class="postno"
title="Link to trackback <%=counter%>"><%=counter%>.</a>
- <a href="<%=trackBackUrl%>"
target="_blank"><%="".equals(trackBackBlog_name)?trackBackUrl:trackBackBlog_name%></a>
+ <dt id="comment<%=counter%>" class="<%=alt%>">
+ <a href="#comment<%=counter%>" class="postno"
title="Link to comment <%=counter%>"><%=counter%>.</a>
+ At
+ <% sdf.applyPattern("kk:mm z"); %><%=sdf.format( new
Date(commentDateLong) )%>
+ on <%sdf.applyPattern("d MMM yyyy");%><%=sdf.format(
new Date(commentDateLong) )%>, <%=commentAuthor%> wrote:
</dt>
<dd class="<%=alt%>">
<%
- if (! "".equals(trackBackTitle)) {
- %><h3><%=trackBackTitle%></h3><%
- }
- if (! "".equals(trackBackExcerpt)) {
- %><%=trackBackExcerpt%><br/><%
+ if (! "".equals(commentTitle)) {
+ %><h3><%=commentTitle%></h3><br/><%
}
%>
- <a href="<%=trackBackUrl%>"
target="_blank"><%="".equals(trackBackBlog_name)?trackBackUrl:trackBackBlog_name%></a>
+ <%=commentBody%>
<%
- jData.gui().html().drawBeginActionMenu(trackbackBean
,
+ jData.gui().html().drawBeginActionMenu(commentBean ,
null, null, false, "",
"jahiatemplates.Corporate_portal_templates", null, out);
%>
</dd>
<%
}
- %>
- </dl>
- <%
+ %></dl><%
+ jData.gui().html().drawBeginActionMenu(commentsBean ,
+ null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ }
+
+
+ if (trackbacks != null) {
+ ContainerListBean trackbacksBean = new
ContainerListBean(trackbacks,jParams);
+ jData.gui().html().drawBeginActionMenu(trackbacksBean ,
+ null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ if (trackbacksCount>0 || jData.gui().isEditMode()) {
+ %><h4 id="trackbacks"><%=trackbacksCount%>
<jahia:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="blog.trackbacks"/></h4>
+ <dl>
+ <%
+ Enumeration trackbacksEnum = trackbacks.getContainers();
+ int counter = 0;
+ while (trackbacksEnum.hasMoreElements()) {
+ JahiaContainer trackback = (JahiaContainer)
trackbacksEnum.nextElement();
+ ContainerBean trackbackBean = new
ContainerBean(trackback,jParams);
+ counter++;
+ String alt = counter % 2 == 1 ? "alt" : "alt2";
+ String trackBackTitle =
trackback.getFieldValue("trackBackTitle","");
+ String trackBackExcerpt =
trackback.getFieldValue("trackBackExcerpt","");
+ String trackBackUrl =
trackback.getFieldValue("trackBackUrl","#");
+ String trackBackBlog_name =
trackback.getFieldValue("trackBackBlog_name","#");
+ %>
+ <dt id="trackback<%=counter%>" class="<%=alt%>">
+ <a href="#trackback<%=counter%>" class="postno"
title="Link to trackback <%=counter%>"><%=counter%>.</a>
+ <a href="<%=trackBackUrl%>"
target="_blank"><%="".equals(trackBackBlog_name)?trackBackUrl:trackBackBlog_name%></a>
+ </dt>
+ <dd class="<%=alt%>">
+ <%
+ if (! "".equals(trackBackTitle)) {
+ %><h3><%=trackBackTitle%></h3><%
+ }
+ if (! "".equals(trackBackExcerpt)) {
+ %><%=trackBackExcerpt%><br/><%
+ }
+ %>
+ <a href="<%=trackBackUrl%>"
target="_blank"><%="".equals(trackBackBlog_name)?trackBackUrl:trackBackBlog_name%></a>
+ <%
+
jData.gui().html().drawBeginActionMenu(trackbackBean ,
+ null, null, false, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ %>
+ </dd>
+ <%
+ }
+ %>
+ </dl>
+ <%
+ }
+ jData.gui().html().drawEndActionMenu(trackbacksBean ,
+ null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+
}
- jData.gui().html().drawEndActionMenu(trackbacksBean ,
- null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
%>
<h4><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
