You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/23 13:32:34 UTC
svn commit: r1234764 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/ archiva/templates/ redback/ redback/templates/
Author: olamy
Date: Mon Jan 23 12:32:33 2012
New Revision: 1234764
URL: http://svn.apache.org/viewvc?rev=1234764&view=rev
Log:
use i18n function call rather than simple variable because if key is missing and function exists with same name the js function is called which can be weird
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Mon Jan 23 12:32:33 2012
@@ -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();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Mon Jan 23 12:32:33 2012
@@ -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;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html Mon Jan 23 12:32:33 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js Mon Jan 23 12:32:33 2012
@@ -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",
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js Mon Jan 23 12:32:33 2012
@@ -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;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html Mon Jan 23 12:32:33 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html Mon Jan 23 12:32:33 2012
@@ -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
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html Mon Jan 23 12:32:33 2012
@@ -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
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js Mon Jan 23 12:32:33 2012
@@ -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;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js?rev=1234764&r1=1234763&r2=1234764&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js Mon Jan 23 12:32:33 2012
@@ -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;