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/02/29 10:55:00 UTC
svn commit: r1295047 - 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: Wed Feb 29 09:55:00 2012
New Revision: 1295047
URL: http://svn.apache.org/viewvc?rev=1295047&view=rev
Log:
add spinner and modify button state when searching
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/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.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=1295047&r1=1295046&r2=1295047&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 Wed Feb 29 09:55:00 2012
@@ -222,3 +222,4 @@ search.artifact.noresults=No results fou
search.artifact.results.groupId=Group ID
search.artifact.results.artifactId=Artifact ID
search.artifact.results.version=Version
+search.artifact.searching=Searching .....
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1295047&r1=1295046&r2=1295047&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Wed Feb 29 09:55:00 2012
@@ -688,7 +688,8 @@ $(function() {
customShowError("#main-content #search-basic-form", null, null, []);
}
var searchResultsGrid=$("#main-content #search-results #search-results-grid" );
- $("#main-content #user-messages").html(mediumSpinnerImg());
+ $("#main-content #btn-basic-search" ).button("loading");
+ $("#user-messages").html(mediumSpinnerImg());
this.searchRequest().repositories=this.selectedRepoIds;
$.ajax("restServices/archivaServices/searchService/quickSearchWithRepositories",
{
@@ -715,6 +716,10 @@ $(function() {
error: function(data) {
var res = $.parseJSON(data.responseText);
displayRestError(res);
+ },
+ complete:function() {
+ $("#main-content #btn-basic-search" ).button("reset");
+ removeMediumSpinnerImg("#user-messages");
}
}
);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1295047&r1=1295046&r2=1295047&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Wed Feb 29 09:55:00 2012
@@ -201,15 +201,16 @@
<option value="${repoId}">${repoId}</option>
{{/each}}
</select>
- </div>
- <div class="control-group">
- <label class="control-label" for="search-terms"></label>
- <div class="controls">
- <input type="text" class="input-medium search-query" id="search-terms" name="search-terms" size="50"
- data-bind="value: searchRequest().queryTerms" placeholder="${$.i18n.prop('search.artifact.search.form.query.terms')}"/>
</div>
- </div>
- <button type="submit" class="btn" data-bind="click: basicSearch">Search</button>
+ <div class="control-group">
+ <label class="control-label" for="search-terms"></label>
+ <div class="controls">
+ <input type="text" class="input-medium search-query" id="search-terms" name="search-terms" size="50"
+ data-bind="value: searchRequest().queryTerms" placeholder="${$.i18n.prop('search.artifact.search.form.query.terms')}"/>
+ </div>
+ </div>
+ <button type="submit" id="btn-basic-search" class="btn btn-primary" data-loading-text="${$.i18n.prop('search.artifact.searching')}" data-bind="click: basicSearch">Search</button>
+ </fieldset>
</form>
</div>
<div class="pill-pane" id="search-advanced-form-pane">
@@ -251,7 +252,7 @@
</div>
</div>
</fieldset>
- <button type="submit" class="btn" data-bind="click: advancedSearch">Search</button>
+ <button type="submit" id="btn-advanced-search" class="btn btn-primary" class="btn" data-bind="click: advancedSearch">Search</button>
</form>
</div>
<div class="pill-pane" id="search-osgi-form-pane">