summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-09-28 14:00:56 +0000
committerOlivier Lamy <olamy@apache.org>2012-09-28 14:00:56 +0000
commit08a76456232a06e62e32c1c7f7f341ec0f95deee (patch)
treea1fb6ddbe40c40d0bd1ca2e9d6b14d59525c9043 /archiva-modules/archiva-web
parent08d17fd8dd03dbfcae380883d14f5f6e15b60115 (diff)
downloadarchiva-08a76456232a06e62e32c1c7f7f341ec0f95deee.tar.gz
archiva-08a76456232a06e62e32c1c7f7f341ec0f95deee.zip
use bootstrap toggle button feature
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1391470 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js8
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html3
2 files changed, 9 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
index c5c27397a..d1701d836 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
@@ -521,10 +521,12 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
this.networkConfiguration=ko.observable(networkConfiguration);
save=function(){
+ $("#user-messages" ).html(mediumSpinnerImg());
+ var mainContent=$("#main-content");
if (!$("#main-content" ).find("#network-configuration-edit-form").valid()){
return;
}
- clearUserMessages();
+ mainContent.find("#network-configuration-btn-save" ).button('loading');
$.ajax("restServices/archivaServices/archivaAdministrationService/setNetworkConfiguration", {
type: "POST",
contentType: 'application/json',
@@ -532,6 +534,10 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
dataType: 'json',
success: function(data){
displaySuccessMessage( $.i18n.prop("network-configuration.updated"));
+ },
+ complete: function(){
+ removeMediumSpinnerImg("#user-messages");
+ mainContent.find("#network-configuration-btn-save" ).button('reset');
}
});
}
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
index 9b165d993..77d2f61d0 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
@@ -311,7 +311,8 @@
</div>
</div>
</fieldset>
- <button id="network-configuration-btn-save" data-bind="click: save" class="btn">${$.i18n.prop('save')}</button>
+ <button id="network-configuration-btn-save" data-loading-text="${$.i18n.prop('common.loading')}"
+ data-bind="click: save" class="btn">${$.i18n.prop('save')}</button>
</form>
</script>