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 2012/03/05 16:25:08 UTC
svn commit: r1297085 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/
archiva-webapp-js/src/main/webapp/js/archiva/
archiva-webapp-js/src/main/webapp/js/archiva/templates/
Author: olamy
Date: Mon Mar 5 15:25:08 2012
New Revision: 1297085
URL: http://svn.apache.org/viewvc?rev=1297085&view=rev
Log:
placeholder with i18n for quick search with autocomplete
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1297085&r1=1297084&r2=1297085&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Mon Mar 5 15:25:08 2012
@@ -126,6 +126,7 @@ menu.repository.groups=Repository Groups
menu.artifacts=Artifacts
menu.artifacts.search=Search
menu.artifacts.browse=Browse
+menu.topbar.quicksearch=Quick Search
#user
user.change.password.required=Change password required
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1297085&r1=1297084&r2=1297085&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Mon Mar 5 15:25:08 2012
@@ -228,6 +228,7 @@ $(function() {
},
select: function( event, ui ) {
$.log("select artifactId:"+ui.item.artifactId);
+ // user can be in a non search view so init the search view first
displaySearch(function(){
var searchViewModel = new SearchViewModel();
var searchRequest = new SearchRequest();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html?rev=1297085&r1=1297084&r2=1297085&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html Mon Mar 5 15:25:08 2012
@@ -49,7 +49,8 @@
</li>
<li class="pull-right">
<div class="ui-widget">
- <input type="text" class="ui-autocomplete-input" id="quick-search-autocomplete" placeholder="Search" />
+ <input type="text" class="ui-autocomplete-input" id="quick-search-autocomplete"
+ placeholder="${$.i18n.prop('menu.topbar.quicksearch')}" />
</div>
</li>
</ul>