From 7a5c97076f6420070e4f8e7c08b95e4f63b07e2a Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 8 Aug 2012 09:43:07 -0500
Subject: [PATCH] fixed navbar separators

---
 VERSION                                |  2 +-
 applications/welcome/views/layout.html |  2 +-
 gluon/tools.py                         | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index f097e61b..212f6ead 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-08 09:34:59) dev
+Version 2.00.0 (2012-08-08 09:43:04) dev
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index eb5e165e..56e5d2e1 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -77,7 +77,7 @@
           <span class="icon-bar"></span>
         </a>
 	<a class="brand" href="#">web2py&trade;&nbsp;</a>
-	<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ','')) or ''}}</div>
+	<div id="navbar">{{='auth' in globals() and auth.navbar() or ''}}</div>
 	<div class="nav-collapse">
 	  {{is_mobile=request.user_agent().is_mobile}}
 	  {{if response.menu:}}
diff --git a/gluon/tools.py b/gluon/tools.py
index 8edf937a..29c37273 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1216,7 +1216,7 @@ class Auth(object):
         if isinstance(prefix,str) and self.user:
             # backward compatibility
             if not '%' in prefix: prefix+' %(first_name)s'
-            prefix_str = (T(prefix) % self.user).strip()+' '
+            prefix_str = (T(prefix) % self.user).strip()
         else:
             prefix_str = str(prefix or '')
         if not action:
@@ -1239,8 +1239,8 @@ class Auth(object):
             bar = SPAN(prefix_str,
                        s1, logout, s3, _class='auth_navbar')
             if not 'profile' in self.settings.actions_disabled:
-                bar.insert(4, s2)
-                bar.insert(5, profile)
+                bar.insert(-1, s2)
+                bar.insert(-1, profile)
             if not 'change_password' in self.settings.actions_disabled:
                 bar.insert(-1, s2)
                 bar.insert(-1, password)
@@ -1252,8 +1252,8 @@ class Auth(object):
             bar = SPAN(s1, login, s3, _class='auth_navbar')
 
             if not 'register' in self.settings.actions_disabled:
-                bar.insert(2, s2)
-                bar.insert(3, register)
+                bar.insert(-1, s2)
+                bar.insert(-1, register)
             if 'username' in self.settings.table_user.fields() and \
                     not 'retrieve_username' in self.settings.actions_disabled:
                 bar.insert(-1, s2)