diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-02-22 16:35:48 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-02-22 16:35:48 +0000 |
| commit | ac6dc59b949c0da7874ff32f148c95b2ac7b2f65 (patch) | |
| tree | e9dbf0a7202dc07e1122df9b5e0d0ca4eba6fa12 /archiva-modules | |
| parent | 4e4d09901f0d2dccb76fb7cc4cca73a5b022689d (diff) | |
| download | archiva-ac6dc59b949c0da7874ff32f148c95b2ac7b2f65.tar.gz archiva-ac6dc59b949c0da7874ff32f148c95b2ac7b2f65.zip | |
really correctly go to welcome on logout
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1449111 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js index 2b0e4489a..6b124d6a4 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js @@ -99,7 +99,8 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa 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,jqueryCookie,bootstrap,archivaSearch,jqueryVa }; 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"); }); } |