use i18n function call rather than simple variable because if key is missing and...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1234764 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index e5647cc0ca2b7aea607075d5cb03d38a581aa509..219925184d5628206527cda077e8293c2af2d3d9 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -111,11 +111,12 @@ $(function() {
     $("#sidebar-content [redback-permissions]").each(function(element){
       $(this).hide();
     });
-
+    $.log("hideElementWithKarma");
   }
 
 
   checkSecurityLinks=function(){
+    $.log("checkSecurityLinks");
     var user = userLogged();
     $.log("checkSecurityLinks, user:"+user);
 
@@ -136,6 +137,7 @@ $(function() {
     $.ajax("restServices/redbackServices/userService/isAdminUserExists", {
       type: "GET",
       dataType: 'json',
+      async: false,
       success: function(data) {
         var adminExists = JSON.parse(data);
         if (adminExists == false) {
@@ -145,6 +147,7 @@ $(function() {
         } else {
           $("#create-admin-link").hide();
         }
+        $.log("adminExists:"+adminExists);
       }
     });
   }
@@ -159,6 +162,8 @@ $(function() {
 
   $('#topbar-menu-container').html($("#topbar-menu"));
   $('#sidebar-content').html($("#main-menu"));
+
+
   checkCreateAdminLink();
   hideElementWithKarma();
   checkSecurityLinks();

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
index 9932c50bfa32944fa08386449f1423a5317318f6..181d430825408a4cf3f86ffd576fc14a51674d69 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
@@ -133,6 +133,7 @@ $(function() {
     this.availableLayouts = window.managedRepositoryTypes;
 
     save=function(){
+      $.log("repositories.js#save");
       var valid = $("#main-content #managed-repository-edit-form").valid();
       if (valid==false) {
           return;

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
index 18233271d67acef512505719587f46885db16ee2..9d93239696cfdc9e95c88b35d67d75ccd29df787 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
@@ -30,7 +30,7 @@
         </li>
         <li id="login-link" style="display: none">
           <a href="#" onclick="loginBox();" id="login-link-a">
-            <span class="label success">${login}</span>
+            <span class="label success">${$.i18n.prop('login')}</span>
           </a>
         </li>
         <li id="change-password-link" style="">
@@ -43,7 +43,7 @@
         </li>
         <li id="register-link" style="display: none">
           <a href="#" onclick="registerBox();" id="register-link-a">
-            <span class="label notice">${register}</span>
+            <span class="label notice">${$.i18n.prop('register')}</span>
           </a>
         </li>
       </ul>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
index a4160292c851dc9e91c3918ca7f9ab290a413f6f..1f80baa2165e64d0ffab0402e7397fff87cf6dfa 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
@@ -37,6 +37,7 @@ $(function() {
   userLogged=function() {
     // call restServices/redbackServices/loginService/isLogged to know
     // if a session exists and check the cookie
+    $.log("userLogged");
     var userLogged = true;
     $.ajax("restServices/redbackServices/loginService/isLogged", {
       type: "GET",

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
index bdcf99071df1d5534cca3b954d63d491b06b54fa..e8ce1e31ae1cfa70b23d57a07bacd2879941be16 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
@@ -45,6 +45,7 @@ $(function() {
    * validate the register form and call REST service
    */
   register=function(){
+    $.log("register.js#register");
     var valid = $("#user-register-form").valid();
     if (!valid) {
         return;

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
index 7691583824e8f8db3f90f199bea6c812eadf10f4..a0e0e90619c376fb01fc82faea45ddf717b80969 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
@@ -41,7 +41,7 @@
       </form>
   </div>
   <div class="modal-footer" id="modal-login-footer">
-    <button class="btn primary" onclick="return login();" id="modal-login-ok">${login}</button>
+    <button class="btn primary" onclick="login();" id="modal-login-ok">${$.i18n.prop('login)}</button>
   </div>
 </div>
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
index 5acd6fd4046efc983ca7a81578bcc7e13c296180..4207d22246d6cc38440a570e3f8764c7207acac2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
@@ -50,6 +50,6 @@
       </form>
   </div>
   <div class="modal-footer" id="modal-password-change-footer">
-    <button class="btn primary" onclick="return" id="modal-change-password-ok">${register}</button>
+    <button class="btn primary" onclick="return" id="modal-change-password-ok">${$.i18n.prop('register')}</button>
   </div>
 </div>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
index d6da8ec929f35723ad49803b7b4da2ad97fa21d0..b555f3372e585e970d343ae051d238b3f67e03c2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
@@ -48,6 +48,6 @@
       </form>
   </div>
   <div class="modal-footer" id="modal-register-footer">
-      <button class="btn primary" onclick="return register();" id="modal-register-ok">${register}</button>
+      <button class="btn primary" onclick="return register();" id="modal-register-ok">${$.i18n.prop('register')}</button>
   </div>
 </div>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
index 55813d8818a58a09c588a353f728f873f931de04..ab239c74e6b8b7fc7bbe075269b08c7e46a18a68 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
@@ -97,6 +97,7 @@ $(function() {
       };
 
       this.createAdmin = function() {
+        $.log("user.js#createAdmin");
         var valid = $("#user-create").valid();
         $.log("create admin");
         if (!valid) {
@@ -310,6 +311,7 @@ $(function() {
    * open a modal box for login
    */
   loginBox=function(){
+    $.log("loginBox");
     screenChange();
     if (window.modalLoginWindow==null) {
       window.modalLoginWindow = $("#modal-login").modal({backdrop:'static',show:false});
@@ -325,6 +327,7 @@ $(function() {
     });
     $("#modal-login").delegate("#modal-login-ok", "click keydown keypress", function(e) {
       e.preventDefault();
+      $.log("loginBox before login");
       login();
     });
     $("#modal-login").focus();
@@ -398,6 +401,7 @@ $(function() {
    * validate login box before ajax call
    */
   login=function(){
+    $.log("user.js#login");
     $("#modal-login-err-message").html("");
     screenChange();
     var valid = $("#user-login-form").valid();
@@ -493,6 +497,7 @@ $(function() {
       })
       $("#modal-user-edit #modal-user-edit-ok").on( "click keydown keypress", function(e) {
         e.preventDefault();
+        $.log("user.js#editUserDetailsBox");
         var valid = $("#user-edit-form").valid();
         if (!valid) {
             return;
@@ -568,6 +573,7 @@ $(function() {
    * @param registration are we in registration mode ? if yes the user will be logged
    */
   changePassword=function(previousPassword,registration,user){
+    $.log("user.js#changePassword");
     var valid = $("#password-change-form").valid();
     if (valid==false) {
         return;

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
index 888def24cb86188738b305def7859ccfbb78b27a..fba291eb5a75e559573935dea05b21686af4bc77 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
@@ -138,6 +138,7 @@ $(function() {
       });
       $("#main-content #user-create").delegate("#user-create-form-save-button", "click keydown", function(e) {
         e.preventDefault();
+        $.log("users.js#editUserBox");
         var valid = $("#user-create").valid();
         if (!valid) {
             return;