Author: pvollenweider
Date: Fri Jun 22 14:22:22 2007
New Revision: 728
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D728&repname=
=3Dcorporate_portal_templates_v2
Log:
Reactive doc listing/detail but desactive the version box
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
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.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=3D728&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 Fri Jun 22 14:22:22 2007
@@ -123,84 +123,6 @@
}
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>
=
</form>
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=3D728&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 Fri Jun 22 14:22:22=
2007
@@ -244,7 +244,7 @@
</content:container>
</table>
=
- <%@ include file=3D"container_revisions_listing.inc"%>
+ <%!--@ include file=3D"container_revisions_listing.inc"--%>
</td></tr>
</content:containerList>
</table>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/folderDocumentBox.jsp&rev=3D728&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/doc/folderDocumentBox.jsp (origina=
l)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp Fri Jun =
22 14:22:22 2007
@@ -1,18 +1,18 @@
<%--
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.
--%><%@ page language=3D"java" %>
<%@ page import=3D"org.jahia.engines.calendar.CalendarHandler" %>
@@ -128,7 +128,7 @@
titleKey=3D"description"
bundleKey=3D"<%=3DresBundleID%>"
type=3D"SmallText"
- =
+
/>
</content:declareContainer>
</content:declareContainerList>
@@ -202,7 +202,7 @@
</fieldset>
</logic:present>
</jahiaHtml:actionMenu></td></tr>
- <%@ include file=3D"container_revisions_listing.inc"%>
+ <%!--@ include file=3D"container_revisions_listing.inc"--%>
</content:container></td></tr></table>
</content:containerList>
</table></td></tr></table>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
