placeholder with i18n for quick search with autocomplete

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

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index 7c5a437636aec06ba2fe79adfe4838baa9394ce9..96e00d01725e56500177bb3729dae2af5e88da73 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index dde707ba187befefe24fce36bba2605b97302bf3..9db28f811a2b8b9cda09eac4598afd6d65cafcd2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -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();

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
index 7586804057211e7850d2dd3329d8856aff43d9cd..16ee84e40cef01bd41c515b5c8532397c150b6be 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
@@ -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>