--- a/src/pyams_ldap/zmi/plugin.py Wed May 20 12:26:01 2015 +0200
+++ b/src/pyams_ldap/zmi/plugin.py Wed Jun 17 09:57:26 2015 +0200
@@ -37,6 +37,7 @@
from pyams_ldap.query import LDAPQuery
from pyams_pagelet.pagelet import pagelet_config
from pyams_security.zmi.utility import SecurityManagerPluginsTable
+from pyams_skin.page import DefaultPageHeaderAdapter
from pyams_skin.skin import apply_skin
from pyams_skin.table import I18nColumn
from pyams_skin.viewlet.toolbar import ToolbarMenuItem
@@ -119,7 +120,7 @@
"""LDAP plug-in add form connection"""
id = 'ldap_connection_form'
- tabLabel = _("Connection")
+ tab_label = _("Connection")
legend = None
fields = field.Fields(ILDAPPlugin).select('server_uri', 'bind_dn', 'bind_password', 'use_tls',
'use_pool', 'pool_size', 'pool_lifetime')
@@ -131,7 +132,7 @@
"""LDAP plug-in add form users schema"""
id = 'ldap_users_form'
- tabLabel = _("Users schema")
+ tab_label = _("Users schema")
legend = None
fields = field.Fields(ILDAPPlugin).select('base_dn', 'search_scope', 'login_attribute', 'login_query',
'uid_attribute', 'uid_query', 'title_format')
@@ -143,7 +144,7 @@
"""LDAP plug-in add form groups schema"""
id = 'ldap_groups_form'
- tabLabel = _("Groups schema")
+ tab_label = _("Groups schema")
legend = None
fields = field.Fields(ILDAPPlugin).select('groups_base_dn', 'groups_search_scope', 'groups_query',
'group_prefix', 'group_uid_attribute', 'group_title_format')
@@ -155,7 +156,7 @@
"""LDAP plug-in add form search settings"""
id = 'ldap_search_form'
- tabLabel = _("Search settings")
+ tab_label = _("Search settings")
legend = None
fields = field.Fields(ILDAPPlugin).select('users_select_query', 'users_search_query',
'groups_select_query', 'groups_search_query')
@@ -211,7 +212,7 @@
"""LDAP plug-in connection edit form"""
id = 'ldap_connection_form'
- tabLabel = _("Connection")
+ tab_label = _("Connection")
legend = None
fields = field.Fields(ILDAPPlugin).select('server_uri', 'bind_dn', 'bind_password', 'use_tls',
'use_pool', 'pool_size', 'pool_lifetime')
@@ -223,7 +224,7 @@
"""LDAP plug-in users schema edit form"""
id = 'ldap_users_form'
- tabLabel = _("Users schema")
+ tab_label = _("Users schema")
legend = None
fields = field.Fields(ILDAPPlugin).select('base_dn', 'search_scope', 'login_attribute', 'login_query',
'uid_attribute', 'uid_query', 'title_format')
@@ -235,7 +236,7 @@
"""LDAP plug-in groups schema edit form"""
id = 'ldap_groups_form'
- tabLabel = _("Groups schema")
+ tab_label = _("Groups schema")
legend = None
fields = field.Fields(ILDAPPlugin).select('groups_base_dn', 'groups_search_scope', 'groups_query',
'group_prefix', 'group_uid_attribute', 'group_title_format')
@@ -247,7 +248,7 @@
"""LDAP plug-in search settings"""
id = 'ldap_search_form'
- tabLabel = _("Search settings")
+ tab_label = _("Search settings")
legend = None
fields = field.Fields(ILDAPPlugin).select('users_select_query', 'users_search_query',
'groups_select_query', 'groups_search_query')
@@ -270,18 +271,17 @@
@adapter_config(context=(ILDAPPlugin, IAdminLayer, LDAPPluginSearchView), provides=IPageHeader)
-class LDAPPluginSearchViewHeaderAdapter(ContextRequestViewAdapter):
+class LDAPPluginSearchViewHeaderAdapter(DefaultPageHeaderAdapter):
"""LDAP users folder search view header adapter"""
back_url = '#security-manager.html'
icon_class = 'fa fa-fw fa-sitemap'
+ title = _("Security manager")
@property
- def title(self):
+ def subtitle(self):
return self.context.title
- subtitle = _("Search users and groups")
-
@view_config(name='search-results.html', context=ILDAPPlugin, request_type=IPyAMSLayer,
permission='system.view')