pvollenweider 2005/06/01 14:45:21 CEST
Modified files:
. ant.build.properties.example
src/view/jsp/include blog_declarations.inc blog_entries.inc
blog_list.inc blog_searchbox.inc
src/view/jsp web_css.jsp
Log:
Fix bug on calendar and on blog entries counter
Sync with 4.1 BRANCH
Revision Changes Path
1.2 +1 -1 corporate_portal_templates/ant.build.properties.example
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/ant.build.properties.example.diff?r1=1.1&r2=1.2&f=h
1.4 +1 -1
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.3&r2=1.4&f=h
1.4 +0 -2
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.3&r2=1.4&f=h
1.5 +3 -0
corporate_portal_templates/src/view/jsp/include/blog_list.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_list.inc.diff?r1=1.4&r2=1.5&f=h
1.3 +7 -0
corporate_portal_templates/src/view/jsp/include/blog_searchbox.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_searchbox.inc.diff?r1=1.2&r2=1.3&f=h
1.33 +2 -1 corporate_portal_templates/src/view/jsp/web_css.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/web_css.jsp.diff?r1=1.32&r2=1.33&f=h
Index: ant.build.properties.example
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/ant.build.properties.example,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.build.properties.example 13 Nov 2003 14:38:22 -0000 1.1
+++ ant.build.properties.example 1 Jun 2005 12:45:20 -0000 1.2
@@ -1,5 +1,5 @@
# Change this file and rename it to ant.build.properties
build.base=build
-tomcat.home=c:/jahia401/tomcat
+tomcat.home=c:/jakarta-tomcat-5.5.9/tomcat
classes=${tomcat.home}/webapps/jahia/WEB-INF/classes
lib=${tomcat.home}/webapps/jahia/WEB-INF/lib
Index: blog_declarations.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_declarations.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blog_declarations.inc 31 May 2005 10:02:59 -0000 1.3
+++ blog_declarations.inc 1 Jun 2005 12:45:20 -0000 1.4
@@ -27,7 +27,7 @@
// make filter to get all blog entries for current month
cal.set( Calendar.HOUR_OF_DAY, 0 );
cal.set( Calendar.MINUTE, 0);
- cal.set( Calendar.SECOND, -1);
+ cal.set( Calendar.SECOND, 0);
Date lowerVal = cal.getTime();
cal.add( Calendar.MONTH, 1 );
Date upperVal = cal.getTime();
Index: blog_entries.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_entries.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blog_entries.inc 30 May 2005 14:29:14 -0000 1.3
+++ blog_entries.inc 1 Jun 2005 12:45:20 -0000 1.4
@@ -47,7 +47,6 @@
logger.debug("Entry container id is " + entryContainer.getID());
entry = entryContainer.getJahiaContainer(jParams,
jParams.getEntryLoadRequest());
}
-
ContainerBean entryBean = new ContainerBean(entry,jParams);
entriesCounter++;
String title = entry.getFieldValue("title","");
@@ -160,7 +159,6 @@
*/
jData.gui().html().drawEndActionMenu(entryBean ,
null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
-
}
if (! isDivDateClosed) {
%></div><%
Index: blog_list.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_list.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- blog_list.inc 4 May 2005 15:00:16 -0000 1.4
+++ blog_list.inc 1 Jun 2005 12:45:20 -0000 1.5
@@ -4,6 +4,9 @@
</content:declareContainer>
</content:declareContainerList>
+<%
+request.removeAttribute("entries_search_handler");
+%>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
Index: blog_searchbox.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_searchbox.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blog_searchbox.inc 29 Apr 2005 12:48:46 -0000 1.2
+++ blog_searchbox.inc 1 Jun 2005 12:45:20 -0000 1.3
@@ -1,3 +1,9 @@
+<%
+if (blogSearchString == null) {
+ blogSearchString = "";
+}
+%>
+
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="100%" class="boxtitlecolor1">
@@ -9,6 +15,7 @@
<tr>
<td class="boxcontentborder1">
<form action="<%=bypassUrl%>" method="get" name="searchblog">
+ <input type="hidden" name="category"
value="<%=requestedCategory%>"/>
<input name="blogSearchString" type="text"
value="<%=blogSearchString%>"/>
<a
href="javascript:checkMaxPageItems();document.searchblog.submit()"><img
src="<jahia:contextURL/>/images/search.gif"
alt="<jahia:resourceBundle
Index: web_css.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/web_css.jsp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- web_css.jsp 31 May 2005 09:04:37 -0000 1.32
+++ web_css.jsp 1 Jun 2005 12:45:21 -0000 1.33
@@ -942,7 +942,8 @@
clear: both;
font-size: 1px;
line-height: 0px;
-}a.maincat {
+}
+a.maincat {
font-size:11px;
font-weight: bold;
color: <%=darkcolor1%>;
