Author: bpapez
Date: Tue May 15 16:15:39 2007
New Revision: 661
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D661&repname=
=3Dcorporate_portal_templates_v2
Log:
Port blog changes from jahia 4.2 to jahia 5
Added:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corporat=
eportalv2/validation/beans/BlogValidationBean.java
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_listing_rss_2_0.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_rss_2_0.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/addcomment_form.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/definitions.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entry.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/eventlistener.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/filters.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/list.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/listing_filters.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_comments.inc
Added: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corpo=
rateportalv2/validation/beans/BlogValidationBean.java
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corporateportalv2/validati=
on/beans/BlogValidationBean.java&rev=3D661&repname=3Dcorporate_portal_templ=
ates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corporat=
eportalv2/validation/beans/BlogValidationBean.java (added)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corporat=
eportalv2/validation/beans/BlogValidationBean.java Tue May 15 16:15:39 2007
@@ -0,0 +1,6 @@
+package jahiatemplates.org.jahia.corporateportalv2.validation.beans;
+
+public interface BlogValidationBean {
+ public String getBlogTitle();
+ public String getBlogDate();
+}
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_listing_rss_2_0.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blog_listing_rss_2_0.jsp&rev=3D661&repname=3Dcorporate_port=
al_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_listing_rss_2_0.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_listing_rss_2_0.jsp Tue May 1=
5 16:15:39 2007
@@ -93,12 +93,12 @@
=
// get all blogs
ContainerFilterByContainerDefinition entriesDefFilter =3D
- new ContainerFilterByContainerDefinition("entries", jParams.getEntryLo=
adRequest());
+ new ContainerFilterByContainerDefinition("blogEntries", jParams.getEnt=
ryLoadRequest());
containerFilterVector.add(entriesDefFilter);
=
// on non-edit mode, hide pages with empty title
if (! jData.gui().isEditMode()) {
- ContainerFilterBean emptyEntryFilter =3D new ContainerFilterBean("titl=
e",
+ ContainerFilterBean emptyEntryFilter =3D new ContainerFilterBean("blog=
Title",
jParams.getEntryLoadRequest());
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL, "<empty=
>");
containerFilterVector.add(emptyEntryFilter);
@@ -106,18 +106,18 @@
=
if ( containerFilterVector.size() > 0 ) {
ContainerFilters containerFilters =3D new ContainerFilters(
- containerFilterVector, jParams.getSiteID(), "entries");
- request.setAttribute("entries_filter_handler", containerFilters);
+ containerFilterVector, jParams.getSiteID(), "blogEntries");
+ request.setAttribute("blogEntries_filter_handler", containerFilters);
}
=
// sort by date desc
ContainerSorterByContainerDefinition entries_sort_handler =3D
- new ContainerSorterByContainerDefinition(-1, "date", "entries",
+ new ContainerSorterByContainerDefinition(-1, "date", "blogEntries",
jParams.getEntryLoadRequest(), true);
entries_sort_handler.setDescOrdering();
- request.setAttribute("entries_sort_handler", entries_sort_handler);
+ request.setAttribute("blogEntries_sort_handler", entries_sort_handler);
=
- JahiaContainerList entries =3D jData.containers().getContainerList("en=
tries");
+ JahiaContainerList entries =3D jData.containers().getContainerList("bl=
ogEntries");
if (entries !=3D null) {
// only display the 15 last entries.
entries.setCtnListPagination(15,0);
@@ -130,15 +130,15 @@
changePage(jParams, entry.getPageID());
%>
<item>
- <title><%=3DtoXml(entry.getFieldValue("title",
""))%></title>
+ <title><%=3DtoXml(entry.getFieldValue("blogTitle",
""))%></title>
<link><%=3DgetURL(jParams)%>?entryId=3D<%=3Dentry.getID()%></link>
<guid
isPermaLink=3D"false"><%=3Dentry.getID()%>@<%=3DjParams.getReques=
t().getServerName()%></guid>
-
<description><![CDATA[<%=3DtoXml(removeTags(entry.getFieldValue("body",=
"")))%>]]></description>
+
<description><![CDATA[<%=3DtoXml(removeTags(entry.getFieldValue("blogBo=
dy", "")))%>]]></description>
=
<%
long dateLong =3D -1;
try {
- dateLong =3D Long.parseLong((String)entry.getFieldObject("date"));
+ dateLong =3D Long.parseLong((String)entry.getFieldObject("blogDate"));
} catch (NumberFormatException nfe) {nfe.printStackTrace();}
=
String postDate =3D sdf.format(new Date(dateLong));
@@ -165,7 +165,7 @@
}
=
%>
- <dc:creator><%=3DtoXml(entry.getFieldValue("author",
""))%></dc:creator>
+
<dc:creator><%=3DtoXml(entry.getFieldValue("blogAuthor", ""))%></dc:cre=
ator>
<dc:date><%=3DpostDate%></dc:date>
<%
=
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_rss_2_0.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blog_rss_2_0.jsp&rev=3D661&repname=3Dcorporate_portal_templ=
ates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_rss_2_0.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_rss_2_0.jsp Tue May 15 16:15:=
39 2007
@@ -65,26 +65,26 @@
Vector containerFilterVector =3D new Vector();
// on non-edit mode, hide pages with empty title
if (! jData.gui().isEditMode()) {
- ContainerFilterBean emptyEntryFilter =3D new ContainerFilterBean("titl=
e",
+ ContainerFilterBean emptyEntryFilter =3D new ContainerFilterBean("blog=
Title",
jParams.getEntryLoadRequest());
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL, "<empty=
>");
containerFilterVector.add(emptyEntryFilter);
}
=
if ( containerFilterVector.size() > 0 ) {
- ContainerFilters containerFilters =3D new ContainerFilters("entries",
+ ContainerFilters containerFilters =3D new ContainerFilters("blogEntrie=
s",
jParams, containerFilterVector);
- request.setAttribute("entries_filter_handler", containerFilters);
+ request.setAttribute("blogEntries_filter_handler", containerFilters);
}
=
// sort by date desc
ContainerSorterByContainerDefinition entries_sort_handler =3D
- new ContainerSorterByContainerDefinition(-1, "date", "entries",
+ new ContainerSorterByContainerDefinition(-1, "blogDate", "blogEntr=
ies",
jParams.getEntryLoadRequest(), true);
entries_sort_handler.setDescOrdering();
- request.setAttribute("entries_sort_handler", entries_sort_handler);
+ request.setAttribute("blogEntries_sort_handler", entries_sort_handler);
=
- JahiaContainerList entries =3D jData.containers().getContainerList("en=
tries");
+ JahiaContainerList entries =3D jData.containers().getContainerList("bl=
ogEntries");
if (entries !=3D null) {
// only display the 15 last entries.
entries.setCtnListPagination(15,0);
@@ -95,15 +95,15 @@
JahiaContainer entry =3D (JahiaContainer)entriesEnum.nextEleme=
nt();
%>
<item>
- <title><%=3DtoXml(entry.getFieldValue("title",
""))%></title>
+ <title><%=3DtoXml(entry.getFieldValue("blogTitle",
""))%></title>
<link><%=3Dbuffer.toString()%>?entryId=3D<%=3Dentry.getID()%></link>
<guid
isPermaLink=3D"false"><%=3Dentry.getID()%>@<%=3DjParams.getReques=
t().getServerName()%></guid>
-
<description><![CDATA[<%=3DtoXml(removeTags(entry.getFieldValue("body",=
"")))%>]]></description>
+
<description><![CDATA[<%=3DtoXml(removeTags(entry.getFieldValue("blogBo=
dy", "")))%>]]></description>
=
<%
long dateLong =3D -1;
try {
- dateLong =3D Long.parseLong((String)entry.getFieldObject("date"));
+ dateLong =3D Long.parseLong((String)entry.getFieldObject("blogDate"));
} catch (NumberFormatException nfe) {nfe.printStackTrace();}
=
String postDate =3D sdf.format(new Date(dateLong));
@@ -130,7 +130,7 @@
}
=
%>
- <dc:creator><%=3DtoXml(entry.getFieldValue("author",
""))%></dc:creator>
+
<dc:creator><%=3DtoXml(entry.getFieldValue("blogAuthor", ""))%></dc:cre=
ator>
<dc:date><%=3DpostDate%></dc:date>
<%
=
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/addcomment_form.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/addcomment_form.inc&rev=3D661&repname=3Dcorporate_por=
tal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/addcomment_form.inc (origina=
l)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/addcomment_form.inc Tue May =
15 16:15:39 2007
@@ -25,21 +25,21 @@
<content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo=
rate_portal_templates_v2"
resourceName=3D"blog.title"/>
</td>
- <td><input type=3D"text" name=3D"title" style=3D"width:80%;" value=
=3D"Re: <%=3Dtitle%>"></td>
+ <td><input type=3D"text" name=3D"commentTitle" style=3D"width:80%;=
" value=3D"Re: <%=3Dtitle%>"></td>
</tr>
<tr>
<td>
<content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo=
rate_portal_templates_v2"
resourceName=3D"blog.author"/>
</td>
- <td><input type=3D"text" name=3D"author" style=3D"width:80%;" valu=
e=3D"<%=3DjParams.getUser().getUsername()%>"></td>
+ <td><input type=3D"text" name=3D"commentAuthor" style=3D"width:80%=
;" value=3D"<%=3DjParams.getUser().getUsername()%>"></td>
</tr>
<tr>
<td>
<content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo=
rate_portal_templates_v2"
resourceName=3D"blog.body"/>
</td>
- <td><textarea name=3D"body" cols=3D"40" rows=3D"50" style=3D"width=
:80%;height:100px;"></textarea></td>
+ <td><textarea name=3D"commentBody" cols=3D"40" rows=3D"50" style=
=3D"width:80%;height:100px;"></textarea></td>
</tr>
<tr>
<td> </td>
@@ -52,7 +52,7 @@
</tr>
</table>
<input type=3D"hidden" name=3D"addComment" value=3D"Submit"/>
- <input type=3D"hidden" name=3D"date" value=3D"<%=3DSystem.currentTimeM=
illis()%>"/>
+ <input type=3D"hidden" name=3D"commentDate" value=3D"<%=3DSystem.curre=
ntTimeMillis()%>"/>
</form>
=
<br/>
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/blog.jsp&rev=3D661&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog.jsp Tue May 15 16:15:39=
2007
@@ -106,12 +106,12 @@
}
if(!isregistered){
String watch =3D "<img src=3D\"" + contextURL + "/=
img/push.gif\" width=3D\"32\" height=3D\"18\" border=3D\"0\" align=3D\"midd=
le\" />";
- if(!jParams.getUser().getUserProperty("email").getValue().equals("")){
+ if (isLogged && !jParams.getUser().getUserProperty("email").getValue().eq=
uals("")){
=
%>
<%=3Dwatch%> <a href=3D"<%=3DbypassUrl%>?subscribe=3Dtrue" title=3D"email =
address:<%=3DjParams.getUser().getUserProperty("email").getValue()%>">watch=
this blog, <%=3DjParams.getUser().getUsername ()%></a><br>
<%
-} else {
+} else if (isLogged) {
%>
<%=3Dwatch%><a href=3D"?subscribe=3Dfalse"> please fill you email adress i=
n user settings</a><br>
<%
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog_listing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/blog_listing.jsp&rev=3D661&repname=3Dcorporate_portal=
_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog_listing.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog_listing.jsp Tue May 15 =
16:15:39 2007
@@ -44,7 +44,7 @@
} =
%>
<input type=3D"hidden" name=3D"range" value=3D"<%=3Drange%>"/>
- <content:containerList name=3D"entries" windowSize=3D"25">
+ <content:containerList name=3D"blogEntries" windowSize=3D"25">
<content:previousWindowButton title=3D'<%=3D"<<"
+ get=
ResourceBundle("blog.results.previous","previous results",jData)%>' method=
=3D"post" formName=3D"jahiapageform" /> 
<content:cListPagination nbStepPerPage=3D"10" >
<content:cListPaginationPreviousRangeOfPages
method=3D"pos=
t" formName=3D"jahiapageform" title=3D" .. "/>
@@ -77,7 +77,7 @@
}
}
=
- JahiaContainerList entries =3D jData.containers().getConta=
inerList( "entries" );
+ JahiaContainerList entries =3D jData.containers().getConta=
inerList( "blogEntries" );
// create container list if don't exist
if ( entries !=3Dnull && entries.getID()=3D=3D0 ) {
ContainerListBean entriesBean =3D new ContainerListBea=
n(entries,jParams);
@@ -116,10 +116,10 @@
int blogPageId =3D entryBean.getPageID();
String blogPageUrl =3D jParams.composePageUrl(blogPage=
Id);
String blogPageTitle =3D ContentPage.getPage(blogPageI=
d).getTitle(jParams);
- String title =3D entry.getFieldValue("title","");
- String body =3D entry.getFieldValue("body","");
- String author =3D entry.getFieldValue("author","");
- String excerpt =3D entry.getFieldValue("excerpt","");;
+ String title =3D entry.getFieldValue("blogTitle","");
+ String body =3D entry.getFieldValue("blogBody","");
+ String author =3D entry.getFieldValue("blogAuthor","");
+ String excerpt =3D entry.getFieldValue("blogExcerpt","=
");;
if ("".equals(excerpt)){
excerpt =3D removeTags(body);
if ( (excerpt.length()) > 255 ) {
@@ -131,7 +131,7 @@
//String date =3D entry.getFieldValue("date","");
long dateLong =3D -1;
try {
- dateLong =3D Long.parseLong((String)entry.getField=
Object("date"));
+ dateLong =3D Long.parseLong((String)entry.getField=
Object("blogDate"));
} catch (NumberFormatException nfe) {
}
sdf.applyPattern("dd.MM.yyyy");
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/declarations.inc&rev=3D661&repname=3Dcorporate_portal=
_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/declarations.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/declarations.inc Tue May 15 =
16:15:39 2007
@@ -28,7 +28,7 @@
cal.setTime(new Date(t));
} else {
// detect pagination request for optimization
- String pagination =3D request.getParameter("ctnscroll_entries");
+ String pagination =3D request.getParameter("ctnscroll_blogEntries");
if ( pagination !=3D null && !"".equals(pagination) ){
Date lastDate =3D (Date)jData.params().getSession().getAttribute("=
blog.printMonthView.date");
if ( lastDate !=3D null ){
@@ -66,29 +66,29 @@
Vector containerFilterVector =3D new Vector();
=
ContainerFilterByContainerDefinition entriesDefFilter =3D
- new ContainerFilterByContainerDefinition("entries", jData.params()=
.getEntryLoadRequest());
+ new ContainerFilterByContainerDefinition("blogEntries", jData.para=
ms().getEntryLoadRequest());
containerFilterVector.add(entriesDefFilter);
=
- ContainerFilterBean dateFilter =3D new ContainerFilterBean("date",true=
,jData.params().getEntryLoadRequest());
+ ContainerFilterBean dateFilter =3D new ContainerFilterBean("blogDate",=
true,jData.params().getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_SMALLER, String.valueOf(=
upperVal.getTime()) );
containerFilterVector.add(dateFilter);
=
- dateFilter =3D new ContainerFilterBean("date",true,jData.params().getE=
ntryLoadRequest());
+ dateFilter =3D new ContainerFilterBean("blogDate",true,jData.params().=
getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_BIGGER, String.valueOf(l=
owerVal.getTime()) );
containerFilterVector.add(dateFilter);
=
if ( containerFilterVector.size()>0 ) {
ContainerFilters containerFilters ;
if (displayAllSiteEntries) {
- containerFilters =3D new ContainerFilters(containerFilterVector,j=
Data.params().getSiteID(),"entries");
+ containerFilters =3D new ContainerFilters(containerFilterVector,j=
Data.params().getSiteID(),"blogEntries");
} else {
- containerFilters =3D new ContainerFilters("entries", jData.par=
ams(), containerFilterVector);
+ containerFilters =3D new ContainerFilters("blogEntries", jData=
.params(), containerFilterVector);
}
containerFilters.setContextID("printMonthView");
- request.setAttribute("entries_filter_handler",containerFilters);
+ request.setAttribute("blogEntries_filter_handler",containerFilters);
}
Hashtable dayHasEntry =3D new Hashtable();
- JahiaContainerList entries =3D jData.containers().getContainerList( "e=
ntries" );
+ JahiaContainerList entries =3D jData.containers().getContainerList( "b=
logEntries" );
if (entries !=3D null) {
entries.setIsContainersLoaded(false);
Enumeration entriesEnum =3D entries.getContainers();
@@ -96,7 +96,7 @@
JahiaContainer entry =3D (JahiaContainer) entriesEnum.nextElem=
ent();
long dateLong =3D -1;
try {
- dateLong =3D Long.parseLong((String)entry.getFieldObject("=
date"));
+ dateLong =3D Long.parseLong((String)entry.getFieldObject("=
blogDate"));
Calendar entryDate =3D new GregorianCalendar();
entryDate.setTime(new Date(dateLong));
int entryDay =3D entryDate.get(Calendar.DAY_OF_MONTH);
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/definitions.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/definitions.inc&rev=3D661&repname=3Dcorporate_portal_=
templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/definitions.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/definitions.inc Tue May 15 1=
6:15:39 2007
@@ -14,34 +14,34 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---%><content:declareContainerList name=3D"entries" title=3D"List of entrie=
s">
+--%><content:declareContainerList name=3D"blogEntries" title=3D"List of en=
tries">
<content:declareContainer>
- <content:declareField name=3D"title" title=3D"Title" type=3D"SmallText"
+ <content:declareField name=3D"blogTitle" title=3D"Title" type=3D"Small=
Text"
titleKey=3D"blog.title" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"body" title=3D"Body" type=3D"BigText"
+ <content:declareField name=3D"blogBody" title=3D"Body" type=3D"BigText"
titleKey=3D"blog.body" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"attachement" title=3D"Attachment associa=
ted" type=3D"File"
+ <content:declareField name=3D"blogAttachement" title=3D"Attachment ass=
ociated" type=3D"File"
titleKey=3D"blog.attachement" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"date" title=3D"Date" type=3D"Date"
+ <content:declareField name=3D"blogDate" title=3D"Date" type=3D"Date"
value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]>"
titleKey=3D"news.date" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"author" title=3D"Author" type=3D"SharedS=
mallText" titleKey=3D"blog.author" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"excerpt"
+ <content:declareField name=3D"blogAuthor" title=3D"Author" type=3D"Sha=
redSmallText" titleKey=3D"blog.author" bundleKey=3D"<%=3DresBundleID%>"/>
+ <content:declareField name=3D"blogExcerpt"
title=3D"The Excerpt of this post" type=3D"BigText"
titleKey=3D"blog.excerpt" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"keyWords"
+ <content:declareField name=3D"blogKeyWords"
title=3D"Comma seperated Keywords for this post" type=3D"Small=
Text"
titleKey=3D"blog.keyWords" bundleKey=3D"<%=3DresBundleID%>"/>
=
<content:declareContainerList name=3D"comments" title=3D"List of comme=
nts">
<content:declareContainer>
- <content:declareField name=3D"author" title=3D"Author" type=3D"Sha=
redSmallText"
+ <content:declareField name=3D"commentAuthor" title=3D"Author" type=
=3D"SharedSmallText"
titleKey=3D"blog.author" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"title" title=3D"Title" type=3D"Small=
Text"
+ <content:declareField name=3D"commentTitle" title=3D"Title" type=
=3D"SmallText"
titleKey=3D"blog.title" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"body" title=3D"Body" type=3D"BigText"
+ <content:declareField name=3D"commentBody" title=3D"Body" type=3D"=
BigText"
titleKey=3D"blog.body" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"date" title=3D"Date" type=3D"Date"
+ <content:declareField name=3D"commentDate" title=3D"Date" type=3D"=
Date"
value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]>"
titleKey=3D"news.date" bundleKey=3D"<%=3DresBundleID%>"/>
</content:declareContainer>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/entries.inc&rev=3D661&repname=3Dcorporate_portal_temp=
lates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc Tue May 15 16:15=
:39 2007
@@ -28,7 +28,7 @@
}
%>
<input type=3D"hidden" name=3D"range" value=3D"<%=3Drange%>"/>
-<content:containerList name=3D"entries" windowSize=3D"25">
+<content:containerList name=3D"blogEntries" windowSize=3D"25">
<content:cListPaginationCurrentPageScrollingValue valueOnly=3D"false" =
/>
<content:previousWindowButton title=3D'<%=3D"<<" +
getResourceBund=
le("blog.results.previous","previous results",jData)%>' method=3D"post" for=
mName=3D"jahiapageform" /> 
<content:cListPagination nbStepPerPage=3D"10" >
@@ -42,7 +42,7 @@
</content:containerList>
</content:jahiaPageForm>
<%
-JahiaContainerList entries =3D jData.containers().getContainerList( "entri=
es" );
+JahiaContainerList entries =3D jData.containers().getContainerList( "blogE=
ntries" );
if (entries !=3D null) {
// Any reason here to force reloading the container list ?
//entries.setIsContainersLoaded(false);
@@ -96,9 +96,9 @@
}*/
ContainerBean entryBean =3D new ContainerBean(entry,jParams);
entriesCounter++;
- String title =3D entry.getFieldValue("title","");
- String body =3D entry.getFieldValue("body","");
- String author =3D entry.getFieldValue("author","");
+ String title =3D entry.getFieldValue("blogTitle","");
+ String body =3D entry.getFieldValue("blogBody","");
+ String author =3D entry.getFieldValue("blogAuthor","");
String excerpt =3D body;
=
if (! "".equals(blogSearchString)) {
@@ -106,7 +106,7 @@
excerpt =3D hl(excerpt,blogSearchString,true);
}
/*
- String excerpt =3D entry.getFieldValue("excerpt","");;
+ String excerpt =3D entry.getFieldValue("blogExcerpt","");;
if ("".equals(excerpt)){
excerpt =3D body;
excerpt =3D removeTags(body);
@@ -115,10 +115,10 @@
}
}
*/
- //String date =3D entry.getFieldValue("date","");
+ //String date =3D entry.getFieldValue("blogDate","");
long dateLong =3D -1;
try {
- dateLong =3D Long.parseLong((String)entry.getFieldObject("date=
"));
+ dateLong =3D Long.parseLong((String)entry.getFieldObject("blog=
Date"));
} catch (NumberFormatException nfe) {
}
sdf.applyPattern("dd.MM.yyyy");
@@ -143,7 +143,7 @@
<dd class=3D"summary">
<%=3DtoEmotion(excerpt,contextUrl + "/img/emotions/")%>
<div style=3D"text-align:right;margin:10px;"><br/>
- <a href=3D"<%=3DbypassUrl%>?entryId=3D<%=3Dentry.getID()%>" cl=
ass=3D"continued" ><content:resourceBundle
+ <a href=3D"<%=3DbypassUrl%>?entryId=3D<%=3Dentry.getID()%>" cl=
ass=3D"continued"><content:resourceBundle
resourceBundle=3D"jahiatemplates.Corporate_por=
tal_templates_v2"
resourceName=3D"blog.continued"/></a>
</div>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entry.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/entry.inc&rev=3D661&repname=3Dcorporate_portal_templa=
tes_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entry.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entry.inc Tue May 15 16:15:3=
9 2007
@@ -32,11 +32,11 @@
entry =3D entryContainer.getJahiaContainer(jParams, jParams.ge=
tEntryLoadRequest());
}
ContainerBean entryBean =3D new ContainerBean(entry,jParams);
- String title =3D entry.getFieldValue("title","");
- String body =3D entry.getFieldValue("body","");
- String author =3D entry.getFieldValue("author","");
- String excerpt =3D entry.getFieldValue("excerpt","");
- String keywords =3D entry.getFieldValue("keyWords","");
+ String title =3D entry.getFieldValue("blogTitle","");
+ String body =3D entry.getFieldValue("blogBody","");
+ String author =3D entry.getFieldValue("blogAuthor","");
+ String excerpt =3D entry.getFieldValue("blogExcerpt","");
+ String keywords =3D entry.getFieldValue("blogKeyWords","");
=
StringBuffer buffer =3D new StringBuffer();
buffer.append(request.getScheme());
@@ -51,10 +51,10 @@
String trackBackURL =3D buffer.toString();
=
=
- //String date =3D entry.getFieldValue("date","");
+ //String date =3D entry.getFieldValue("blogDate","");
long dateLong =3D -1;
try {
- dateLong =3D Long.parseLong((String)entry.getFieldObject("date=
"));
+ dateLong =3D Long.parseLong((String)entry.getFieldObject("blog=
Date"));
} catch (NumberFormatException nfe) {
}
sdf.applyPattern("dd.MM.yyyy");
@@ -95,7 +95,7 @@
sdf.applyPattern("kk:mm");
String kkmm =3D sdf.format( new Date(dateLong) );
=
- JahiaFileField attachement =3D (JahiaFileField) entry.getFieldObje=
ct("attachement");
+ JahiaFileField attachement =3D (JahiaFileField) entry.getFieldObje=
ct("blogAttachement");
boolean hasAttachement =3D false;
boolean hasImage =3D false;
if (attachement !=3D null) {
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/eventlistener.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/eventlistener.inc&rev=3D661&repname=3Dcorporate_porta=
l_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/eventlistener.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/eventlistener.inc Tue May 15=
16:15:39 2007
@@ -95,11 +95,11 @@
}
}
=
-if ( "entries".equals(theContainer.getDefinition().getName()) ){
+if ( "blogEntries".equals(theContainer.getDefinition().getName()) ){
if ( "addContainerEngineAfterInit".equals(eventName) ) {
logger.debug("Start eventlistner for event addContainerEngineAfter=
Init for entries Container List");
=
- JahiaField theField =3D theContainer.getField("date");
+ JahiaField theField =3D theContainer.getField("blogDate");
if (theField.getObject() =3D=3D null) {
Calendar cal =3D Calendar.getInstance(TimeZone.getTimeZone("UT=
C"));
long now =3D cal.getTime().getTime();
@@ -108,15 +108,16 @@
feh.addUpdatedField(theField.getID(), theField.getLanguageCode=
());
logger.debug("Adding updated field #" + theField.getID() + " f=
or language code [" + theField.getLanguageCode() + "]");
updatedFields.add(new Integer(theField.getID()));
- logger.debug("Set value for field [date] to : [" + theField.ge=
tObject() +"]");
+ logger.debug("Set value for field [blogDate] to : [" + theFiel=
d.getObject() +"]");
}
- theField =3D theContainer.getField("author");
+
+ theField =3D theContainer.getField("blogAuthor");
if (theField.getValue() =3D=3D null || "".equals(theField.getValue=
())) {
String author =3D jParams.getUser().getUsername();
theField.setValue(author);
feh.addUpdatedField(theField.getID(), theField.getLanguageCode=
());
updatedFields.add(new Integer(theField.getID()));
- logger.debug("Set value for field [author] to [" + theField.ge=
tValue() + "]");
+ logger.debug("Set value for field [blogAuthor] to [" + theFiel=
d.getValue() + "]");
}
} else if ( "containerAdded".equals(eventName) ) {
logger.debug("Activate container ["+theContainer.getID()+"]");
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/filters.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/filters.inc&rev=3D661&repname=3Dcorporate_portal_temp=
lates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/filters.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/filters.inc Tue May 15 16:15=
:39 2007
@@ -20,7 +20,7 @@
Vector containerFilterVector =3D new Vector();
=
ContainerFilterByContainerDefinition entriesDefFilter =3D
- new ContainerFilterByContainerDefinition("entries", jParams.getEntryLo=
adRequest());
+ new ContainerFilterByContainerDefinition("blogEntries", jParams.getEnt=
ryLoadRequest());
containerFilterVector.add(entriesDefFilter);
=
String blogSearchString =3D request.getParameter("blogSearchString");
@@ -28,7 +28,7 @@
// on non-edit mode, hide pages with empty title
if (! jData.gui().isEditMode()) {
=
- ContainerFilterBean emptyEntryFilter =3D new ContainerFilterBean("=
title",jParams.getEntryLoadRequest());
+ ContainerFilterBean emptyEntryFilter =3D new ContainerFilterBean("=
blogTitle",jParams.getEntryLoadRequest());
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"<em=
pty>");
containerFilterVector.add(emptyEntryFilter);
=
@@ -37,19 +37,19 @@
if (blogSearchString !=3D null && blogSearchString.length() > 0) {
logger.debug("blogSearchString is " + blogSearchString);
ContainerSearcher containerSearcher =3D new ContainerSearcher(
- jData.params().getSiteID(), "entries", blogSearchString,
+ jData.params().getSiteID(), "blogEntries", blogSearchString,
jData.params().getEntryLoadRequest());
- containerSearcher.setContextID("blogEntries");
- request.setAttribute("entries_search_handler",containerSearcher);
+ containerSearcher.setContextID("blogEntries");
+ request.setAttribute("blogEntries_search_handler",containerSearcher);
} else {
- // serch only in current page and in containerList "entries"
+ // serch only in current page and in containerList "blogEntries"
blogSearchString =3D "";
//StringBuffer searchBlogQuery =3D new StringBuffer();
// searchBlogQuery.append(" pageid:" + jData.page().getID());
-// searchBlogQuery.append(" AND container_definition_name:entries");
+// searchBlogQuery.append(" AND container_definition_name:blogEntries");
// ContainerSearcher containerSearcher =3D new ContainerSearcher(jParam=
s.getSiteID(),
// null,searchBlogQuery.toString(),jParams.getEntryLoadRequest());
-// request.setAttribute("entries_search_handler",containerSearcher);
+// request.setAttribute("blogEntries_search_handler",containerSearcher);
if (requestedCategory !=3D null) {
HashSet cats =3D new HashSet();
Category cat =3D Category.getCategory(requestedCategory,user);
@@ -105,11 +105,11 @@
logger.debug("Filter from " + sdf.format( (new Date(lowerVal.getTi=
me())) ) + " to " +
sdf.format( (new Date(upperVal.getTime())) ));
=
- ContainerFilterBean dateFilter =3D new ContainerFilterBean("date",=
true,jParams.getEntryLoadRequest());
+ ContainerFilterBean dateFilter =3D new ContainerFilterBean("blogDa=
te",true,jParams.getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_SMALLER, String.valu=
eOf(upperVal.getTime()) );
containerFilterVector.add(dateFilter);
=
- dateFilter =3D new ContainerFilterBean("date",true,jParams.getEntr=
yLoadRequest());
+ dateFilter =3D new ContainerFilterBean("blogDate",true,jParams.get=
EntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_BIGGER, String.value=
Of(lowerVal.getTime()) );
containerFilterVector.add(dateFilter);
}
@@ -117,14 +117,14 @@
}
if ( containerFilterVector.size()>0 ) {
ContainerFilters containerFilters ;
- containerFilters =3D new ContainerFilters("entries", jData.params(), c=
ontainerFilterVector);
+ containerFilters =3D new ContainerFilters("blogEntries", jData.params(=
), containerFilterVector);
containerFilters.setContextID("blogEntries");
- request.setAttribute("entries_filter_handler",containerFilters);
+ request.setAttribute("blogEntries_filter_handler",containerFilters);
}
=
// sort by date desc
ContainerSorterByContainerDefinition entries_sort_handler =3D
- new ContainerSorterByContainerDefinition(siteId, "date", "entries", tr=
ue, entryLoadRequest);
+ new ContainerSorterByContainerDefinition(siteId, "blogDate", "blogEntr=
ies", true, entryLoadRequest);
entries_sort_handler.setDescOrdering();
-request.setAttribute("entries_sort_handler",entries_sort_handler);
+request.setAttribute("blogEntries_sort_handler",entries_sort_handler);
%>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/list.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/list.inc&rev=3D661&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/list.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/list.inc Tue May 15 16:15:39=
2007
@@ -25,7 +25,7 @@
</content:declareContainerList>
=
<%
-request.removeAttribute("entries_search_handler");
+request.removeAttribute("blogEntries_search_handler");
%>
=
<table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"100%">
@@ -48,8 +48,8 @@
.lookupPageTemplateByName ("Blog", jParams.getSiteID()=
);
List blogPagesId =3D JahiaPageBaseService.getInstance().getPag=
eIDsWithTemplate(pageDef.getID());
final Iterator blogPagesIdIter =3D blogPagesId.iterator();
- request.removeAttribute("entries_filter_handler");
- request.removeAttribute("entries_sort_handler");
+ request.removeAttribute("blogEntries_filter_handler");
+ request.removeAttribute("blogEntries_sort_handler");
=
ArrayList blogKeys =3D new ArrayList();
Hashtable blogKeyToBlogPage =3D new Hashtable();
@@ -114,7 +114,7 @@
=
// get the entries container List
int containerListId =3D ServicesRegistry.getInstance().
- getJahiaContainersService().getContainerListID("entrie=
s", blogPage.getID());
+ getJahiaContainersService().getContainerListID("blogEn=
tries", blogPage.getID());
if (containerListId !=3D -1) {
JahiaContainerList entriesCl =3D ServicesRegistry.getI=
nstance().
getJahiaContainersService().loadContainerList( con=
tainerListId, LoadFlags.ALL, jParams );
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/listing_filters.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/listing_filters.inc&rev=3D661&repname=3Dcorporate_por=
tal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/listing_filters.inc (origina=
l)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/listing_filters.inc Tue May =
15 16:15:39 2007
@@ -22,7 +22,7 @@
=
// on non-edit mode, hide pages with empty title
if (! jData.gui().isEditMode()) {
- ContainerFilterBean emptyEntryFilter =3D new ContainerFilterBean("=
title",jParams.getEntryLoadRequest());
+ ContainerFilterBean emptyEntryFilter =3D new ContainerFilterBean("=
blogTitle",jParams.getEntryLoadRequest());
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"<em=
pty>");
containerFilterVector.add(emptyEntryFilter);
}
@@ -31,24 +31,24 @@
if (blogSearchString !=3D null && blogSearchString.length() > 0) {
logger.debug("blogSearchString is " + blogSearchString);
ContainerSearcher containerSearcher =3D new ContainerSearcher(
- jData.params().getSiteID(), "entries", blogSearchString,
+ jData.params().getSiteID(), "blogEntries", blogSearchString,
jData.params().getEntryLoadRequest());
- request.setAttribute("entries_search_handler",containerSearcher);
+ request.setAttribute("blogEntries_search_handler",containerSearcher);
} else {
- // serch only in current page and in containerList "entries"
+ // serch only in current page and in containerList "blogEntries"
blogSearchString =3D "";
StringBuffer searchBlogQuery =3D new StringBuffer();
//searchBlogQuery.append(" pageid:" + jData.page().getID());
- searchBlogQuery.append("container_definition_name:entries");
+ searchBlogQuery.append("container_definition_name:blogEntries");
ContainerSearcher containerSearcher =3D new ContainerSearcher(
- jData.params().getSiteID(), "entries", searchBlogQuery.toString(),
+ jData.params().getSiteID(), "blogEntries", searchBlogQuery.toStrin=
g(),
jData.params().getEntryLoadRequest());
- request.setAttribute("entries_search_handler",containerSearcher);
+ request.setAttribute("blogEntries_search_handler",containerSearcher);
}
*/
// get all blogs
ContainerFilterByContainerDefinition entriesDefFilter =3D
- new ContainerFilterByContainerDefinition("entries", jParams.getEntryLo=
adRequest());
+ new ContainerFilterByContainerDefinition("blogEntries", jParams.getEnt=
ryLoadRequest());
containerFilterVector.add(entriesDefFilter);
=
String blogSearchString =3D request.getParameter("blogSearchString");
@@ -73,9 +73,9 @@
if (blogSearchString !=3D null && blogSearchString.length() > 0) {
=
ContainerSearcher containerSearcher =3D new ContainerSearcher(
- jData.params().getSiteID(), "entries", blogSearchString,
+ jData.params().getSiteID(), "blogEntries", blogSearchString,
jData.params().getEntryLoadRequest());
- request.setAttribute("entries_search_handler",containerSearcher);
+ request.setAttribute("blogEntries_search_handler",containerSearche=
r);
blogSearchString =3D "";
=
} else {
@@ -115,11 +115,11 @@
logger.debug("Filter from " + sdf.format( (new Date(lowerVal.g=
etTime())) ) + " to " +
sdf.format( (new Date(upperVal.getTime())) ));
=
- ContainerFilterBean dateFilter =3D new ContainerFilterBean("da=
te",true,jParams.getEntryLoadRequest());
+ ContainerFilterBean dateFilter =3D new ContainerFilterBean("bl=
ogDate",true,jParams.getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_SMALLER, String.=
valueOf(upperVal.getTime()) );
containerFilterVector.add(dateFilter);
=
- dateFilter =3D new ContainerFilterBean("date",true,jParams.get=
EntryLoadRequest());
+ dateFilter =3D new ContainerFilterBean("blogDate",true,jParams=
.getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_BIGGER, String.v=
alueOf(lowerVal.getTime()) );
containerFilterVector.add(dateFilter);
}
@@ -127,13 +127,13 @@
}
if ( containerFilterVector.size()>0 ) {
ContainerFilters containerFilters ;
- containerFilters =3D new ContainerFilters(containerFilterVector,jData.=
params().getSiteID(),"entries");
- request.setAttribute("entries_filter_handler",containerFilters);
+ containerFilters =3D new ContainerFilters(containerFilterVector,jData.=
params().getSiteID(),"blogEntries");
+ request.setAttribute("blogEntries_filter_handler",containerFilters);
}
// sort by date desc
ContainerSorterByContainerDefinition entries_sort_handler =3D
- new ContainerSorterByContainerDefinition(siteId, "date", "entries", tr=
ue, entryLoadRequest);
+ new ContainerSorterByContainerDefinition(siteId, "blogDate", "blogEntr=
ies", true, entryLoadRequest);
entries_sort_handler.setDescOrdering();
-request.setAttribute("entries_sort_handler",entries_sort_handler);
+request.setAttribute("blogEntries_sort_handler",entries_sort_handler);
=
%>
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_comments.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/view_comments.inc&rev=3D661&repname=3Dcorporate_porta=
l_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_comments.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_comments.inc Tue May 15=
16:15:39 2007
@@ -37,13 +37,13 @@
ContainerBean commentBean =3D new ContainerBean(comment,jParam=
s);
counter++;
String alt =3D counter % 2 =3D=3D 1 ? "alt" : "alt2";
- String commentAuthor =3D comment.getFieldValue("author","");
- String commentTitle =3D comment.getFieldValue("title","");
- String commentBody =3D comment.getFieldValue("body","");
- String commentDate =3D comment.getFieldValue("date","");
+ String commentAuthor =3D comment.getFieldValue("commentAuthor"=
,"");
+ String commentTitle =3D comment.getFieldValue("commentTitle","=
");
+ String commentBody =3D comment.getFieldValue("commentBody","");
+ String commentDate =3D comment.getFieldValue("commentDate","");
long commentDateLong =3D -1;
try {
- commentDateLong =3D Long.parseLong((String)comment.getFiel=
dObject("date"));
+ commentDateLong =3D Long.parseLong((String)comment.getFiel=
dObject("commentDate"));
} catch (NumberFormatException nfe) {
}
%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
