Author: knguyen
Date: Thu May 24 17:58:37 2007
New Revision: 679
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D679&repname=
=3Dcorporate_portal_templates_v2
Log:
TEMPLATES-232 : backport revision listing for Document Listing template.
Added:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.jsp
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties
branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/css/template_css.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_fr.properties=
&rev=3D679&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/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties Thu May 24 17:58:37 2007
@@ -111,6 +111,8 @@
blog.tu =3D ma
blog.we =3D me
blog.wrote =3D a =C3=A9crit
+blog.results.next =3D r=C3=A9sultats suivant
+blog.results.previous =3D r=C3=A9sultats pr=C3=A9c=C3=A9dent
boxContainer =3D Boite
boxContainer.boxType =3D Type
boxContainer.displaySubDir =3D Afficher les sous-r=C3=A9pertoires
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/common/declarations.inc&rev=3D679&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/common/declarations.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc Thu May 24=
17:58:37 2007
@@ -55,6 +55,10 @@
org.jahia.services.workflow.*,
org.jahia.utils.*,
org.jahia.utils.fileparsers.CharsetDetection,
+ org.jahia.views.engines.JahiaEngineCommonData,
+ org.jahia.views.engines.JahiaEngineViewHelper,
+ org.jahia.views.engines.versioning.actions.*,
+ org.jahia.views.engines.versioning.ContentVersioningViewHelper,
org.apache.commons.lang.StringUtils,
org.apache.slide.common.UriPath,
org.apache.slide.common.PropertyName,
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/common/top.inc&rev=3D679&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/common/top.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc Thu May 24 17:58:37=
2007
@@ -165,6 +165,9 @@
<script language=3D"javascript" src=3D"<content:contextURL/>/javascript/cp=
tv2.js"
type=3D"text/javascript"></script>
=
+<!-- versioning-->
+<script type=3D"text/javascript" src=3D"<content:serverHttpPath/>/jsp/jahi=
a/javascript/zimbra/versioning/ContainerVersionCompare.js"></script>
+
<%@ include file=3D"../javascript/transmenu_init.inc"%>
<script language=3D"javascript" type=3D"text/javascript">
<!--
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/css/template_css.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/css/template_css.jsp&rev=3D679&repname=3Dcorporate_portal_t=
emplates_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/css/template_css.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/css/template_css.jsp Thu May 24 17=
:58:37 2007
@@ -470,4 +470,27 @@
table.formResultListing th.order2 a{background:url(<content:serverHttpPath=
/>/jsp/jahia/engines/images/arrow_up.png) no-repeat;padding-right:5px;}
table.formResultListing tr.odd{background:#ecf7ce;}
table.formResultListing tr.even{background:#fff;}
-div.formResultListing span.pagebanner {width:670px; display:block;} =
\ No newline at end of file
+div.formResultListing span.pagebanner {width:670px; display:block;} =
+
+/* Versioning revision Display Tag
+----------------------------------------------- */
+table.revisionsListing {border: 1px solid #666;width: 80%;margin: 10px 0 0=
0 !important;}
+table.revisionsListing th, table.revisionsListing td {padding: 2px 10px 2p=
x 4px !important;text-align: left;vertical-align: top;}
+table.revisionsListing thead tr {background-color: #fc0;}
+table.revisionsListing th.sorted {background-color: orange;}
+table.revisionsListing th a,table.revisionsListing th a:visited {color: bl=
ack;}
+table.revisionsListing th a:hover {text-decoration: underline;color: black=
;}
+table.revisionsListing th.sorted a,table.revisionsListing th.sortable a {b=
ackground-position: right top;display: block;width: 100%;}
+table.revisionsListing th.sortable a {padding-right: 5px;background-image:=
url(<content:serverHttpPath/>/jsp/jahia/engines/images/arrow_off.png);back=
ground-repeat:no-repeat;}
+table.revisionsListing th.order1 a {padding-right: 5px;background-image: u=
rl(<content:serverHttpPath/>/jsp/jahia/engines/images/arrow_down.png);backg=
round-repeat:no-repeat;}
+table.revisionsListing th.order2 a {padding-right: 5px;background-image: u=
rl(<content:serverHttpPath/>/jsp/jahia/engines/images/arrow_up.png);backgro=
und-repeat:no-repeat;}
+table.revisionsListing tr.odd {background-color: #fff}
+table.revisionsListing tr.tableRowEven,tr.even {background-color: #fea}
+table.revisionsListing {padding:0px;width: 100%;margin-left: -2px;margin-r=
ight: -2px;}
+table.revisionsListing thead tr {background-color: #69c;}
+table.revisionsListing tr.even {background-color: #def;}
+div.revisionsListing span.pagelinks a {display: inline;}
+th.revisionsListingHeader {font-weight: bold !important;}
+.compareAddedDifference {background-color:aqua !important;color:black !imp=
ortant;}
+.compareChangedDifference {background-color:lime !important;color:black !i=
mportant;}
+.compareDeletedDifference {background-color:red !important;text-decoration=
:line-through !important;color:black !important;}
Added: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing=
.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.jsp&rev=3D679&repnam=
e=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/doc/container_revisions_listing.js=
p (added)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.js=
p Thu May 24 17:58:37 2007
@@ -0,0 +1,208 @@
+<%@ page language=3D"java" %>
+<%@ page import=3D"org.jahia.engines.calendar.CalendarHandler" %>
+<%!
+public CalendarHandler getCalHandler(String calIdentifier,
+ long initialDate,
+ ProcessingContext jParams){
+ Long date =3D new Long(initialDate);
+ CalendarHandler calHandler =3D
+ new CalendarHandler(jParams.settings().getJahiaEnginesHttpPath=
(),
+ calIdentifier,
+ ContentVersioningAction.DATE_FORMAT,
+ date,
+ jParams.getLocale(),
+ new Long(0));
+ return calHandler;
+}
+
+public ContentVersioningViewHelper initContainerRevisionsListing(String ob=
jectKey,
+ ProcessingContext jParams, HttpServletRequest request) throws JahiaExcep=
tion, ClassNotFoundException {
+ =
+ ContentObject contentObject =3D null;
+ // Prepage a new engine view helper
+ EntryLoadRequest loadRequest =3D EntryLoadRequest.VERSIONED;
+ contentObject =3D ContentObject.getContentObjectInstance(ObjectKey.getIn=
stance(objectKey));
+ CalendarHandler cal =3D this.getCalHandler("restoreDateCalendar",0,jPara=
ms);
+ ContentVersioningViewHelper versViewHelper =3D ContentVersioningViewHelp=
er.getInstance(contentObject,cal);
+ cal =3D this.getCalHandler("fromRevisionDateCalendar",0,jParams);
+ versViewHelper.setFromRevisionDateCalendar(cal);
+ cal =3D this.getCalHandler("toRevisionDateCalendar",0,jParams);
+ versViewHelper.setToRevisionDateCalendar(cal);
+
+ long toDate =3D versViewHelper.getToRevisionDateCalendar().getDateLong()=
.longValue();
+ if ( toDate =3D=3D 0 ){
+ toDate =3D Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTime=
InMillis();
+ }
+ toDate +=3D versViewHelper.getToRevisionDateCalendar().getTimeZoneOffSet=
().longValue()
+ + versViewHelper.getToRevisionDateCalendar().getServerClientTimeDiff().l=
ongValue();
+
+ loadRequest =3D
+ new EntryLoadRequest(EntryLoadRequest.VERSIONED_WORKFLOW_STATE,
+ (int) (toDate / 1000),
+ jParams.getEntryLoadRequest().getLocales());
+
+ // prepare Revisions List
+ ContentTreeRevisionsVisitor revisionsVisitor =3D
+ versViewHelper.getContentTreeRevisionsVisitor(
+ jParams.getUser(),loadRequest, ProcessingContext.EDIT);
+
+ revisionsVisitor.setWithDeletedContent(true);
+ revisionsVisitor.setWithStagingRevisions(true);
+ long fromDate =3D versViewHelper.getFromRevisionDateCalendar().getDateLo=
ng().longValue();
+ if ( fromDate > 0 ){
+ fromDate +=3D versViewHelper.getFromRevisionDateCalendar().getTimeZo=
neOffSet().longValue()
+ + versViewHelper.getFromRevisionDateCalendar().getServerClientTimeDi=
ff().longValue();
+ }
+ revisionsVisitor.setFromRevisionDate(fromDate);
+ revisionsVisitor.setToRevisionDate(toDate);
+
+ revisionsVisitor.loadRevisions(false);
+ revisionsVisitor.sortRevisions(
+ jParams.getLocale().toString(),
+ versViewHelper.getSortAttribute(),
+ versViewHelper.getSortOrder(), false);
+
+ ArrayList revisions =3D revisionsVisitor.getRevisions();
+ ArrayList filteredRevisions =3D new ArrayList();
+ int size =3D revisions.size();
+ // remove deleted revisions, we don't want to restore at deleted revision
+ RevisionEntrySet revEntrySet;
+ if ( (versViewHelper.isRestoringPage() || versViewHelper.isRestoringCont=
ainer() )) {
+ boolean isEditMode =3D jParams.getOperationMode().equals(ProcessingC=
ontext.EDIT);
+ for (int i =3D 0; i < size; i++) {
+ revEntrySet =3D (RevisionEntrySet) revisions.get(i);
+ if ((revEntrySet.getWorkflowState() !=3D
+ EntryLoadRequest.DELETED_WORKFLOW_STATE)
+ && !(revEntrySet.getWorkflowState() > EntryLoadRequest.A=
CTIVE_WORKFLOW_STATE && !isEditMode) ) {
+ filteredRevisions.add(revEntrySet);
+ }
+ }
+ } else {
+ filteredRevisions =3D revisions;
+ }
+ if ( filteredRevisions =3D=3D null ){
+ filteredRevisions =3D new ArrayList();
+ }
+ request.setAttribute("revisions", filteredRevisions);
+ return versViewHelper;
+}
+%>
+
+
+<%
+ ContainerBean containerBean =3D (ContainerBean) pageContext.
+ findAttribute("parentContainerBean");
+ String objectKey =3D null;
+ if (containerBean !=3D null) {
+ JahiaContainer theContainer =3D containerBean.getJahiaContainer();
+ ContentContainer cContainer =3D ContentContainer.getContainer(theCon=
tainer.getID());
+ objectKey =3D cContainer.getObjectKey().toString();
+%>
+<%
+
+String revisionListActionURL =3D jParams.composeStrutsUrl("ContainerVersio=
ning", new Properties(), null);;
+
+%>
+<%
+ ContentVersioningViewHelper versViewHelper =3D initContainerRevisionsL=
isting(objectKey, jParams, request);
+ final int nbMaxOfRevisions =3D versViewHelper.getNbMaxOfRevisions().in=
tValue();
+
+ StringBuffer strBuffer =3D new StringBuffer("{\"revisions\":[");
+ String[] selectedRevs =3D request.getParameterValues("revisionEntrySet=
");
+ List selectedRevsList =3D new ArrayList();
+ if ( selectedRevs !=3D null ){
+ selectedRevsList =3D Arrays.asList(selectedRevs);
+ for ( int i=3D0; i<selectedRevs.length; i++ ){
+ strBuffer.append("\"");
+ strBuffer.append(selectedRevs[i]);
+ strBuffer.append("\"");
+ if ( i<selectedRevs.length ){
+ strBuffer.append(",");
+ }
+ }
+ }
+ strBuffer.append("]}");
+%>
+<script type=3D"text/javascript">
+<!--
+
+var jsObj<%=3DobjectKey%> =3D <%=3DstrBuffer.toString()%>;
+var containerCompareHandler<%=3DobjectKey%> =3D new ContainerVersionCompar=
e(jsObj<%=3DobjectKey%>.revisions);
+jsObj<%=3DobjectKey%> =3D null;
+
+function selectRevisionEntry<%=3DobjectKey%>(index){
+ if ( document.revisionsListForm<%=3DobjectKey%>.revisionEntrySet[index=
] !=3D null ){
+ document.revisionsListForm<%=3DobjectKey%>.revisionEntrySet[index]=
.checked =3D true;
+ } else {
+ // only one revision entry
+ document.revisionsListForm<%=3DobjectKey%>.revisionEntrySet.checke=
d =3D true;
+ }
+}
+
+function handleRevisionSelect<%=3DobjectKey%>(theInput){
+ containerCompareHandler<%=3DobjectKey%>._handleRevisionSelect(theInput);=
=
+}
+
+function handleCompare<%=3DobjectKey%>(objectKey){
+ if (containerCompareHandler<%=3DobjectKey%>._count < 2 ){
+ alert('<content:engineResourceBundle resourceName=3D"org.jahia.engines=
.version.atLeastTwoRevisionsMustBeSelected" defaultValue=3D"At least two re=
visions must be selected" />');
+ return;
+ } =
+ var actionURL =3D '<%=3DrevisionListActionURL%>&method=3DcontainerVersio=
nCompare&objectKey=3D' + objectKey;
+ actionURL+=3D'&version1=3D' + containerCompareHandler<%=3DobjectKey%>._r=
evisions[0] + '&version2=3D' + containerCompareHandler<%=3DobjectKey%>._rev=
isions[1];
+ OpenJahiaScrollableWindow(actionURL,'compareRevisions',800,480);
+}
+
+function handleRevisionDetails<%=3DobjectKey%>(version1,objectKey){
+ var actionURL =3D '<%=3DrevisionListActionURL%>&method=3DcontainerVersio=
nCompare&objectKey=3D' + objectKey;
+ actionURL+=3D'&version1=3D' + version1;
+ OpenJahiaScrollableWindow(actionURL,'compareRevisions',800,480);
+}
+
+ //-->
+</script>
+<%
+ ArrayList allRevisions =3D (ArrayList) request.getAttribute("revisions=
");
+ int nbRevisions =3D allRevisions.size();
+ if (nbMaxOfRevisions !=3D -1 && nbRevisions > nbMaxOfRevisions) {
+ nbRevisions =3D nbMaxOfRevisions;
+ =
+ ArrayList revisions =3D new ArrayList();
+ for ( int i=3D0; i<nbRevisions; i++ ){
+ revisions.add(allRevisions.get(i));
+ }
+ request.setAttribute("revisions",revisions);
+ }
+ org.jahia.utils.displaytag.CaseInsensitiveComparator comparator =3D =
+ new org.jahia.utils.displaytag.CaseInsensitiveComparator(request.get=
Locale());
+ =
+ boolean moreThanOneRevision =3D nbRevisions>1;
+ int count=3D0;
+%>
+<div style=3D"padding-top:10px;">
+<form id=3D"revisionsListForm<%=3DobjectKey%>" action=3D"<%=3DbypassUrl%>"=
name=3D"revisionsListForm<%=3DobjectKey%>" method=3D"post">
+<b><content:engineResourceBundle resourceName=3D"org.jahia.engines.version=
.nbOfRevisions"/> :</b>
+<%=3DnbRevisions%> ( Total : <%=3DallRevisions.size()%> )
+<div class=3D"revisionsListing" style=3D"padding-top:10px;">
+<display:table name=3D"revisions" class=3D"revisionsListing" pagesize=3D"2=
0" requestURI=3D"<%=3DbypassUrl%>" excludedParams=3D"*" id=3D"listItem" >
+ <%
+ count++;
+ RevisionEntrySet revEntrySet =3D (RevisionEntrySet) pageContext.getA=
ttribute("listItem");
+ %>
+ <display:column sortProperty=3D"versionID" title=3D'<%=3DJahiaResource=
Bundle.getEngineResource( "org.jahia.engines.version.version", jParams, jPa=
rams.getLocale(),"Version")%>' sortable=3D"true" headerClass=3D"revisionsLi=
stingHeader">
+ <% if ( moreThanOneRevision ){ %><input id=3D"<%=3DrevEntrySet.toStrin=
g()%>" class=3D"input" type=3D"checkbox" name=3D"revisionEntrySet" value=3D=
"<%=3DrevEntrySet.toString()%>" onClick=3D"handleRevisionSelect<%=3DobjectK=
ey%>(this);" <%if ( selectedRevsList.contains(revEntrySet.toString()) ){%>c=
hecked<%}%> /><% } %><% if ( count>1 ){%><a href=3D"javascript:handleRevisi=
onDetails<%=3DobjectKey%>('<%=3DrevEntrySet.toString()%>','<%=3DobjectKey%>=
')"><%=3DRevisionEntrySet.getVersionNumber(revEntrySet, jParams, jParams.ge=
tLocale())%></a><% } else { %><span class=3D"revisionLink"><%=3DRevisionEnt=
rySet.getVersionNumber(revEntrySet, jParams, jParams.getLocale())%></span><=
% } %>
+ </display:column>
+ <display:column title=3D'<%=3DJahiaResourceBundle.getEngineResource( "=
org.jahia.engines.version.date", jParams, jParams.getLocale(),"Date")%>' so=
rtable=3D"true" sortProperty=3D"versionID" comparator=3D"<%=3D comparator %=
>" headerClass=3D"revisionsListingHeader">
+ <%=3DRevisionEntrySet.getVersionDate(revEntrySet,jParams.getLocale())%>
+ </display:column>
+ <display:column property=3D"lastContributor" title=3D'<%=3DJahiaResour=
ceBundle.getEngineResource( "org.jahia.services.metadata.lastContributor", =
jParams, jParams.getLocale(),"Last contributor")%>' sortable=3D"true" compa=
rator=3D"<%=3D comparator %>" headerClass=3D"revisionsListingHeader"/>
+</display:table>
+<% if ( moreThanOneRevision ){ %>
+<input type=3D"button" value=3D'<%=3DJahiaResourceBundle.getEngineResource=
( "org.jahia.engines.version.compare", jParams, jParams.getLocale(),"Compar=
e")%>' style=3D"float:right; margin-top:5px;" onclick=3D"handleCompare<%=3D=
objectKey%>('<%=3DobjectKey%>')" />
+<% } %>
+</div>
+<div class=3D"clearing"> </div>
+</div>
+</form>
+</div>
+ <% } %>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/detail.jsp&rev=3D679&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/doc/detail.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp Thu May 24 17:58:37=
2007
@@ -161,7 +161,9 @@
<td><%@ include file=3D"page_categories_list.inc"%></t=
d></tr></table></td>
</tr>
</table>
- </jahiaHtml:actionMenu><%
- }
-}
-%>
+ </jahiaHtml:actionMenu>
+ <%
+ }%>
+ <%@ include file=3D"container_revisions_listing.jsp"%>
+<% } %>
+ =
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
