fix validation and activation of search results tab

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1294226 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index eb13285671fe3131d998aeb21e3bdfebfab5e553..a075c1529b0b6129d06ed7d89a3623cd792c4538 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -561,10 +561,14 @@ $(function() {
                  element: $("#main-content #search-basic-form #search-terms" ).get(0)
         }];
         customShowError("#main-content #search-basic-form", null, null, errorList);
+        return;
       } else {
         // cleanup previours error message
         customShowError("#main-content #search-basic-form", null, null, []);
       }
+      $("#main-content #search-results" ).html(mediumSpinnerImg());
+      activateSearchResultsTab();
+
     }
 
     advancedSearch=function(){
@@ -572,6 +576,16 @@ $(function() {
     }
   }
 
+  activateSearchResultsTab=function(){
+    var mainContent=$("#main-content");
+    mainContent.find("#search-form-collapse").removeClass("active");
+    mainContent.find("#search-results").addClass("active");
+
+    mainContent.find("#search-form-collapse-li").removeClass("active");
+    mainContent.find("#search-results-li" ).addClass("active");
+
+  }
+
   displaySearch=function(){
     clearUserMessages();
     var mainContent=$("#main-content");

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
index c98c62b8bbdfaafba2599a6cf563eb8b41adee06..bc230baef60261c085f8b43d2865b955ced2dea9 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
@@ -157,10 +157,10 @@
   <div id="search-artifacts-tabs">
     <div class="tabbable tabs-below">
       <ul class="nav nav-tabs">
-        <li class="active">
+        <li class="active" id="search-form-collapse-li">
           <a data-toggle="tab" href="#search-form-collapse">${$.i18n.prop('search.artifact.form.header')}</a>
         </li>
-          <li class="">
+          <li id="search-results-li">
             <a data-toggle="tab" href="#search-results">${$.i18n.prop('search.artifact.results.header')}</a>
           </li>
       </ul>