Show conda install option even when no tool_dependencies.xml is available.

Also reword different install options, I hope this is more clear - I do think it exposes les of the internal language to the end user.

templates/admin/tool_shed_repository/common.mako

@@ -112,7 +112,7 @@
     </div>
     %if install_resolver_dependencies_check_box:
     <div class="form-row">
-        <label>Install resolvable dependencies (Currently conda-only) ?</label>
+        <label>When available, install externally managed dependencies (e.g. conda)? <i>New Option</i></label>
         ${install_resolver_dependencies_check_box.get_html()}
         <div class="toolParamHelp" style="clear: both;">
             Un-check to skip automatic installation of tool dependencies.
@@ -163,7 +163,7 @@
     %if tool_dependencies_root_folder or missing_tool_dependencies_root_folder:
         %if install_tool_dependencies_check_box is not None:
             <div class="form-row">
-                <label>Handle tool dependencies?</label>
+                <label>When available, install tool shed managed dependencies?</label>
                 <% disabled = trans.app.config.tool_dependency_dir is None %>
                 ${install_tool_dependencies_check_box.get_html( disabled=disabled )}
                 <div class="toolParamHelp" style="clear: both;">

templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako

@@ -38,6 +38,8 @@
             can_display_tool_dependencies = False
     else:
         can_display_tool_dependencies = False
+    can_display_resolver_installation = install_resolver_dependencies_check_box is not None
+
 %>
 
 %if message:
@@ -84,7 +86,7 @@
                 ${render_readme_section( containers_dict )}
                 <div style="clear: both"></div>
             %endif
-            %if can_display_repository_dependencies or can_display_tool_dependencies:
+            %if can_display_repository_dependencies or can_display_tool_dependencies or can_display_resolver_installation:
                 <div class="form-row">
                     <table class="colored" width="100%">
                         <th bgcolor="#EBD9B2">Confirm dependency installation</th>

templates/admin/tool_shed_repository/select_tool_panel_section.mako

@@ -38,6 +38,7 @@
             can_display_tool_dependencies = False
     else:
         can_display_tool_dependencies = False
+    can_display_resolver_installation = install_resolver_dependencies_check_box is not None
 %>
 
 %if message:
@@ -84,7 +85,7 @@
                 ${render_readme_section( containers_dict )}
                 <div style="clear: both"></div>
             %endif
-            %if can_display_repository_dependencies or can_display_tool_dependencies:
+            %if can_display_repository_dependencies or can_display_tool_dependencies or can_display_resolver_installation:
                 <div class="form-row">
                     <table class="colored" width="100%">
                         <th bgcolor="#EBD9B2">Confirm dependency installation</th>