[silva.pas.base][Sylvain Viollon] Fix descriptions.

author:    Sylvain Viollon
date:      Fri Oct 25 18:05:24 2013 +0200
revision:  257:d4cfed94ea9e in silva.pas.base
branch:    2.4
details:   https://hg.infrae.com/silva.pas.base?cmd=changeset;node=d4cfed94ea9e
modified:  src/silva/pas/base/Membership.py
added:     
removed:   
log:       Fix descriptions.

Subject: [silva.pas.base][Sylvain Viollon] Update cancel button.


author:    Sylvain Viollon
date:      Fri Oct 25 18:16:15 2013 +0200
revision:  258:2c8516270407 in silva.pas.base
branch:    2.4
details:   https://hg.infrae.com/silva.pas.base?cmd=changeset;node=2c8516270407
modified:  src/silva/pas/base/Membership.py
added:     
removed:   
log:       Update cancel button.


diffstat:

 src/silva/pas/base/Membership.py |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (26 lines):

diff -r 995cadd3dd5e -r 2c8516270407 src/silva/pas/base/Membership.py
--- a/src/silva/pas/base/Membership.py	Fri Oct 25 15:57:46 2013 +0200
+++ b/src/silva/pas/base/Membership.py	Fri Oct 25 18:16:15 2013 +0200
@@ -263,10 +263,12 @@
 
 
 class ISettingsFields(Interface):
-    _display_usernames = schema.Bool(title=u'Display user names',
-        description=u'Display user names instead of login names in tab access.')
+    _display_usernames = schema.Bool(
+        title=u'Display user names',
+        description=u'Display user names instead of login names in the ' \
+            u'folder listing and access screen.')
     _display_emails = schema.Bool(title=u'Display emails',
-        description=u'Display emails in tab access.')
+        description=u'Display emails in the access screen.')
     _redirect_to_root = schema.Bool(title=u'Logout redirect to root',
         description=u"Always redirect to root after logout.")
 
@@ -301,5 +303,5 @@
                     u'sessions and permissions.')
     fields = silvaforms.Fields(ISettingsFields)
     actions = silvaforms.Actions(
-        silvaforms.CancelAction(),
+        silvaforms.CancelConfigurationAction(),
         silvaforms.EditAction())