You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/03 01:03:43 UTC
svn commit: r1428116 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp:
images/archiva.png js/archiva/main.js js/templates/archiva/generics.html
Author: olamy
Date: Thu Jan 3 00:03:43 2013
New Revision: 1428116
URL: http://svn.apache.org/viewvc?rev=1428116&view=rev
Log:
[MRM-1737] Improve welcome page
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/archiva.png (with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/archiva.png
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/archiva.png?rev=1428116&view=auto
==============================================================================
Binary file - no diff available.
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/archiva.png
------------------------------------------------------------------------------
svn:mime-type = image/png
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=1428116&r1=1428115&r2=1428116&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 Thu Jan 3 00:03:43 2013
@@ -97,7 +97,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
url: 'restServices/redbackServices/loginService/logout',
complete: function(){
// go to welcome on logout
- window.sammyArchivaApplication.setLocation("#search");
+ window.sammyArchivaApplication.setLocation("#welcome");
}
});
@@ -688,8 +688,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
});
this.get('#welcome', function () {
- $.log("#welcome hash");
- checkCreateAdminLink(function(){window.sammyArchivaApplication.setLocation("#search")});
+ displayWelcome();
});
@@ -740,6 +739,15 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
});
};
+ displayWelcome=function(){
+ $.log("#welcome hash");
+ checkCreateAdminLink(function(){
+ //window.sammyArchivaApplication.setLocation("#search")
+ $("#main-content" ).html($("#welcome" ).tmpl({runtimeInfo: window.archivaRuntimeInfo}));
+ drawQuickSearchAutocomplete("#quick-search-autocomplete-welcome");
+ });
+ }
+
userLoggedCallbackFn=function(user){
$.log("userLoggedCallbackFn:"+ (user?user.username():null));
var loginLink=$("#login-link");
@@ -840,9 +848,9 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
};
- drawQuickSearchAutocomplete=function(){
+ drawQuickSearchAutocomplete=function(selector){
- $( "#quick-search-autocomplete" ).autocomplete({
+ $( selector ? selector : "#quick-search-autocomplete" ).autocomplete({
minLength: 3,
delay: 600,
source: function(request, response){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html?rev=1428116&r1=1428115&r2=1428116&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html Thu Jan 3 00:03:43 2013
@@ -65,3 +65,29 @@
</div>
</script>
+<script id="welcome" type="text/html">
+ <div class="row-fluid">
+ <div class="row">
+ <img src="images/archiva.png"/>
+ </div>
+ <div class="page-header">
+ <h3>${$.i18n.prop('welcome.title')}</h3>
+ </div>
+ <div class="row">
+ <h5>Type in the name of a project, or artifact into the text box below. Use "Search" on the left for more options.</h5>
+ <span class="span2"></span>
+ <div class="ui-widget">
+ <input type="text" class="ui-autocomplete-input search-query" id="quick-search-autocomplete-welcome"
+ placeholder="${$.i18n.prop('menu.topbar.quicksearch')}"/>
+ </div>
+ </div>
+ <br/>
+ <div class="row">
+ <span class="span1"></span>
+ <span class="span3"><a href="http://archiva.apache.org/docs/${runtimeInfo.version}" target="_blank">Documentation reference</a></span>
+ <span class="span1"></span>
+ <span class="span3"><a href="http://archiva.apache.org" target="_blank">Web site</a></span>
+ </div>
+ </div>
+</script>
+