From f4af9f8529a85fc92cefa92c7485739af5734de3 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 21 Dec 2012 18:42:10 +0000 Subject: [PATCH] display a spinner when something happend instead of no user informations git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425077 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/general-admin.js | 7 +++++++ .../main/webapp/js/templates/archiva/general-admin.html | 4 ++-- 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 0fa26baa4..82bb451ea 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 @@ -401,7 +401,10 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" } disableKnowContentConsumer=function(adminRepositoryConsumer){ + $.log("disableKnowContentConsumer"); clearUserMessages(); + var userMessages=$("#user-messages" ) + userMessages.html(mediumSpinnerImg()); var url="restServices/archivaServices/archivaAdministrationService/disabledKnownContentConsumer/" url+=encodeURIComponent(adminRepositoryConsumer.id()); $.ajax(url, { @@ -410,12 +413,15 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" success: function(data){ adminRepositoryConsumer.enabled(false); displaySuccessMessage( $.i18n.prop("repository-scanning.consumers.know.disabled",adminRepositoryConsumer.id())); + removeMediumSpinnerImg(userMessages); } }); } enableKnowContentConsumer=function(adminRepositoryConsumer){ clearUserMessages(); + var userMessages=$("#user-messages" ) + userMessages.html(mediumSpinnerImg()); var url="restServices/archivaServices/archivaAdministrationService/enabledKnownContentConsumer/" url+=encodeURIComponent(adminRepositoryConsumer.id()); $.ajax(url, { @@ -424,6 +430,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" success: function(data){ adminRepositoryConsumer.enabled(true); displaySuccessMessage( $.i18n.prop("repository-scanning.consumers.know.enabled",adminRepositoryConsumer.id())); + removeMediumSpinnerImg(userMessages); } }); } 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 af6aa7001..09a3e29bd 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 @@ -224,13 +224,13 @@ {{if knownAdminRepositoryConsumer.enabled()==true}} - + {{else}} - + -- 2.39.5