From 7ff56bfc60703af37e6f063d97fe5a309453fc67 Mon Sep 17 00:00:00 2001
From: Dave Bouvier <dave@bx.psu.edu>
Date: Mon, 3 Jun 2013 16:12:24 -0400
Subject: [PATCH] Cleanup after merge conflict.

---
 templates/webapps/tool_shed/index.mako | 39 ++++----------------------
 1 file changed, 5 insertions(+), 34 deletions(-)

diff --git a/templates/webapps/tool_shed/index.mako b/templates/webapps/tool_shed/index.mako
index be93640cc12..63d1335d948 100644
--- a/templates/webapps/tool_shed/index.mako
+++ b/templates/webapps/tool_shed/index.mako
@@ -92,14 +92,11 @@
                         <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_categories' )}">Browse by category</a>
                     </div>
                     %if trans.user:
-                        <div class="toolSectionPad"></div>
-                        <div class="toolSectionTitle">
-                            Repositories I Can Change
-                        </div>
-                        <div class="toolTitle">
-                            <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_repositories_i_own' )}">Repositories I own</a>
-                        </div>
-                        %if has_reviewed_repositories:
+                        %if trans.user.active_repositories:
+                            <div class="toolSectionPad"></div>
+                            <div class="toolSectionTitle">
+                                Repositories I Can Change
+                            </div>
                             <div class="toolTitle">
                                 <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_repositories_i_own' )}">Repositories I own</a>
                             </div>
@@ -138,32 +135,6 @@
                                 <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_my_writable_repositories_with_invalid_tools' )}">Latest revision: invalid tools</a>
                             </div>
                         %endif
-                        %if has_deprecated_repositories:
-                            <div class="toolTitle">
-                                <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_deprecated_repositories_i_own' )}">Deprecated repositories I own</a>
-                            </div>
-                        %endif
-                        <div class="toolTitle">
-                            <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_my_writable_repositories' )}">My writable repositories</a>
-                        </div>
-                        <div class="toolTitle">
-                            <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_my_writable_repositories_missing_tool_test_components' )}">Latest revision: missing tool tests</a>
-                        </div>
-                        <div class="toolTitle">
-                            <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_my_writable_repositories_with_install_errors' )}">Latest revision: installation errors</a>
-                        </div>
-                        <div class="toolTitle">
-                            <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_my_writable_repositories_with_failing_tool_tests' )}">Latest revision: failing tool tests</a>
-                        </div>
-                        <div class="toolTitle">
-                            <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_my_writable_repositories_with_skip_tool_test_checked' )}">Latest revision: skip tool tests</a>
-                        </div>
-                        <div class="toolTitle">
-                            <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_my_writable_repositories_with_no_failing_tool_tests' )}">Latest revision: all tool tests pass</a>
-                        </div>
-                        <div class="toolTitle">
-                            <a target="galaxy_main" href="${h.url_for( controller='repository', action='browse_my_writable_repositories_with_invalid_tools' )}">Latest revision: invalid tools</a>
-                        </div>
                         <div class="toolSectionPad"></div>
                         <div class="toolSectionTitle">
                             Available Actions