Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-09-06 14:20:56 +00:00
parent 5c8b237be7
commit fb16a787ed
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
View File

@ -339,6 +339,8 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
*/
loginBox=function(){
if (window.modalLoginWindow!=null){
window.modalLoginWindow=null;
}

16
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
View File

@ -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>