From cdcf3a5f531c9d867494c59505f70bd3d5acda05 Mon Sep 17 00:00:00 2001
From: Daniel Blankenberg <dan@bx.psu.edu>
Date: Tue, 11 Jan 2011 08:34:02 -0500
Subject: [PATCH] Some minor cleanup for 4822:4ab987b90e44.

---
 templates/external_services/generic_json.mako | 10 +++++-----
 templates/requests/common/common.mako         | 17 -----------------
 templates/requests/common/view_sample.mako    |  4 ++--
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/templates/external_services/generic_json.mako b/templates/external_services/generic_json.mako
index 71c719b6676..d6f205403e0 100644
--- a/templates/external_services/generic_json.mako
+++ b/templates/external_services/generic_json.mako
@@ -2,10 +2,10 @@
 <%namespace file="json_common.mako" import="display_item" />
 
 <%def name="title()">Results from ${action.label} of ${param_dict['service_instance'].name} (${param_dict['service'].name}) on ${param_dict['item'].name}</%def>
-    <div class="toolForm" id="json-result-${action.name}">
-        <div class="toolFormTitle">Results from <i>${action.label}</i> of <i>${param_dict['service_instance'].name} (${param_dict['service'].name})</i> on <i>${param_dict['item'].name}</i></div>
-        <div class="form-row">
-            ${display_item( result )}
-        </div>
+<div class="toolForm" id="json-result-${action.name}">
+    <div class="toolFormTitle">Results from <i>${action.label}</i> of <i>${param_dict['service_instance'].name} (${param_dict['service'].name})</i> on <i>${param_dict['item'].name}</i></div>
+    <div class="form-row">
+        ${display_item( result )}
     </div>
+</div>
 
diff --git a/templates/requests/common/common.mako b/templates/requests/common/common.mako
index e948e2f9d74..8e3dd2cce64 100644
--- a/templates/requests/common/common.mako
+++ b/templates/requests/common/common.mako
@@ -257,23 +257,6 @@
     %endif
 </%def>
 
-<%def name="render_external_service_action_group( external_service_group )">
-    <li>${external_service_group.label}<div class="action-button" name="${external_service_group.name}" > 
-    ##<% print 'external_service_group', external_service_group.name, external_service_group %>
-    %for item in external_service_group:
-        %if isinstance( item, list ):
-            ${ render_external_service_action_group( item ) }
-        %else:
-            ${ render_external_service_action( item ) }
-        %endif
-    %endfor
-    </div></li>
-</%def>
-
-<%def name="render_external_service_action( external_service_action )">
-    <li><a class="action-button" name="${ external_service_action.name }" href="${ external_service_action.get_action_access_link( trans ) }">${ external_service_action.label }</a></li>
-</%def>
-
 <%def name="render_samples_grid( cntrller, request, displayable_sample_widgets, action, adding_new_samples=False, encoded_selected_sample_ids=[], render_buttons=False, grid_header='<h3>Samples</h3>' )">
     ## Displays the "Samples" grid
     <%
diff --git a/templates/requests/common/view_sample.mako b/templates/requests/common/view_sample.mako
index 1cc1207d0cc..bbe4aab88cf 100644
--- a/templates/requests/common/view_sample.mako
+++ b/templates/requests/common/view_sample.mako
@@ -29,7 +29,7 @@
                     </div>
                     <div class="toolSectionBody">
                         <div class="toolSectionBg">
-    %endif
+        %endif
                         %for item in external_service_group:
                             %if isinstance( item, list ):
                                 ${ render_external_service_action_group( item ) }
@@ -37,7 +37,7 @@
                                 ${ render_external_service_action( item ) }
                             %endif
                         %endfor
-    %if external_service_group.label:
+        %if external_service_group.label:
                         </div>
                     </div>
                 </div>