Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add spinner and modify button state when searching 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1295047 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-02-29 09:55:00 +00:00
parent 9eb977f581
commit a67abc4333
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
View File

@ -222,3 +222,4 @@ search.artifact.noresults=No results found.
search.artifact.results.groupId=Group ID search.artifact.results.groupId=Group ID
search.artifact.results.artifactId=Artifact ID search.artifact.results.artifactId=Artifact ID
search.artifact.results.version=Version search.artifact.results.version=Version
search.artifact.searching=Searching .....

7
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
View File

@ -688,7 +688,8 @@ $(function() {
customShowError("#main-content #search-basic-form", null, null, []); customShowError("#main-content #search-basic-form", null, null, []);
} }
var searchResultsGrid=$("#main-content #search-results #search-results-grid" ); 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; this.searchRequest().repositories=this.selectedRepoIds;
$.ajax("restServices/archivaServices/searchService/quickSearchWithRepositories", $.ajax("restServices/archivaServices/searchService/quickSearchWithRepositories",
{ {
@ -715,6 +716,10 @@ $(function() {
error: function(data) { error: function(data) {
var res = $.parseJSON(data.responseText); var res = $.parseJSON(data.responseText);
displayRestError(res); displayRestError(res);
},
complete:function() {
$("#main-content #btn-basic-search" ).button("reset");
removeMediumSpinnerImg("#user-messages");
} }
} }
); );

19
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
View File

@ -201,15 +201,16 @@
<option value="${repoId}">${repoId}</option> <option value="${repoId}">${repoId}</option>
{{/each}} {{/each}}
</select> </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>
</div> <div class="control-group">
<button type="submit" class="btn" data-bind="click: basicSearch">Search</button> <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> </form>
</div> </div>
<div class="pill-pane" id="search-advanced-form-pane"> <div class="pill-pane" id="search-advanced-form-pane">
@ -251,7 +252,7 @@
</div> </div>
</div> </div>
</fieldset> </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> </form>
</div> </div>
<div class="pill-pane" id="search-osgi-form-pane"> <div class="pill-pane" id="search-osgi-form-pane">