compare_version.jsp

srouaud Thu, 04 Oct 2007 07:16:02 -0700

Author: srouaud
Date: Thu Oct  4 16:15:55 2007
New Revision: 18756

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18756&repname=
=3Djahia
Log:
DOCU-30 : call the right resource key


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=3D18756&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 Thu Oct  4 16:15:55 2007
@@ -32,17 +32,17 @@
        String actionURL =3D 
(String)request.getAttribute(RevisionEntrySetDetailA=
ction.ACTION_URL_REQUEST_ATTRIBUTE);
        String engineView =3D (String)request.getAttribute("engineView");
 =

-       ContentVersioningViewHelper versViewHelper =3D 
(ContentVersioningViewHelp=
er) =

+       ContentVersioningViewHelper versViewHelper =3D 
(ContentVersioningViewHelp=
er)
          request.getAttribute(JahiaEngineViewHelper.ENGINE_VIEW_HELPER);
 =

   ContainerCompareBean containerCompareBean =3D versViewHelper.getContaine=
rCompareBean();
-      =

+
   // Old engine system
   final HashMap engineMap =3D (HashMap) request.getAttribute("jahia_sessio=
n_engineMap");
   String theScreen =3D (String) engineMap.get("screen");
 =

   final boolean debug =3D request.getQueryString() !=3D null && request.ge=
tQueryString().indexOf("debug=3D") > -1;
-  =

+
 =

 %>
 <%@ include file=3D"common-javascript.inc" %>
@@ -59,10 +59,10 @@
   ContentField contentField =3D null;
   JahiaFieldDefinition def =3D null;
   while ( iterator.hasNext() ){
-    fvc =3D (JahiaFieldVersionCompare)iterator.next(); =

-    fvc.getCompareHandler().highLightDiff();    =

+    fvc =3D (JahiaFieldVersionCompare)iterator.next();
+    fvc.getCompareHandler().highLightDiff();
     contentField =3D ContentField.getField(fvc.getFieldId());
-    def =3D (JahiaFieldDefinition)JahiaFieldDefinition.getChildInstance(St=
ring.valueOf(contentField.getFieldDefID()));    =

+    def =3D (JahiaFieldDefinition)JahiaFieldDefinition.getChildInstance(St=
ring.valueOf(contentField.getFieldDefID()));
     datas.append("{\"fieldId\":").append("\"").append(fvc.getFieldId()).ap=
pend("\",");
     datas.append("\"title\":").append("\"").append(def.getTitle(pageDefID,=
 LanguageCodeConverters.languageCodeToLocale(fvc.getLanguageCode()))).appen=
d("\",");
     datas.append("\"type\":").append("\"").append(contentField.getType()).=
append("\",");
@@ -76,7 +76,7 @@
     }
   }
   datas.append("]}");
-  =

+
   String addedLegend =3D HunkTextDiffVisitor.getAddedText(JahiaResourceBun=
dle
             .getEngineResource( "org.jahia.engines.version.added", jParams=
, jParams.getLocale(),"added"));
   String deletedLegend =3D HunkTextDiffVisitor.getDeletedText(JahiaResourc=
eBundle
@@ -86,7 +86,7 @@
 =

 %>
 <script language=3D"JavaScript">
-<!--   =

+<!--
 =

     function sendFormCancel(){
       window.close();
@@ -112,7 +112,7 @@
           return;
     }
     }
-    =

+
     function hideUserShell(){
       try {
         Dwt.setVisibility(document.getElementById("wrapper"),false);
@@ -132,7 +132,7 @@
     window.onload =3D windowOnload;
 =

 =

-    function launchContainerCompare(){ =

+    function launchContainerCompare(){
       //initZimbraShell("MainShell", true, null, null, true, true, "#33669=
9");
       var str =3D <%=3Ddatas.toString()%>;
       //str.fieldDiffs
@@ -158,7 +158,7 @@
 <tr>
   <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.version.oldVersion" defaultValue=3D"Old vers=
ion"/></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.=
version.lastModifiedBy" defaultValue=3D"last modified by"/>&nbsp;<%=3DRevis=
ionEntrySet.getLastContributor(containerCompareBean.getOldRevision(), jPara=
ms, jParams.getLocale(),"org.jahia.engines.version.lastContributorUnknown",=
"unknown")%>&nbsp;<jahia:engineResourceBundle resourceName=3D"org.jahia.eng=
ines.version.lastModifiedAt.label" defaultValue=3D"at"/>&nbsp;<%=3DRevision=
EntrySet.getVersionDate(containerCompareBean.getOldRevision(), jParams.getL=
ocale())%></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.=
version.lastModifiedBy" defaultValue=3D"last modified by"/>&nbsp;<%=3DRevis=
ionEntrySet.getLastContributor(containerCompareBean.getOldRevision(), jPara=
ms, jParams.getLocale(),"org.jahia.engines.version.lastContributorUnknown",=
"unknown")%>&nbsp;<jahia:engineResourceBundle resourceName=3D"org.jahia.eng=
ines.version.lastModifiedAt" defaultValue=3D"at"/>&nbsp;<%=3DRevisionEntryS=
et.getVersionDate(containerCompareBean.getOldRevision(), jParams.getLocale(=
))%></td>
 </tr>
 <tr>
   <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.version.newVersion" defaultValue=3D"New vers=
ion"/></td>
@@ -173,7 +173,7 @@
   </td>
 </tr>
 </table>
-<% } else { =

+<% } else {
   RevisionEntrySet revisionEntrySet =3D containerCompareBean.getActiveRevi=
sion();
 %>
 <table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" width=3D"80%">

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

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

Reply via email to