From 99d64722a12b17ae32c866685eef4a1080ad5d1a Mon Sep 17 00:00:00 2001
From: Tim Richardson <tim@tim-richardson.net>
Date: Sun, 2 Feb 2014 18:15:57 +1100
Subject: [PATCH] Better button labels for grid search widget This is a second
 attempt at search widget buttons. The create "+Add" is now "+Add Record". The
 first search button becomes "New Search", and the And and Or buttons become
 "+ And" and "+ Or" (to hint that they add terms to the search). There are
 tool tips on all these buttons now

---
 gluon/sqlhtml.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 2b208d7f..dd4b7bf5 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1747,13 +1747,13 @@ class SQLFORM(FORM):
                         _type='text', _id=_id, _class=field.type)
 
                 new_button = INPUT(
-                    _type="button", _value=T('Add'), _class="btn", _title = T('Add clause to search terms'),
+                    _type="button", _value=T('New Search'), _class="btn", _title = T('Start building a new search'),
                     _onclick="%s_build_query('new','%s')" % (prefix,field))
                 and_button = INPUT(
-                    _type="button", _value=T('And'), _class="btn",
+                    _type="button", _value=T('+ And'), _class="btn", _title = T('Add this to the search as an AND term'),
                     _onclick="%s_build_query('and','%s')" % (prefix, field))
                 or_button = INPUT(
-                    _type="button", _value=T('Or'), _class="btn",
+                    _type="button", _value=T('+ Or'), _class="btn",_title = T('Add this to the search as an OR term'),
                     _onclick="%s_build_query('or','%s')" % (prefix, field))
                 close_button = INPUT(
                     _type="button", _value=T('Close'), _class="btn",
@@ -1960,10 +1960,10 @@ class SQLFORM(FORM):
 
         def gridbutton(buttonclass='buttonadd', buttontext=T('Add'),
                        buttonurl=url(args=[]), callback=None,
-                       delete=None, trap=True, noconfirm=None):
+                       delete=None, trap=True, noconfirm=None, title=None):
             if showbuttontext:
                 return A(SPAN(_class=ui.get(buttonclass)),
-                         SPAN(T(buttontext), _title=T(buttontext),
+                         SPAN(T(buttontext), _title=title or T(buttontext),
                               _class=ui.get('buttontext')),
                          _href=buttonurl,
                          callback=callback,
@@ -1977,7 +1977,7 @@ class SQLFORM(FORM):
                          callback=callback,
                          delete=delete,
                          noconfirm=noconfirm,
-                         _title=T(buttontext),
+                         _title=title or T(buttontext),
                          _class=ui.get('buttontext'),
                          cid=request.cid)
 
@@ -2238,7 +2238,8 @@ class SQLFORM(FORM):
         if create:
             add = gridbutton(
                 buttonclass='buttonadd',
-                buttontext=T('Add'),
+                buttontext=T('Add Record'),
+                title=T("Add record to database"),
                 buttonurl=url(args=['new', tablename]))
             if not searchable:
                 console.append(add)