add a welcome badge on user login

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
index b6bd478cdc7bafc5ff9af2dd6ec34793e01ee9c6..23477cd89dc5104cfd8b5c367a43e2646239055f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
@@ -92,6 +92,7 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
     hideElementWithKarma();
     $("#main-content").empty();
     $("#user-messages" ).empty();
+    $("#login-welcome" ).hide();
     $.ajax({
       url: 'restServices/redbackServices/loginService/logout',
       complete: function(){

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js
index 76963b69a9813fbc5face358757ecf49dc9965f3..cf0bc6ab817d9e964482f7b9bcb12b5af4724469 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js
@@ -133,7 +133,6 @@ require(["jquery","jquery.tmpl","i18n","knockout"], function(jquery,jqueryTmpl,i
     if(window.archivaModel.adminExists==false){
       displayErrorMessage($.i18n.prop("admin.creation.mandatory"));
     }
-
   }
 
   /**

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
index f7d4bf2ee116a9916b259e84853e00638eeba412..732a8eb8038a9bad7dba983f90016b303672df63 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
@@ -445,7 +445,8 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
       }
       clearForm("#user-login-form");
       decorateMenuWithKarma(user);
-
+      $("#login-welcome" ).show();
+      $("#welcome-label" ).html("Welcome " + user.username());
       return;
     }
     var modalLoginErrMsg=$("#modal-login-err-message");

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
index 4be060d2fd0f120d338a1232d9481b520dd7c5f7..8a04be2fc0f9c42df5538ce0b6a6bec674e5aa74 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
@@ -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>