diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-28 13:32:12 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-28 13:32:12 +0000 |
| commit | 9a70ec8eccde0ac28ac9700d3e420271b24fb8fa (patch) | |
| tree | 465f069eba585ca5c5d07b15f2f9785ae6f30bf4 | |
| parent | dadd2e46091671e0d55cb33abe3a9b6192eabf30 (diff) | |
| download | archiva-9a70ec8eccde0ac28ac9700d3e420271b24fb8fa.tar.gz archiva-9a70ec8eccde0ac28ac9700d3e420271b24fb8fa.zip | |
use bootstrap toggle button feature
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1391453 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 4 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index 0ea324242..fd2c9b35f 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -36,6 +36,7 @@ identifier=Id url=Url directory=Directory save.all=Save all +common.loading=Loading... authz.karma.needed=You need to be authenticated for this action or have more privileges. error.500=An error has happened you must contact the administrator to check the logs. 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 c3eb1fc92..4fcb25202 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 @@ -599,6 +599,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" var self=this; save=function(){ $("#user-messages").html( mediumSpinnerImg()); + $("#main-content" ).find("#ui-configuration-btn-save" ).button('loading'); $.ajax("restServices/archivaServices/archivaAdministrationService/setUiConfiguration", { type: "POST", contentType: 'application/json', @@ -609,6 +610,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" }, complete: function(){ removeMediumSpinnerImg("#user-messages"); + $("#main-content" ).find("#ui-configuration-btn-save" ).button('reset'); } }); } 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 22a0f8ddc..c6dff4fe4 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 @@ -341,7 +341,7 @@ </div> </fieldset> - <button id="ui-configuration-btn-save" data-bind="click: save" class="btn">${$.i18n.prop('save')}</button> + <button id="ui-configuration-btn-save" data-bind="click: save" class="btn" data-loading-text="${$.i18n.prop('common.loading')}">${$.i18n.prop('save')}</button> </form> </script> |