From 36dcc9959a3db38b72af009b3e9cc9469481cc0b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 28 Sep 2012 13:45:46 +0000 Subject: [PATCH] use bootstrap toggle button feature git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1391462 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/general-admin.js | 6 ++++++ .../src/main/webapp/js/templates/archiva/general-admin.html | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 4fcb25202..4dcbf80a0 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 @@ -848,6 +848,8 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" return; } clearUserMessages(); + $("#user-messages" ).html(mediumSpinnerImg()); + $("#main-content" ).find("#appearance-configuration-btn-save" ).button('loading'); $.ajax("restServices/archivaServices/archivaAdministrationService/setOrganisationInformation", { type: "POST", contentType: "application/json", @@ -859,6 +861,10 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" }, error: function(data){ displayErrorMessage($.i18n.prop('appearance-configuration.updating-error')); + }, + complete: function(){ + removeMediumSpinnerImg("#user-messages"); + $("#main-content" ).find("#appearance-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 c6dff4fe4..9b165d993 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 @@ -538,7 +538,7 @@ - + -- 2.39.5