pvollenweider 2005/04/08 15:47:40 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp blog_listing.jsp
src/view/jsp/include declarations.inc sitemap.inc
Log:
Add search to blog listing
Revision Changes Path
1.1.2.10 +54 -17 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.9&r2=1.1.2.10&f=h
1.6.4.3 +1 -0
corporate_portal_templates/src/view/jsp/include/declarations.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/declarations.inc.diff?r1=1.6.4.2&r2=1.6.4.3&f=h
1.9.4.1 +1 -1
corporate_portal_templates/src/view/jsp/include/sitemap.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/sitemap.inc.diff?r1=1.9&r2=1.9.4.1&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.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- blog_listing.jsp 8 Apr 2005 12:49:48 -0000 1.1.2.9
+++ blog_listing.jsp 8 Apr 2005 13:47:39 -0000 1.1.2.10
@@ -24,6 +24,34 @@
new ContainerFilterByContainerDefinition("entries",
jParams.getEntryLoadRequest());
containerFilterVector.add(entriesDefFilter);
+ String blogSearchString =
request.getParameter("blogSearchString");
+ if (blogSearchString != null) {
+ // get the list of child pages to construct the query
+ StringBuffer searchBlogQuery = new
StringBuffer(blogSearchString);
+ ContentPage startPage =
ContentPage.getPage(jData.page().getID());
+ int pageInfosFlag = ContentPage.ACTIVE_PAGE_INFOS |
ContentPage.STAGING_PAGE_INFOS;
+ FlatSiteMapViewHelper flatSiteMap = new
FlatSiteMapViewHelper(jParams.getUser(), startPage, pageInfosFlag,
+
jParams.getLocale().toString(), FlatSiteMapViewHelper.DEFAULT_LEVEL);
+
+ searchBlogQuery.append(" AND (");
+ for (int j = 0; j < flatSiteMap.size(); j++) {
+ int pageId = flatSiteMap.getPageID(j);
+ if (j > 0){
+ searchBlogQuery.append(" OR ");
+ }
+ searchBlogQuery.append("pageid:" + pageId );
+ }
+ searchBlogQuery.append(")");
+ searchBlogQuery.append(" AND
(container_definition_name:entries OR container_definition_name:comment)");
+
+ logger.debug("Query is " + searchBlogQuery.toString());
+ ContainerSearcher containerSearcher = new
ContainerSearcher(jParams.getSiteID(),null,searchBlogQuery.toString(),jParams.getEntryLoadRequest());
+
request.setAttribute("entries_search_handler",containerSearcher);
+ } else {
+ blogSearchString = "";
+ }
+
+
if ( containerFilterVector.size()>0 ) {
ContainerFilters containerFilters =
new
ContainerFilters(containerFilterVector,jParams.getSiteID(),"entries");
@@ -138,6 +166,12 @@
<td valign="top">
<div class="calendar">
<%=printMonthView(t,bypassUrl,range,logger)%>
+ <br/>
+
+ <form action="<%=bypassUrl%>" method="get" name="searchblog">
+ <input name="blogSearchString" type="text"
value="<%=blogSearchString%>"/>
+ </form>
+
<content:declareContainerList name="blogs" title="List of blogs">
<content:declareContainer>
<content:declareField name="blogPage" title="Title" type="Page"/>
@@ -146,24 +180,8 @@
<content:containerList name='blogs' id="blogs">
<jahiaHtml:actionMenu name="blogs" namePostFix=""
resourceBundle="jahiatemplates.Corporate_portal_templates">
- <h2>Blogs</h2>
+ <h3>Blogs</h3>
<%
- ContainerListBean blogsBean = (ContainerListBean)
pageContext.findAttribute("blogs");
- if
(blogsBean.getJahiaContainerList().checkWriteAccess(jParams.getUser())) {
- org.jahia.engines.JahiaEngine theAddContainerEngine =
- (org.jahia.engines.JahiaEngine)
org.jahia.registries.EnginesRegistry.getInstance().getEngine( "addcontainer" );
- StringBuffer addContName = new StringBuffer("addContainer_");
- addContName.append(blogsBean.getId());
-
addContName.append(jData.gui().html().cleanSessionID(jParams.getSessionID()));
- String addContHtml = theAddContainerEngine.renderLink(
jParams, blogsBean.getJahiaContainerList() );
- String launcher =
"OpenJahiaScrollableWindow('"+addContHtml+"','"+addContName+"',640,480)";
- %>
- <a
href="javascript:swithToEditMode();<%=launcher%>"><%=addButton%>
- Add blog
- </a>
- <%
- }
-
// get all pages with template definition name "Blog"
JahiaPageDefinition pageDef =
ServicesRegistry.getInstance().getJahiaPageTemplateService()
@@ -196,6 +214,25 @@
}
}
}
+ %>
+ <%
+ ContainerListBean blogsBean = (ContainerListBean)
pageContext.findAttribute("blogs");
+ if
(blogsBean.getJahiaContainerList().checkWriteAccess(jParams.getUser())) {
+ org.jahia.engines.JahiaEngine theAddContainerEngine =
+ (org.jahia.engines.JahiaEngine)
org.jahia.registries.EnginesRegistry.getInstance().getEngine( "addcontainer" );
+ StringBuffer addContName = new StringBuffer("addContainer_");
+ addContName.append(blogsBean.getId());
+
addContName.append(jData.gui().html().cleanSessionID(jParams.getSessionID()));
+ String addContHtml = theAddContainerEngine.renderLink(
jParams, blogsBean.getJahiaContainerList() );
+ String launcher =
"OpenJahiaScrollableWindow('"+addContHtml+"','"+addContName+"',640,480)";
+ %>
+ <a
href="javascript:swithToEditMode();<%=launcher%>"><%=addButton%>
+ Add blog
+ </a>
+ <%
+ }
+
+
Collections.sort(blogKeys);
%><ul class="offsite"><%
for (int i = 0; i < blogKeys.size(); i++) {
Index: declarations.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/declarations.inc,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -u -r1.6.4.2 -r1.6.4.3
--- declarations.inc 7 Apr 2005 15:56:13 -0000 1.6.4.2
+++ declarations.inc 8 Apr 2005 13:47:40 -0000 1.6.4.3
@@ -11,6 +11,7 @@
<%@ page import="org.jahia.data.containers.*" %>
<%@ page import="org.jahia.data.fields.*" %>
<%@ page import="org.jahia.data.files.*" %>
+<%@ page import="org.jahia.data.viewhelper.sitemap.*" %>
<%@ page import="org.jahia.exceptions.*" %>
<%@ page import="org.jahia.gui.*" %>
<%@ page import="org.jahia.params.*" %>
Index: sitemap.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/sitemap.inc,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -r1.9 -r1.9.4.1
--- sitemap.inc 12 Oct 2004 11:37:41 -0000 1.9
+++ sitemap.inc 8 Apr 2005 13:47:40 -0000 1.9.4.1
@@ -1,5 +1,5 @@
<%@ page import="java.util.*" %>
-<%@ page import="org.jahia.data.viewhelper.sitemap.*" %>
+
<%
HashMap engineMap =
(HashMap)request.getAttribute("org.jahia.engines.EngineHashMap");
