svn commit: r1308324 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js

[ol...@apache.org]

Author: olamy
Date: Mon Apr  2 12:39:28 2012
New Revision: 1308324

URL: http://svn.apache.org/viewvc?rev=1308324&view=rev
Log:
correctly display spinner when loading network configuration screen

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1308324&r1=1308323&r2=1308324&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js Mon Apr  2 12:39:28 2012
@@ -540,12 +540,13 @@ define("archiva.general-admin",["jquery"
   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"
   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));