pvollenweider 2005/04/26 10:55:36 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp blog_listing.jsp
src/view/jsp/include blog_declarations.inc blog_entries.inc
blog_entry.inc blog_filters.inc
page_title.inc
Log:
- Fix calendar if currentWeek is Last week
- Hide entry on non edit mode if empty title
- always display trackback counter
Revision Changes Path
1.1.2.22 +16 -0 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.21&r2=1.1.2.22&f=h
1.1.2.8 +5 -0
corporate_portal_templates/src/view/jsp/include/blog_declarations.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_declarations.inc.diff?r1=1.1.2.7&r2=1.1.2.8&f=h
1.1.2.14 +9 -0
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.13&r2=1.1.2.14&f=h
1.1.2.20 +7 -16
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.19&r2=1.1.2.20&f=h
1.1.2.7 +10 -0
corporate_portal_templates/src/view/jsp/include/blog_filters.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_filters.inc.diff?r1=1.1.2.6&r2=1.1.2.7&f=h
1.3.4.2 +8 -2
corporate_portal_templates/src/view/jsp/include/page_title.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/page_title.inc.diff?r1=1.3.4.1&r2=1.3.4.2&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.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- blog_listing.jsp 22 Apr 2005 14:29:00 -0000 1.1.2.21
+++ blog_listing.jsp 26 Apr 2005 08:55:35 -0000 1.1.2.22
@@ -19,6 +19,13 @@
// last entries
Vector containerFilterVector = new Vector();
+ // on non-edit mode, hide pages with empty title
+ if (! jData.gui().isEditMode()) {
+ ContainerFilterBean emptyEntryFilter = new
ContainerFilterBean("title",jParams.getEntryLoadRequest());
+
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"");
+ containerFilterVector.add(emptyEntryFilter);
+ }
+
// get all blogs
ContainerFilterByContainerDefinition entriesDefFilter =
new ContainerFilterByContainerDefinition("entries",
jParams.getEntryLoadRequest());
@@ -212,6 +219,11 @@
if (comments != null) {
commentsCount = comments.getFullSize();
}
+ JahiaContainerList trackbacks =
entry.getContainerList( "trackbacks" );
+ int trackbaksCount = 0;
+ if (trackbacks != null) {
+ trackbaksCount = trackbacks.getFullSize();
+ }
%>
| <a
href="<%=blogPageUrl%>?entryId=-1"><%=blogPageTitle%></a>
@@ -219,6 +231,10 @@
class="commentlink"><%=commentsCount%>
<jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="blog.comments"/></a>
+ <a
href="<%=blogPageUrl%>?entryId=<%=entry.getID()%>#trackbacks"
+ class="commentlink"><%=trackbaksCount%>
+ <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="blog.trackbacks"/></a>
</dd>
<%
}
Index: blog_declarations.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/blog_declarations.inc,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- blog_declarations.inc 20 Apr 2005 09:23:11 -0000 1.1.2.7
+++ blog_declarations.inc 26 Apr 2005 08:55:35 -0000 1.1.2.8
@@ -151,6 +151,9 @@
boolean hasEntry = dayHasEntry.get( Integer.toString(d))!=null;
weekOfYear = cal.get(Calendar.WEEK_OF_YEAR);
dayDate = cal.getTimeInMillis();
+ if (cal.get( Calendar.DAY_OF_WEEK ) == Calendar.MONDAY) {
+ isLastCurrentDivClosed = false;
+ }
if( (cal.get( Calendar.DAY_OF_WEEK ) == Calendar.MONDAY ) &&
(firstWeekOfYear != weekOfYear)) {
if( (weekOfYear == currWeek) && "week".equals(range)) {
@@ -179,12 +182,14 @@
buf.append( "</a>" );
if( cal.get( Calendar.DAY_OF_WEEK ) == Calendar.SUNDAY ) {
buf.append("</span>\n");
+ logger.debug("isLastCurrentDivClosed is closed here");
isLastCurrentDivClosed = true;
} else {
buf.append( " " );
}
cal.add( Calendar.DAY_OF_MONTH, 1 );
}
+ logger.debug("isLastCurrentDivClosed is " + isLastCurrentDivClosed);
if (! isLastCurrentDivClosed) {
buf.append("</span>");
}
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.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- blog_entries.inc 25 Apr 2005 15:06:56 -0000 1.1.2.13
+++ blog_entries.inc 26 Apr 2005 08:55:35 -0000 1.1.2.14
@@ -116,11 +116,20 @@
commentsCount = comments.getFullSize();
}
+ JahiaContainerList trackbacks = entry.getContainerList(
"trackbacks" );
+ int trackbaksCount = 0;
+ if (trackbacks != null) {
+ trackbaksCount = trackbacks.getFullSize();
+ }
%>
<a href="<%=bypassUrl%>?entryId=<%=entry.getID()%>#comments"
class="commentlink"><%=commentsCount%>
<jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="blog.comments"/></a>
+ <a href="<%=bypassUrl%>?entryId=<%=entry.getID()%>#trackbacks"
+ class="commentlink"><%=trackbaksCount%>
+ <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="blog.trackbacks"/></a>
</dd>
<%
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.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- blog_entry.inc 22 Apr 2005 14:29:00 -0000 1.1.2.19
+++ blog_entry.inc 26 Apr 2005 08:55:35 -0000 1.1.2.20
@@ -56,6 +56,7 @@
if (comments != null) {
commentsCount = comments.getFullSize();
}
+
%>
<a href="#comments" class="commentlink"><%=commentsCount%>
<jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
@@ -66,14 +67,10 @@
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>
- <%
- }
%>
+ <a href="#trackbacks" class="commentlink"><%=trackbacksCount%>
+ <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="blog.trackbacks"/></a>
</p>
<%
@@ -146,15 +143,9 @@
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>
- <%
- }
- %>
+ <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%>
Index: blog_filters.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/blog_filters.inc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- blog_filters.inc 15 Apr 2005 14:07:11 -0000 1.1.2.6
+++ blog_filters.inc 26 Apr 2005 08:55:35 -0000 1.1.2.7
@@ -4,6 +4,16 @@
Vector containerFilterVector = new Vector();
String blogSearchString = request.getParameter("blogSearchString");
+
+// on non-edit mode, hide pages with empty title
+if (! jData.gui().isEditMode()) {
+
+ ContainerFilterBean emptyEntryFilter = new
ContainerFilterBean("title",jParams.getEntryLoadRequest());
+ emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"");
+ containerFilterVector.add(emptyEntryFilter);
+
+}
+
if (blogSearchString != null) {
// get the list of child pages to construct the query
StringBuffer searchBlogQuery = new StringBuffer(blogSearchString);
Index: page_title.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/page_title.inc,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- page_title.inc 4 Apr 2005 12:28:05 -0000 1.3.4.1
+++ page_title.inc 26 Apr 2005 08:55:35 -0000 1.3.4.2
@@ -18,5 +18,11 @@
<logic:notEmpty name="pageTitleValue">
<bean:write name='pageTitleValue' filter='false'/>
</logic:notEmpty>
-<jahiaHtml:actionMenu name="pageTitle" namePostFix=""
resourceBundle="jahiatemplates.Corporate_portal_templates" useFieldSet="false">
-</jahiaHtml:actionMenu>
+<%
+if (pageContext.getAttribute("pageTitle") != null) {
+ %>
+ <jahiaHtml:actionMenu name="pageTitle" namePostFix=""
resourceBundle="jahiatemplates.Corporate_portal_templates" useFieldSet="false">
+ </jahiaHtml:actionMenu>
+ <%
+}
+%>
\ No newline at end of file
