Changeset 4840

Timestamp:

Mar 24, 2009, 3:55:03 PM (15 years ago)

Author:

Martin Svensson

Message:

References #1240. The functionallity in the webclient is done. The documentation is not completely updated yet.

Location:

trunk

Files:

• doc/src/docbook/figures/item_overview.png (modified) (previous)
• doc/src/docbook/userdoc/webclient.xml (modified) (5 diffs)
• www/common/overview/ajax.jsp (modified) (3 diffs)
• www/common/overview/failures.jsp (modified) (2 diffs)
• www/common/overview/frameset.jsp (modified) (2 diffs)
• www/common/overview/index.jsp (modified) (2 diffs)
• www/common/overview/info.jsp (modified) (3 diffs)
• www/common/overview/overview.jsp (modified) (2 diffs)
• www/common/overview/tree.jsp (modified) (10 diffs)
• www/images/validate.gif (added)

trunk/doc/src/docbook/userdoc/webclient.xml

@@ -2238 +2238 @@
       function you can get an overview of all hybridizations,
       extracts, samples, annotations, raw data sets, etc. that are
-      related to a given item. The overview includes a lot of checks
-      that validates the data for missing or possibly incorrect information.
+      related to a given item. In the overview you can validate
+      the data to find possibly missing or incorrect information.
     </para>
     
@@ -2270 +2270 @@
       <listitem>
         <para>
-        To the left is a tree displaying all items
-        that are related to the current item.
+        To the left is a tree displaying items that are related 
+        to the current item. The tree is loaded gradually when 
+        you click your way through the sublevels. 
+        The only exception is when a validation has been done, 
+        in this case the whole tree is loaded through the validation-process.               
         </para>
       </listitem>
@@ -2279 +2282 @@
         The lower right shows a list of warnings and error
         messages that was found when validating the data.
+        This section is empty if no validation has been done. 
+        Click on <guibutton>Validate</guibutton> to validate the data.        
         <nohelp>
-        In the example you can see that we have failed to
-        specify a value for the <guilabel>Temperature</guilabel>
-        protocol parameter for one of the samples.
-        </nohelp>
+        In the example you can see that we failed to assign biosource to sample 
+        <guilabel>Sample A.ref</guilabel> and
+        protocol and hardware to array batch <guilabel>Affymetrix batch A</guilabel>.
+        </nohelp> 
         </para>
       </listitem>
@@ -2290 +2295 @@
         <para>
           The upper right shows information about the
-          currently selected item in the tree. This part also
-          contains more information errors or warnings for this
-          item. It may also present you with one or more suggestions
+          currently selected item in the tree. This part will also
+          contain more information about errors or warnings for this
+          item, but only if a validation has been done. 
+          It may also present you with one or more suggestions
           about how to fix the problem and with a link that
           takes you to the most probable location where you can fix
@@ -2577 +2583 @@
         title="How to fix validation failures">
         
-        <para>
+        <para>        
         The overview includes a function that allows
         you to quickly fix most of the problems found during the 

trunk/www/common/overview/ajax.jsp

@@ -30 +30 @@
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.WebException"
-  import="net.sf.basedb.clients.web.util.HTML"
 %>
 <%
@@ -46 +45 @@
     dc = sc.newDbControl();
     GenericOverview overview = OverviewUtil.getCurrentOverview(sc);
-    Node parent = overview.getNode("N"+nodeId);
+    Node parent = overview.getNode(nodeId);
     overview.expand(dc, parent, false);
     overview.updateFailureCountOnNodes();
     if (parent != null && parent.numChildren() > 0)
     {
-      String parentIconSuffix = "";
-      String parentTooltip = "";
-      int errors = parent.getNumErrors();
-      int warnings = parent.getNumWarnings();
-      if (errors > 0)
-      {
-        parentIconSuffix = "Error"; 
-        parentTooltip = errors + " error(s) on this item";
-      }
-      else if (warnings > 0)
-      {     
-        parentIconSuffix = "Warning";
-        parentTooltip = warnings + " warning(s) on this item";
-      }
       for (Node n : parent.getChildren())
       {
@@ -77 +62 @@
           folderIcon = "Annotation";
         }       
-        String tooltip = "";
         int numChildren = n.getChildren() == null ? 
           0 : n.getChildren().size();
         %>begin
 id  <%=n.getId()%>
-title <%=HTML.javaScriptEncode(n.getTitle()) + (n.getNodeType() == Node.Type.FOLDER ? " (" + numChildren + ")" : "")%>
-hashCode  <%=n.hashCode()%>
+title <%=n.getTitle() + (n.getNodeType() == Node.Type.FOLDER ? " (" + numChildren + ")" : "")%>
 folderIcon  <%=folderIcon %>
-parentIconSuffix  <%=parentIconSuffix%>
-tooltip <%=HTML.javaScriptEncode(tooltip)%>
-parentTooltip <%=HTML.javaScriptEncode(parentTooltip)%>
 end
 <%

trunk/www/common/overview/failures.jsp

@@ -58 +58 @@
   GenericOverview overview = OverviewUtil.getCurrentOverview(sc);
   ValidationOptions options = overview.getValidationOptions();
-
+  Boolean showFailures = Values.getBoolean(request.getParameter("show_failures"), false);
   List<Failure> failures = overview.getFailures();
   if (failures == null) failures = new LinkedList<Failure>();
@@ -130 +130 @@
     <base:body>
       <div class="summary">
-        <b>
+      <b>
+      <%
+      if (showFailures)
+      {
+        %>
         <%=errors.size() %> error(s),
         <%=warnings.size()%> warning(s)
-        </b>
+      <%
+      }       
+      else
+      {
+        %>
+        <i>Item-tree not validated</i>
+        <%
+      }
+      %>
+      </b>
       </div>
-      <br>
-      <div class="joust">
-      <table border="0" cellspacing="0" cellpadding="0" width="100%">
       <%
-      int index = 0;
-      Iterator<Failure> all = new NestedIterator<Failure>(errors, warnings);
-      while (all.hasNext())
-      {
-        Failure failure = all.next();
-        Validator validator = failure.getValidator();
-        Severity severity = options.getSeverity(validator);
-        if (severity != Severity.IGNORE)
+      if(showFailures)
+      {
+        %>
+        <br>
+        <div class="joust">
+        <table border="0" cellspacing="0" cellpadding="0" width="100%">
+        <%
+        int index = 0;
+        Iterator<Failure> all = new NestedIterator<Failure>(errors, warnings);
+        while (all.hasNext())
         {
-          index++;
-          String failureId = "F" + System.identityHashCode(failure);
-          Node node = failure.getNode();
-          BasicItem item = node.getItem();
-          String onClick = "";
-          String tooltip = "";
-          if (item == null)
+          Failure failure = all.next();
+          Validator validator = failure.getValidator();
+          Severity severity = options.getSeverity(validator);
+          if (severity != Severity.IGNORE)
           {
-            tooltip = "Get more information about this failure";
-            onClick = "failureOnClick(event, '"+failureId+"', '" + node.getId() + "')";
+            index++;
+            String failureId = "F" + System.identityHashCode(failure);
+            Node node = failure.getNode();
+            BasicItem item = node.getItem();
+            String onClick = "";
+            String tooltip = "";
+            if (item == null)
+            {
+              tooltip = "Get more information about this failure";
+              onClick = "failureOnClick(event, '"+failureId+"', '" + node.getId() + "')";
+            }
+            else
+            {
+              tooltip = "Get more information about this failure (use CTRL, ALT or SHIFT to edit the item)";
+              onClick = "failureOnClick(event, '"+failureId+"', '" + node.getId() + 
+                "', '" + item.getType().name() + "', " + item.getId() + ")";
+            }
+            %>
+            <tr id="<%=failureId%>" class="menuitem failure" 
+              onclick="<%=onClick%>" 
+              onmouseover="Main.addClass(this, 'hover')" 
+              onmouseout="Main.removeClass(this, 'hover')"
+              title="<%=tooltip%>"
+              >
+              <td width="20px" class="index text"><%=index%></td>
+              <td width="20px" class="text"><base:icon image="<%=severity == Severity.ERROR ? "error.gif" : "warning.gif"%>" /></td>
+              <td class="text"><%=HTML.encodeTags(failure.getMessage()) %></td>
+              <td class="text"><%=HTML.encodeTags(node.getTitle()) %></td>
+            </tr>
+            <%
           }
-          else
-          {
-            tooltip = "Get more information about this failure (use CTRL, ALT or SHIFT to edit the item)";
-            onClick = "failureOnClick(event, '"+failureId+"', '" + node.getId() + 
-              "', '" + item.getType().name() + "', " + item.getId() + ")";
-          }
-          %>
-          <tr id="<%=failureId%>" class="menuitem failure" 
-            onclick="<%=onClick%>" 
-            onmouseover="Main.addClass(this, 'hover')" 
-            onmouseout="Main.removeClass(this, 'hover')"
-            title="<%=tooltip%>"
-            >
-            <td width="20px" class="index text"><%=index%></td>
-            <td width="20px" class="text"><base:icon image="<%=severity == Severity.ERROR ? "error.gif" : "warning.gif"%>" /></td>
-            <td class="text"><%=HTML.encodeTags(failure.getMessage()) %></td>
-            <td class="text"><%=HTML.encodeTags(node.getTitle()) %></td>
-          </tr>
-          <%
         }
+        %>
+        </table>
+        </div>
+        <%
       }
       %>
-      </table>
-      </div>
     </base:body>
   </base:page>

trunk/www/common/overview/frameset.jsp

@@ -35 +35 @@
 final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
 final String ID = sc.getId();
+final String showFailures = request.getParameter("show_failures");
 %>
 <base:page type="frameset" title="">
@@ -40 +41 @@
   <frameset cols="300,*" frameborder="yes" border="5">
     <frame name="tree" 
-      src="tree.jsp?ID=<%=ID%>" 
+      src="tree.jsp?ID=<%=ID%>&show_failures=<%=showFailures%>" 
       scrolling="auto" marginwidth="0" marginheight="4" frameborder="1"
     >
     <frameset rows="*,200" framborder="yes" border="5">
       <frame name="info" 
-        src="info.jsp?ID=<%=ID%>"
+        src="info.jsp?ID=<%=ID%>&show_failures=<%=showFailures%>"
         scrolling="auto" marginwidth="0" marginheight="4" frameborder="1"
       >
       <frame name="failures"
-        src="failures.jsp?ID=<%=ID%>"
+        src="failures.jsp?ID=<%=ID%>&show_failures=<%=showFailures%>"
         scrolling="auto" marginwidth="0" marginheight="4" frameborder="1"
       >

trunk/www/common/overview/index.jsp

@@ -68 +68 @@
     overview.updateFailureCountOnNodes();
     dc.close();
-    redirect = "frameset.jsp?ID="+ID;
+    redirect = "frameset.jsp?ID="+ID+"&show_failures="+false;
   }
-  else if ("Revalidate".equals(cmd))
+  else if ("Validate".equals(cmd))
   {
     final Item itemType = Item.valueOf(request.getParameter("item_type"));
@@ -82 +82 @@
     overview.updateFailureCountOnNodes();
     dc.close();
-    redirect = "frameset.jsp?ID="+ID+"&item_type="+itemType.name()+"&item_id="+itemId;
+    redirect = "frameset.jsp?ID="+ID+"&item_type="+itemType.name()+"&item_id="+itemId+"&show_failures="+true;
   }
   else if ("SaveValidationOptions".equals(cmd))

trunk/www/common/overview/info.jsp

@@ -101 +101 @@
   ValidationOptions options = overview.getValidationOptions();
   String nodeId = request.getParameter("nodeId");
+  Boolean showFailures = Values.getBoolean(request.getParameter("show_failures"), false);
   Node node = overview.getNode(nodeId);
   if (node == null) node = overview.getRootNode();
@@ -262 +263 @@
       <tr>
         <td class="prompt">Errors (children)</td>
-        <td><%=node.getNumErrors()+node.getChildErrors()%> (<%=node.getChildErrors()%>)</td>
+        <%
+        if (showFailures)
+        {
+        %>
+          <td><%=node.getNumErrors()+node.getChildErrors()%> (<%=node.getChildErrors()%>)</td>
+        <%
+        }
+        else
+        {       
+        %>
+          <td><i>- n/a -</i></td>
+        <%
+        }
+        %>
       </tr>
       <tr>
         <td class="prompt">Warnings (children)</td>
-        <td><%=node.getNumWarnings()+node.getChildWarnings()%> (<%=node.getChildWarnings()%>)</td>
+        <%
+        if (showFailures)
+        {
+        %>
+          <td><%=node.getNumWarnings()+node.getChildWarnings()%> (<%=node.getChildWarnings()%>)</td>
+        <%
+        }
+        else
+        {       
+        %>
+          <td><i>- n/a -</i></td>
+        <%
+        }
+        %>
       </tr>
       <%
@@ -466 +493 @@
         </table>
         <%
-      }
-      %>
-      <h4>Failure details</h4>
-      <table>
-      <%
-      int numFailures = 0;
-      for (Failure failure : failures)
-      {
-        Validator validator = failure.getValidator();
-        Severity severity = options.getSeverity(validator);
-        if (failure.getNode() == node && severity != Severity.IGNORE)
-        {
-          numFailures++;
-          List<Fix> fixes = failure.getFixes();
-          %>
-          <tr>
-            <td><base:icon image="<%=severity == Severity.ERROR ? 
-              "error.gif" : "warning.gif"%>" /></td>
-            <td><b><%=HTML.encodeTags(failure.getMessage())%></b></td>
-          </tr>
-          <tr>
-            <td style="border-bottom: 1px dotted #999999;"></td>
-            <td style="border-bottom: 1px dotted #999999;">
-              <%=HTML.encodeTags(validator.getDescription())%><br>
-              <%
-              if (fixes != null && fixes.size() > 0)
-              {
-                for (Fix fix : fixes)
-                {
-                  if (fix == null) continue;
-                  BasicItem fixItem = fix.getItem();
-                  if (fixItem.hasPermission(Permission.WRITE))
+      }     
+      if (showFailures)
+      {
+        %>
+        <h4>Failure details</h4>      
+        <table>
+        <%
+        int numFailures = 0;
+        for (Failure failure : failures)
+        {
+          Validator validator = failure.getValidator();
+          Severity severity = options.getSeverity(validator);
+          if (failure.getNode() == node && severity != Severity.IGNORE)
+          {
+            numFailures++;
+            List<Fix> fixes = failure.getFixes();
+            %>
+            <tr>
+              <td><base:icon image="<%=severity == Severity.ERROR ? 
+                "error.gif" : "warning.gif"%>" /></td>
+              <td><b><%=HTML.encodeTags(failure.getMessage())%></b></td>
+            </tr>
+            <tr>
+              <td style="border-bottom: 1px dotted #999999;"></td>
+              <td style="border-bottom: 1px dotted #999999;">
+                <%=HTML.encodeTags(validator.getDescription())%><br>
+                <%
+                if (fixes != null && fixes.size() > 0)
+                {
+                  for (Fix fix : fixes)
                   {
-                    String fixIt = "";
-                    if (fix.isAnnotationFix())
+                    if (fix == null) continue;
+                    BasicItem fixItem = fix.getItem();
+                    if (fixItem.hasPermission(Permission.WRITE))
                     {
-                      AnnotationType at = fix.getAnnotationType();
-                      if (fix.isFromInherited())
+                      String fixIt = "";
+                      if (fix.isAnnotationFix())
                       {
-                        fixIt = "editInheritedAnnotation('" + fixItem.getType().name() + "', " + 
-                          fixItem.getId() + ", " + at.getId() + ")";
+                        AnnotationType at = fix.getAnnotationType();
+                        if (fix.isFromInherited())
+                        {
+                          fixIt = "editInheritedAnnotation('" + fixItem.getType().name() + "', " + 
+                            fixItem.getId() + ", " + at.getId() + ")";
+                        }
+                        else
+                        {
+                          fixIt = "editAnnotation('" + fixItem.getType().name() + "', " + 
+                            fixItem.getId() + ", " + at.getId() + ")";
+                        }
+                      }
+                      else if (fix.isDataFileFix())
+                      {
+                        FileSetMember member = fix.getFileSetMember();
+                        fixIt = "editDataFile('" + fixItem.getType().name() + "', " + 
+                          fixItem.getId() + ")";
                       }
                       else
                       {
-                        fixIt = "editAnnotation('" + fixItem.getType().name() + "', " + 
-                          fixItem.getId() + ", " + at.getId() + ")";
+                        fixIt = "editItem('" + fixItem.getType().name() + "', " + 
+                          fixItem.getId() + ")";
                       }
+                      %>
+                      <base:icon image="fixit.png" 
+                        style="padding-bottom: 4px;" /><a href="javascript:<%=fixIt%>"
+                        title="Edit this item to fix the problem"><%=HTML.encodeTags(fix.getMessage())%></a><br>
+                      <%
                     }
-                    else if (fix.isDataFileFix())
-                    {
-                      FileSetMember member = fix.getFileSetMember();
-                      fixIt = "editDataFile('" + fixItem.getType().name() + "', " + 
-                        fixItem.getId() + ")";
-                    }
-                    else
-                    {
-                      fixIt = "editItem('" + fixItem.getType().name() + "', " + 
-                        fixItem.getId() + ")";
-                    }
-                    %>
-                    <base:icon image="fixit.png" 
-                      style="padding-bottom: 4px;" /><a href="javascript:<%=fixIt%>"
-                      title="Edit this item to fix the problem"><%=HTML.encodeTags(fix.getMessage())%></a><br>
-                    <%
                   }
                 }
-              }
-              %>
-            </td>
-          </tr>
+                %>
+              </td>
+            </tr>
+            <%
+          }
+        }
+        %>
+        </table>
+        <%
+        if (numFailures == 0)
+        {
+          %>
+          No validation failures on this item
           <%
-        }
-      }
-      %>
-      </table>
-      <%
-      if (numFailures == 0)
-      {
-        %>
-        No validation failures on this item
-        <%
+        }       
       }
       %>

trunk/www/common/overview/overview.jsp

@@ -96 +96 @@
       frames['overview']['tree'].closeAll();
     }
-    function revalidate()
-    {
+    function validate()
+    { 
       var url = '<%=root%>/common/overview/index.jsp?ID=<%=ID%>';
-      url += '&cmd=Revalidate';
+      url += '&cmd=Validate';
       url += '&item_type=<%=itemType.name()%>';
       url += '&item_id=<%=itemId%>';
@@ -118 +118 @@
     </script>
       <tbl:toolbar>
-        <tbl:button image="joust/plusonly.gif" title="Expand all"
-          onclick="expandAll()" tooltip="Expand entire tree"/>
-        <tbl:button image="joust/minusonly.gif" title="Collapse all" 
-          onclick="collapseAll()" tooltip="Collapse entire tree" />
-        <tbl:button image="refresh.gif" title="Validate" 
-          onclick="revalidate()" tooltip="Validate the whole tree" />
+        
+        <tbl:button image="validate.gif" title="Validate" 
+          onclick="validate()" tooltip="Load and validate entire tree" />
         <tbl:button image="configure.png" title="Validation options&hellip;" 
           onclick="validationOptions()" tooltip="Change validation options" />

trunk/www/common/overview/tree.jsp

@@ -40 +40 @@
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
 <%!
-String generateSubTree(Node startNode, String ID)
+String generateSubTree(Node startNode, String ID, boolean showFailures)
 {
   StringBuilder sb = new StringBuilder();
@@ -53 +53 @@
 
     String folderIcon = child.getNodeType() == Node.Type.FOLDER ? "Folder" : "Item";
+    String tooltip = "";
     if (child.getItemType() == Item.ANNOTATIONTYPE && startNode.getItemType() == Item.PROTOCOL)
     {
@@ -61 +62 @@
       folderIcon = "Annotation";
     }
-    if (errors > 0)
-    {
-      folderIcon += "Error";
-    }
-    else if (warnings > 0)
-    {
-      folderIcon += "Warning";
-    }
-    else if (childErrors > 0)
-    {
-      folderIcon += "ChildError";
-    }
-    else if (childWarnings > 0)
-    {
-      folderIcon += "ChildWarning";
-    }
-    String tooltip = "";
-    if (warnings > 0 && errors > 0)
-    {
-      tooltip += errors + " error(s); " + warnings + " warning(s) on this item";
-    }
-    else if (errors > 0)
-    {
-      tooltip += errors + " error(s) on this item";
-    }
-    else if (warnings > 0)
-    {
-      tooltip += warnings + " warning(s) on this item";
-    }
-    if (childErrors > 0 && childWarnings > 0)
-    {
-      if (tooltip.length() > 0) tooltip += "; ";
-      tooltip += childErrors + " error(s); " + childWarnings + " warning(s) on child items";
-    }
-    else if (childErrors > 0)
-    {
-      if (tooltip.length() > 0) tooltip += "; ";
-      tooltip += childErrors + " error(s) on child items";
-    }
-    else if (childWarnings > 0)
-    {
-      if (tooltip.length() > 0) tooltip += "; ";
-      tooltip += childWarnings + " warning(s) on child items";
+    
+    if (showFailures)
+    {
+      if (errors > 0)
+      {
+        folderIcon += "Error";
+      }
+      else if (warnings > 0)
+      {
+        folderIcon += "Warning";
+      }
+      else if (childErrors > 0)
+      {
+        folderIcon += "ChildError";
+      }
+      else if (childWarnings > 0)
+      {
+        folderIcon += "ChildWarning";
+      }     
+      if (warnings > 0 && errors > 0)
+      {
+        tooltip += errors + " error(s); " + warnings + " warning(s) on this item";
+      }
+      else if (errors > 0)
+      {
+        tooltip += errors + " error(s) on this item";
+      }
+      else if (warnings > 0)
+      {
+        tooltip += warnings + " warning(s) on this item";
+      }
+      if (childErrors > 0 && childWarnings > 0)
+      {
+        if (tooltip.length() > 0) tooltip += "; ";
+        tooltip += childErrors + " error(s); " + childWarnings + " warning(s) on child items";
+      }
+      else if (childErrors > 0)
+      {
+        if (tooltip.length() > 0) tooltip += "; ";
+        tooltip += childErrors + " error(s) on child items";
+      }
+      else if (childWarnings > 0)
+      {
+        if (tooltip.length() > 0) tooltip += "; ";
+        tooltip += childWarnings + " warning(s) on child items";
+      }
     }
     int numChildren = child.getChildren() == null ? 
@@ -112 +116 @@
     sb.append(child.getNodeType() == Node.Type.FOLDER ? " (" + numChildren + ")" : "").append("',");
     sb.append("'showInfo(\"").append(child.getId()).append("\")','").append(HTML.javaScriptEncode(tooltip)).append("', '").append(child.getId()).append("',");
-    sb.append("'lazyInitSubNode(").append(child.hashCode()).append(")')\n");
-    sb.append(generateSubTree(child, ID));
+    sb.append("'lazyInitSubNode(\"").append(child.getId()).append("\")')\n");
+    sb.append(generateSubTree(child, ID, showFailures));
   }
   return sb.toString();
@@ -126 +130 @@
 {
   GenericOverview overview = OverviewUtil.getCurrentOverview(sc);
-  
+  Boolean showFailures = Values.getBoolean(request.getParameter("show_failures"), false);
   Nameable rootItem = (Nameable)overview.getRootItem();
   Node rootNode = overview.getRootNode();
   String rootIcon = "Home";
-  if (rootNode.getNumErrors() > 0 || rootNode.getChildErrors() > 0)
-  {
-    rootIcon = "Error";
-  }
-  else if (rootNode.getNumWarnings() > 0 || rootNode.getChildWarnings() > 0)
-  {
-    rootIcon = "Warning";
+  if (showFailures)
+  {
+    if (rootNode.getNumErrors() > 0 || rootNode.getChildErrors() > 0)
+    {
+      rootIcon = "Error";
+    }
+    else if (rootNode.getNumWarnings() > 0 || rootNode.getChildWarnings() > 0)
+    {
+      rootIcon = "Warning";
+    }
   }
   %>
@@ -190 +197 @@
     IconStore.addIcon('AnnotatioChildnErrorSelected', path + 'annotationchilderrorselected.gif', 18, 16);
     var node<%=rootNode.hashCode()%> = JoustMenu.addMenuItem(-1, '<%=rootIcon%>', '<%=HTML.javaScriptEncode(rootItem.getName())%>', 'showInfo("<%=rootNode.getId()%>")', '', '<%=rootNode.getId()%>');
-    <%=generateSubTree(rootNode, ID)%>
+    <%=generateSubTree(rootNode, ID, showFailures)%>
     JoustMenu.menuItems[node<%=rootNode.hashCode()%>].isOpen = true;
     JoustMenu.draw('joust');
@@ -208 +215 @@
   function showInfo(nodeId)
   {
-    parent.frames['info'].location.href = 'info.jsp?ID=<%=ID%>&nodeId='+nodeId;
+    parent.frames['info'].location.href = 'info.jsp?ID=<%=ID%>&nodeId='+nodeId+'&show_failures=<%=showFailures%>';
   }
   
@@ -229 +236 @@
   function lazyInitSubNode(nodeId)
   { 
-    var parentMenu = JoustMenu.menuItems['N' + nodeId];
+    var parentMenu = JoustMenu.menuItems[nodeId];
     JoustMenu.changeCursorOnMenuItem(parentMenu.index, 'progress');   
     var request = Ajax.getXmlHttpRequest();
@@ -246 +253 @@
       {
         var id = kv['id'];
-        var folderIcon = kv['folderIcon'];        
-        var parentIconSuffix = kv['parentIconSuffix'];
-        var tooltip = kv['tooltip'] ? kv['tooltip'] : ''; 
-        var parentTooltip = kv['parentTooltip'] ? kv['parentTooltip'] : '';                           
+        var folderIcon = kv['folderIcon'];                                
         numAdded++;
         var node = JoustMenu.addLazyChildItem(
-              parentMenu.index, folderIcon, kv['title'], 'showInfo(\''+id+'\')', 
-                tooltip , id, 'lazyInitSubNode('+kv['hashCode']+')');
-        
-        if (parentIconSuffix)
-        {
-          updateParentMenu(parentMenu, parentIconSuffix, parentTooltip);          
-          JoustMenu.menuItems['0'].iconName = parentIconSuffix;
-          reloadSiblingFrames();
-        }
+              parentMenu.index, folderIcon, Main.trimString(kv['title']), 'showInfo(\''+id+'\')', 
+                '' , id, 'lazyInitSubNode(\''+id+'\')');
       }
       else
@@ -271 +268 @@
     JoustMenu.changeCursorOnMenuItem(parentMenu.index, 'pointer');
     return numAdded > 0;          
-  }
-
-  function reloadSiblingFrames()
-  {
-    parent.frames.failures.location.reload();
-    parent.frames.info.location.reload();
-  }
-
-  function updateParentMenu(menuItem, iconSuffix, tooltip)
-  {
-    menuItem.tooltip = tooltip;
-    var currentIcon = menuItem.iconName;    
-    if (currentIcon.indexOf('Error') < 0 && currentIcon.indexOf('Warning') < 0)
-    {
-      menuItem.iconName += iconSuffix;
-    }
-    else if (iconSuffix == 'Error')
-    { 
-      menuItem.iconName = currentIcon.replace(/ChildError/, iconSuffix);
-      menuItem.iconName = currentIcon.replace(/ChildWarning/, iconSuffix);
-      menuItem.iconName = currentIcon.replace(/Warning/, iconSuffix);
-    }
-    else if (iconSuffix == 'Warning')
-    {
-      menuItem.iconName = currentIcon.replace(/ChildError/, iconSuffix);
-      menuItem.iconName = currentIcon.replace(/ChildWarning/, iconSuffix);           
-    }
-    updateIconRecursively(menuItem.parentItemIndex, 'Child'+iconSuffix);
-  }
-
-  function updateIconRecursively(itemIndex, newIconSuffix)
-  {   
-    var item = JoustMenu.menuItems[itemIndex];
-    var currentIcon = item.iconName;
-    if (currentIcon.indexOf('Error') < 0 && currentIcon.indexOf('Warning') < 0)
-    {
-      item.iconName += newIconSuffix;
-    }
-    else if (newIconSuffix == 'ChildError')
-    {
-      item.iconName = currentIcon.replace(/ChildWarning/, newIconSuffix);
-    }
-    if (item.parentItemIndex > 0)
-    {
-      updateIconRecursively(item.parentItemIndex, newIconSuffix);
-    }
   }