Author: dpillot
Date: Wed May 30 15:43:57 2007
New Revision: 685
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D685&repname=
=3Dcorporate_portal_templates_v2
Log:
various issues on docdetail/doclisting feature. scenario doclisting double =
checked
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/document_detail.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_list=
ing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/container_revisions_listing.jsp&rev=3D685&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.js=
p (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.js=
p Wed May 30 15:43:57 2007
@@ -17,7 +17,7 @@
=
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;
@@ -140,14 +140,14 @@
}
=
function handleRevisionSelect<%=3DobjectKey%>(theInput){
- containerCompareHandler<%=3DobjectKey%>._handleRevisionSelect(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);
@@ -166,16 +166,16 @@
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 =
+ org.jahia.utils.displaytag.CaseInsensitiveComparator comparator =3D
new org.jahia.utils.displaytag.CaseInsensitiveComparator(request.get=
Locale());
- =
+
boolean moreThanOneRevision =3D nbRevisions>1;
int count=3D0;
%>
@@ -202,7 +202,7 @@
<% } %>
</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=3D685&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 Wed May 30 15:43:57=
2007
@@ -17,48 +17,12 @@
--%><%@ include file=3D"../common/declarations.inc"%>
<%@ include file=3D"../common/common_vars.inc"%>
=
-<%
-StringBuffer sourceValues =3D new StringBuffer("None");
-Vector sourceVector =3D new Vector(); // used for filters
-Vector sourceVector2 =3D new Vector(); // used for filters
-
-JahiaContainerList sourceContainerList =3D jData.containers().getAbsoluteC=
ontainerList( "sourceContainer", jData.gui().getLevelID( 1 ) );
-ContainerListBean sourceContainerListBean =3D new ContainerListBean(source=
ContainerList,jParams);
-
-Enumeration sourceEnumeration =3D sourceContainerList.getContainers();
-int sourceCount =3D 0;
-while (sourceEnumeration.hasMoreElements()) {
- JahiaContainer sourceContainer =3D (JahiaContainer)sourceEnumeration.n=
extElement();
- ContainerBean sourceContainerBean =3D new ContainerBean(sourceContaine=
r,jParams);
- String sourceValue =3D sourceContainer.getFieldValue("sourceValue","",=
true , jData.params());
- sourceValues.append(":");
- sourceValues.append(org.jahia.data.fields.ExpressionMarker.drawMarker(=
"currentSite.homePage.containerLists[\"sourceContainer\"].getContainerByID(=
"+sourceContainer.getID()+").fields[\"sourceValue\"].value", true));
- sourceVector.add(org.jahia.data.fields.ExpressionMarker.drawMarker("cu=
rrentSite.homePage.containerLists[\"sourceContainer\"].getContainerByID("+s=
ourceContainer.getID()+").fields[\"sourceValue\"].value", true));
- sourceVector2.add(sourceValue);
- }
-
-StringBuffer typeValues =3D new StringBuffer("None");
-Vector typeVector =3D new Vector(); // used for filters
-Vector typeVector2 =3D new Vector(); // used for filters
-
-JahiaContainerList typeContainerList =3D jData.containers().getAbsoluteCon=
tainerList( "typeContainer", jData.gui().getLevelID( 1 ) );
-ContainerListBean typeContainerListBean =3D new ContainerListBean(typeCont=
ainerList,jParams);
-
-Enumeration typeEnumeration =3D typeContainerList.getContainers();
-int typeCount =3D 0;
-while (typeEnumeration.hasMoreElements()) {
- JahiaContainer typeContainer =3D (JahiaContainer)typeEnumeration.nextE=
lement();
- ContainerBean typeContainerBean =3D new ContainerBean(typeContainer,jP=
arams);
- String typeValue =3D typeContainer.getFieldValue("typeValue","", true =
, jData.params());
- typeValues.append(":");
- typeValues.append(org.jahia.data.fields.ExpressionMarker.drawMarker("c=
urrentSite.homePage.containerLists[\"typeContainer\"].getContainerByID("+ty=
peContainer.getID()+").fields[\"typeValue\"].value", true));
- typeVector.add(org.jahia.data.fields.ExpressionMarker.drawMarker("curr=
entSite.homePage.containerLists[\"typeContainer\"].getContainerByID("+typeC=
ontainer.getID()+").fields[\"typeValue\"].value", true));
- typeVector2.add(typeValue);
- }
- %>
+<%@ include file=3D"sources.inc"%>
+<%@ include file=3D"types.inc"%>
<%@ include file=3D"filters.inc"%>
<%@ include file=3D"definitions.inc"%>
-
+</div>
+<div style=3D"display:block;float:left;width:70%;border-color: gray;border=
-width: 0px 0px 0px 1px;border-style: none none none dotted;padding: 10px;">
<%!
public String getPath (JahiaPage link, JahiaData jData)
throws JahiaException
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/document_detail.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/document_detail.jsp&rev=3D685&repname=3Dcorporate_portal_te=
mplates_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/document_detail.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/document_detail.jsp Wed May 30 15:=
43:57 2007
@@ -1,34 +1,46 @@
<%--
Copyright 2002-2006 Jahia Ltd
=
-Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L), =
-Version 1.0 (the "License"), or (at your option) any later version; you ma=
y =
-not use this file except in compliance with the License. You should have =
-received a copy of the License along with this program; if not, you may ob=
tain =
-a copy of the License at =
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
=
http://www.jahia.org/license/
=
-Unless required by applicable law or agreed to in writing, software =
-distributed under the License is distributed on an "AS IS" BASIS, =
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
-See the License for the specific language governing permissions and =
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
--%><%@ include file=3D"common/top_declarations.inc"%>
<jesi:template>
- <%@ include file=3D"common/top.inc"%>
+<%
+isFullScreen=3Dtrue;
+%>
+<%@ include file=3D"common/top.inc"%>
=
<div class=3D"full2">
<jesi:fragment aclGroup=3D"true" expiration=3D"20"> <!-- TODO: invalid=
ate this automatically -->
+<div style=3D"float: left;margin: 10px 10px 10px 10px;width: 24%;">
+ <div id=3D"navigation">
+ <div class=3D"navdeco">
+ <logic:notEqual name=3D"currentPage" property=3D"homePage"=
value=3D"true">
+ <jsp:include page=3D"nav/menu.jsp" flush=3D"true"/>
+ </logic:notEqual>
+ </div>
+ </div>
+
<jsp:include page=3D"doc/detail.jsp" flush=3D"true"/>
- </jesi:fragment>
- <jesi:fragment aclGroup=3D"true"> =
- <jsp:include page=3D"common/main_content.jsp" flush=3D"true"/>
- </jesi:fragment>
- <jesi:fragment aclGroup=3D"true"> =
+
+
+
<jsp:include page=3D"box/box.jsp" flush=3D"true"/>
- </jesi:fragment>
+
+</div>
</div>
+</jesi:fragment>
<%@ include file=3D"common/bottom.inc"%>
=
</jesi:template>
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
