# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1286266509 -7200
# Node ID a9e4c51fc1c1cea1a5c9726ae4896f461947e901
# Parent  30582ba8b368cd12d21ba0bbb4ef012c9d44d1c2
[login ui] cleanup and somewhat bw compat

diff -r 30582ba8b368 -r a9e4c51fc1c1 web/views/basecomponents.py
--- a/web/views/basecomponents.py	Tue Oct 05 10:14:37 2010 +0200
+++ b/web/views/basecomponents.py	Tue Oct 05 10:15:09 2010 +0200
@@ -26,6 +26,7 @@
 _ = unicode
 
 from logilab.mtconverter import xml_escape
+from logilab.common.deprecation import class_renamed
 from rql import parse
 
 from cubicweb.selectors import (yes, multi_etypes_rset, match_form_params,
@@ -98,14 +99,15 @@
     with user'action (preference, logout, etc...)
     """
     __abstract__ = True
+    __regid__ = 'loggeduserlink'
     cw_property_defs = VISIBLE_PROP_DEF
     # don't want user to hide this component using an cwproperty
     site_wide = True
-    __regid__ = 'loggeduserlink'
 
 
 class CookieAnonUserLink(_UserLink):
-    __select__ = _UserLink.__select__ & configuration_values('auth-mode', 'cookie') & anonymous_user()
+    __select__ = (_UserLink.__select__ & anonymous_user()
+                  & configuration_values('auth-mode', 'cookie'))
     loginboxid = 'popupLoginBox'
 
     def call(self):
@@ -116,9 +118,11 @@
         self.wview('logform', rset=self.cw_rset, id=self.loginboxid,
                    klass='hidden', title=False, showmessage=False)
 
+AnonUserLink = class_renamed('AnonUserLink', CookieAnonUserLink)
+
 class HTTPAnonUserLink(_UserLink):
-    __select__ = _UserLink.__select__ & configuration_values('auth-mode', 'http') & anonymous_user()
-    loginboxid = 'popupLoginBox'
+    __select__ = (_UserLink.__select__ & anonymous_user()
+                  & configuration_values('auth-mode', 'http'))
 
     def call(self):
         w = self.w