Author: olamy
Date: Fri Sep 28 14:00:56 2012
New Revision: 1391470
URL: http://svn.apache.org/viewvc?rev=1391470&view=rev
Log:
use bootstrap toggle button feature
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=1391470&r1=1391469&r2=1391470&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 Sep 28 14:00:56 2012
@@ -521,10 +521,12 @@ define("archiva.general-admin",["jquery"
this.networkConfiguration=ko.observable(networkConfiguration);
save=function(){
+ $("#user-messages" ).html(mediumSpinnerImg());
+ var mainContent=$("#main-content");
if (!$("#main-content"
).find("#network-configuration-edit-form").valid()){
return;
}
- clearUserMessages();
+ mainContent.find("#network-configuration-btn-save" ).button('loading');
$.ajax("restServices/archivaServices/archivaAdministrationService/setNetworkConfiguration",
{
type: "POST",
contentType: 'application/json',
@@ -532,6 +534,10 @@ define("archiva.general-admin",["jquery"
dataType: 'json',
success: function(data){
displaySuccessMessage( $.i18n.prop("network-configuration.updated"));
+ },
+ complete: function(){
+ removeMediumSpinnerImg("#user-messages");
+ mainContent.find("#network-configuration-btn-save" ).button('reset');
}
});
}
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=1391470&r1=1391469&r2=1391470&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 Sep 28 14:00:56 2012
@@ -311,7 +311,8 @@
</div>
</div>
</fieldset>
- <button id="network-configuration-btn-save" data-bind="click: save"
class="btn">${$.i18n.prop('save')}</button>
+ <button id="network-configuration-btn-save"
data-loading-text="${$.i18n.prop('common.loading')}"
+ data-bind="click: save"
class="btn">${$.i18n.prop('save')}</button>
</form>
</script>
