Author: olamy
Date: Fri Sep 28 13:45:46 2012
New Revision: 1391462
URL: http://svn.apache.org/viewvc?rev=1391462&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=1391462&r1=1391461&r2=1391462&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 13:45:46 2012
@@ -848,6 +848,8 @@ define("archiva.general-admin",["jquery"
return;
}
clearUserMessages();
+ $("#user-messages" ).html(mediumSpinnerImg());
+ $("#main-content" ).find("#appearance-configuration-btn-save"
).button('loading');
$.ajax("restServices/archivaServices/archivaAdministrationService/setOrganisationInformation",
{
type: "POST",
contentType: "application/json",
@@ -859,6 +861,10 @@ define("archiva.general-admin",["jquery"
},
error: function(data){
displayErrorMessage($.i18n.prop('appearance-configuration.updating-error'));
+ },
+ complete: function(){
+ removeMediumSpinnerImg("#user-messages");
+ $("#main-content" ).find("#appearance-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=1391462&r1=1391461&r2=1391462&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 13:45:46 2012
@@ -538,7 +538,7 @@
</div>
</div>
</fieldset>
- <button id="appearance-configuration-btn-save" data-bind="click: save"
class="btn">${$.i18n.prop('save')}</button>
+ <button id="appearance-configuration-btn-save"
data-loading-text="${$.i18n.prop('common.loading')}" data-bind="click: save"
class="btn">${$.i18n.prop('save')}</button>
</form>
</script>
