[Zope-Checkins] CVS: Zope/lib/python/Products/CallProfiler/dtml - configure.dtml:1.1.2.3 results.dtml:1.1.2.3

[Anthony Baxter]

Update of /cvs-repository/Zope/lib/python/Products/CallProfiler/dtml
In directory cvs.zope.org:/tmp/cvs-serv21874/dtml

Modified Files:
      Tag: anthony-CallProfiler-branch
	configure.dtml results.dtml 
Log Message:
Icons are refreshed when the Configure screen lists modules. This works 
around the problem that when icon entries are first scanned (at boot time) 
the products have empty icon attributes.

The refresh pain has been fixed by a strongly worded refresh.txt that's
displayed on the refresh screen.

The results pages are cleaned up more. Detail display of a request from 
the aggregates page needs to be brought into the aggregate page (like the
normal detail page).

The README.txt has been updated to be actually correct. It should get 
turned into help docs, really.



=== Zope/lib/python/Products/CallProfiler/dtml/configure.dtml 1.1.2.2 => 1.1.2.3 ===
 <dtml-var manage_tabs>
 
+<dtml-call fixup_icons>
+
 <form action="clear" method="POST">
 <input type="submit" value="Clear results">
 </form>


=== Zope/lib/python/Products/CallProfiler/dtml/results.dtml 1.1.2.2 => 1.1.2.3 ===
     </td>
     <td align="right">
-      <a href="results?expand_all=1"> Expand all entries (slow!) </a>
+      <dtml-if expand_all>
+        <a href="results"> Collapse all entries</a>
+      <dtml-else>
+        <a href="results?expand_all=1"> Expand all entries (possibly slow!) </a>
+      </dtml-if>
     </td>
   </tr>
 </table>
@@ -33,7 +37,7 @@
  <tr class="<dtml-if sequence-odd>row-hilite<dtml-else>row-normal</dtml-if>">
   <td valign="top">
      <a name="&dtml-tid;">     </a>
-       <a href="results?expand_tid=&dtml-tid;#&dtml-tid;">
+       <a href="results?expand_tid=&dtml-tid;#detail_view">
          &dtml-str_time_start;
        </a>
   </td>
@@ -47,13 +51,18 @@
           <b> &dtml-url; </b>
         </td>
       </tr>
-    <dtml-if expr="(REQUEST.get('expand_tid', 0) == tid)
-                   or REQUEST.get('expand_all', 0)">
+    <dtml-if expr="REQUEST.get('expand_all', 0)">
       <tr>
         <td colspan="3">
           <dtml-var "detail(this(), REQUEST, tid=tid)">
         </td>
       </tr>
+   <dtml-elif expr="(REQUEST.get('expand_tid', 0) == tid)">
+      <tr>
+        <td colspan="3">
+	  Detailed view <a href="#detail_view">below</a>
+	</td>
+      </tr>
    </dtml-if>
     </table>
   </td>
@@ -63,6 +72,18 @@
  </tr>
 
 </dtml-in>
+<dtml-if expand_tid>
+      <tr>
+        <th colspan="6">
+	  <a name="detail_view">Detailed view</a>
+	</td>
+      </tr>
+      <tr>
+	<td colspan="6">
+          <dtml-var "detail(this(), REQUEST, tid=expand_tid)">
+        </td>
+      </tr>
+</dtml-if>
 
 </table>
 
@@ -75,7 +96,7 @@
       <dtml-if expand_all>
         <a href="results"> Collapse all entries</a>
       <dtml-else>
-        <a href="results?expand_all=1"> Expand all entries (slow!) </a>
+        <a href="results?expand_all=1"> Expand all entries (possibly slow!) </a>
       </dtml-if>
     </td>
   </tr>