Author: dpillot
Date: Mon Jul 2 14:24:42 2007
New Revision: 738
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D738&repname=
=3Dcorporate_portal_templates_v2
Log:
http://www.jahia.net/jira/browse/TEMPLATES-232
compare mode for each main-content
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_list=
ing.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/container_revisions_listing.inc&rev=3D738&repname=3Dcor=
porate_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.in=
c (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.in=
c Mon Jul 2 14:24:42 2007
@@ -90,14 +90,15 @@
=
=
<%
- ContainerBean containerBean =3D (ContainerBean) pageContext.
- findAttribute("parentContainerBean");
+ ContainerBean containerBean =3D (ContainerBean) pageContext.findAttribut=
e("contentContainer");
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();
%>
+ <tr>
+ <td style=3D"padding-top: 10px;">
<%
=
String revisionListActionURL =3D jParams.composeStrutsUrl("ContainerVersio=
ning", new Properties(), null);;
@@ -175,11 +176,10 @@
}
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()%> )
@@ -190,19 +190,32 @@
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><=
% } %>
+ <% 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"aStyle"><%=3DRevisionEntrySet.=
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>
+<div>
<% 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>
+ <table border=3D"0" width=3D"100%" cellspacing=3D"0">
+ <tr>
+ <td nowrap valign=3D"top" align=3D"left" style=3D"padding-top: 30p=
x;">
+ <div class=3D"navBox"> </div>
+ </td>
+ </tr>
+ </table>
+</div>
+</div>
<div class=3D"clearing"> </div>
-
-</form>
</div>
+</form>
+
+ </td>
+ </tr>
<% } %>
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=3D738&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 Mon Jul 2 14:24:42=
2007
@@ -208,7 +208,7 @@
if ((descSize > 0) || (editMode)){%>
=
<table width=3D"100%" border=3D"0" cellspacing=3D"2" cellpadding=3D"0">
-<tr><td <%if (editMode){%>class=3D"boxEPbordercolor1"<%}%>>
+<tr><td <%if (editMode && descSize > 0){%>class=3D"boxEPbordercolor1"<%}%>>
=
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"2">
<content:containerList name=3D'<%=3D"contentContainer" + id%>' id=3D"conte=
ntContainerList">
@@ -216,10 +216,10 @@
=
<table width=3D"100%" border=3D"0">
<content:container id=3D"contentContainer">
- <tr><td>
- <jahiaHtml:actionMenu name=3D"contentContainer" namePostFix=3D=
"" resourceBundle=3D"jahiatemplates.Corporate_portal_templates">
+ <tr><td><jahiaHtml:actionMenu name=3D"contentContainer" namePo=
stFix=3D"" resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2">
<content:containerDiffHighlight id=3D"contentContainerHighLigh=
t" name=3D"contentContainer"/>
<content:textField name=3D'<%=3D"subTitle" + id%>'
defaultValue=3D"" di=
ffActive=3D"true" display=3D"false" valueId=3D"subTitle"/>
+
<logic:notEmpty name=3D"subTitle">
<h3><content:textField name=3D'<%=3D"subTitle" + id%>' def=
aultValue=3D"" diffActive=3D"true"/></h3>
</logic:notEmpty>
@@ -236,18 +236,16 @@
<content:bigTextField name=3D'<%=3D"mainContent" + id%>' d=
efaultValue=3D"" diffActive=3D"true"/>
</div>
<br/>
- <logic:present name=3D"contentContainerHighLight">
- </fieldset>
- </logic:present>
- </jahiaHtml:actionMenu>
- </td></tr>
- </content:container>
- </table>
+ <logic:present name=3D"contentContainerHighLight"></fieldset><=
/logic:present>
+ </jahiaHtml:actionMenu></td></tr>
+ <%@ include file=3D"container_revisions_listing.inc"%>
+ </content:container></td></tr></table>
=
- <!--@ include file=3D"container_revisions_listing.inc"-->
- </td></tr>
</content:containerList>
</table>
+</td></tr></table>
+
+
<%if (editMode){%><br/><%}%>
<content:containerList name=3D'<%=3D"contentContainer" + id%>'>
=
@@ -258,4 +256,4 @@
=
</content:containerList></td></tr></table><%}%>
<% } %>
-
+<br/><br/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
