Author: olamy
Date: Fri Dec 21 18:42:10 2012
New Revision: 1425077
URL: http://svn.apache.org/viewvc?rev=1425077&view=rev
Log:
display a spinner when something happend instead of no user informations
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
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=1425077&r1=1425076&r2=1425077&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
Fri Dec 21 18:42:10 2012
@@ -401,7 +401,10 @@ define("archiva.general-admin",["jquery"
}
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"
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"
success: function(data){
adminRepositoryConsumer.enabled(true);
displaySuccessMessage(
$.i18n.prop("repository-scanning.consumers.know.enabled",adminRepositoryConsumer.id()));
+ removeMediumSpinnerImg(userMessages);
}
});
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html?rev=1425077&r1=1425076&r2=1425077&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
Fri Dec 21 18:42:10 2012
@@ -224,13 +224,13 @@
<tr>
{{if knownAdminRepositoryConsumer.enabled()==true}}
<td>
- <a href="#" data-bind="click: function(){
disableKnowContentConsumer(knownAdminRepositoryConsumer) }">
+ <a class="cursor-hand" data-bind="click: function(){
disableKnowContentConsumer(knownAdminRepositoryConsumer) }">
<img src="images/weather-clear-22-22.png"/>
</a>
</td>
{{else}}
<td>
- <a href="#" data-bind="click: function(){
enableKnowContentConsumer(knownAdminRepositoryConsumer) }">
+ <a class="cursor-hand" data-bind="click: function(){
enableKnowContentConsumer(knownAdminRepositoryConsumer) }">
<img src="images/dialog-error-22-22.png"/>
</a>
</td>
