svn commit: r1421468 - in /archiva/trunk/archiva-modules/archiva-web: archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js

[olamy]

Author: olamy
Date: Thu Dec 13 20:04:12 2012
New Revision: 1421468

URL: http://svn.apache.org/viewvc?rev=1421468&view=rev
Log:
add missing i18n and reuse selector

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

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=1421468&r1=1421467&r2=1421468&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
 Thu Dec 13 20:04:12 2012
@@ -597,5 +597,8 @@ redback.runtime.properties.key.label=Key
 redback.runtime.properties.value.label=Value
 redback.runtime.user-managers.impls.choosed=UserManager(s) choosed
 redback.runtime.user-managers.impls.available=UserManager(s) availables
+redback.runtime.ldap.verified=Ldap connection verified.
+redback.runtime.ldap.checkModification=Verify LDAP changes.
+redback.runtime.ldap.checkServer=Verify LDAP configuration on server side.
 
 

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=1421468&r1=1421467&r2=1421468&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
 Thu Dec 13 20:04:12 2012
@@ -1272,7 +1272,7 @@ define("archiva.general-admin",["jquery"
              {
                type: "GET",
                success: function(data) {
-                 var 
message=$.i18n.prop('archiva-runtime-configuration.ldap.verified');
+                 var message=$.i18n.prop('redback.runtime.ldap.verified');
                  displaySuccessMessage(message);
                },
                error: function(data) {
@@ -1299,7 +1299,7 @@ define("archiva.general-admin",["jquery"
                
data:ko.toJSON(self.archivaRuntimeConfiguration().ldapConfiguration),
                dataType: 'json',
                success: function(data) {
-                 var 
message=$.i18n.prop('archiva-runtime-configuration.ldap.verified');
+                 var message=$.i18n.prop('redback.runtime.ldap.verified');
                  displaySuccessMessage(message);
                },
                error: function(data) {
@@ -1349,11 +1349,11 @@ define("archiva.general-admin",["jquery"
 
     saveArchivaRuntimeConfiguration=function(){
       $.log("saveArchivaRuntimeConfiguration");
-      $("#archiva-runtime-configuration-save" ).button('loading');
+      var saveButton = $("#archiva-runtime-configuration-save" );
+      saveButton.button('loading');
       clearUserMessages();
       var userMessages=$("#user-messages");
       userMessages.html(mediumSpinnerImg());
-      $("#repository-group-save" ).button('loading');
       
self.archivaRuntimeConfiguration().userManagerImpls=ko.observableArray([]);
       $.log("length:"+self.usedUserManagerImpls().length);
       for(var i=0;i<self.usedUserManagerImpls().length;i++){
@@ -1370,7 +1370,7 @@ define("archiva.general-admin",["jquery"
           data:ko.toJSON(self.archivaRuntimeConfiguration),
           dataType: 'json',
           success: function(data) {
-            var 
message=$.i18n.prop('archiva-runtime-configuration.updated');//,self.archivaRuntimeConfiguration().userManagerImpl());
+            var message=$.i18n.prop('archiva-runtime-configuration.updated');
             displaySuccessMessage(message);
           },
           error: function(data) {
@@ -1379,7 +1379,7 @@ define("archiva.general-admin",["jquery"
           },
           complete:function(data){
             removeMediumSpinnerImg(userMessages);
-            $("#archiva-runtime-configuration-save" ).button('reset');
+            saveButton.button('reset');
           }
         }
       );