Merge pull request #395 from UW-Madison-DoIT/goodbyeTabSubHeaders

Removes the header from specific tabs on search results
uPortal-Attic · Feb 3, 2016 · 563cd04 · 563cd04
2 parents 258bd31 + c0c9393
commit 563cd04
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/angularjs-portal-home/src/main/webapp/my-app/search/controllers.js b/angularjs-portal-home/src/main/webapp/my-app/search/controllers.js
@@ -84,26 +84,32 @@ define(['angular', 'portal/search/controllers', 'my-app/marketplace/controllers'
         if (filterName == 'all') {
           $('#all-selector').addClass('active');
           $('#myuw-results').show();
+          $('#myuw-results-header').show();
           $('#wisc-directory-results').show();
+          $('#wisc-directory-results-header').show();
           $('#wisc-edu-results').show();
+          $('#wisc-edu-results-header').show();
           $('#wiscDirectorySeeMoreResults').show();
           initwiscDirectoryResultLimit();
         } else if (filterName == 'myuw') {
           $('#myuw-selector').addClass('active');
           $('#myuw-results').show();
+          $('#myuw-results-header').hide();
           $('#wisc-directory-results').hide();
           $('#wisc-edu-results').hide();
           $('#wiscDirectorySeeMoreResults').hide();
         } else if (filterName == 'directory') {
           $('#directory-selector').addClass('active');
           $('#wisc-directory-results').show();
+          $('#wisc-directory-results-header').hide();
           $('#myuw-results').hide();
           $('#wisc-edu-results').hide();
           $('#wiscDirectorySeeMoreResults').hide();
           $scope.wiscDirectoryResultLimit = 25;
         } else if (filterName == 'google') {
           $('#google-selector').addClass('active');
           $('#wisc-edu-results').show();
+          $('#wisc-edu-results-header').hide();
           $('#myuw-results').hide();
           $('#wisc-directory-results').hide();
           $('#wiscDirectorySeeMoreResults').hide();

diff --git a/angularjs-portal-home/src/main/webapp/my-app/search/partials/search-results.html b/angularjs-portal-home/src/main/webapp/my-app/search/partials/search-results.html
@@ -17,8 +17,10 @@
   </div>
 
   <div id="myuw-results" class='search-results-container'>
-    <h4 class="header">MyUW</h4>
-    <hr>
+    <div id="myuw-results-header">
+      <h4 class="header">MyUW</h4>
+      <hr>
+    </div>
     <loading-gif data-object='myuwResults'></loading-gif>
     <div ng-show="myuwFilteredResults.length == 0" class='no-result'>
       No MyUW results. <a href="apps">Try browsing instead?</a>
@@ -50,8 +52,10 @@ <h4><a href="{{::portlet.maxUrl}}" target="{{::portlet.target}}">{{ portlet.name
 
   <!--wisc directory results-->
   <div id="wisc-directory-results" class='search-results-container'>
-    <h4 class='header'>Directory</h4>
-    <hr>
+    <div id="wisc-directory-results-header">
+      <h4 class='header'>Directory</h4>
+      <hr>
+    </div>
     <loading-gif data-object='wiscDirectoryResults' data-empty='wiscDirectoryResults'></loading-gif>
     <div ng-show="wiscDirectoryResults.length === 0 && !wiscDirectoryTooManyResults" class='no-result'>
       No directory results.
@@ -98,8 +102,10 @@ <h4>{{item.fullName}}</h4>
 
   <!--wisc.edu results-->
   <div id="wisc-edu-results" class='search-results-container'>
-    <h4 class='header'>Wisc.edu</h4>
-    <hr>
+    <div id="wisc-edu-results-header">
+      <h4 class='header'>Wisc.edu</h4>
+      <hr>
+    </div>
     <loading-gif data-object='googleResults' data-empty='googleEmptyResults'></loading-gif>
     <div ng-show="googleResults.length === 0" class='no-result'>
       No wisc.edu results.