Author: xlawrence
Date: Tue Jan 10 17:01:11 2006
New Revision: 12752

URL: https://jahia.mine.nu/websvn/listing.php?sc=1&rev=12752&repname=jahia
Log:
modified workflow JSP to use the ComplexTree component
added showReport.jsp in order to display errors and warnings

Added:
    trunk/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp
Modified:
    trunk/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp

Modified: trunk/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp
URL: 
https://jahia.mine.nu/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp&rev=12752&repname=jahia
==============================================================================
--- trunk/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp Tue Jan 
10 17:01:11 2006
@@ -1,114 +1,30 @@
 <%@ page language="java" contentType="text/html;charset=UTF-8" %>
-<%@ page import="org.jahia.content.ContentFieldKey,
-                 org.jahia.content.ContentObject,
-                 org.jahia.content.ContentPageKey,
-                 org.jahia.data.JahiaData,
-                 org.jahia.data.containers.JahiaContainer,
-                 org.jahia.data.viewhelper.sitemap.TreeSiteMapViewHelper,
-                 org.jahia.engines.EngineMessage,
-                 org.jahia.engines.workflow.ActionEntry,
-                 org.jahia.engines.workflow.WorkflowHelper" %>
-<%@ page import="org.jahia.exceptions.JahiaException" %>
-<%@ page import="org.jahia.gui.GuiBean" %>
-<%@ page import="org.jahia.params.ParamBean" %>
-<%@ page import="org.jahia.registries.ServicesRegistry" %>
-<%@ page import="org.jahia.resourcebundle.JahiaResourceBundle" %>
-<%@ page import="org.jahia.services.fields.ContentField" %>
-<%@ page import="org.jahia.services.pages.ContentPage" %>
-<%@ page import="org.jahia.services.sites.JahiaSite" %>
-<%@ page import="org.jahia.services.sites.SiteLanguageSettings" %>
-<%@ page import="org.jahia.services.usermanager.JahiaUser" %>
-<%@ page import="org.jahia.services.version.ActivationTestResults" %>
-<%@ page import="org.jahia.services.version.IsValidForActivationResults" %>
-<%@ page import="org.jahia.services.version.JahiaSaveVersion" %>
-<%@ page import="org.jahia.services.version.StateModificationContext" %>
-<%@ page import="org.jahia.services.workflow.WorkflowService" %>
-<%@ page import="org.jahia.utils.JahiaTools" %>
-<%@ page import="org.jahia.utils.LanguageCodeConverters" %>
-<%@ page import="javax.servlet.jsp.JspWriter" %>
-<%@ page import="javax.servlet.jsp.PageContext" %>
-<%@ page import="java.io.IOException" %>
-<%@ page import="java.text.MessageFormat" %>
-<%@ page import="java.util.*" %>
-<%@ page import="org.jahia.services.lock.LockKey"%>
+<%@ page import="org.jahia.engines.workflow.ActionEntry,
+                 org.jahia.params.ParamBean,
+                 org.jahia.resourcebundle.JahiaResourceBundle,
+                 org.jahia.services.sites.JahiaSite,
+                 org.jahia.services.sites.SiteLanguageSettings,
+                 org.jahia.taglibs.ajax.ComplexTreeInclude" %>
+<%@ page import="org.jahia.engines.workflow.WorkflowHelper"%>
+<%@ page import="org.jahia.services.pages.ContentPage"%>
 
 <%@ taglib uri="JahiaLib" prefix="jahia" %>
 <%@ taglib uri="contentLib" prefix="content" %>
+<%@ taglib uri="ajaxLib" prefix="ajax" %>
 
 <jahia:i18n/>
 
 <jsp:useBean id="jspSource" class="java.lang.String" scope="request"/>
 
-<%!
-    public void displayActivationResult(Object testResultObject,
-                                        ParamBean jParams, ContentObject 
contentPage, int i, PageContext pageContext)
-            throws IOException, JahiaException {
-        final JspWriter out = pageContext.getOut();
-        if (testResultObject.getClass() == IsValidForActivationResults.class) {
-            final IsValidForActivationResults ivfar = 
(IsValidForActivationResults) testResultObject;
-            if (ContentFieldKey.FIELD_TYPE.equals(ivfar.getObjectType())) {
-                final ContentField field = 
ContentField.getField(ivfar.getObjectID());
-                final ContentPage curContentPage = 
ServicesRegistry.getInstance().getJahiaPageService().
-                        lookupContentPage(field.getPageID(), false);
-                JahiaContainer jContainer = null;
-                final Locale loc = 
LanguageCodeConverters.languageCodeToLocale(ivfar.getLanguageCode());
-                final EngineMessage message = ivfar.getMsg();
-                if (message != null) {
-                    final String keyValue = 
JahiaResourceBundle.getMessageResource(message.getKey(), jParams.getLocale());
-                    final MessageFormat msgFormat = new 
MessageFormat(keyValue);
-                    msgFormat.setLocale(jParams.getLocale());
-                    out.println("<li>" + msgFormat.format(message.getValues()) 
+ "</li>");
-
-                } else {
-                    out.println("<li>" + ivfar.getComment() + "</li>");
-                }
-                out.println("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-                if (field.getContainerID() != 0) { // Is the field attached to 
a page.
-                    jContainer = ServicesRegistry.getInstance().
-                            
getJahiaContainersService().loadContainerInfo(field.getContainerID(), 
jParams.getEntryLoadRequest());
-                    // The construction of this following link can be 
seriously rediscussed
-                    out.println("(<a 
href=\"javascript:OpenJahiaScrollableWindow('" + 
jParams.getRequest().getContextPath() + org.jahia.bin.Jahia.getServletPath() + 
"/engineName/updatecontainer/op/edit/pid/" + contentPage.getID() + 
"?mode=display&cid=" + jContainer.getID() + "#" + i + "', '', 720, 500)\">" + 
JahiaResourceBundle.getEngineResource("org.jahia.containerId.label", jParams, 
jParams.getLocale()) + "&nbsp;:&nbsp;<b>" + jContainer.getID() + "</b></a>,");
-                    
out.println(JahiaResourceBundle.getEngineResource("org.jahia.fieldId.label", 
jParams, jParams.getLocale()) + "&nbsp;:&nbsp;<b>" + ivfar.getObjectID() + 
"</b>,");
-                } else {
-                    // The construction of this following link can be 
seriously rediscussed
-                    out.println("(<a 
href=\"javascript:OpenJahiaScrollableWindow('" + 
jParams.getRequest().getContextPath() + org.jahia.bin.Jahia.getServletPath() + 
"/engineName/updatefield/op/edit/pid/" + contentPage.getID() + 
"?mode=display&fid=" + ivfar.getObjectID() + "#" + i + "', '', 640, 500)\">" + 
JahiaResourceBundle.getEngineResource("org.jahia.fieldId.label", jParams, 
jParams.getLocale()) + "&nbsp;:&nbsp;<b>" + ivfar.getObjectID() + "</b></a>,");
-                }
-                
out.println(JahiaResourceBundle.getEngineResource("org.jahia.page.label", 
jParams, jParams.getLocale()) + "&nbsp;:&nbsp;<b>" + 
curContentPage.getTitle(jParams) + "</b>,");
-                
out.print(JahiaResourceBundle.getEngineResource("org.jahia.engines.shared.Page_Field.languages.label",
 jParams, jParams.getLocale()) + "&nbsp;:&nbsp;<b>" + 
loc.getDisplayLanguage(loc));
-                if (!"".equals(loc.getDisplayCountry(loc))) {
-                    
out.print(JahiaTools.replacePattern(loc.getDisplayCountry(loc), " ", "&nbsp;"));
-                }
-                out.println("&nbsp;[" + loc.getDisplayName() + 
"]</b>)&nbsp;&nbsp;&nbsp;");
-            } else {
-                // Other object type
-                final Locale loc = LanguageCodeConverters.languageCodeToLocale(
-                        ivfar.getLanguageCode());
-                out.println("<li>" + ivfar.getComment() + "</li>");
-                out.println("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-                out.println("Object&nbsp;:&nbsp;<b>" + ivfar.getObjectType() + 
"</b>,");
-                out.println("Object&nbsp;ID&nbsp;:&nbsp;<b>" + 
ivfar.getObjectID() + "</b>,");
-                out.print("Language&nbsp;:&nbsp;<b>" + 
loc.getDisplayLanguage(loc));
-                if (!"".equals(loc.getDisplayCountry(loc))) {
-                    
out.print(JahiaTools.replacePattern(loc.getDisplayCountry(loc), " ", "&nbsp;"));
-                }
-                out.println("&nbsp;[" + loc.getDisplayName() + 
"]</b>)&nbsp;&nbsp;&nbsp;");
-            }
-        } else {
-            out.println(testResultObject.toString());
-        }
-    }
-%>
-
 <%
     final HashMap engineMap = (HashMap) 
request.getAttribute("org.jahia.engines.EngineHashMap");
     final String engineUrl = (String) engineMap.get("engineUrl");
     final String theScreen = (String) engineMap.get("screen");
     final ParamBean jParams = (ParamBean) 
request.getAttribute("org.jahia.params.ParamBean");
-    final JahiaData jData = (JahiaData) 
request.getAttribute("org.jahia.data.JahiaData");
-    final ContentPage jContentPage = 
ServicesRegistry.getInstance().getJahiaPageService().
-            lookupContentPage(jParams.getPageID(), false);
-    final JahiaUser user = jParams.getUser();
-    final Map lockInformation = (Map) engineMap.get("lockInformation");
+    final ContentPage rootPage = jParams.getContentPage();
+    final String entryPoint = rootPage.getObjectKey().toString();
+    final String title = 
JahiaResourceBundle.getEngineResource("org.jahia.engines.workflow.WorkflowEngine.approvalPages.label",
+            jParams, jParams.getLocale());
     final JahiaSite jahiaSite = jParams.getSite();
     final Vector languageSettings = jahiaSite.getLanguageSettings();
     // Remove unactivated languages.
@@ -129,8 +45,6 @@
     final String activeAction = (String) engineMap.get("activeAction");
     final String displayParam = "display&display=";
 
-    final String workInProgressLauncher = "openWorkInProgressWindow('" +
-            request.getContextPath() + "')";
     final boolean showEditMenu = false;
 
     final List orderedTabs = new ArrayList();
@@ -156,6 +70,16 @@
         }
     }
 
+    String option = null;
+    final WorkflowHelper workflowHelper = (WorkflowHelper) 
engineMap.get("workflowHelper");
+    final Iterator iterator = additionalOptions.iterator();
+    while (iterator.hasNext()) {
+        final String additionalKey = (String) iterator.next();
+        if (workflowHelper.isActive(rootPage.getObjectKey(), 
jParams.getLocale().toString(), activeAction, additionalKey)) {
+            option = additionalKey;
+        }
+    }
+
 %>
 
 <h3 class="wflow">
@@ -206,10 +130,8 @@
 </p>
 <% } else { %>
 
-
 <% if (activeTabOption != null) { %>
 
-
 <h5 class="asInline"><jahia:engineResourceBundle 
resourceName="org.jahia.engines.workflow.WorkflowEngine.select.label"/>:</h5>
 <select name="workflowAction" 
onchange="handleActionChanges('display&display=<%= activeTabOption %>')">
     <%
@@ -222,9 +144,7 @@
     %> selected="selected"<%
         }
     %>><%=actionNames.get(key) %></option>
-    <%
-        }
-    %>
+    <% } %>
 </select>
 
 <table class="text" border="0" cellspacing="0" cellpadding="0">
@@ -238,7 +158,6 @@
     </tr>
 </table>
 
-
 <% } %>
 
 <script type="text/javascript">
@@ -248,6 +167,7 @@
     function checkAllBoxes(language) {
         for (var i = 0; i < document.mainForm.length; i++) {
             var checkBoxName = document.mainForm.elements[i].name;
+            alert (checkBoxName);
             if (!document.mainForm.elements[checkBoxName].disabled &&
                 checkBoxName.indexOf(language + '|') != -1) {
                 document.mainForm.elements[checkBoxName].checked =
@@ -272,11 +192,11 @@
                 document.mainForm.elements[checkBoxName].checked = false;
             }
         }
-
     }
 
     // Set or reset the check boxes on a given language.
-    function checkAllBoxes2(state, language) {
+    function checkAllBoxes(language, state) {
+        if (!state) state = "<%=option%>";
         for (var i = 0; i < document.mainForm.length; i++) {
             var checkBoxName = document.mainForm.elements[i].name;
             if (!document.mainForm.elements[checkBoxName].disabled &&
@@ -316,215 +236,9 @@
     </li>
 </ul>
 
-<table>
-<tr>
-    <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-    <td><b><jahia:engineResourceBundle
-            
resourceName="org.jahia.engines.workflow.WorkflowEngine.approvalPages.label"/></b></td>
-    <td>&nbsp;</td>
-    <%
-        final Set languageCodes = new HashSet();
-        languageEnum = languageSettings.elements();
-        while (languageEnum.hasMoreElements()) {
-            final SiteLanguageSettings mySiteLanguageSettings = 
(SiteLanguageSettings) languageEnum.nextElement();
-            final String languageCode = mySiteLanguageSettings.getCode();
-            languageCodes.add(languageCode);
-            final Locale loc = 
LanguageCodeConverters.languageCodeToLocale(languageCode);
-            final String alt = loc.getDisplayLanguage(loc) + " [" + 
loc.getDisplayName() + "]";
-            final int span = 1 + additionalOptions.size();
-    %>
-    <td align="center" colspan="<%= span %>">
-        &nbsp;&nbsp;<a href="javascript:checkAllBoxes('<%=languageCode%>');"
-            ><jahia:displayLanguageFlag code="<%=loc.getLanguage()%>"
-                                        alt="<%=alt%>"
-            /></a><%if (mySiteLanguageSettings.isMandatory()) {%>*<%} else 
{%>&nbsp;<%}%>&nbsp;
-    </td>
-    <td>&nbsp;&nbsp;</td>
-    <% } %>
-</tr>
-<%
-    if (additionalOptions.size() > 1) {
-%>
-<tr><td colspan="3">&nbsp;</td>
-    <%
-        languageEnum = languageSettings.elements();
-        while (languageEnum.hasMoreElements()) {
-            final SiteLanguageSettings mySiteLanguageSettings = 
(SiteLanguageSettings) languageEnum.nextElement();
-            final String languageCode = mySiteLanguageSettings.getCode();
-    %>
-    <td>&nbsp;&nbsp;</td>
-    <%
-        final Iterator additionalOptionsiterator = 
additionalOptions.iterator();
-        while (additionalOptionsiterator.hasNext()) {
-            final String s = (String) additionalOptionsiterator.next();
-    %>
-    <td align="center">
-        <a href="javascript:checkAllBoxes2('<%=s%>', '<%=languageCode%>');">
-            <jahia:displayIcon src='<%= "workflow"+s%>' alt="Invert all pages 
acceptance"/></a>
-    </td><%
-    }
-%>
-    <td>&nbsp;&nbsp;&nbsp;&nbsp;</td><%
-    }
-%>
-</tr><%
-    }
-
-    final String[] resourceBundleState = {"", "workflowActiveState", 
"workflowEditAnimState", "workflowWaitingState"};
-    final TreeSiteMapViewHelper treeJahiaSiteMap = (TreeSiteMapViewHelper) 
engineMap.get("treeJahiaSiteMap");
-    final WorkflowHelper workflowHelper = (WorkflowHelper) 
engineMap.get("workflowHelper");
-    final String screen = displayParam + activeTabOption;
-    final ArrayList shouldDrawLineSegment = new ArrayList();
-    for (int level = 0; level < treeJahiaSiteMap.getMaxLevel(); level++) {
-        shouldDrawLineSegment.add(level, Boolean.TRUE);
-    }
-    int classNb = 0;
-    for (int i = 0; i < treeJahiaSiteMap.size(); i++) {
-        final ContentObject contentObject = 
treeJahiaSiteMap.getContentObject(i);
-        if (contentObject == null) continue;
-        final JahiaSaveVersion saveVersion = ServicesRegistry.getInstance().
-                
getJahiaVersionService().getSiteSaveVersion(jParams.getSiteID());
-        final ActivationTestResults activationTestResults = 
ServicesRegistry.getInstance().getWorkflowService().isValidForActivation(contentObject,
-                languageCodes, jParams, new StateModificationContext(new 
ContentPageKey(contentObject.getID()), languageCodes, false));
-        boolean isNotifyCheckBoxEnabled = true;
-%>
-<tr>
-<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-<td>
-    &nbsp;&nbsp;<a name="<%=i%>"></a><%
-    // Draw node line icons ----------------------------------------
-    for (int level = 0; level < treeJahiaSiteMap.getPageLevel(i); level++) {
-        if (treeJahiaSiteMap.getPageLevel(i) > level + 1) {
-            if (((Boolean) shouldDrawLineSegment.get(level)).booleanValue()) {
-%><jahia:displayIcon src="vLineIcon" align="absmiddle"/><%
-} else {
-%><jahia:displayIcon src="org.jahia.pix.image" width="14" height="0" 
align="absmiddle"/><%
-    }
-} else {
-    if (treeJahiaSiteMap.isExpanded(i) || !treeJahiaSiteMap.hasChild(i)) {
-        if (treeJahiaSiteMap.isLastSister(i)) {
-            shouldDrawLineSegment.set(level, Boolean.FALSE);
-%><jahia:displayIcon src="lastNodeIcon" align="absmiddle"/><%
-} else {
-    shouldDrawLineSegment.set(level, Boolean.TRUE);
-%><jahia:displayIcon src="lineNodeIcon" align="absmiddle"/><%
-                }
-            }
-        }
-    }
-    // -------------------------------------------------------------
-    // Draw expand/collapse icons ----------------------------------
-    if (treeJahiaSiteMap.isExpanded(i)) {
-%><a 
href="javascript:handleActionChanges('<%=screen%>&sitemap=collapse|<%=i%>#<%=i%>')"
-        ><jahia:displayIcon src="minusNodeIcon" alt="Collapse" 
align="absmiddle"/></a><%
-} else if (treeJahiaSiteMap.hasChild(i)) {
-%><a 
href="javascript:handleActionChanges('<%=screen%>&sitemap=expandall|<%=i%>#<%=i%>')"
-        ><jahia:displayIcon src="expandAllNodeIcon" alt="Expand all" 
align="absmiddle"/></a
-        ><a 
href="javascript:handleActionChanges('<%=screen%>&sitemap=expand|<%=i%>#<%=i%>')"
-        ><jahia:displayIcon src="plusNodeIcon" alt="Expand" 
align="absmiddle"/></a><%
-} else {
-%><jahia:displayIcon src="org.jahia.pix.image" width="14" height="0" 
align="absmiddle"/><%
-    }
-    // -------------------------------------------------------------
-    // Draw info icon ----------------------------------------------
-    if (!treeJahiaSiteMap.shouldShowInformation(i)) {
-%><a 
href="javascript:handleActionChanges('<%=screen%>&sitemap=showinfo|<%=i%>#<%=i%>')"><%
-    if ((activationTestResults.getErrors().size() == 0) && 
(activationTestResults.getWarnings().size() == 0)) {
-%><jahia:displayIcon src="infoIcon" alt="Display last page information" 
align="absmiddle"/><% } else { %>
-    <jahia:displayIcon src="infoIconAnim" alt="Display last page information" 
align="absmiddle"/><%
-    } %></a><%
-} else {
-%><a 
href="javascript:handleActionChanges('<%=screen%>&sitemap=hideinfo|<%=i%>#<%=i%>')"
-        ><jahia:displayIcon src="infoIconActive" alt="Hide last page 
information" align="absmiddle"/></a><%
-    }
-    // -------------------------------------------------------------
-    // Write page title --------------------------------------------
-    final String pageTitle = treeJahiaSiteMap.getPageTitle(i, 
jParams.getLocale().toString());
-//                boolean isPageMarkedForDeletion = 
contentObject.isStagedEntryMarkedForDeletion(jParams.getLocale().toString());
-    final boolean isPageMarkedForDeletion = contentObject.isMarkedForDelete();
-    String style = "white-space: nowrap;";
-    if (isPageMarkedForDeletion) {
-        style += "text-decoration: line-through;";
-    }
-    if (contentObject.getID() == jParams.getPageID()) {
-        style += " font-weight: bold;";
-    } %>&nbsp;<span style="<%=style%>"
-        ><%=GuiBean.glueTitle(JahiaTools.text2html(pageTitle), 25) %></span><%
-    // end write page title ----------------------------------------
-    // Display lock if any page object is edited -------------------
-    // #ifdef LOCK%>
-    <%
-        LockKey lockKey = 
LockKey.composeLockKey(LockKey.WORKFLOW_ACTION+"_"+contentObject.getObjectKey().getType(),
 contentObject.getID(), contentObject.getID());
-//                LockPrerequisites lockPrerequisites = 
LockPrerequisites.getInstance();
-//                LockPrerequisitesResult lockPrerequisitesResult = 
lockPrerequisites.getLockPrerequisitesResult(lockKey);
-        boolean isLocked = lockInformation != null && 
((Boolean)lockInformation.get(lockKey)).booleanValue()==false;
-        if (isLocked) {
-     %>&nbsp;&nbsp;<a 
href="<%=jData.gui().html().drawLockEngineLauncher(lockKey)%>"><jahia:displayIcon
 src="locked" align="absmiddle" alt="A page child object is already 
edited"/></a><%
-    }
-    // #endif
-    %>
-</td>
-<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-<%
-    languageEnum = languageSettings.elements();
-    final Map languagesStates = 
ServicesRegistry.getInstance().getWorkflowService().getLanguagesStates(contentObject);
-    final Map pageOnlyLanguagesStates = contentObject.getLanguagesStates();
-//            String parameters = null;
-    while (languageEnum.hasMoreElements()) {
-        final SiteLanguageSettings mySiteLanguageSettings = 
(SiteLanguageSettings) languageEnum.nextElement();
-        final String languageCode = mySiteLanguageSettings.getCode();
-        Integer languageState = (Integer) languagesStates.get(languageCode);
-        final Integer sharedLanguageState = (Integer) 
languagesStates.get(ContentObject.SHARED_LANGUAGE);
-//                Integer pageLanguageState = 
(Integer)pageOnlyLanguagesStates.get(languageCode);
-        if (languageState != null && languageState.intValue() != -1) {
-
-            if (sharedLanguageState != null && languageState.intValue() < 
sharedLanguageState.intValue()) {
-                languageState = sharedLanguageState;
-            }
-//                    if ( languageState.intValue() > 
EntryLoadRequest.STAGING_WORKFLOW_STATE ){
-//                        if ( pageLanguageState == null || 
pageLanguageState.intValue() < languageState.intValue() ){
-//                            // the page cannot be in waiting for approval if 
it has no entry ( jahia page info ) at waiting for approval state.
-//                            languageState = new 
Integer(EntryLoadRequest.STAGING_WORKFLOW_STATE);
-//                        }
-//                    }
-            if ((contentObject instanceof ContentPage) && ((ContentPage) 
contentObject).hasSameParentID() == treeJahiaSiteMap.getParentPageID(i)) {
-%><td colspan="<%=languageSettings.size() * (2 + additionalOptions.size()) 
%>"><i>Page moved</i></td><%
-        break;
-    }
-    if 
(ServicesRegistry.getInstance().getWorkflowService().getWorkflowMode(contentObject)
 == WorkflowService.LINKED) {
-%><td colspan="<%=languageSettings.size() * (2 + additionalOptions.size()) 
%>">&nbsp;</td><%
-        break;
-    }
-%><td align="center"><jahia:displayIcon 
src="<%=resourceBundleState[languageState.intValue()]%>"/></td><%
-    final Iterator iterator = additionalOptions.iterator();
-    while (iterator.hasNext()) {
-        final String additionalKey = (String) iterator.next();
-        if (workflowHelper.isActive(contentObject.getObjectKey(), 
languageCode, activeAction, additionalKey) && !isLocked) {
-            final String paramName = "checkbox|" + languageCode + "|" + 
contentObject.getObjectKey() + "|" + additionalKey;
-%><td><input type="checkbox" name="<%=paramName%>" value="on"<%
-                            if (additionalOptions.size() > 1) {
-%> onclick="javascript:excludeCheck('<%=additionalKey%>', '<%=languageCode%>', 
'<%=contentObject.getObjectKey()%>')"<%
-                            }
-                            if (request.getParameter(paramName)!=null) {
-%> checked="checked"<%
-                            }
-%>></td><%
-} else {
-%><td>&nbsp;</td><%
-        }
-    }
-%><td>&nbsp;&nbsp;</td><%
-} else {
-    final int span = 2 + additionalOptions.size();
-%><td colspan="<%=span%>" align="center">&nbsp;</td><%
-        }
-    }
-%>
-</tr>
-<% if (treeJahiaSiteMap.shouldShowInformation(i)) { %>
-<%@ include file="../workflow/informations.inc" %>
-<% } %>
-<% } %>
-</table>
-
+<ajax:complexTreeInclude divID="tree1"
+                         style="<%=ComplexTreeInclude.WORKFLOW_STYLE%>"
+                         title="<%=title%>"
+                         entryPointKey="<%=entryPoint%>"
+                         additionalKey="<%=option%>" />
 <% } %>

Added: trunk/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp
URL: 
https://jahia.mine.nu/websvn/filedetails.php?path=/trunk/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp&rev=12752&repname=jahia
==============================================================================
--- trunk/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp (added)
+++ trunk/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp Tue Jan 10 
17:01:11 2006
@@ -0,0 +1,108 @@
+<%@ page import="org.jahia.content.ContentObject"%>
+<%@ page import="org.jahia.content.JahiaObject"%>
+<%@ page import="org.jahia.content.ObjectKey"%>
+<%@ page import="org.jahia.engines.EngineMessage"%>
+<%@ page import="org.jahia.exceptions.JahiaException"%>
+<%@ page import="org.jahia.params.ParamBean"%>
+<%@ page import="org.jahia.resourcebundle.JahiaResourceBundle"%>
+<%@ page import="org.jahia.services.version.ActivationTestResults"%>
+<%@ page import="org.jahia.services.version.IsValidForActivationResults"%>
+<%@ page import="org.jahia.utils.LanguageCodeConverters"%>
+<%@ page import="java.io.IOException"%>
+<%@ page import="java.text.MessageFormat"%>
+<%@ page import="java.util.Locale"%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<%@ taglib uri="JahiaLib" prefix="jahia" %>
+
+<%!
+    public String displayActivationResult(final Object testResultObject,
+                                          final ParamBean jParams,
+                                          final String key)
+            throws IOException, JahiaException, ClassNotFoundException {
+        final StringBuffer buff = new StringBuffer();
+        if (testResultObject.getClass() == IsValidForActivationResults.class) {
+            final IsValidForActivationResults ivfar = 
(IsValidForActivationResults) testResultObject;
+            final Locale loc = 
LanguageCodeConverters.languageCodeToLocale(ivfar.getLanguageCode());
+            final EngineMessage message = ivfar.getMsg();
+            final String msg;
+
+            System.out.println("MSG locale: " + jParams.getLocale());
+
+            if (message != null) {
+                final String keyValue = 
JahiaResourceBundle.getMessageResource(message.getKey(), jParams.getLocale());
+                final MessageFormat msgFormat = new MessageFormat(keyValue);
+                msgFormat.setLocale(jParams.getLocale());
+                msg = msgFormat.format(message.getValues());
+
+            } else {
+                msg = ivfar.getComment();
+            }
+
+            final ObjectKey objectKey = ObjectKey.getInstance(key);
+            final ContentObject object = (ContentObject) 
JahiaObject.getInstance(objectKey);
+
+            buff.append("[<b>").append(object.getObjectKey()).append("</b>] 
-&nbsp;");
+            
buff.append(JahiaResourceBundle.getEngineResource("org.jahia.engines.shared.Page_Field.languages.label",
+                    jParams, jParams.getLocale()));
+            buff.append(": 
'<b>").append(loc.getDisplayLanguage(jParams.getLocale()));
+            buff.append("</b>':&nbsp;").append(msg);
+
+        } else {
+            buff.append(testResultObject.toString());
+        }
+        return buff.toString();
+    }
+%>
+
+<%
+    final String key = request.getParameter("objectkey");
+    final ActivationTestResults results = (ActivationTestResults) 
request.getSession().getAttribute(key);
+    final ParamBean jParams = (ParamBean) 
request.getAttribute("org.jahia.params.ParamBean");
+
+    if (results.getWarnings().size() > 0) { %>
+
+<h3 class="wflowreport">
+    <jahia:engineResourceBundle
+            
resourceName="org.jahia.engines.workflow.WorkflowEngine.workflowreport.label"/>
+</h3>
+
+<div id="buttons">
+    <div class="button">
+        <a href="javascript:window.close();"
+           title="<jahia:engineResourceBundle 
resourceName="org.jahia.close.button"/>">
+            <jahia:engineResourceBundle resourceName="org.jahia.close.button"/>
+        </a>
+    </div>
+</div>
+
+<br/>&nbsp;<br/>
+
+<h5 class="warningIcon">
+    <span class="errorbold"><jahia:engineResourceBundle 
resourceName="org.jahia.warning.label"/></span></h5>
+<ul>
+    <%
+        for (int i = 0; i < results.getWarnings().size(); i++) {
+            final Object testResultObject = results.getWarnings().get(i);
+    %>
+    <li><%=displayActivationResult(testResultObject, jParams, key)%></li>
+
+    <% } %>
+</ul>
+<% }
+
+    if (results.getErrors().size() > 0) { %>
+<h5 class="errorIcon">
+    <span class="errorbold"><jahia:engineResourceBundle 
resourceName="org.jahia.error.label"/></span></h5>
+<ul>
+    <%
+        for (int i = 0; i < results.getWarnings().size(); i++) {
+            final Object testResultObject = results.getWarnings().get(i);
+    %>
+    <li><%=displayActivationResult(testResultObject, jParams, key)%></li>
+
+    <% } %>
+</ul>
+<% } %>
+
+<br/>
\ No newline at end of file

Reply via email to