Author: bpapez
Date: Tue May 15 16:15:31 2007
New Revision: 1190
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1190&repname=
=3Dcorporate_portal_templates
Log:
Port blog changes from jahia 4.2 to jahia 5
Added:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corporat=
eportal/validation/beans/BlogValidationBean.java
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_listing_rss_2_0.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_rss_2_0.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/eventlistener.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_addcomment_form.=
inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_definitions.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_entries.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_entry.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_filters.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_list.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_listing_filters.=
inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_view_comments.inc
Added: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corpo=
rateportal/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/corporateportal/validation=
/beans/BlogValidationBean.java&rev=3D1190&repname=3Dcorporate_portal_templa=
tes
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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=
eportal/validation/beans/BlogValidationBean.java (added)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corporat=
eportal/validation/beans/BlogValidationBean.java Tue May 15 16:15:31 2007
@@ -0,0 +1,6 @@
+package jahiatemplates.org.jahia.corporateportal.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/view/jsp/blog_listing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/blog_listing.jsp&rev=3D1190&repname=3Dcorporate_portal=
_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/blog_listing.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_listing.jsp Tue May 15 1=
6:15:31 2007
@@ -25,7 +25,6 @@
<%@ include file=3D"include/blog_definitions.inc"%>
=
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
-
<tr>
<jesi:fragment >
<td width=3D"100%" valign=3D"top" style=3D"padding-left:10px;">
@@ -56,7 +55,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);
@@ -95,10 +94,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 ) {
@@ -107,10 +106,10 @@
}
=
=
- //String date =3D entry.getFieldValue("date","");
+ //String date =3D entry.getFieldValue("blogDate","");
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/view/jsp/blog_listing_rss_2_0.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/blog_listing_rss_2_0.jsp&rev=3D1190&repname=3Dcorporat=
e_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/blog_listing_rss_2_0.jsp (ori=
ginal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_listing_rss_2_0.jsp Tue =
May 15 16:15:31 2007
@@ -90,12 +90,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, "");
containerFilterVector.add(emptyEntryFilter);
@@ -103,18 +103,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, "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);
@@ -127,15 +127,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));
@@ -162,7 +162,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/view/jsp/blog_rss_2_0.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/blog_rss_2_0.jsp&rev=3D1190&repname=3Dcorporate_portal=
_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/blog_rss_2_0.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_rss_2_0.jsp Tue May 15 1=
6:15:31 2007
@@ -64,26 +64,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, "");
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);
@@ -94,15 +94,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));
@@ -129,7 +129,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/view/jsp/eventlistener.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/eventlistener.jsp&rev=3D1190&repname=3Dcorporate_porta=
l_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/eventlistener.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/eventlistener.jsp Tue May 15 =
16:15:31 2007
@@ -34,6 +34,10 @@
<%@ page import=3D"org.jahia.services.fields.*" %>
<%@ page import=3D"org.jahia.services.pages.*" %>
<%@ page import=3D"org.jahia.services.version.*" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.services.acl.JahiaBaseACL"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.services.acl.ACLInfo"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.hibernate.model.JahiaAclEntry"%>
+<[EMAIL PROTECTED]
import=3D"org.jahia.services.usermanager.JahiaGroupManagerService"=
%>
<jsp:useBean id=3D"eventsToTrap" class=3D"java.util.Vector" scope=3D"appli=
cation"/>
<%// loads the events to trap
if (eventsToTrap.size() =3D=3D 0) {
@@ -142,6 +146,21 @@
}
}
} else if ( "containerAdded".equals(eventName) ) {
+ JahiaBaseACL theACL =3D new JahiaBaseACL(theContainer.getAclID=
());
+ =
+ theACL.setInheritance(ACLInfo.NO_INHERITANCE);
+ =
+ JahiaAclEntry readPermission =3D new JahiaAclEntry();
+ readPermission.setPermission(JahiaBaseACL.READ_RIGHTS, JahiaAc=
lEntry.ACL_YES);
+ theACL.setGroupEntry(ServicesRegistry.getInstance().getJahiaGr=
oupManagerService().lookupGroup(
+ JahiaGroupManagerService.GUEST_GROUPNAME + ":" + jPara=
ms.getSiteID()), readPermission);
+
+ JahiaAclEntry adminPermission =3D new JahiaAclEntry();
+ adminPermission.setPermission(JahiaBaseACL.READ_RIGHTS, JahiaA=
clEntry.ACL_YES);
+ adminPermission.setPermission(JahiaBaseACL.WRITE_RIGHTS, Jahia=
AclEntry.ACL_YES);
+ adminPermission.setPermission(JahiaBaseACL.ADMIN_RIGHTS, Jahia=
AclEntry.ACL_YES);
+ theACL.setUserEntry(jParams.getUser(), adminPermission);
+ =
JahiaPage blogPage =3D (JahiaPage) theContainer.getFieldObject=
("blogPage");
if (blogPage !=3D null) {
logger.debug("Activate blogPage ["+blogPage.getID()+"]");
@@ -166,11 +185,11 @@
=
}
}
- } else if ( "entries".equals(theContainer.getDefinition().getName()) ){
+ } else if ( "blogEntries".equals(theContainer.getDefinition().getName(=
)) ){
if ( "addContainerEngineAfterInit".equals(eventName) ) {
logger.debug("Start eventlistner for event addContainerEngineA=
fterInit 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=
("UTC"));
long now =3D cal.getTime().getTime();
@@ -179,52 +198,64 @@
feh.addUpdatedField(theField.getID(), theField.get=
LanguageCode());
logger.debug("Adding updated field #" + theField.g=
etID() + " for language code [" + theField.getLanguageCode() + "]");
updatedFields.add(new Integer(theField.getID()));
- logger.debug("Set value for field [date] to : [" + theFiel=
d.getObject() +"]");
+ logger.debug("Set value for field [blogDate] to : [" + the=
Field.getObject() +"]");
}
- theField =3D theContainer.getField("author");
+ theField =3D theContainer.getField("blogAuthor");
if (theField.getObject() =3D=3D null) {
String author =3D jParams.getUser().getUserKey();
theField.setObject(author);
feh.addUpdatedField(theField.getID(), theField.get=
LanguageCode());
updatedFields.add(new Integer(theField.getID()));
- logger.debug("Set value for field [author] to [" + theFiel=
d.getObject() + "]");
+ logger.debug("Set value for field [blogAuthor] to [" + the=
Field.getObject() + "]");
} else if ("".equals(theField.getObject())) {
String author =3D jParams.getUser().getUserKey();
theField.setObject(author);
feh.addUpdatedField(theField.getID(), theField.get=
LanguageCode());
updatedFields.add(new Integer(theField.getID()));
- logger.debug("Set value for field [author] to [" + theFiel=
d.getObject() + "]");
+ logger.debug("Set value for field [blogAuthor] to [" + the=
Field.getObject() + "]");
}
} else if ( "containerAdded".equals(eventName) ) {
logger.debug("Activate container ["+theContainer.getID()+"]");
+ boolean substitutedElr =3D false;
+ try {
+ if (jParams.getEntryLoadRequest().isCurrent()) {
+ substitutedElr =3D true;
+ EntryLoadRequest elr =3D new EntryLoadRequest(EntryLoa=
dRequest.STAGING_WORKFLOW_STATE, 0,
+ jParams.getEntryLoadRequest().getLocales());
+ jParams.setSubstituteEntryLoadRequest(elr);
+ } =
// container validation
- Set languageCodes =3D new HashSet();
- languageCodes.add(ContentObject.SHARED_LANGUAGE);
- languageCodes.add(jParams.getLocale().toString());
-
- JahiaSaveVersion saveVersion =3D
- ServicesRegistry.getInstance().getJahiaVersionService().
- getSiteSaveVersion(jParams.getSiteID());
-
- StateModificationContext smc =3D new StateModificationContext(
- new ContentContainerKey(theContainer.getID()), languageCod=
es);
- smc.setDescendingInSubPages(false);
-
- Enumeration childs =3D theContainer.getFields();
- while (childs.hasMoreElements()) {
- JahiaField child =3D (JahiaField)childs.nextElement();
- ContentField field =3D child.getContentField();
- if (field !=3D null) {
- field.activate(languageCodes, saveVersion.getVersionID=
(),jParams, smc);
+ Set languageCodes =3D new HashSet();
+ languageCodes.add(ContentObject.SHARED_LANGUAGE);
+ languageCodes.add(jParams.getLocale().toString());
+
+ JahiaSaveVersion saveVersion =3D
+ ServicesRegistry.getInstance().getJahiaVersionService(=
).
+ getSiteSaveVersion(jParams.getSiteID());
+
+ StateModificationContext smc =3D new StateModificationCont=
ext(
+ new ContentContainerKey(theContainer.getID()),
langua=
geCodes);
+ smc.setDescendingInSubPages(false);
+
+ Enumeration childs =3D theContainer.getFields();
+ while (childs.hasMoreElements()) {
+ JahiaField child =3D (JahiaField)childs.nextElement();
+ ContentField field =3D child.getContentField();
+ if (field !=3D null) {
+ field.activate(languageCodes, saveVersion.getVersi=
onID(),jParams, smc);
+ }
}
- }
- JahiaContainersService jahiaContainersService =3D
- ServicesRegistry.getInstance().getJahiaContainersService();
- if (jahiaContainersService !=3D null) {
- ActivationTestResults atr =3D jahiaContainersService.activ=
ateStagedContainer(languageCodes,theContainer.getID(),
- jParams.getUser(), saveVersion, jParams, smc);
- logger.debug("ActivationTestResults is " + atr.toString());
- }
+ JahiaContainersService jahiaContainersService =3D
+ ServicesRegistry.getInstance().getJahiaContainersServi=
ce();
+ if (jahiaContainersService !=3D null) {
+ ActivationTestResults atr =3D jahiaContainersService.a=
ctivateStagedContainer(languageCodes,theContainer.getID(),
+ jParams.getUser(), saveVersion, jParams, smc);
+ logger.debug("ActivationTestResults is " + atr.toStrin=
g());
+ }
+ } finally {
+ if (substitutedElr)
+ jParams.resetSubstituteEntryLoadRequest();
+ } =
}
=
=
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_addcomment=
_form.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/blog_addcomment_form.inc&rev=3D1190&repname=3D=
corporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/blog_addcomment_form.=
inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_addcomment_form.=
inc Tue May 15 16:15:31 2007
@@ -25,21 +25,21 @@
<content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo=
rate_portal_templates"
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"
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"
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/view/jsp/include/blog_declaratio=
ns.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/blog_declarations.inc&rev=3D1190&repname=3Dcor=
porate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/blog_declarations.inc=
(original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_declarations.inc=
Tue May 15 16:15:31 2007
@@ -55,25 +55,25 @@
=
Vector containerFilterVector =3D new Vector();
=
- 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);
}
- 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();
@@ -81,7 +81,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/view/jsp/include/blog_definition=
s.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/blog_definitions.inc&rev=3D1190&repname=3Dcorp=
orate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/blog_definitions.inc =
(original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_definitions.inc =
Tue May 15 16:15:31 2007
@@ -14,38 +14,40 @@
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"
+ containerBeanName=3D"jahiatemplates.org.jahia.corporateportal.validati=
on.beans.BlogValidationBean"
+ validatorKey=3D"blogValidationBean">
<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" value=
=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]>"
+ <content:declareField name=3D"blogDate" title=3D"Date" type=3D"Date" v=
alue=3D"<jahia_calendar[dd.MM.yyyy / HH:mm]>now"
titleKey=3D"blog.date" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"author" title=3D"Author" type=3D"SharedS=
mallText"
- value=3D"<%=3DjData.params().getUser().getUsername()%>"
+ <content:declareField name=3D"blogAuthor" title=3D"Author" type=3D"Sha=
redSmallText"
+ value=3D'<jahia-expression expr=3D"currentUser.username" storeMark=
er=3D"false"/>'
titleKey=3D"blog.author" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"excerpt"
+ <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"
- titleKey=3D"blog.author" bundleKey=3D"<%=3DresBundleID%>"
- value=3D"<%=3DjData.params().getUser().getUsername()%>"/>
- <content:declareField name=3D"title" 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"
- titleKey=3D"blog.body" bundleKey=3D"<%=3DresBundleID%>"/>
- <content:declareField name=3D"date" title=3D"Date" type=3D"Date"
+ <content:declareField name=3D"commentAuthor" title=3D"Name of the =
author" type=3D"SharedSmallText"
+ titleKey=3D"blog.commentAuthor" bundleKey=3D"<%=3DresBundleID%=
>"
+ value=3D'<jahia-expression expr=3D"user/username" storeMarker=
=3D"false"/>'/>
+ <content:declareField name=3D"commentTitle" title=3D"Title of this=
comment" type=3D"SmallText"
+ titleKey=3D"blog.commentTitle" bundleKey=3D"<%=3DresBundleID%>=
"/>
+ <content:declareField name=3D"commentBody" title=3D"Body of this c=
omment" type=3D"BigText"
+ titleKey=3D"blog.commentBody" bundleKey=3D"<%=3DresBundleID%>"=
/>
+ <content:declareField name=3D"commentDate" title=3D"Date" type=3D"=
Date"
value=3D"<jahia_calendar[dd.MM.yyyy / HH:mm]>"
- titleKey=3D"blog.date" bundleKey=3D"<%=3DresBundleID%>"/>
+ titleKey=3D"blog.commentDate" bundleKey=3D"<%=3DresBundleID%>"=
/>
</content:declareContainer>
</content:declareContainerList>
=
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_entries.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/blog_entries.inc&rev=3D1190&repname=3Dcorporat=
e_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/blog_entries.inc (ori=
ginal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_entries.inc Tue =
May 15 16:15:31 2007
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%
-JahiaContainerList entries =3D jData.containers().getContainerList( "entri=
es" );
+JahiaContainerList entries =3D jData.containers().getContainerList( "blogE=
ntries" );
if (entries !=3D null) {
entries.setIsContainersLoaded(false);
ContainerListBean entriesBean =3D new ContainerListBean(entries,jParam=
s);
@@ -65,9 +65,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)) {
@@ -75,7 +75,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);
@@ -84,10 +84,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");
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_entry.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/blog_entry.inc&rev=3D1190&repname=3Dcorporate_=
portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/blog_entry.inc (origi=
nal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_entry.inc Tue Ma=
y 15 16:15:31 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/view/jsp/include/blog_filters.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/blog_filters.inc&rev=3D1190&repname=3Dcorporat=
e_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/blog_filters.inc (ori=
ginal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_filters.inc Tue =
May 15 16:15:31 2007
@@ -24,7 +24,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("blogTit=
le", jParams.getEntryLoadRequest());
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"<em=
pty>");
containerFilterVector.add(emptyEntryFilter);
=
@@ -33,9 +33,9 @@
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 {
blogSearchString =3D "";
@@ -94,24 +94,24 @@
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);
}
}
if ( containerFilterVector.size()>0 ) {
ContainerFilters containerFilters ;
- containerFilters =3D new ContainerFilters("entries", jData.params(), c=
ontainerFilterVector);
- request.setAttribute("entries_filter_handler",containerFilters);
+ containerFilters =3D new ContainerFilters("blogEntries", jData.params(=
), containerFilterVector);
+ request.setAttribute("blogEntries_filter_handler",containerFilters);
}
=
-// sort by date desc
+// sort by blogDate desc
ContainerSorterByContainerDefinition entries_sort_handler =3D
- new ContainerSorterByContainerDefinition(jParams.getSiteID(), "date", =
"entries", true, jParams.getEntryLoadRequest());
+ new ContainerSorterByContainerDefinition(jParams.getSiteID(), "blogDat=
e", "blogEntries", true, jParams.getEntryLoadRequest());
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/view/jsp/include/blog_list.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/blog_list.inc&rev=3D1190&repname=3Dcorporate_p=
ortal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/blog_list.inc (origin=
al)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_list.inc Tue May=
15 16:15:31 2007
@@ -27,7 +27,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%">
@@ -41,17 +41,23 @@
<td class=3D"boxcontentborder1">
=
<content:containerList name=3D'blogs' id=3D"blogs">
- <jahiaHtml:actionMenu name=3D"blogs" namePostFix=3D""
- resourceBundle=3D"jahiatemplates.Corporate_portal_template=
s">
- <%
+ <% =
+ // if user is admin -> can access list action menu =
+ ContainerListBean blogsBean =3D (ContainerListBean) pageContex=
t.findAttribute("blogs");
+ =
+ if (jParams.getUser().isAdminMember( jParams.getSiteID() )) { =
+ jData.gui().html().drawBeginActionMenu(blogsBean ,
+ null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates", null, out); =
+ }
+
// get all pages with template definition name "Blog"
JahiaPageDefinition pageDef =3D
ServicesRegistry.getInstance().getJahiaPageTemplateService=
()
.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();
@@ -77,8 +83,6 @@
}
}
=
- ContainerListBean blogsBean =3D (ContainerListBean) pageContex=
t.findAttribute("blogs");
-
boolean hasWriteAccess =3D blogsBean.getJahiaContainerList().g=
etID() =3D=3D 0 ?
jData.page().checkWriteAccess(jParams.getUser()) :
blogsBean.getJahiaContainerList().checkWriteAccess(jParams=
.getUser());
@@ -116,7 +120,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 );
@@ -147,7 +151,12 @@
%>
</li>
</ul>
- </jahiaHtml:actionMenu>
+ <%
+ if (jParams.getUser().isAdminMember( jParams.getSiteID() )) { =
+ jData.gui().html().drawEndActionMenu(blogsBean ,
+ null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates", null, out); =
+ }
+ %>
</content:containerList>
</td>
</tr>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_listing_fi=
lters.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/blog_listing_filters.inc&rev=3D1190&repname=3D=
corporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/blog_listing_filters.=
inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_listing_filters.=
inc Tue May 15 16:15:31 2007
@@ -20,14 +20,14 @@
=
// 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("blogTit=
le",jParams.getEntryLoadRequest());
emptyEntryFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"<em=
pty>");
containerFilterVector.add(emptyEntryFilter);
}
=
// 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");
@@ -52,9 +52,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", containerSearch=
er);
//blogSearchString =3D "";
=
} else {
@@ -96,11 +96,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);
}
@@ -108,12 +108,12 @@
}
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(jParams.getSiteID(), "date", =
"entries", true, jParams.getEntryLoadRequest());
+ new ContainerSorterByContainerDefinition(jParams.getSiteID(), "blogDat=
e", "blogEntries", true, jParams.getEntryLoadRequest());
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/view/jsp/include/blog_view_comme=
nts.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/blog_view_comments.inc&rev=3D1190&repname=3Dco=
rporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/blog_view_comments.in=
c (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_view_comments.in=
c Tue May 15 16:15:31 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
