svn commit: r1449111 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js

[olamy]

Author: olamy
Date: Fri Feb 22 16:35:48 2013
New Revision: 1449111

URL: http://svn.apache.org/r1449111
Log:
really correctly go to welcome on logout

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js?rev=1449111&r1=1449110&r2=1449111&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
 Fri Feb 22 16:35:48 2013
@@ -99,7 +99,8 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
         function(){
           // go to welcome on logout
           //window.sammyArchivaApplication.setLocation("#welcome");
-          $.log("displayWelcome");
+          //$.log("displayWelcome");
+          window.sammyArchivaApplication.setLocation("#welcome");
           displayWelcome();
         }
     );
@@ -744,11 +745,10 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
   };
 
   displayWelcome=function(){
-    $.log("#welcome hash");
     checkCreateAdminLink(function(){
-      window.sammyArchivaApplication.setLocation("#welcome");
-      //$("#main-content" ).html($("#welcome" ).tmpl({runtimeInfo: 
window.archivaRuntimeInfo}));
-      //drawQuickSearchAutocomplete("#quick-search-autocomplete-welcome");
+      //window.sammyArchivaApplication.setLocation("#search")
+      $("#main-content" ).html($("#welcome" ).tmpl({runtimeInfo: 
window.archivaRuntimeInfo}));
+      drawQuickSearchAutocomplete("#quick-search-autocomplete-welcome");
     });
   }