Author: olamy
Date: Fri Sep 28 13:32:12 2012
New Revision: 1391453
URL: http://svn.apache.org/viewvc?rev=1391453&view=rev
Log:
use bootstrap toggle button feature
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
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-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1391453&r1=1391452&r2=1391453&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
Fri Sep 28 13:32:12 2012
@@ -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.
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=1391453&r1=1391452&r2=1391453&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:32:12 2012
@@ -599,6 +599,7 @@ define("archiva.general-admin",["jquery"
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"
},
complete: function(){
removeMediumSpinnerImg("#user-messages");
+ $("#main-content" ).find("#ui-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=1391453&r1=1391452&r2=1391453&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:32:12 2012
@@ -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>
