dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

links to user have _rel='nofollow'

Browse Source
This commit is contained in:
mdipierro
2013-01-10 23:12:01 -06:00
parent 563239147f
commit 7a94b2dbd6
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.01.10.15.12.56 Version 2.4.1-alpha.2+timestamp.2013.01.10.23.11.16
gluon/tools.py
+19 -16
View File
@@ -1256,6 +1256,9 @@ class Auth(object):
def navbar(self, prefix='Welcome', action=None, def navbar(self, prefix='Welcome', action=None,
separators=(' [ ', ' | ', ' ] '), user_identifier=DEFAULT, separators=(' [ ', ' | ', ' ] '), user_identifier=DEFAULT,
referrer_actions=DEFAULT, mode='default'): referrer_actions=DEFAULT, mode='default'):
def Anr(*a,**b):
b['_rel']='nofollow'
return A(*a,**b)
referrer_actions = [] if not referrer_actions else referrer_actions referrer_actions = [] if not referrer_actions else referrer_actions
request = current.request request = current.request
asdropdown = (mode == 'dropdown') asdropdown = (mode == 'dropdown')
@@ -1286,19 +1289,19 @@ class Auth(object):
user_identifier = user_identifier % self.user user_identifier = user_identifier % self.user
if not user_identifier: if not user_identifier:
user_identifier = '' user_identifier = ''
logout = A(T('Logout'), _href='%s/logout?_next=%s' % logout = Anr(T('Logout'), _href='%s/logout?_next=%s' %
(action, urllib.quote(self.settings.logout_next))) (action, urllib.quote(self.settings.logout_next)))
profile = A(T('Profile'), _href=href('profile')) profile = Anr(T('Profile'), _href=href('profile'))
password = A(T('Password'), _href=href('change_password')) password = Anr(T('Password'), _href=href('change_password'))
bar = SPAN( bar = SPAN(
prefix, user_identifier, s1, logout, s3, _class='auth_navbar') prefix, user_identifier, s1, logout, s3, _class='auth_navbar')
if asdropdown: if asdropdown:
logout = LI(A(I(_class='icon-off'), ' ' + T('Logout'), _href='%s/logout?_next=%s' % logout = LI(Anr(I(_class='icon-off'), ' ' + T('Logout'), _href='%s/logout?_next=%s' %
(action, urllib.quote(self.settings.logout_next)))) # the space before T('Logout') is intentional. It creates a gap between icon and text (action, urllib.quote(self.settings.logout_next)))) # the space before T('Logout') is intentional. It creates a gap between icon and text
profile = LI(A(I(_class='icon-user'), ' ' + profile = LI(Anr(I(_class='icon-user'), ' ' +
T('Profile'), _href=href('profile'))) T('Profile'), _href=href('profile')))
password = LI(A(I(_class='icon-lock'), ' ' + password = LI(Anr(I(_class='icon-lock'), ' ' +
T('Password'), _href=href('change_password'))) T('Password'), _href=href('change_password')))
bar = UL(logout, _class='dropdown-menu') bar = UL(logout, _class='dropdown-menu')
# logout will be the last item in list # logout will be the last item in list
@@ -1312,21 +1315,21 @@ class Auth(object):
bar.insert(-1, s2) bar.insert(-1, s2)
bar.insert(-1, password) bar.insert(-1, password)
else: else:
login = A(T('Login'), _href=href('login')) login = Anr(T('Login'), _href=href('login'))
register = A(T('Register'), _href=href('register')) register = Anr(T('Register'), _href=href('register'))
retrieve_username = A( retrieve_username = Anr(
T('Forgot username?'), _href=href('retrieve_username')) T('Forgot username?'), _href=href('retrieve_username'))
lost_password = A( lost_password = Anr(
T('Lost password?'), _href=href('request_reset_password')) T('Lost password?'), _href=href('request_reset_password'))
bar = SPAN(s1, login, s3, _class='auth_navbar') bar = SPAN(s1, login, s3, _class='auth_navbar')
if asdropdown: if asdropdown:
login = LI(A(I(_class='icon-off'), ' ' + T('Login'), _href=href('login'))) # the space before T('Login') is intentional. It creates a gap between icon and text login = LI(Anr(I(_class='icon-off'), ' ' + T('Login'), _href=href('login'))) # the space before T('Login') is intentional. It creates a gap between icon and text
register = LI(A(I(_class='icon-user'), register = LI(Anr(I(_class='icon-user'),
' ' + T('Register'), _href=href('register'))) ' ' + T('Register'), _href=href('register')))
retrieve_username = LI(A(I(_class='icon-edit'), ' ' + T( retrieve_username = LI(Anr(I(_class='icon-edit'), ' ' + T(
'Forgot username?'), _href=href('retrieve_username'))) 'Forgot username?'), _href=href('retrieve_username')))
lost_password = LI(A(I(_class='icon-lock'), ' ' + T( lost_password = LI(Anr(I(_class='icon-lock'), ' ' + T(
'Lost password?'), _href=href('request_reset_password'))) 'Lost password?'), _href=href('request_reset_password')))
bar = UL(login, _class='dropdown-menu') bar = UL(login, _class='dropdown-menu')
# login will be the last item in list # login will be the last item in list
@@ -1349,10 +1352,10 @@ class Auth(object):
if asdropdown: if asdropdown:
bar.insert(-1, LI('', _class='divider')) bar.insert(-1, LI('', _class='divider'))
if self.user_id: if self.user_id:
bar = LI(A(prefix, user_identifier, _href='#'), bar = LI(Anr(prefix, user_identifier, _href='#'),
bar, _class='dropdown') bar, _class='dropdown')
else: else:
bar = LI(A(T('Login'), _href='#'), bar = LI(Anr(T('Login'), _href='#'),
bar, _class='dropdown') bar, _class='dropdown')
return bar return bar