compare_version.jsp

knguyen Tue, 15 May 2007 08:30:32 -0700

Author: knguyen
Date: Tue May 15 17:30:09 2007
New Revision: 17317

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17317&repname=
=3Djahia
Log:
fix JAHIA-1589 : IE6 and version compare


Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ontainer/compare_version.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versio=
ning/container/compare_version.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/versioning/container/compare_version.=
jsp&rev=3D17317&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/webapp/views/engines/versioning/c=
ontainer/compare_version.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ontainer/compare_version.jsp Tue May 15 17:30:09 2007
@@ -85,42 +85,6 @@
             .getEngineResource( "org.jahia.engines.version.changed", jPara=
ms, jParams.getLocale(),"changed"));
 =

 %>
-<div class=3D"content" style=3D"width:100%;margin:0px 0px 0px 0px;padding:=
0px 0px 0px 0px;">
-<%
-  if ( containerCompareBean.isCompareMode() ){
-%>
-<table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" width=3D"80%">
-<tr>
-  <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.oldVersion.label" defaultValue=3D=
"Old version"/></td>
-  <td valign=3D"top" align=3D"left">:</td>
-  <td valign=3D"top" align=3D"left" width=3D"100%"><%=3DRevisionEntrySet.g=
etVersionNumber(containerCompareBean.getOldRevision(), jParams, jParams.get=
Locale())%>, <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
versioning.lastModifiedBy.label" defaultValue=3D"last modified by"/>&nbsp;<=
%=3DRevisionEntrySet.getLastContributor(containerCompareBean.getOldRevision=
(), jParams, jParams.getLocale(),"org.jahia.engines.versioning.lastContribu=
torUnknown.label","unknown")%>&nbsp;<jahia:engineResourceBundle resourceNam=
e=3D"org.jahia.engines.versioning.lastModifiedAt.label" defaultValue=3D"at"=
/>&nbsp;<%=3DRevisionEntrySet.getVersionDate(containerCompareBean.getOldRev=
ision(), jParams.getLocale())%></td>
-</tr>
-<tr>
-  <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.newVersion.label" defaultValue=3D=
"New version"/></td>
-  <td valign=3D"top" align=3D"left">:</td>
-  <td valign=3D"top" align=3D"left"><%=3DRevisionEntrySet.getVersionNumber=
(containerCompareBean.getNewRevision(), jParams, jParams.getLocale())%>, <j=
ahia:engineResourceBundle resourceName=3D"org.jahia.engines.versioning.last=
ModifiedBy.label" defaultValue=3D"last modified by"/>&nbsp;<%=3DRevisionEnt=
rySet.getLastContributor(containerCompareBean.getNewRevision(), jParams, jP=
arams.getLocale(),"org.jahia.engines.versioning.lastContributorUnknown.labe=
l","unknown")%>&nbsp;<jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.versioning.lastModifiedAt.label" defaultValue=3D"at"/>&nbsp;<%=3DRe=
visionEntrySet.getVersionDate(containerCompareBean.getNewRevision(), jParam=
s.getLocale())%></td>
-</tr>
-<tr>
-  <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.differenceLegend" defaultValue=3D=
"Legend"/></td>
-  <td valign=3D"top" align=3D"left">:</td>
-  <td valign=3D"top" align=3D"left" nowrap>
-    <%=3DaddedLegend%>&nbsp;|&nbsp;<%=3DdeletedLegend%>&nbsp;|&nbsp;<%=3Du=
pdatedLegend%>
-  </td>
-</tr>
-</table>
-<% } else { =

-  RevisionEntrySet revisionEntrySet =3D containerCompareBean.getActiveRevi=
sion();
-%>
-<table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" width=3D"80%">
-<tr>
-  <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.version.label" defaultValue=3D"Ve=
rsion"/></td>
-  <td valign=3D"top" align=3D"left">:</td>
-  <td valign=3D"top" align=3D"left" width=3D"100%"><%=3DRevisionEntrySet.g=
etVersionNumber(revisionEntrySet, jParams, jParams.getLocale())%>, <jahia:e=
ngineResourceBundle resourceName=3D"org.jahia.engines.versioning.lastModifi=
edBy.label" defaultValue=3D"last modified by"/>&nbsp;<%=3DRevisionEntrySet.=
getLastContributor(revisionEntrySet, jParams, jParams.getLocale(),"org.jahi=
a.engines.versioning.lastContributorUnknown.label","unknown")%>&nbsp;<jahia=
:engineResourceBundle resourceName=3D"org.jahia.engines.versioning.lastModi=
fiedAt.label" defaultValue=3D"at"/>&nbsp;<%=3DRevisionEntrySet.getVersionDa=
te(revisionEntrySet, jParams.getLocale())%></td>
-</tr>
-</table>
-<% } %>
-
-<div id=3D"fieldDiffsContainer">&nbsp;
 <script language=3D"JavaScript">
 <!--   =

 =

@@ -185,6 +149,43 @@
     AjxCore.addOnloadListener(launchContainerCompare);
 //-->
 </script>
+
+<div class=3D"content" style=3D"width:100%;margin:0px 0px 0px 0px;padding:=
0px 0px 0px 0px;">
+<%
+  if ( containerCompareBean.isCompareMode() ){
+%>
+<table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" width=3D"80%">
+<tr>
+  <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.oldVersion.label" defaultValue=3D=
"Old version"/></td>
+  <td valign=3D"top" align=3D"left">:</td>
+  <td valign=3D"top" align=3D"left" width=3D"100%"><%=3DRevisionEntrySet.g=
etVersionNumber(containerCompareBean.getOldRevision(), jParams, jParams.get=
Locale())%>, <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
versioning.lastModifiedBy.label" defaultValue=3D"last modified by"/>&nbsp;<=
%=3DRevisionEntrySet.getLastContributor(containerCompareBean.getOldRevision=
(), jParams, jParams.getLocale(),"org.jahia.engines.versioning.lastContribu=
torUnknown.label","unknown")%>&nbsp;<jahia:engineResourceBundle resourceNam=
e=3D"org.jahia.engines.versioning.lastModifiedAt.label" defaultValue=3D"at"=
/>&nbsp;<%=3DRevisionEntrySet.getVersionDate(containerCompareBean.getOldRev=
ision(), jParams.getLocale())%></td>
+</tr>
+<tr>
+  <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.newVersion.label" defaultValue=3D=
"New version"/></td>
+  <td valign=3D"top" align=3D"left">:</td>
+  <td valign=3D"top" align=3D"left"><%=3DRevisionEntrySet.getVersionNumber=
(containerCompareBean.getNewRevision(), jParams, jParams.getLocale())%>, <j=
ahia:engineResourceBundle resourceName=3D"org.jahia.engines.versioning.last=
ModifiedBy.label" defaultValue=3D"last modified by"/>&nbsp;<%=3DRevisionEnt=
rySet.getLastContributor(containerCompareBean.getNewRevision(), jParams, jP=
arams.getLocale(),"org.jahia.engines.versioning.lastContributorUnknown.labe=
l","unknown")%>&nbsp;<jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.versioning.lastModifiedAt.label" defaultValue=3D"at"/>&nbsp;<%=3DRe=
visionEntrySet.getVersionDate(containerCompareBean.getNewRevision(), jParam=
s.getLocale())%></td>
+</tr>
+<tr>
+  <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.differenceLegend" defaultValue=3D=
"Legend"/></td>
+  <td valign=3D"top" align=3D"left">:</td>
+  <td valign=3D"top" align=3D"left" nowrap>
+    <%=3DaddedLegend%>&nbsp;|&nbsp;<%=3DdeletedLegend%>&nbsp;|&nbsp;<%=3Du=
pdatedLegend%>
+  </td>
+</tr>
+</table>
+<% } else { =

+  RevisionEntrySet revisionEntrySet =3D containerCompareBean.getActiveRevi=
sion();
+%>
+<table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" width=3D"80%">
+<tr>
+  <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.version.label" defaultValue=3D"Ve=
rsion"/></td>
+  <td valign=3D"top" align=3D"left">:</td>
+  <td valign=3D"top" align=3D"left" width=3D"100%"><%=3DRevisionEntrySet.g=
etVersionNumber(revisionEntrySet, jParams, jParams.getLocale())%>, <jahia:e=
ngineResourceBundle resourceName=3D"org.jahia.engines.versioning.lastModifi=
edBy.label" defaultValue=3D"last modified by"/>&nbsp;<%=3DRevisionEntrySet.=
getLastContributor(revisionEntrySet, jParams, jParams.getLocale(),"org.jahi=
a.engines.versioning.lastContributorUnknown.label","unknown")%>&nbsp;<jahia=
:engineResourceBundle resourceName=3D"org.jahia.engines.versioning.lastModi=
fiedAt.label" defaultValue=3D"at"/>&nbsp;<%=3DRevisionEntrySet.getVersionDa=
te(revisionEntrySet, jParams.getLocale())%></td>
+</tr>
+</table>
+<% } %>
+
+<div id=3D"fieldDiffsContainer">&nbsp;
 </div>
 </div>
 <div class=3D"clearing">&nbsp;</div>
\ No newline at end of file

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

svn commit: [jahia] r17317 - /branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/container/compare_version.jsp

Reply via email to