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/09/06 16:20:56 UTC

svn commit: r1381615 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp: css/archiva.css js/redback/user.js js/templates/archiva/menu.html

Author: olamy
Date: Thu Sep  6 14:20:56 2012
New Revision: 1381615

URL: http://svn.apache.org/viewvc?rev=1381615&view=rev
Log:
do not change hash when login or logout

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
    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/templates/archiva/menu.html

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css?rev=1381615&r1=1381614&r2=1381615&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css Thu Sep  6 14:20:56 2012
@@ -156,4 +156,4 @@ footer {
     border-bottom: 1px solid #EEEEEE;
     margin: 15px 0 20px;
     padding-bottom: 3px;
-}
\ 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=1381615&r1=1381614&r2=1381615&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 Thu Sep  6 14:20:56 2012
@@ -339,6 +339,8 @@ define("redback.user",["jquery","utils",
    */
   loginBox=function(){
 
+
+
     if (window.modalLoginWindow!=null){
       window.modalLoginWindow=null;
     }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html?rev=1381615&r1=1381614&r2=1381615&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html Thu Sep  6 14:20:56 2012
@@ -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>