Author: olamy
Date: Sat Dec 29 21:07:25 2012
New Revision: 1426833
URL: http://svn.apache.org/viewvc?rev=1426833&view=rev
Log:
add a welcome badge on user login
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js?rev=1426833&r1=1426832&r2=1426833&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
Sat Dec 29 21:07:25 2012
@@ -92,6 +92,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
hideElementWithKarma();
$("#main-content").empty();
$("#user-messages" ).empty();
+ $("#login-welcome" ).hide();
$.ajax({
url: 'restServices/redbackServices/loginService/logout',
complete: function(){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js?rev=1426833&r1=1426832&r2=1426833&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js
Sat Dec 29 21:07:25 2012
@@ -133,7 +133,6 @@ require(["jquery","jquery.tmpl","i18n","
if(window.archivaModel.adminExists==false){
displayErrorMessage($.i18n.prop("admin.creation.mandatory"));
}
-
}
/**
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js?rev=1426833&r1=1426832&r2=1426833&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
Sat Dec 29 21:07:25 2012
@@ -445,7 +445,8 @@ function(jquery,utils,i18n,jqueryValidat
}
clearForm("#user-login-form");
decorateMenuWithKarma(user);
-
+ $("#login-welcome" ).show();
+ $("#welcome-label" ).html("Welcome " + user.username());
return;
}
var modalLoginErrMsg=$("#modal-login-err-message");
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html?rev=1426833&r1=1426832&r2=1426833&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
Sat Dec 29 21:07:25 2012
@@ -75,7 +75,13 @@
<div style="max-height: 40px" class="navbar-inner">
<div class="container-fluid">
<div id="organisation-logo" style="max-height: 40px"
class="pull-left"></div>
+
<ul class="nav pull-right">
+ <li id="login-welcome" style="display: none">
+ <a>
+ <span class="label label-important" id="welcome-label"></span>
+ </a>
+ </li>
<li id="create-admin-link" style="display: none">
<a href="#open-admin-create-box" onclick="adminCreateBox();"
id="create-admin-link-a">
<span class="label
label-important">${$.i18n.prop('create.admin.page.link')}</span>
