Author: olamy
Date: Fri Nov 23 16:29:43 2012
New Revision: 1412944
URL: http://svn.apache.org/viewvc?rev=1412944&view=rev
Log:
[MRM-1714] using LDAP can be configurable with the ui
move button in loading state.
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=1412944&r1=1412943&r2=1412944&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 Nov 23 16:29:43 2012
@@ -1161,8 +1161,7 @@ define("archiva.general-admin",["jquery"
saveArchivaRuntimeConfiguration=function(){
$.log("saveArchivaRuntimeConfiguration");
-
-
+ $("#archiva-runtime-configuration-save" ).button('loading');
clearUserMessages();
var userMessages=$("#user-messages");
userMessages.html(mediumSpinnerImg());
@@ -1183,6 +1182,7 @@ define("archiva.general-admin",["jquery"
},
complete:function(data){
removeMediumSpinnerImg(userMessages);
+ $("#archiva-runtime-configuration-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=1412944&r1=1412943&r2=1412944&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 Nov 23 16:29:43 2012
@@ -908,7 +908,7 @@
data-bind="value:
archivaRuntimeConfiguration().userManagerImpl"/>
</div>
</div>
- <button data-bind="click: saveArchivaRuntimeConfiguration"
class="btn">${$.i18n.prop('save')}</button>
+ <button data-bind="click: saveArchivaRuntimeConfiguration"
id="archiva-runtime-configuration-save"
class="btn">${$.i18n.prop('save')}</button>
</fieldset>
</form>
</div>
