do not change hash when login or logout

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
index f145eb09f4abe1296f06cd24fc64b697a95e52ff..8ee84ff0e094b6ab3e856017cbdab700f0266375 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
@@ -156,4 +156,4 @@ footer {
     border-bottom: 1px solid #EEEEEE;
     margin: 15px 0 20px;
     padding-bottom: 3px;
-}
\ 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 d54c07bdca90afcb054493bd7cd93b3bd9fcb120..eb5454634c920c6fc98ee7f2b342ac08b0667131 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
@@ -339,6 +339,8 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
    */
   loginBox=function(){
 
+
+
     if (window.modalLoginWindow!=null){
       window.modalLoginWindow=null;
     }

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
index 5b2bc8e5f3927368e727886bf1989c2d8a621c13..f0ee15a674fd55d20d028b8ca9e20cf4b3e8acbf 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
@@ -69,21 +69,23 @@
               </a>
             </li>
             <li id="login-link" style="display: none">
-              <a href="#" onclick="loginBox();" id="login-link-a">
-                <span class="label label-success force-upper-case">${$.i18n.prop('login')}</span>
+              <a onclick="loginBox();" id="login-link-a">
+                <span class="btn btn-success label force-upper-case">${$.i18n.prop('login')}</span>
               </a>
             </li>
             <li id="change-password-link">
-              <a href="#" onclick="editUserDetailsBox();">${$.i18n.prop('edit.details')}</a>
+              <a onclick="editUserDetailsBox();">
+                <span class="btn btn-warning label force-upper-case">${$.i18n.prop('edit.details')}</span>
+              </a>
             </li>
             <li id="logout-link" style="display: none">
-              <a href="#" onclick="logout(true);" id="logout-link-a">
-                <span class="label label-important force-upper-case">${$.i18n.prop('logout')}</span>
+              <a onclick="logout(true);" id="logout-link-a">
+                <span class="btn btn-danger label force-upper-case">${$.i18n.prop('logout')}</span>
               </a>
             </li>
             <li id="register-link" style="display: none">
-              <a href="#" onclick="registerBox();" id="register-link-a">
-                <span class="label label-info force-upper-case">${$.i18n.prop('register')}</span>
+              <a onclick="registerBox();" id="register-link-a">
+                <span class="btn btn-info label force-upper-case">${$.i18n.prop('register')}</span>
               </a>
             </li>
             <li>