svn commit: [jahia] r17779 - /branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp

[xlawrence]

Author: xlawrence
Date: Tue Jun 26 16:57:14 2007
New Revision: 17779

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17779&repname=
=3Djahia
Log:
use a link to launch the engines instead of an image button, as suggested b=
y Serge

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/showReport.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/wo=
rkflow/showReport.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp&rev=3D177=
79&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/jsp/jahia/engines/workflow=
/showReport.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/showReport.jsp Tue Jun 26 16:57:14 2007
@@ -62,56 +62,49 @@
             } else {
                 msg =3D ivfar.getComment();
             }
-            buff.append("[<b>").append(ivfar.getObjectType()).append(" ").=
append(ivfar.getObjectID()).append("</b>] -&nbsp;");
-            buff.append(JahiaResourceBundle.getEngineResource("org.jahia.e=
ngines.shared.Page_Field.languages.label",
-                    jParams, jParams.getLocale()));
-            buff.append(": '<b>").append(loc.getDisplayLanguage(jParams.ge=
tLocale()));
-            buff.append("</b>':&nbsp;").append(msg);
-            buff.append("&nbsp;");
+
             final ObjectKey objKey =3D ivfar.getNodeKey();
             final ContentObject obj =3D (ContentObject) ContentObject.getI=
nstance(objKey);
+
             if (obj !=3D null /* && obj.checkWriteAccess(jParams.getUser()=
) */) {
                 if (ivfar.getObjectType().equals(ContentFieldKey.FIELD_TYP=
E)) {
-                    final String updateLabel =3D JahiaResourceBundle.getEn=
gineResource("org.jahia.engines.updatefiled.UpdateField_Engine.updateField.=
label",
-                            jParams, jParams.getLocale());
+                    buff.append("[<b>");
                     buff.append("<a href=3D\"javascript:");
                     buff.append(jData.gui().html().drawUpdateFieldLauncher=
((ContentField) obj));
-                    buff.append("\"><img  border=3D\"0\" src=3D\"");
-                    buff.append(jParams.getContextPath());
-                    buff.append("/jsp/jahia/engines/images/actions/update.=
gif\" alt=3D\" ");
-                    buff.append(updateLabel);
-                    buff.append("\" title=3D\"");
-                    buff.append(updateLabel);
-                    buff.append("\"/></a>");
+                    buff.append("\">");
+                    buff.append(ivfar.getObjectType()).append(" ").append(=
ivfar.getObjectID());
+                    buff.append("</a>");
+                    buff.append("</b>] -&nbsp;");
 =

                 } else if (ivfar.getObjectType().equals(ContentContainerKe=
y.CONTAINER_TYPE)) {
-                    final String updateLabel =3D JahiaResourceBundle.getEn=
gineResource("org.jahia.engines.title.UpdateContainer",
-                            jParams, jParams.getLocale());
+                    buff.append("[<b>");
                     buff.append("<a href=3D\"javascript:");
                     buff.append(jData.gui().html().drawUpdateContainerLaun=
cher((ContentContainer) obj));
-                    buff.append("\"><img  border=3D\"0\" src=3D\"");
-                    buff.append(jParams.getContextPath());
-                    buff.append("/jsp/jahia/engines/images/actions/update.=
gif\" alt=3D\" ");
-                    buff.append(updateLabel);
-                    buff.append("\" title=3D\"");
-                    buff.append(updateLabel);
-                    buff.append("\"/></a>");
+                    buff.append("\">");
+                    buff.append(ivfar.getObjectType()).append(" ").append(=
ivfar.getObjectID());
+                    buff.append("</a>");
+                    buff.append("</b>] -&nbsp;");
 =

                 } else if (ivfar.getObjectType().equals(ContentPageKey.PAG=
E_TYPE)) {
-                    final String updateLabel =3D JahiaResourceBundle.getEn=
gineResource("org.jahia.engines.title.UpdateContainer",
-                            jParams, jParams.getLocale());
+                    buff.append("[<b>");
                     buff.append("<a href=3D\"javascript:");
                     buff.append(jData.gui().html().drawPagePropertiesLaunc=
her((ContentPage) obj));
-                    buff.append("\"><img  border=3D\"0\" src=3D\"");
-                    buff.append(jParams.getContextPath());
-                    buff.append("/jsp/jahia/engines/images/actions/update.=
gif\" alt=3D\" ");
-                    buff.append(updateLabel);
-                    buff.append("\" title=3D\"");
-                    buff.append(updateLabel);
-                    buff.append("\"/></a>");
+                    buff.append("\">");
+                    buff.append(ivfar.getObjectType()).append(" ").append(=
ivfar.getObjectID());
+                    buff.append("</a>");
+                    buff.append("</b>] -&nbsp;");
+
+                } else {
+                    buff.append("[<b>").append(ivfar.getObjectType()).appe=
nd(" ").append(ivfar.getObjectID()).append("</b>] -&nbsp;");
                 }
             }
 =

+            buff.append(JahiaResourceBundle.getEngineResource("org.jahia.e=
ngines.shared.Page_Field.languages.label",
+                    jParams, jParams.getLocale()));
+            buff.append(": '<b>").append(loc.getDisplayLanguage(jParams.ge=
tLocale()));
+            buff.append("</b>':&nbsp;").append(msg);
+            buff.append("&nbsp;");
+
         } else {
             buff.append(testResultObject.toString());
         }
@@ -128,7 +121,7 @@
 =

 <script type=3D"text/javascript">
     window.onunload =3D function () {
-        window.opener.refreshTree(); =

+        window.opener.refreshTree();
     }
 </script>
 =


_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list