From cb1bdf9a68c94410e36286bbe9e8165ca3f6df99 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 2 Apr 2012 12:39:28 +0000 Subject: [PATCH] correctly display spinner when loading network configuration screen git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308324 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/general-admin.js | 6 ++++-- 1 file changed, 4 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 1ee371fff..1513a7e44 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 @@ -540,12 +540,13 @@ define("archiva.general-admin",["jquery","i18n","order!utils","order!jquery.tmpl displayNetworkConfiguration=function(){ screenChange(); var mainContent=$("#main-content"); - mainContent.html($("#network-configuration-screen").tmpl()); + mainContent.html(mediumSpinnerImg()); $.ajax("restServices/archivaServices/archivaAdministrationService/getNetworkConfiguration", { type: "GET", dataType: 'json', success: function(data){ + mainContent.html($("#network-configuration-screen").tmpl()); var networkConfiguration=new NetworkConfiguration(data.maxTotal,data.maxTotalPerHost,data.usePooling); var networkConfigurationViewModel=new NetworkConfigurationViewModel(networkConfiguration); ko.applyBindings(networkConfigurationViewModel,mainContent.get(0)); @@ -807,12 +808,13 @@ define("archiva.general-admin",["jquery","i18n","order!utils","order!jquery.tmpl displayAppearanceConfiguration=function(){ screenChange(); var mainContent=$("#main-content"); - mainContent.html($("#changeAppearance").tmpl()); + mainContent.html(mediumSpinnerImg()); $.ajax("restServices/archivaServices/archivaAdministrationService/getOrganisationInformation", { type: "GET", dataType: 'json', success: function(data) { + mainContent.html($("#changeAppearance").tmpl()); var organisationInformation=new OrganisationInformation(data.name,data.url,data.logoLocation); var organisationInformationViewModel=new OrganisationInformationViewModel(organisationInformation); ko.applyBindings(organisationInformationViewModel, mainContent.get(0)); -- 2.39.5