Pull in changes from stable branch.

lib/tool_shed/util/repository_dependency_util.py

@@ -85,10 +85,9 @@ def can_add_to_key_rd_dicts( key_rd_dict, key_rd_dicts ):
     for kr_dict in key_rd_dicts:
         key = kr_dict.keys()[ 0 ]
         if key == k:
-            val = kr_dict[ key ]
-            for repository_dependency in val:
-                if repository_dependency[ 0:3 ] == partial_rd:
-                    return False
+            repository_dependency = kr_dict[ key ]
+            if repository_dependency[ 0:3 ] == partial_rd:
+                return False
     return True
 
 def create_repository_dependency_objects( trans, tool_path, tool_shed_url, repo_info_dicts, reinstalling=False, install_repository_dependencies=False,

templates/webapps/tool_shed/admin/index.mako

@@ -40,7 +40,7 @@
     <div class="unified-panel-header" unselectable="on">
         <div class='unified-panel-header-inner'>Administration</div>
     </div>
-    <div class="page-container" style="padding: 10px;">
+    <div class="unified-panel-body" style="padding: 10px; overflow: auto;">
         <div class="toolMenu">
             <div class="toolSectionList">
                 <div class="toolSectionTitle">

templates/webapps/tool_shed/index.mako

@@ -41,7 +41,7 @@
     <div class="unified-panel-header" unselectable="on">
         <div class='unified-panel-header-inner'>${trans.app.shed_counter.valid_tools | h} valid tools on ${trans.app.shed_counter.generation_time | h}</div>
     </div>
-    <div class="page-container" style="padding: 10px;">
+    <div class="unified-panel-body" style="padding: 10px; overflow: auto;">
         <div class="toolMenu">
             <div class="toolSectionList">
                 %if user_id or repository_id: